make experimental option setting for redacted query params similar to other experimental options

Author: laurit

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java

@@ -20,7 +20,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
-import io.opentelemetry.instrumentation.api.internal.ExperimentalParameterUtil;
+import io.opentelemetry.instrumentation.api.internal.Experimental;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
@@ -64,7 +64,6 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
   private Function<SpanNameExtractor<? super REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
       spanNameExtractorTransformer = Function.identity();
   private boolean emitExperimentalHttpClientMetrics = false;
-  private boolean redactQueryParameters = true;
   private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
 
   private DefaultHttpClientInstrumenterBuilder(
@@ -187,7 +186,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
   @CanIgnoreReturnValue
   public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setRedactQueryParameters(
       boolean redactQueryParameters) {
-    this.redactQueryParameters = redactQueryParameters;
+    Experimental.setRedactQueryParameters(httpAttributesExtractorBuilder, redactQueryParameters);
     return this;
   }
 
@@ -226,10 +225,6 @@ public Instrumenter<REQUEST, RESPONSE> build() {
     SpanNameExtractor<? super REQUEST> spanNameExtractor =
         spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
 
-    if (redactQueryParameters) {
-      ExperimentalParameterUtil.setRedactQueryParameters(redactQueryParameters);
-    }
-
     InstrumenterBuilder<REQUEST, RESPONSE> builder =
         Instrumenter.<REQUEST, RESPONSE>builder(
                 openTelemetry, instrumentationName, spanNameExtractor)

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/Experimental.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.internal;
+
+import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
+import java.util.function.BiConsumer;
+import javax.annotation.Nullable;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class Experimental {
+
+  @Nullable
+  private static volatile BiConsumer<HttpClientAttributesExtractorBuilder<?, ?>, Boolean>
+      redactHttpClientQueryParameters;
+
+  private Experimental() {}
+
+  public static void setRedactQueryParameters(
+      HttpClientAttributesExtractorBuilder<?, ?> builder, boolean redactQueryParameters) {
+    if (redactHttpClientQueryParameters != null) {
+      redactHttpClientQueryParameters.accept(builder, redactQueryParameters);
+    }
+  }
+
+  public static void internalSetRedactHttpClientQueryParameters(
+      BiConsumer<HttpClientAttributesExtractorBuilder<?, ?>, Boolean>
+          redactHttpClientQueryParameters) {
+    Experimental.redactHttpClientQueryParameters = redactHttpClientQueryParameters;
+  }
+}

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ExperimentalParameterUtil.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.internal.ExperimentalParameterUtil;
+import io.opentelemetry.instrumentation.api.internal.Experimental;
 import io.opentelemetry.instrumentation.api.internal.HttpConstants;
 import io.opentelemetry.instrumentation.api.semconv.network.internal.AddressAndPortExtractor;
 import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalNetworkAttributesExtractor;
@@ -40,6 +40,11 @@ public final class HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> {
   ToIntFunction<Context> resendCountIncrementer = HttpClientRequestResendCount::getAndIncrement;
   boolean redactQueryParameters;
 
+  static {
+    Experimental.internalSetRedactHttpClientQueryParameters(
+        (builder, redact) -> builder.redactQueryParameters = redact);
+  }
+
   HttpClientAttributesExtractorBuilder(
       HttpClientAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter) {
     this.httpAttributesGetter = httpAttributesGetter;
@@ -182,7 +187,6 @@ HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setResendCountIncremente
    * @see InstrumenterBuilder#addAttributesExtractor(AttributesExtractor)
    */
   public AttributesExtractor<REQUEST, RESPONSE> build() {
-    redactQueryParameters = ExperimentalParameterUtil.isRedactQueryParameters();
     return new HttpClientAttributesExtractor<>(this);
   }
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java

@@ -30,7 +30,7 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.instrumentation.api.internal.ExperimentalParameterUtil;
+import io.opentelemetry.instrumentation.api.internal.Experimental;
 import io.opentelemetry.instrumentation.api.internal.HttpConstants;
 import java.net.ConnectException;
 import java.util.HashMap;
@@ -212,10 +212,10 @@ void stripBasicAuthTest(String url, String expectedResult) {
     Map<String, String> request = new HashMap<>();
     request.put("urlFull", url);
 
-    ExperimentalParameterUtil.setRedactQueryParameters(true);
-
-    AttributesExtractor<Map<String, String>, Map<String, String>> extractor =
-        HttpClientAttributesExtractor.create(new TestHttpClientAttributesGetter());
+    HttpClientAttributesExtractorBuilder<Map<String, String>, Map<String, String>> builder =
+        HttpClientAttributesExtractor.builder(new TestHttpClientAttributesGetter());
+    Experimental.setRedactQueryParameters(builder, true);
+    AttributesExtractor<Map<String, String>, Map<String, String>> extractor = builder.build();
 
     AttributesBuilder attributes = Attributes.builder();
     extractor.onStart(attributes, Context.root(), request);