MOB-3245: Deprecating RumScreenName (#591)

* MOB-3245 Adding deprecation tag to RumScreenName in the com.splunk.rum directory * MOB-3245 running spotlessApply * MOB-3245 removing import from SplunkScreenNameExtractor * MOB-3245 uppercasing deprecated tag
open-telemetry · Jul 14, 2023 · dc8ffb6 · dc8ffb6
1 parent c10003f
commit dc8ffb6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
@@ -57,6 +57,7 @@ val otelInstrumentationVersion = "1.28.0"
 val otelInstrumentationAlphaVersion = "$otelInstrumentationVersion-alpha"
 
 dependencies {
+    implementation(project(":opentelemetry-android-instrumentation"))
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/MainActivity.java b/sample-app/src/main/java/com/splunk/android/sample/MainActivity.java
@@ -39,9 +39,9 @@
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
 import com.splunk.android.sample.databinding.ActivityMainBinding;
-import com.splunk.rum.RumScreenName;
 import com.splunk.rum.SplunkRum;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.rum.internal.instrumentation.RumScreenName;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 

diff --git a/sample-app/src/main/java/com/splunk/android/sample/SecondFragment.java b/sample-app/src/main/java/com/splunk/android/sample/SecondFragment.java
@@ -28,14 +28,14 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.navigation.fragment.NavHostFragment;
 import com.splunk.android.sample.databinding.FragmentSecondBinding;
-import com.splunk.rum.RumScreenName;
 import com.splunk.rum.SplunkRum;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.events.EventEmitter;
 import io.opentelemetry.api.events.EventEmitterProvider;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.rum.internal.instrumentation.RumScreenName;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.logs.internal.SdkEventEmitterProvider;
 import java.util.Random;

diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/RumScreenName.java b/splunk-otel-android/src/main/java/com/splunk/rum/RumScreenName.java
@@ -23,7 +23,8 @@
 
 /**
  * This annotation can be used to customize the {@code screen.name} attribute for an instrumented
- * Fragment or Activity. TODO: Deprecate this so the otel one can be used instead
+ * Fragment or Activity. @Deprecated RumScreenName moved to
+ * io.opentelemetry.rum.internal.instrumentation package
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)