Actually call listeners (#421)

* pass sdk to listeners * spotless * fix test
open-telemetry · Jun 10, 2024 · fdadc56 · fdadc56
1 parent a371094
commit fdadc56
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/android-agent/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java b/android-agent/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
@@ -337,6 +337,8 @@ OpenTelemetryRum build(ServiceManager serviceManager) {
                         .setPropagators(buildFinalPropagators())
                         .build();
 
+        otelSdkReadyListeners.forEach(listener -> listener.accept(sdk));
+
         scheduleDiskTelemetryReader(signalFromDiskExporter, diskBufferingConfiguration);
 
         SdkPreconfiguredRumBuilder delegate =

diff --git a/android-agent/src/test/java/io/opentelemetry/android/OpenTelemetryRumBuilderTest.java b/android-agent/src/test/java/io/opentelemetry/android/OpenTelemetryRumBuilderTest.java
@@ -43,6 +43,7 @@
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.contrib.disk.buffering.SpanToDiskExporter;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
 import io.opentelemetry.sdk.resources.Resource;
@@ -56,6 +57,7 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -149,10 +151,6 @@ void shouldInstallInstrumentation() {
         verify(listener).onApplicationBackgrounded();
     }
 
-    private OtelRumConfig buildConfig() {
-        return new OtelRumConfig().disableNetworkAttributes();
-    }
-
     @Test
     void canAddPropagator() {
         Context context = Context.root();
@@ -256,6 +254,16 @@ void diskBufferingEnabled_when_exception_thrown() {
         assertThat(SignalFromDiskExporter.get()).isNull();
     }
 
+    @Test
+    void sdkReadyListeners() {
+        OtelRumConfig config = buildConfig();
+        AtomicReference<OpenTelemetrySdk> seen = new AtomicReference<>();
+        OpenTelemetryRum.builder(application, config)
+                .addOtelSdkReadyListener(seen::set)
+                .build(mock(ServiceManager.class));
+        assertThat(seen.get()).isNotNull();
+    }
+
     @Test
     void diskBufferingDisabled() {
         ArgumentCaptor<SpanExporter> exporterCaptor = ArgumentCaptor.forClass(SpanExporter.class);
@@ -336,4 +344,8 @@ private static ServiceManager createServiceManager(Object... services) {
     private OpenTelemetryRumBuilder makeBuilder() {
         return OpenTelemetryRum.builder(application, buildConfig());
     }
+
+    private OtelRumConfig buildConfig() {
+        return new OtelRumConfig().disableNetworkAttributes().disableSdkInitializationEvents();
+    }
 }