Suppressing auto instrumentation

Author: LikeTheSalad

opamp-client/build.gradle.kts

@@ -16,6 +16,7 @@ otelJava.moduleName.set("io.opentelemetry.contrib.opamp.client")
 dependencies {
   implementation("com.squareup.okhttp3:okhttp")
   implementation("com.github.f4b6a3:uuid-creator")
+  implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   annotationProcessor("com.google.auto.value:auto-value")
   compileOnly("com.google.auto.value:auto-value-annotations")
   testImplementation("org.mockito:mockito-inline")

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/connectivity/http/OkHttpSender.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.opamp.client.internal.connectivity.http;
 
+import io.opentelemetry.api.internal.InstrumentationUtil;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.CompletableFuture;
@@ -13,6 +14,7 @@
 import okhttp3.Callback;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import okhttp3.RequestBody;
 import okio.BufferedSink;
 
@@ -45,8 +47,14 @@ public CompletableFuture<Response> send(BodyWriter writer, int contentLength) {
     RequestBody body = new RawRequestBody(writer, contentLength, MEDIA_TYPE);
     builder.post(body);
 
+    InstrumentationUtil.suppressInstrumentation(() -> doSendRequest(builder.build(), future));
+
+    return future;
+  }
+
+  private void doSendRequest(Request request, CompletableFuture<Response> future) {
     client
-        .newCall(builder.build())
+        .newCall(request)
         .enqueue(
             new Callback() {
               @Override
@@ -59,8 +67,6 @@ public void onFailure(Call call, IOException e) {
                 future.completeExceptionally(e);
               }
             });
-
-    return future;
   }
 
   private static class OkHttpResponse implements Response {