Revert "use ThreadLocal so that metrics can re-use this solution if span is turned off"

This reverts commit a7fded2.

Author: ldetmer

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryRetryHelper.java

@@ -27,15 +27,21 @@
 import com.google.cloud.RetryHelper;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.ContextKey;
 import io.opentelemetry.context.Scope;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class BigQueryRetryHelper extends RetryHelper {
 
+  public static final ContextKey<AtomicInteger> RETRY_ATTEMPT_KEY =
+      ContextKey.named("bq_retry_attempt");
+
   private static final Logger LOG = Logger.getLogger(BigQueryRetryHelper.class.getName());
 
   public static <V> V runWithRetries(
@@ -54,8 +60,11 @@ public static <V> V runWithRetries(
               .spanBuilder("com.google.cloud.bigquery.BigQueryRetryHelper.runWithRetries")
               .startSpan();
     }
-    try (Scope runWithRetriesScope = runWithRetries != null ? runWithRetries.makeCurrent() : null;
-        BigQueryRetryTracker tracker = new BigQueryRetryTracker()) {
+    Context retryContext = Context.current().with(RETRY_ATTEMPT_KEY, new AtomicInteger(0));
+    if (runWithRetries != null) {
+      retryContext = retryContext.with(runWithRetries);
+    }
+    try (Scope runWithRetriesScope = retryContext.makeCurrent()) {
       // Suppressing should be ok as a workaraund. Current and only ResultRetryAlgorithm
       // implementation does not use response at all, so ignoring its type is ok.
       @SuppressWarnings("unchecked")

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryRetryTracker.java

@@ -19,7 +19,7 @@
 import com.google.api.client.http.*;
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.cloud.bigquery.BigQueryRetryTracker;
+import com.google.cloud.bigquery.BigQueryRetryHelper;
 import com.google.common.annotations.VisibleForTesting;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
@@ -86,7 +86,7 @@ public void initialize(HttpRequest request) throws IOException {
 
     addInitialHttpAttributesToSpan(span, request);
 
-    AtomicInteger attemptTracker = BigQueryRetryTracker.get();
+    AtomicInteger attemptTracker = Context.current().get(BigQueryRetryHelper.RETRY_ATTEMPT_KEY);
     if (attemptTracker != null) {
       int attempt = attemptTracker.getAndIncrement();
       if (attempt > 0) {

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java

@@ -44,10 +44,11 @@
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
-import com.google.cloud.bigquery.BigQueryRetryTracker;
+import com.google.cloud.bigquery.BigQueryRetryHelper;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
@@ -56,6 +57,7 @@
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -319,13 +321,15 @@ public void testAddRequestBodySizeToSpan_WithEncoding() throws IOException {
   @Test
   public void testRetryCountFromContext() throws IOException {
     HttpTransport transport = createTransport();
+    AtomicInteger counter = new AtomicInteger(2);
+    Context context =
+        io.opentelemetry.context.Context.current()
+            .with(BigQueryRetryHelper.RETRY_ATTEMPT_KEY, counter);
 
-    try (BigQueryRetryTracker tracker = new BigQueryRetryTracker()) {
-      BigQueryRetryTracker.get().set(2);
+    try (io.opentelemetry.context.Scope scope = context.makeCurrent()) {
       HttpRequest request = buildGetRequest(transport, initializer, BASE_URL);
       HttpResponse response = request.execute();
       response.disconnect();
-      assertEquals(3, BigQueryRetryTracker.get().get());
     }
 
     spanScope.close();
@@ -336,6 +340,7 @@ public void testRetryCountFromContext() throws IOException {
     SpanData span = spans.get(0);
     assertEquals(
         2L, span.getAttributes().get(HttpTracingRequestInitializer.HTTP_REQUEST_RESEND_COUNT));
+    assertEquals(3, counter.get());
   }
 
   @Test