From 9c9e8d279839d1ff8f005b787a2797f2d630c86a Mon Sep 17 00:00:00 2001 From: Brede Fritjof Klausen Date: Thu, 22 Jun 2023 15:29:19 +0200 Subject: [PATCH] [ITA-1557] Include spring-boot services --- servicebuilder-core-addons/pom.xml | 1 + .../no/obos/util/servicebuilder/addon/JerseyClientAddon.java | 3 ++- .../no/obos/util/servicebuilder/model/ServiceDefinition.java | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml index a5fb6b8c..5e99e98d 100644 --- a/servicebuilder-core-addons/pom.xml +++ b/servicebuilder-core-addons/pom.xml @@ -25,6 +25,7 @@ no.obos.metrics obos-metrics-servlet + 10.1.11 com.fasterxml.jackson.core diff --git a/servicebuilder-core-addons/src/main/java/no/obos/util/servicebuilder/addon/JerseyClientAddon.java b/servicebuilder-core-addons/src/main/java/no/obos/util/servicebuilder/addon/JerseyClientAddon.java index 43a63c16..51c15fd7 100644 --- a/servicebuilder-core-addons/src/main/java/no/obos/util/servicebuilder/addon/JerseyClientAddon.java +++ b/servicebuilder-core-addons/src/main/java/no/obos/util/servicebuilder/addon/JerseyClientAddon.java @@ -143,7 +143,8 @@ public void addToJerseyConfig(JerseyConfig jerseyConfig) { @Override public void addToJettyServer(JettyServer jettyServer) { if (monitorIntegration) { - ObosHealthCheckRegistry.registerPingCheck(serviceDefinition.getName() + ": " + uri.toString(), uri.toString()); + boolean isSpringboot = (serviceDefinition.isSpringboot() != null && serviceDefinition.isSpringboot()); + ObosHealthCheckRegistry.registerPingCheck(serviceDefinition.getName() + ": " + uri.toString(), uri.toString(), isSpringboot); } } diff --git a/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/ServiceDefinition.java b/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/ServiceDefinition.java index 6abe2cc3..f169a676 100644 --- a/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/ServiceDefinition.java +++ b/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/ServiceDefinition.java @@ -12,5 +12,8 @@ default JsonConfig getJsonConfig() { return JsonConfig.standard; } + default Boolean isSpringboot() { + return false; + } }