Log hadler on by default. Build step only if LogsEnabled. Config inte…

…rceptor tweaks
loicmathieu · Aug 21, 2024 · c52c74f · c52c74f
1 parent 4d09b9d
commit c52c74f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/...oyment/src/main/java/io/quarkus/opentelemetry/deployment/logging/LogHandlerProcessor.java b/...oyment/src/main/java/io/quarkus/opentelemetry/deployment/logging/LogHandlerProcessor.java
@@ -1,14 +1,20 @@
 package io.quarkus.opentelemetry.deployment.logging;
 
+import java.util.function.BooleanSupplier;
+import java.util.function.Function;
+
 import io.quarkus.agroal.spi.OpenTelemetryInitBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.BuildSteps;
 import io.quarkus.deployment.annotations.Consume;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.LogHandlerBuildItem;
+import io.quarkus.opentelemetry.runtime.config.build.OTelBuildConfig;
 import io.quarkus.opentelemetry.runtime.logs.OpenTelemetryLogConfig;
 import io.quarkus.opentelemetry.runtime.logs.OpenTelemetryLogRecorder;
 
+@BuildSteps(onlyIf = LogHandlerProcessor.LogsEnabled.class)
 class LogHandlerProcessor {
 
     @BuildStep
@@ -17,4 +23,19 @@ class LogHandlerProcessor {
     LogHandlerBuildItem build(OpenTelemetryLogRecorder recorder, OpenTelemetryLogConfig config) {
         return new LogHandlerBuildItem(recorder.initializeHandler(config));
     }
+
+    public static class LogsEnabled implements BooleanSupplier {
+        OTelBuildConfig otelBuildConfig;
+
+        public boolean getAsBoolean() {
+            return otelBuildConfig.logs().enabled()
+                    .map(new Function<Boolean, Boolean>() {
+                        @Override
+                        public Boolean apply(Boolean enabled) {
+                            return otelBuildConfig.enabled() && enabled;
+                        }
+                    })
+                    .orElseGet(() -> otelBuildConfig.enabled());
+        }
+    }
 }
diff --git a/.../io/quarkus/opentelemetry/runtime/config/HierarchicalOTelConnectionConfigInterceptor.java b/.../io/quarkus/opentelemetry/runtime/config/HierarchicalOTelConnectionConfigInterceptor.java
@@ -37,6 +37,7 @@ public class HierarchicalOTelConnectionConfigInterceptor extends FallbackConfigS
     static final String BASE = "quarkus.otel.exporter.otlp.";
     static final String TRACES = BASE + "traces.";
     static final String METRICS = BASE + "metrics.";
+    static final String LOGS = BASE + "logs.";
 
     private static final MappingFunction mappingFunction = new MappingFunction();
 
@@ -86,6 +87,12 @@ public String apply(String name) {
                     return BASE + property;
                 }
             }
+            if (name.startsWith(LOGS)) {
+                String property = name.substring(LOGS.length());
+                if (PROPERTY_NAMES.contains(property)) {
+                    return BASE + property;
+                }
+            }
             return name;
         }
     }

diff --git a/...y/runtime/src/main/java/io/quarkus/opentelemetry/runtime/logs/OpenTelemetryLogConfig.java b/...y/runtime/src/main/java/io/quarkus/opentelemetry/runtime/logs/OpenTelemetryLogConfig.java
@@ -11,6 +11,6 @@ public interface OpenTelemetryLogConfig {
     /**
      * Determine whether to enable the OpenTelemetry logging handler
      */
-    @WithDefault("false")
+    @WithDefault("true")
     boolean enabled();
 }