wip

signalfx · Jun 7, 2024 · 7828651 · 7828651
1 parent 1bc3c4c
commit 7828651
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 9 deletions.
diff --git a/sample-app/src/main/AndroidManifest.xml b/sample-app/src/main/AndroidManifest.xml
@@ -21,10 +21,15 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".JetpackComposeActivity"
+            android:theme="@style/Theme.SplunkRUMSampleApp.NoActionBar"
+            android:label="@string/app_name"
+            android:exported="true">
+        </activity>
         <service
             android:name=".SplunkBackgroundService"
             android:exported="false"

diff --git a/sample-app/src/main/java/com/splunk/android/sample/FirstFragment.java b/sample-app/src/main/java/com/splunk/android/sample/FirstFragment.java
@@ -19,6 +19,7 @@
 import static io.opentelemetry.api.common.AttributeKey.longKey;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -80,6 +81,10 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
                         NavHostFragment.findNavController(FirstFragment.this)
                                 .navigate(R.id.action_FirstFragment_to_SecondFragment));
 
+        binding.buttonScreenName.setOnClickListener(v -> {
+            SplunkRum.getInstance().setScreenName("custom-screen");
+        });
+
         binding.crash.setOnClickListener(v -> multiThreadCrashing());
 
         binding.httpMe.setOnClickListener(
@@ -184,6 +189,8 @@ public LiveData<String> getSessionId() {
     public void onDestroyView() {
         super.onDestroyView();
         binding = null;
+
+        SplunkRum.getInstance().setScreenName(null);
     }
 
     @Override

diff --git a/sample-app/src/main/res/layout/fragment_first.xml b/sample-app/src/main/res/layout/fragment_first.xml
@@ -42,6 +42,12 @@
                 android:layout_height="wrap_content"
                 android:text="@string/next" />
 
+            <Button
+                android:id="@+id/button_screen_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/screen_name" />
+
             <Button
                 android:id="@+id/crash"
                 android:layout_width="wrap_content"

diff --git a/sample-app/src/main/res/values/strings.xml b/sample-app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="second_fragment_label">Second Fragment</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
+    <string name="screen_name">Custom screen name</string>
 
     <string name="hello_first_fragment">Hello first fragment</string>
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>

diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/ExplicitVisibleScreenNameTracker.java b/splunk-otel-android/src/main/java/com/splunk/rum/ExplicitVisibleScreenNameTracker.java
@@ -0,0 +1,39 @@
+package com.splunk.rum;
+
+import androidx.annotation.Nullable;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.opentelemetry.android.instrumentation.activity.VisibleScreenTracker;
+
+public class ExplicitVisibleScreenNameTracker extends VisibleScreenTracker {
+    private final AtomicReference<String> lastScreenName = new AtomicReference<>();
+    private final AtomicReference<String> previouslyLastScreenName = new AtomicReference<>();
+
+    public void setExplicitScreenName(String screenName) {
+        this.previouslyLastScreenName.set(this.lastScreenName.get());
+        this.lastScreenName.set(screenName);
+    }
+
+    @Nullable
+    @Override
+    public String getPreviouslyVisibleScreen() {
+        String screenName = previouslyLastScreenName.get();
+        if (screenName != null) {
+            return screenName;
+        }
+
+        return super.getPreviouslyVisibleScreen();
+    }
+
+    @Override
+    public String getCurrentlyVisibleScreen() {
+        String screenName = lastScreenName.get();
+        if (screenName != null) {
+            return screenName;
+        }
+
+        return super.getCurrentlyVisibleScreen();
+    }
+
+}
diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/NoOpSplunkRum.java b/splunk-otel-android/src/main/java/com/splunk/rum/NoOpSplunkRum.java
@@ -32,7 +32,7 @@ class NoOpSplunkRum extends SplunkRum {
     // passing null values here is fine, they'll never get used anyway
     @SuppressWarnings("NullAway")
     private NoOpSplunkRum() {
-        super(OpenTelemetryRum.noop(), null);
+        super(OpenTelemetryRum.noop(), null, null);
     }
 
     @Override

diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/RumInitializer.java b/splunk-otel-android/src/main/java/com/splunk/rum/RumInitializer.java
@@ -36,6 +36,7 @@
 import io.opentelemetry.android.OpenTelemetryRum;
 import io.opentelemetry.android.OpenTelemetryRumBuilder;
 import io.opentelemetry.android.RuntimeDetailsExtractor;
+import io.opentelemetry.android.ScreenAttributesSpanProcessor;
 import io.opentelemetry.android.config.OtelRumConfig;
 import io.opentelemetry.android.instrumentation.activity.VisibleScreenTracker;
 import io.opentelemetry.android.instrumentation.anr.AnrDetector;
@@ -52,6 +53,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 import io.opentelemetry.sdk.trace.SpanLimits;
+import io.opentelemetry.sdk.trace.SpanProcessor;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
@@ -86,7 +88,7 @@ class RumInitializer {
     }
 
     SplunkRum initialize(Looper mainLooper) {
-        VisibleScreenTracker visibleScreenTracker = new VisibleScreenTracker();
+        ExplicitVisibleScreenNameTracker visibleScreenTracker = new ExplicitVisibleScreenNameTracker();
 
         initializationEvents.begin();
 
@@ -98,6 +100,7 @@ SplunkRum initialize(Looper mainLooper) {
             config.disableNetworkChangeMonitoring();
         }
 
+        config.disableScreenAttributes();
         OpenTelemetryRumBuilder otelRumBuilder = OpenTelemetryRum.builder(application, config);
 
         otelRumBuilder.mergeResource(createSplunkResource());
@@ -193,6 +196,13 @@ SplunkRum initialize(Looper mainLooper) {
             installCrashReporter(otelRumBuilder);
         }
 
+        otelRumBuilder.addTracerProviderCustomizer(
+                (tracerProviderBuilder, app) -> {
+                    SpanProcessor screenAttributesAppender =
+                            new ScreenAttributesSpanProcessor(visibleScreenTracker);
+                    return tracerProviderBuilder.addSpanProcessor(screenAttributesAppender);
+                });
+
         // Lifecycle events instrumentation are always installed.
         installLifecycleInstrumentations(otelRumBuilder, visibleScreenTracker);
 
@@ -204,7 +214,7 @@ SplunkRum initialize(Looper mainLooper) {
                 builder.getConfigFlags(),
                 openTelemetryRum.getOpenTelemetry().getTracer(RUM_TRACER_NAME));
 
-        return new SplunkRum(openTelemetryRum, globalAttributeSupplier);
+        return new SplunkRum(openTelemetryRum, globalAttributeSupplier, visibleScreenTracker);
     }
 
     @NonNull

diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/SplunkRum.java b/splunk-otel-android/src/main/java/com/splunk/rum/SplunkRum.java
@@ -28,6 +28,7 @@
 import androidx.annotation.Nullable;
 import com.splunk.rum.internal.GlobalAttributesSupplier;
 import io.opentelemetry.android.OpenTelemetryRum;
+import io.opentelemetry.android.instrumentation.activity.VisibleScreenTracker;
 import io.opentelemetry.android.instrumentation.startup.AppStartupTimer;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
@@ -72,15 +73,17 @@ public class SplunkRum {
 
     private final OpenTelemetryRum openTelemetryRum;
     private final GlobalAttributesSupplier globalAttributes;
+    private final ExplicitVisibleScreenNameTracker visibleScreenTracker;
 
     static {
         Handler handler = new Handler(Looper.getMainLooper());
         startupTimer.detectBackgroundStart(handler);
     }
 
-    SplunkRum(OpenTelemetryRum openTelemetryRum, GlobalAttributesSupplier globalAttributes) {
+    SplunkRum(OpenTelemetryRum openTelemetryRum, GlobalAttributesSupplier globalAttributes, ExplicitVisibleScreenNameTracker visibleScreenTracker) {
         this.openTelemetryRum = openTelemetryRum;
         this.globalAttributes = globalAttributes;
+        this.visibleScreenTracker = visibleScreenTracker;
     }
 
     /** Creates a new {@link SplunkRumBuilder}, used to set up a {@link SplunkRum} instance. */
@@ -113,6 +116,18 @@ static SplunkRum initialize(SplunkRumBuilder builder, Application application) {
         return INSTANCE;
     }
 
+    public void setScreenName(String screenName) {
+        if (visibleScreenTracker != null) {
+            visibleScreenTracker.setExplicitScreenName(screenName);
+        }
+
+        getTracer()
+                .spanBuilder("Created")
+                .setAttribute(COMPONENT_KEY, "ui")
+                .startSpan()
+                .end();
+    }
+
     /** Returns {@code true} if the Splunk RUM library has been successfully initialized. */
     public static boolean isInitialized() {
         return INSTANCE != null;

diff --git a/splunk-otel-android/src/test/java/com/splunk/rum/SplunkRumTest.java b/splunk-otel-android/src/test/java/com/splunk/rum/SplunkRumTest.java
@@ -148,7 +148,7 @@ void nonNullMethods() {
     void addEvent() {
         when(openTelemetryRum.getOpenTelemetry()).thenReturn(otelTesting.getOpenTelemetry());
 
-        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes);
+        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes, null);
 
         Attributes attributes = Attributes.of(stringKey("one"), "1", longKey("two"), 2L);
         splunkRum.addRumEvent("foo", attributes);
@@ -166,7 +166,7 @@ void addException() {
 
         when(openTelemetryRum.getOpenTelemetry()).thenReturn(testSdk);
 
-        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes);
+        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes, null);
 
         NullPointerException exception = new NullPointerException("oopsie");
         Attributes attributes = Attributes.of(stringKey("one"), "1", longKey("two"), 2L);
@@ -197,7 +197,7 @@ private OpenTelemetrySdk buildTestSdk(InMemorySpanExporter testExporter) {
     void createAndEnd() {
         when(openTelemetryRum.getOpenTelemetry()).thenReturn(otelTesting.getOpenTelemetry());
 
-        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes);
+        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes, null);
 
         Span span = splunkRum.startWorkflow("workflow");
         Span inner = tracer.spanBuilder("foo").startSpan();
@@ -255,7 +255,7 @@ void updateLocation() {
                 .when(globalAttributes)
                 .update(isA(Consumer.class));
 
-        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes);
+        SplunkRum splunkRum = new SplunkRum(openTelemetryRum, globalAttributes, null);
 
         Location location = mock(Location.class);
         when(location.getLatitude()).thenReturn(42d);