From cb3df5bdd4e121be35b4b7a0de9a8ff07174c5f2 Mon Sep 17 00:00:00 2001 From: Darby Vernon Date: Tue, 11 Jul 2023 13:38:28 -0600 Subject: [PATCH 1/4] MOB-3245 Adding deprecation tag to RumScreenName in the com.splunk.rum directory --- sample-app/build.gradle.kts | 1 + .../main/java/com/splunk/android/sample/MainActivity.java | 2 +- .../java/com/splunk/android/sample/SecondFragment.java | 2 +- .../src/main/java/com/splunk/rum/RumScreenName.java | 7 +++++-- .../java/com/splunk/rum/SplunkScreenNameExtractor.java | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts index 89545530..2ec7b67c 100644 --- a/sample-app/build.gradle.kts +++ b/sample-app/build.gradle.kts @@ -57,6 +57,7 @@ val otelInstrumentationVersion = "1.27.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 index 8a965daf..22ac4d9b 100644 --- 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 index cdd857ca..76bdc238 100644 --- 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,7 +28,6 @@ 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; @@ -36,6 +35,7 @@ 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 index 990ca4aa..111bf8e5 100644 --- 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,11 +23,14 @@ /** * 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) public @interface RumScreenName { /** Return the customized screen name. */ String value(); -} +} \ No newline at end of file diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java b/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java index c9398c68..1b29bb76 100644 --- a/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java +++ b/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java @@ -19,6 +19,7 @@ import android.app.Activity; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import io.opentelemetry.rum.internal.instrumentation.RumScreenName; import io.opentelemetry.rum.internal.instrumentation.ScreenNameExtractor; import java.util.function.Function; From c9763601b90b684259e9a2122aeda83f5e89b343 Mon Sep 17 00:00:00 2001 From: Darby Vernon Date: Tue, 11 Jul 2023 14:24:04 -0600 Subject: [PATCH 2/4] MOB-3245 running spotlessApply --- .../src/main/java/com/splunk/rum/RumScreenName.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 index 111bf8e5..ef08cc89 100644 --- a/splunk-otel-android/src/main/java/com/splunk/rum/RumScreenName.java +++ b/splunk-otel-android/src/main/java/com/splunk/rum/RumScreenName.java @@ -24,13 +24,12 @@ /** * This annotation can be used to customize the {@code screen.name} attribute for an instrumented * Fragment or Activity. - * @deprecated - * RumScreenName moved to io.opentelemetry.rum.internal.instrumentation package + * + * @deprecated RumScreenName moved to io.opentelemetry.rum.internal.instrumentation package */ - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface RumScreenName { /** Return the customized screen name. */ String value(); -} \ No newline at end of file +} From 0373d0954cdb2fa993f1f1ebc5aa739acb56c998 Mon Sep 17 00:00:00 2001 From: Darby Vernon Date: Thu, 13 Jul 2023 13:40:21 -0600 Subject: [PATCH 3/4] MOB-3245 removing import from SplunkScreenNameExtractor --- .../src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java b/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java index 1b29bb76..c9398c68 100644 --- a/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java +++ b/splunk-otel-android/src/main/java/com/splunk/rum/SplunkScreenNameExtractor.java @@ -19,7 +19,6 @@ import android.app.Activity; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import io.opentelemetry.rum.internal.instrumentation.RumScreenName; import io.opentelemetry.rum.internal.instrumentation.ScreenNameExtractor; import java.util.function.Function; From c2dd27868d80e87e07f765989791c4eb68015e0c Mon Sep 17 00:00:00 2001 From: Darby Vernon Date: Fri, 14 Jul 2023 10:12:27 -0600 Subject: [PATCH 4/4] MOB-3245 uppercasing deprecated tag --- .../src/main/java/com/splunk/rum/RumScreenName.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 index ef08cc89..ab28a020 100644 --- 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,9 +23,8 @@ /** * This annotation can be used to customize the {@code screen.name} attribute for an instrumented - * Fragment or Activity. - * - * @deprecated RumScreenName moved to io.opentelemetry.rum.internal.instrumentation package + * Fragment or Activity. @Deprecated RumScreenName moved to + * io.opentelemetry.rum.internal.instrumentation package */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)