Merge branch 'main' into adinas/AsyncObservability

DataBiosphere · Feb 1, 2024 · fbefd8a · fbefd8a
2 parents f84030b + dc85057
commit fbefd8a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/service/build.gradle b/service/build.gradle
@@ -38,6 +38,7 @@ jib {
 ext {
     parquet_mr_version = "1.13.1"
     hadoop_version = "3.3.6"
+    prometheus_rsocket_version = "1.5.3"
 }
 
 dependencies {
@@ -55,6 +56,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-quartz'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-prometheus'
+    implementation "io.micrometer.prometheus:prometheus-rsocket-spring:$prometheus_rsocket_version"
     implementation 'org.springframework.integration:spring-integration-jdbc'
     implementation 'org.aspectj:aspectjweaver' // required by spring-retry, not used directly
     implementation 'com.google.guava:guava:32.1.3-jre'
@@ -230,7 +232,7 @@ jacocoTestReport {
 test {
     systemProperties['pact.rootDir'] = "$buildDir/pacts"
     systemProperties['pact.provider.version'] = "$project.version"
-    systemProperties['user.timezone'] = "UTC";
+    systemProperties['user.timezone'] = "UTC"
 }
 
 tasks.register("pactTests", Test) {

diff --git a/service/src/main/resources/application-bee.yml b/service/src/main/resources/application-bee.yml
@@ -5,3 +5,9 @@ datarepourl: https://data.${beename}.bee.envs-terra.bio
 workspacemanagerurl: https://workspace.${beename}.bee.envs-terra.bio
 leoUrl: https://leonardo.${beename}.bee.envs-terra.bio
 
+# Note: this will probably get re-nested under `prometheus` if prometheus-rsocket-proxy is upgraded to support
+# spring-boot 3+
+management.metrics.export.prometheus.rsocket:
+  enabled: true
+  host: promproxy.bee.envs-terra.bio
+
diff --git a/service/src/main/resources/application-local-promprox.yml b/service/src/main/resources/application-local-promprox.yml
@@ -0,0 +1,11 @@
+# Note: this will probably get re-nested under `prometheus` if prometheus-rsocket-proxy is upgraded to support
+# spring-boot 3+
+#
+# To run a local prometheus-rsocket-proxy (see https://github.com/micrometer-metrics/prometheus-rsocket-proxy):
+#    docker run -p 8081:8080 -p 7001:7001 micrometermetrics/prometheus-rsocket-proxy:latest
+#
+# To run WDS with this profile enabled:
+#    ./gradlew bootRun --args='--spring.profiles.active=local-promprox'
+management.metrics.export.prometheus.rsocket:
+  enabled: true
+  host: localhost
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
@@ -44,6 +44,17 @@ management:
       export:
         enabled: true
 
+  # Note: this will probably get re-nested under `prometheus` if prometheus-rsocket-proxy is upgraded to support
+  # spring-boot 3+
+  metrics.export.prometheus.rsocket:
+    # TODO(AJ-1342): disabled by default, enable once prod readiness is approved
+    enabled: ${PROMETHEUS_RSOCKET_PROXY_ENABLED:false}
+    host: ${PROMETHEUS_RSOCKET_PROXY_HOST:}
+    port: 7001
+    max-retries: 1000 # default is Long.MAX_VALUE
+    first-backoff: 10s
+    max-backoff: 10m
+
 info:
   app:
     chart-version: ${HELM_CHART:unknown}