Fix hierarchical otlp props lookup, add Grafana traces check

quarkusio · Aug 26, 2024 · 102e1c3 · 102e1c3
1 parent 60994bf
commit 102e1c3
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 39 deletions.
diff --git a/.../io/quarkus/opentelemetry/runtime/config/HierarchicalOTelConnectionConfigInterceptor.java b/.../io/quarkus/opentelemetry/runtime/config/HierarchicalOTelConnectionConfigInterceptor.java
@@ -1,7 +1,7 @@
 package io.quarkus.opentelemetry.runtime.config;
 
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
@@ -46,7 +46,7 @@ public HierarchicalOTelConnectionConfigInterceptor() {
 
     @Override
     public Iterator<String> iterateNames(final ConfigSourceInterceptorContext context) {
-        Set<String> names = new HashSet<>();
+        Set<String> names = new LinkedHashSet<>();
         Iterator<String> namesIterator = context.iterateNames();
         while (namesIterator.hasNext()) {
             String name = namesIterator.next();
@@ -71,6 +71,28 @@ public Iterator<String> iterateNames(final ConfigSourceInterceptorContext contex
         return names.iterator();
     }
 
+    @Override
+    public ConfigValue getValue(final ConfigSourceInterceptorContext context, final String name) {
+        ConfigValue configValue = context.proceed(name);
+        String map = getMapping().apply(name);
+
+        if (name.equals(map)) {
+            return configValue;
+        }
+
+        // not a default
+        if (configValue != null && configValue.getConfigSourceOrdinal() > Integer.MIN_VALUE) {
+            return configValue;
+        }
+
+        ConfigValue fallbackValue = context.proceed(map);
+        if (fallbackValue != null) {
+            return fallbackValue.withName(name);
+        }
+
+        return configValue;
+    }
+
     static class MappingFunction implements Function<String, String> {
         @Override
         public String apply(String name) {

diff --git a/...me/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OTelExporterRecorder.java b/...me/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OTelExporterRecorder.java
@@ -310,43 +310,21 @@ private static Map<String, String> populateTracingExportHttpHeaders(OtlpExporter
     }
 
     private URI getTracesUri(OtlpExporterRuntimeConfig exporterRuntimeConfig) {
-        String endpoint = resolveTraceEndpoint(exporterRuntimeConfig);
+        String endpoint = exporterRuntimeConfig.traces().endpoint().orElse(DEFAULT_GRPC_BASE_URI);
         if (endpoint.isEmpty()) {
             return null;
         }
         return ExporterBuilderUtil.validateEndpoint(endpoint);
     }
 
     private URI getMetricsUri(OtlpExporterRuntimeConfig exporterRuntimeConfig) {
-        String endpoint = resolveTraceEndpoint(exporterRuntimeConfig);
+        String endpoint = exporterRuntimeConfig.metrics().endpoint().orElse(DEFAULT_GRPC_BASE_URI);
         if (endpoint.isEmpty()) {
             return null;
         }
         return ExporterBuilderUtil.validateEndpoint(endpoint);
     }
 
-    static String resolveTraceEndpoint(final OtlpExporterRuntimeConfig runtimeConfig) {
-        String endpoint = runtimeConfig.traces().endpoint()
-                .filter(OTelExporterRecorder::excludeDefaultEndpoint)
-                .orElse(runtimeConfig.endpoint()
-                        .filter(OTelExporterRecorder::excludeDefaultEndpoint)
-                        .orElse(DEFAULT_GRPC_BASE_URI));
-        return endpoint.trim();
-    }
-
-    static String resolveMetricEndpoint(final OtlpExporterRuntimeConfig runtimeConfig) {
-        String endpoint = runtimeConfig.metrics().endpoint()
-                .filter(OTelExporterRecorder::excludeDefaultEndpoint)
-                .orElse(runtimeConfig.endpoint()
-                        .filter(OTelExporterRecorder::excludeDefaultEndpoint)
-                        .orElse(DEFAULT_GRPC_BASE_URI));
-        return endpoint.trim();
-    }
-
-    private static boolean excludeDefaultEndpoint(String endpoint) {
-        return !DEFAULT_GRPC_BASE_URI.equals(endpoint);
-    }
-
     static class HttpClientOptionsConsumer implements Consumer<HttpClientOptions> {
         private final OtlpExporterConfig config;
         private final URI baseUri;

diff --git a/...rc/test/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpExporterProviderTest.java b/...rc/test/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpExporterProviderTest.java
@@ -17,82 +17,104 @@
 
 class OtlpExporterProviderTest {
 
+    static String resolveTraceEndpoint(final OtlpExporterRuntimeConfig runtimeConfig) {
+        String endpoint = runtimeConfig.traces().endpoint()
+                .filter(OtlpExporterProviderTest::excludeDefaultEndpoint)
+                .orElse(runtimeConfig.endpoint()
+                        .filter(OtlpExporterProviderTest::excludeDefaultEndpoint)
+                        .orElse(DEFAULT_GRPC_BASE_URI));
+        return endpoint.trim();
+    }
+
+    static String resolveMetricEndpoint(final OtlpExporterRuntimeConfig runtimeConfig) {
+        String endpoint = runtimeConfig.metrics().endpoint()
+                .filter(OtlpExporterProviderTest::excludeDefaultEndpoint)
+                .orElse(runtimeConfig.endpoint()
+                        .filter(OtlpExporterProviderTest::excludeDefaultEndpoint)
+                        .orElse(DEFAULT_GRPC_BASE_URI));
+        return endpoint.trim();
+    }
+
+    private static boolean excludeDefaultEndpoint(String endpoint) {
+        return !DEFAULT_GRPC_BASE_URI.equals(endpoint);
+    }
+
     @Test
     public void resolveTraceEndpoint_newWins() {
         assertEquals("http://localhost:2222/",
-                OTelExporterRecorder.resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
+                resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
                         "http://localhost:1111/",
                         "http://localhost:2222/")));
     }
 
     @Test
     public void resolveTraceEndpoint_globalWins() {
         assertEquals("http://localhost:1111/",
-                OTelExporterRecorder.resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
+                resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
                         "http://localhost:1111/",
                         DEFAULT_GRPC_BASE_URI)));
     }
 
     @Test
     public void resolveTraceEndpoint_legacyTraceWins() {
         assertEquals("http://localhost:2222/",
-                OTelExporterRecorder.resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
+                resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
                         DEFAULT_GRPC_BASE_URI,
                         "http://localhost:2222/")));
     }
 
     @Test
     public void resolveTraceEndpoint_legacyGlobalWins() {
         assertEquals(DEFAULT_GRPC_BASE_URI,
-                OTelExporterRecorder.resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
+                resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
                         DEFAULT_GRPC_BASE_URI,
                         null)));
     }
 
     @Test
     public void resolveTraceEndpoint_testIsSet() {
         assertEquals(DEFAULT_GRPC_BASE_URI,
-                OTelExporterRecorder.resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
+                resolveTraceEndpoint(createOtlpExporterRuntimeConfig(
                         null,
                         null)));
     }
 
     @Test
     public void resolveMetricEndpoint_newWins() {
         assertEquals("http://localhost:2222/",
-                OTelExporterRecorder.resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
+                resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
                         "http://localhost:1111/",
                         "http://localhost:2222/")));
     }
 
     @Test
     public void resolveMetricEndpoint_globalWins() {
         assertEquals("http://localhost:1111/",
-                OTelExporterRecorder.resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
+                resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
                         "http://localhost:1111/",
                         DEFAULT_GRPC_BASE_URI)));
     }
 
     @Test
     public void resolveMetricEndpoint_legacyTraceWins() {
         assertEquals("http://localhost:2222/",
-                OTelExporterRecorder.resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
+                resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
                         DEFAULT_GRPC_BASE_URI,
                         "http://localhost:2222/")));
     }
 
     @Test
     public void resolveMetricEndpoint_legacyGlobalWins() {
         assertEquals(DEFAULT_GRPC_BASE_URI,
-                OTelExporterRecorder.resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
+                resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
                         DEFAULT_GRPC_BASE_URI,
                         null)));
     }
 
     @Test
     public void resolveMetricEndpoint_testIsSet() {
         assertEquals(DEFAULT_GRPC_BASE_URI,
-                OTelExporterRecorder.resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
+                resolveMetricEndpoint(createOtlpExporterRuntimeConfig(
                         null,
                         null)));
     }

diff --git a/integration-tests/observability-lgtm/src/main/resources/application.properties b/integration-tests/observability-lgtm/src/main/resources/application.properties
@@ -6,12 +6,9 @@ quarkus.micrometer.export.otlp.enabled=true
 quarkus.micrometer.export.otlp.publish=true
 quarkus.micrometer.export.otlp.step=PT5S
 quarkus.micrometer.export.otlp.default-registry=true
-%dev.quarkus.micrometer.export.otlp.url=http://${quarkus.otel-collector.url}/v1/metrics
 %prod.quarkus.micrometer.export.otlp.url=http://localhost:4318/v1/metrics
 
 #opentelemetry
-quarkus.otel.exporter.otlp.traces.protocol=http/protobuf
-%dev.quarkus.otel.exporter.otlp.traces.endpoint=http://${quarkus.otel-collector.url}
 %prod.quarkus.otel.exporter.otlp.traces.endpoint=http://localhost:4318
 
 #quarkus.observability.lgtm.image-name=grafana/otel-lgtm
diff --git a/...on-tests/observability-lgtm/src/test/java/io/quarkus/observability/test/LgtmTestBase.java b/...on-tests/observability-lgtm/src/test/java/io/quarkus/observability/test/LgtmTestBase.java
@@ -28,6 +28,9 @@ public void testTracing() {
         Awaitility.await().atMost(61, TimeUnit.SECONDS).until(
                 () -> client.query("xvalue_X"),
                 result -> !result.data.result.isEmpty());
+        Awaitility.await().atMost(61, TimeUnit.SECONDS).until(
+                () -> client.traces("quarkus-integration-test-observability-lgtm", 20, 3),
+                result -> !result.traces.isEmpty());
     }
 
 }
diff --git a/...observability-lgtm/src/test/java/io/quarkus/observability/test/support/GrafanaClient.java b/...observability-lgtm/src/test/java/io/quarkus/observability/test/support/GrafanaClient.java
@@ -89,4 +89,23 @@ public QueryResult query(String query) {
                 });
         return ref.get();
     }
+
+    public TempoResult traces(String service, int limit, int spss) {
+        AtomicReference<TempoResult> ref = new AtomicReference<>();
+        String path = "/api/datasources/proxy/uid/tempo/api/search?q=%7Bresource.service.name%3D%22"
+                + service + "%22%7D&limit=" + limit + "&spss=" + spss;
+        handle(
+                path,
+                HttpRequest.Builder::GET,
+                HttpResponse.BodyHandlers.ofString(),
+                (r, b) -> {
+                    try {
+                        TempoResult result = MAPPER.readValue(b, TempoResult.class);
+                        ref.set(result);
+                    } catch (JsonProcessingException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                });
+        return ref.get();
+    }
 }
diff --git a/...s/observability-lgtm/src/test/java/io/quarkus/observability/test/support/TempoResult.java b/...s/observability-lgtm/src/test/java/io/quarkus/observability/test/support/TempoResult.java
@@ -0,0 +1,38 @@
+package io.quarkus.observability.test.support;
+
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TempoResult {
+    public List<Map<Object, Object>> traces;
+    public Metrics metrics;
+
+    // getters and setters
+
+    @Override
+    public String toString() {
+        return "TempoResult{" +
+                "traces=" + traces +
+                ", metrics=" + metrics +
+                '}';
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Metrics {
+        public int inspectedBytes;
+        public int completedJobs;
+        public int totalJobs;
+
+        @Override
+        public String toString() {
+            return "Metrics{" +
+                    "inspectedBytes=" + inspectedBytes +
+                    ", completedJobs=" + completedJobs +
+                    ", totalJobs=" + totalJobs +
+                    '}';
+        }
+    }
+}