Use AutoConfiguredOpenTelemetrySdkBuilderCustomizer for Azure (#226)

quarkiverse · Sep 17, 2024 · fd3662f · fd3662f
1 parent f1d5bb7
commit fd3662f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 29 deletions.
diff --git a/...n/java/io/quarkiverse/opentelemetry/exporter/azure/deployment/AzureExporterProcessor.java b/...n/java/io/quarkiverse/opentelemetry/exporter/azure/deployment/AzureExporterProcessor.java
@@ -5,6 +5,7 @@
 import java.util.function.BooleanSupplier;
 import java.util.stream.Stream;
 
+import io.quarkus.opentelemetry.runtime.AutoConfiguredOpenTelemetrySdkBuilderCustomizer;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Singleton;
 
@@ -18,15 +19,9 @@
 import com.azure.core.http.vertx.VertxProvider;
 
 import io.netty.handler.ssl.OpenSsl;
-import io.opentelemetry.sdk.trace.SpanProcessor;
-import io.opentelemetry.sdk.trace.export.SpanExporter;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
-import io.quarkiverse.opentelemetry.exporter.azure.runtime.AzureEndpointSampler;
-import io.quarkiverse.opentelemetry.exporter.azure.runtime.AzureExporterBuildConfig;
-import io.quarkiverse.opentelemetry.exporter.azure.runtime.AzureExporterQuarkusRuntimeConfig;
-import io.quarkiverse.opentelemetry.exporter.azure.runtime.AzureExporterRuntimeConfig;
-import io.quarkiverse.opentelemetry.exporter.azure.runtime.AzureRecorder;
-import io.quarkiverse.opentelemetry.exporter.common.runtime.LateBoundSpanProcessor;
+import io.quarkiverse.opentelemetry.exporter.azure.runtime.*;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -138,17 +133,20 @@ void registerExternalExporter(BuildProducer<ExternalOtelExporterBuildItem> build
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    SyntheticBeanBuildItem installBatchSpanProcessorForAzure(AzureRecorder recorder,
+    SyntheticBeanBuildItem openTelemetryCustomizer(AzureRecorder recorder,
             AzureExporterRuntimeConfig runtimeConfig, AzureExporterQuarkusRuntimeConfig quarkusRuntimeConfig) {
-        return SyntheticBeanBuildItem.configure(LateBoundSpanProcessor.class)
-                .types(SpanProcessor.class)
+        return SyntheticBeanBuildItem.configure(AutoConfiguredOpenTelemetrySdkBuilderCustomizer.class)
+                .types(AutoConfigurationCustomizerProvider.class)
                 .setRuntimeInit()
                 .scope(Singleton.class)
                 .unremovable()
                 .addInjectionPoint(ParameterizedType.create(DotName.createSimple(Instance.class),
-                        new Type[] { ClassType.create(DotName.createSimple(SpanExporter.class.getName())) }, null))
-                .createWith(recorder.createSpanProcessorForAzure(runtimeConfig, quarkusRuntimeConfig))
+                        new Type[] {
+                                ClassType.create(DotName.createSimple(AutoConfigurationCustomizerProvider.class.getName())) },
+                        null))
+                .createWith(recorder.createAzureMonitorCustomizer(runtimeConfig, quarkusRuntimeConfig))
                 .done();
+
     }
 
     @BuildStep

diff --git a/...main/java/io/quarkiverse/opentelemetry/exporter/azure/runtime/AzureMonitorCustomizer.java b/...main/java/io/quarkiverse/opentelemetry/exporter/azure/runtime/AzureMonitorCustomizer.java
@@ -0,0 +1,21 @@
+package io.quarkiverse.opentelemetry.exporter.azure.runtime;
+
+import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporterBuilder;
+
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
+import io.quarkus.opentelemetry.runtime.AutoConfiguredOpenTelemetrySdkBuilderCustomizer;
+
+public class AzureMonitorCustomizer implements AutoConfiguredOpenTelemetrySdkBuilderCustomizer {
+
+    private final String azureConnectionString;
+
+    public AzureMonitorCustomizer(String azureConnectionString) {
+        this.azureConnectionString = azureConnectionString;
+    }
+
+    @Override
+    public void customize(AutoConfiguredOpenTelemetrySdkBuilder builder) {
+        new AzureMonitorExporterBuilder().connectionString(azureConnectionString)
+                .install(builder);
+    }
+}
diff --git a/...time/src/main/java/io/quarkiverse/opentelemetry/exporter/azure/runtime/AzureRecorder.java b/...time/src/main/java/io/quarkiverse/opentelemetry/exporter/azure/runtime/AzureRecorder.java
@@ -4,11 +4,6 @@
 import java.util.function.Function;
 import java.util.regex.Pattern;
 
-import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporterBuilder;
-
-import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import io.opentelemetry.sdk.trace.export.SpanExporter;
-import io.quarkiverse.opentelemetry.exporter.common.runtime.LateBoundSpanProcessor;
 import io.quarkus.arc.SyntheticCreationalContext;
 import io.quarkus.runtime.annotations.Recorder;
 
@@ -17,20 +12,14 @@ public class AzureRecorder {
 
     public static final Pattern SEMI_COLON_PATTERN = Pattern.compile(";");
 
-    public Function<SyntheticCreationalContext<LateBoundSpanProcessor>, LateBoundSpanProcessor> createSpanProcessorForAzure(
+    public Function<SyntheticCreationalContext<AzureMonitorCustomizer>, AzureMonitorCustomizer> createAzureMonitorCustomizer(
             AzureExporterRuntimeConfig runtimeConfig, AzureExporterQuarkusRuntimeConfig quarkusRuntimeConfig) {
         return new Function<>() {
             @Override
-            public LateBoundSpanProcessor apply(SyntheticCreationalContext<LateBoundSpanProcessor> context) {
-                try {
-                    String azureConnectionString = findConnectionString(runtimeConfig, quarkusRuntimeConfig);
-                    SpanExporter azureSpanExporter = new AzureMonitorExporterBuilder()
-                            .connectionString(azureConnectionString)
-                            .buildTraceExporter();
-                    return new LateBoundSpanProcessor(BatchSpanProcessor.builder(azureSpanExporter).build());
-                } catch (IllegalArgumentException iae) {
-                    throw new IllegalStateException("Unable to install OTel Azure Exporter", iae);
-                }
+            public AzureMonitorCustomizer apply(
+                    SyntheticCreationalContext<AzureMonitorCustomizer> objectSyntheticCreationalContext) {
+                String azureConnectionString = findConnectionString(runtimeConfig, quarkusRuntimeConfig);
+                return new AzureMonitorCustomizer(azureConnectionString);
             }
         };
     }