From 7a5d45b4f7b7466aac45fb407da622a0b7265e32 Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Mon, 16 Mar 2026 12:54:20 +0100 Subject: [PATCH 1/2] Clean up --- .../android/okhttp/internal/plugin/OkHttp3Singletons.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/instrumentation/okhttp/library/src/main/java/co/elastic/otel/android/okhttp/internal/plugin/OkHttp3Singletons.java b/instrumentation/okhttp/library/src/main/java/co/elastic/otel/android/okhttp/internal/plugin/OkHttp3Singletons.java index 8c62965b2..df4af7afe 100644 --- a/instrumentation/okhttp/library/src/main/java/co/elastic/otel/android/okhttp/internal/plugin/OkHttp3Singletons.java +++ b/instrumentation/okhttp/library/src/main/java/co/elastic/otel/android/okhttp/internal/plugin/OkHttp3Singletons.java @@ -24,8 +24,6 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceAttributesExtractor; -import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceResolver; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientRequestResendCount; import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor; @@ -33,7 +31,6 @@ import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpAttributesGetter; import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpClientInstrumenterBuilderFactory; import io.opentelemetry.instrumentation.okhttp.v3_0.internal.TracingInterceptor; -import java.util.Collections; import okhttp3.Interceptor; import okhttp3.Request; import okhttp3.Response; @@ -52,10 +49,6 @@ public static void configure(OpenTelemetry openTelemetry) { .setKnownMethods(KNOWN_METHODS) .setSpanNameExtractorCustomizer( x -> HttpSpanNameExtractor.builder(OkHttpAttributesGetter.INSTANCE).build()) - .addAttributesExtractor( - PeerServiceAttributesExtractor.create( - OkHttpAttributesGetter.INSTANCE, - PeerServiceResolver.create(Collections.emptyMap()))) .setEmitExperimentalHttpClientTelemetry(false) .build(); CONNECTION_ERROR_INTERCEPTOR.setDelegate(new ConnectionErrorSpanInterceptor(instrumenter)); From ce50ef8e148a74eb115f98f34e95d68013803d54 Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Mon, 16 Mar 2026 12:59:55 +0100 Subject: [PATCH 2/2] Bumping OTel Java instrumentation version --- gradle/instrumentation.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/instrumentation.versions.toml b/gradle/instrumentation.versions.toml index 5e94bba14..d6b47dda0 100644 --- a/gradle/instrumentation.versions.toml +++ b/gradle/instrumentation.versions.toml @@ -1,9 +1,9 @@ [versions] -opentelemetry-instrumentation-alpha = "2.25.0-alpha" +opentelemetry-instrumentation-alpha = "2.26.0-alpha" opentelemetry-android = "1.2.0-alpha" [libraries] -opentelemetry-instrumentation-api = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.25.0" +opentelemetry-instrumentation-api = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.26.0" opentelemetry-instrumentation-api-incubator = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator", version.ref = "opentelemetry-instrumentation-alpha" } opentelemetry-instrumentation-okhttp = { module = "io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0", version.ref = "opentelemetry-instrumentation-alpha" } opentelemetry-android-session = { module = "io.opentelemetry.android:session", version.ref = "opentelemetry-android" }