fix: disable metrics if endpoint not set (#3213)

fixes: #3156
block · Oct 28, 2024 · 9311f72 · 9311f72
1 parent 3277cee
commit 9311f72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/...-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/StaticConfigSource.java b/...-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/StaticConfigSource.java
@@ -7,7 +7,6 @@
 public class StaticConfigSource implements ConfigSource {
 
     public static final String QUARKUS_BANNER_ENABLED = "quarkus.banner.enabled";
-    final static String OTEL_METRICS_ENABLED = "quarkus.otel.metrics.enabled";
 
     @Override
     public Set<String> getPropertyNames() {
@@ -16,13 +15,8 @@ public Set<String> getPropertyNames() {
 
     @Override
     public String getValue(String propertyName) {
-        switch (propertyName) {
-            case (QUARKUS_BANNER_ENABLED) -> {
-                return "false";
-            }
-            case OTEL_METRICS_ENABLED -> {
-                return "true";
-            }
+        if (propertyName.equals(QUARKUS_BANNER_ENABLED)) {
+            return "false";
         }
         return null;
     }

diff --git a/...tl-runtime/common/runtime/src/main/java/xyz/block/ftl/runtime/config/FTLConfigSource.java b/...tl-runtime/common/runtime/src/main/java/xyz/block/ftl/runtime/config/FTLConfigSource.java
@@ -5,6 +5,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -23,9 +24,11 @@ public class FTLConfigSource implements ConfigSource {
     final static String HOST = "quarkus.http.host";
 
     final static String FTL_BIND = "FTL_BIND";
+    private static final String OTEL_ENV_VAR = "OTEL_EXPORTER_OTLP_ENDPOINT";
 
     final FTLController controller;
 
+    private static final String OTEL_METRICS_DISABLED = "quarkus.otel.sdk.disabled";
     private static final String DEFAULT_USER = "quarkus.datasource.username";
     private static final String DEFAULT_PASSWORD = "quarkus.datasource.password";
     private static final String DEFAULT_URL = "quarkus.datasource.jdbc.url";
@@ -67,6 +70,12 @@ public int getOrdinal() {
     @Override
     public String getValue(String s) {
         switch (s) {
+            case OTEL_METRICS_DISABLED -> {
+                var v = System.getenv(OTEL_ENV_VAR);
+                return Boolean
+                        .toString(v == null || Objects.equals(v, "false") || Objects.equals(v, "0") || Objects.equals(v, "no")
+                                || Objects.equals(v, ""));
+            }
             case SEPARATE_SERVER -> {
                 return "false";
             }