Identifying otel http calls

exporters/common/src/main/java/io/opentelemetry/exporter/internal/InstrumentationUtil.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.internal;
+
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.ContextKey;
+import java.util.Objects;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public class InstrumentationUtil {
+  private static final ContextKey<Boolean> SUPPRESS_INSTRUMENTATION_KEY =
+      ContextKey.named("suppress_instrumentation");
+
+  private InstrumentationUtil() {}
+
+  /**
+   * Adds a Context boolean key that will allow to identify HTTP calls coming from OTel exporters.
+   * The key later be checked by an automatic instrumentation to avoid tracing OTel exporter's
+   * calls.
+   */
+  public static void suppressInstrumentation(Runnable runnable) {
+    Context.current().with(SUPPRESS_INSTRUMENTATION_KEY, true).wrap(runnable).run();
+  }
+
+  /**
+   * Checks if an automatic instrumentation should be suppressed with the provided Context.
+   *
+   * @return TRUE to suppress the automatic instrumentation, FALSE to continue with the
+   *     instrumentation.
+   */
+  public static boolean shouldSuppressInstrumentation(Context context) {
+    return Objects.equals(context.get(SUPPRESS_INSTRUMENTATION_KEY), true);
+  }
+
+  public static boolean shouldSuppressInstrumentation() {
+    return shouldSuppressInstrumentation(Context.current());
+  }
+}

exporters/common/src/test/java/io/opentelemetry/exporter/internal/InstrumentationUtilTest.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.internal;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class InstrumentationUtilTest {
+  @Test
+  void verifySuppressInstrumentation() {
+    // Should be false by default.
+    assertFalse(InstrumentationUtil.shouldSuppressInstrumentation());
+
+    // Should be true inside the Runnable passed to InstrumentationUtil.suppressInstrumentation.
+    InstrumentationUtil.suppressInstrumentation(
+        () -> assertTrue(InstrumentationUtil.shouldSuppressInstrumentation()));
+
+    // Should be false after the runnable finishes.
+    assertFalse(InstrumentationUtil.shouldSuppressInstrumentation());
+  }
+}

exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java

@@ -23,6 +23,7 @@
 
 package io.opentelemetry.exporter.sender.okhttp.internal;
 
+import io.opentelemetry.exporter.internal.InstrumentationUtil;
 import io.opentelemetry.exporter.internal.RetryUtil;
 import io.opentelemetry.exporter.internal.grpc.GrpcExporterUtil;
 import io.opentelemetry.exporter.internal.grpc.GrpcResponse;
@@ -112,51 +113,53 @@
     RequestBody requestBody = new GrpcRequestBody(request, compressionEnabled);
     requestBuilder.post(requestBody);
 
-    client
-        .newCall(requestBuilder.build())
-        .enqueue(
-            new Callback() {
-              @Override
-              public void onFailure(Call call, IOException e) {
-                String description = e.getMessage();
-                if (description == null) {
-                  description = "";
-                }
-                onError.accept(GrpcResponse.create(2 /* UNKNOWN */, description), e);
-              }
-
-              @Override
-              public void onResponse(Call call, Response response) {
-                // Response body is empty but must be consumed to access trailers.
-                try {
-                  response.body().bytes();
-                } catch (IOException e) {
-                  onError.accept(
-                      GrpcResponse.create(
-                          GrpcExporterUtil.GRPC_STATUS_UNKNOWN,
-                          "Could not consume server response."),
-                      e);
-                  return;
-                }
-
-                String status = grpcStatus(response);
-                if ("0".equals(status)) {
-                  onSuccess.run();
-                  return;
-                }
-
-                String errorMessage = grpcMessage(response);
-                int statusCode;
-                try {
-                  statusCode = Integer.parseInt(status);
-                } catch (NumberFormatException ex) {
-                  statusCode = GrpcExporterUtil.GRPC_STATUS_UNKNOWN;
-                }
-                onError.accept(
-                    GrpcResponse.create(statusCode, errorMessage),
-                    new IllegalStateException(errorMessage));
-              }
-            });
+    InstrumentationUtil.suppressInstrumentation(
+        () ->
+            client
+                .newCall(requestBuilder.build())
+                .enqueue(
+                    new Callback() {
+                      @Override
+                      public void onFailure(Call call, IOException e) {
+                        String description = e.getMessage();
+                        if (description == null) {
+                          description = "";
+                        }
+                        onError.accept(GrpcResponse.create(2 /* UNKNOWN */, description), e);
+                      }
+
+                      @Override
+                      public void onResponse(Call call, Response response) {
+                        // Response body is empty but must be consumed to access trailers.
+                        try {
+                          response.body().bytes();
+                        } catch (IOException e) {
+                          onError.accept(
+                              GrpcResponse.create(
+                                  GrpcExporterUtil.GRPC_STATUS_UNKNOWN,
+                                  "Could not consume server response."),
+                              e);
+                          return;
+                        }
+
+                        String status = grpcStatus(response);
+                        if ("0".equals(status)) {
+                          onSuccess.run();
+                          return;
+                        }
+
+                        String errorMessage = grpcMessage(response);
+                        int statusCode;
+                        try {
+                          statusCode = Integer.parseInt(status);
+                        } catch (NumberFormatException ex) {
+                          statusCode = GrpcExporterUtil.GRPC_STATUS_UNKNOWN;
+                        }
+                        onError.accept(
+                            GrpcResponse.create(statusCode, errorMessage),
+                            new IllegalStateException(errorMessage));
+                      }
+                    }));
   }
 
   @Nullable

exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.exporter.sender.okhttp.internal;
 
+import io.opentelemetry.exporter.internal.InstrumentationUtil;
 import io.opentelemetry.exporter.internal.RetryUtil;
 import io.opentelemetry.exporter.internal.auth.Authenticator;
 import io.opentelemetry.exporter.internal.http.HttpSender;
@@ -101,38 +102,40 @@ public void send(
       requestBuilder.post(body);
     }
 
-    client
-        .newCall(requestBuilder.build())
-        .enqueue(
-            new Callback() {
-              @Override
-              public void onFailure(Call call, IOException e) {
-                onError.accept(e);
-              }
-
-              @Override
-              public void onResponse(Call call, okhttp3.Response response) {
-                try (ResponseBody body = response.body()) {
-                  onResponse.accept(
-                      new Response() {
-                        @Override
-                        public int statusCode() {
-                          return response.code();
+    InstrumentationUtil.suppressInstrumentation(
+        () ->
+            client
+                .newCall(requestBuilder.build())
+                .enqueue(
+                    new Callback() {
+                      @Override
+                      public void onFailure(Call call, IOException e) {
+                        onError.accept(e);
+                      }
+
+                      @Override
+                      public void onResponse(Call call, okhttp3.Response response) {
+                        try (ResponseBody body = response.body()) {
+                          onResponse.accept(
+                              new Response() {
+                                @Override
+                                public int statusCode() {
+                                  return response.code();
+                                }
+
+                                @Override
+                                public String statusMessage() {
+                                  return response.message();
+                                }
+
+                                @Override
+                                public byte[] responseBody() throws IOException {
+                                  return body.bytes();
+                                }
+                              });
                         }
-
-                        @Override
-                        public String statusMessage() {
-                          return response.message();
-                        }
-
-                        @Override
-                        public byte[] responseBody() throws IOException {
-                          return body.bytes();
-                        }
-                      });
-                }
-              }
-            });
+                      }
+                    }));
   }
 
   @Override

exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpUtil.java

@@ -18,6 +18,9 @@
  * at any time.
  */
 public final class OkHttpUtil {
+  // For testing purposes
+  @SuppressWarnings("NonFinalStaticField")
+  static boolean propagateContextInDispatcher = false;
 
   /** Returns a {@link Dispatcher} using daemon threads, otherwise matching the OkHttp default. */
   public static Dispatcher newDispatcher() {
@@ -28,7 +31,7 @@ public static Dispatcher newDispatcher() {
             60,
             TimeUnit.SECONDS,
             new SynchronousQueue<>(),
-            new DaemonThreadFactory("okhttp-dispatch")));
+            new DaemonThreadFactory("okhttp-dispatch", propagateContextInDispatcher)));
   }
 
   private OkHttpUtil() {}

exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.sender.okhttp.internal;
+
+import io.opentelemetry.exporter.internal.grpc.GrpcSender;
+import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
+import io.opentelemetry.exporter.internal.marshal.Serializer;
+import java.util.Collections;
+
+class OkHttpGrpcSenderTest
+    extends OkHttpSenderTest<GrpcSender<OkHttpGrpcSenderTest.DummyMarshaler>> {
+
+  @Override
+  void send(GrpcSender<DummyMarshaler> sender, Runnable onSuccess, Runnable onFailure) {
+    sender.send(new DummyMarshaler(), onSuccess, (grpcResponse, throwable) -> onFailure.run());
+  }
+
+  @Override
+  GrpcSender<DummyMarshaler> createSender(String endpoint) {
+    return new OkHttpGrpcSender<>(
+        "https://localhost", false, 10L, Collections.emptyMap(), null, null, null);
+  }
+
+  protected static class DummyMarshaler extends MarshalerWithSize {
+
+    protected DummyMarshaler() {
+      super(0);
+    }
+
+    @Override
+    protected void writeTo(Serializer output) {}
+  }
+}

exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderTest.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.sender.okhttp.internal;
+
+import io.opentelemetry.exporter.internal.http.HttpSender;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.function.Consumer;
+
+class OkHttpHttpSenderTest extends OkHttpSenderTest<HttpSender> {
+
+  @Override
+  void send(HttpSender sender, Runnable onSuccess, Runnable onFailure) {
+    byte[] content = "A".getBytes(StandardCharsets.UTF_8);
+    Consumer<OutputStream> outputStreamConsumer =
+        outputStream -> {
+          try {
+            outputStream.write(content);
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        };
+    sender.send(
+        outputStreamConsumer,
+        content.length,
+        (response) -> onSuccess.run(),
+        (error) -> onFailure.run());
+  }
+
+  @Override
+  HttpSender createSender(String endpoint) {
+    return new OkHttpHttpSender(
+        endpoint, false, "text/plain", 10L, Collections::emptyMap, null, null, null, null);
+  }
+}