Merge pull request #79 from breedx-splk/update_core

Update some core deps and fix warning
open-telemetry · Sep 14, 2023 · dab6dd0 · dab6dd0
2 parents cc53656 + 8d67834
commit dab6dd0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts
@@ -9,8 +9,8 @@ version = project.version.toString().replaceFirst("(-SNAPSHOT)?$".toRegex(), "-a
 android {
     namespace = "io.opentelemetry.android"
 
-    compileSdk = 33
-    buildToolsVersion = "33.0.1"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -62,8 +62,8 @@ val otelVersion = project.property("otel.sdk.version")
 
 dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.core:core:1.10.1")
-    implementation("androidx.navigation:navigation-fragment:2.6.0")
+    implementation("androidx.core:core:1.12.0")
+    implementation("androidx.navigation:navigation-fragment:2.7.2")
 
     api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelVersion-alpha"))
     api("io.opentelemetry:opentelemetry-api")

diff --git a/instrumentation/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java b/instrumentation/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
@@ -22,9 +22,7 @@
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -55,7 +53,6 @@ public final class OpenTelemetryRumBuilder {
     private Resource resource;
 
     private static TextMapPropagator buildDefaultPropagator() {
-        Map<Class<? extends TextMapPropagator>, TextMapPropagator> result = new HashMap<>();
         return TextMapPropagator.composite(
                 W3CTraceContextPropagator.getInstance(), W3CBaggagePropagator.getInstance());
     }