Don't use singleton for propagator getters/setters (#3054)

open-telemetry · May 21, 2021 · f11bd75 · f11bd75
1 parent ccda31a
commit f11bd75
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 20 deletions.
diff --git a/...api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java b/...api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java
@@ -86,8 +86,7 @@ protected void onEnd(
     }
   }
 
-  enum MapGetter implements TextMapGetter<Map<String, String>> {
-    INSTANCE;
+  class MapGetter implements TextMapGetter<Map<String, String>> {
 
     @Override
     public Iterable<String> keys(Map<String, String> carrier) {
@@ -109,7 +108,7 @@ void server() {
         Instrumenter.<Map<String, String>, Map<String, String>>newBuilder(
                 otelTesting.getOpenTelemetry(), "test", unused -> "span")
             .addAttributesExtractors(new AttributesExtractor1(), new AttributesExtractor2())
-            .newServerInstrumenter(MapGetter.INSTANCE);
+            .newServerInstrumenter(new MapGetter());
 
     Context context = instrumenter.start(Context.root(), REQUEST);
     SpanContext spanContext = Span.fromContext(context).getSpanContext();
@@ -151,7 +150,7 @@ void server_error() {
         Instrumenter.<Map<String, String>, Map<String, String>>newBuilder(
                 otelTesting.getOpenTelemetry(), "test", unused -> "span")
             .addAttributesExtractors(new AttributesExtractor1(), new AttributesExtractor2())
-            .newServerInstrumenter(MapGetter.INSTANCE);
+            .newServerInstrumenter(new MapGetter());
 
     Context context = instrumenter.start(Context.root(), REQUEST);
     SpanContext spanContext = Span.fromContext(context).getSpanContext();
@@ -175,7 +174,7 @@ void server_parent() {
         Instrumenter.<Map<String, String>, Map<String, String>>newBuilder(
                 otelTesting.getOpenTelemetry(), "test", unused -> "span")
             .addAttributesExtractors(new AttributesExtractor1(), new AttributesExtractor2())
-            .newServerInstrumenter(MapGetter.INSTANCE);
+            .newServerInstrumenter(new MapGetter());
 
     Map<String, String> request = new HashMap<>(REQUEST);
     W3CTraceContextPropagator.getInstance()

diff --git a/...emetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumenters.java b/...emetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumenters.java
@@ -34,7 +34,7 @@ public final class ApacheHttpClientInstrumenters {
             .setSpanStatusExtractor(spanStatusExtractor)
             .addAttributesExtractor(httpAttributesExtractor)
             .addAttributesExtractor(new ApacheHttpClientNetAttributesExtractor())
-            .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            .newClientInstrumenter(new HttpHeaderSetter());
   }
 
   public static Instrumenter<HttpMethod, Void> instrumenter() {

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/HttpHeaderSetter.java b/...va/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/HttpHeaderSetter.java
@@ -9,8 +9,7 @@
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
 
-enum HttpHeaderSetter implements TextMapSetter<HttpMethod> {
-  INSTANCE;
+final class HttpHeaderSetter implements TextMapSetter<HttpMethod> {
 
   @Override
   public void set(HttpMethod carrier, String key, String value) {

diff --git a/...emetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumenters.java b/...emetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumenters.java
@@ -35,7 +35,7 @@ public final class ApacheHttpClientInstrumenters {
             .setSpanStatusExtractor(spanStatusExtractor)
             .addAttributesExtractor(httpAttributesExtractor)
             .addAttributesExtractor(new ApacheHttpClientNetAttributesExtractor())
-            .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            .newClientInstrumenter(new HttpHeaderSetter());
   }
 
   public static Instrumenter<HttpUriRequest, HttpResponse> instrumenter() {

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/HttpHeaderSetter.java b/...va/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/HttpHeaderSetter.java
@@ -8,8 +8,7 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.http.client.methods.HttpUriRequest;
 
-enum HttpHeaderSetter implements TextMapSetter<HttpUriRequest> {
-  INSTANCE;
+final class HttpHeaderSetter implements TextMapSetter<HttpUriRequest> {
 
   @Override
   public void set(HttpUriRequest carrier, String key, String value) {

diff --git a/...ry/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java b/...ry/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java
@@ -86,7 +86,7 @@ public ArmeriaTracing build() {
     serverInstrumenterBuilder.addRequestMetrics(HttpServerMetrics.get());
 
     return new ArmeriaTracing(
-        clientInstrumenterBuilder.newClientInstrumenter(ClientRequestContextSetter.INSTANCE),
-        serverInstrumenterBuilder.newServerInstrumenter(RequestContextGetter.INSTANCE));
+        clientInstrumenterBuilder.newClientInstrumenter(new ClientRequestContextSetter()),
+        serverInstrumenterBuilder.newServerInstrumenter(new RequestContextGetter()));
   }
 }
diff --git a/...c/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java b/...c/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java
@@ -9,8 +9,7 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-enum ClientRequestContextSetter implements TextMapSetter<ClientRequestContext> {
-  INSTANCE;
+final class ClientRequestContextSetter implements TextMapSetter<ClientRequestContext> {
 
   @Override
   public void set(@Nullable ClientRequestContext carrier, String key, String value) {

diff --git a/...ary/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/RequestContextGetter.java b/...ary/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/RequestContextGetter.java
@@ -12,8 +12,7 @@
 import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-enum RequestContextGetter implements TextMapGetter<ServiceRequestContext> {
-  INSTANCE;
+final class RequestContextGetter implements TextMapGetter<ServiceRequestContext> {
 
   @Override
   public Iterable<String> keys(@Nullable ServiceRequestContext carrier) {

diff --git a/...aagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenters.java b/...aagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenters.java
@@ -30,7 +30,7 @@ public final class JmsInstrumenters {
         Instrumenter.<MessageWithDestination, Void>newBuilder(
                 otel, INSTRUMENTATION_NAME, spanNameExtractor)
             .addAttributesExtractor(attributesExtractor)
-            .newProducerInstrumenter(MessagePropertySetter.INSTANCE);
+            .newProducerInstrumenter(new MessagePropertySetter());
     // MessageConsumer does not do context propagation
     CONSUMER_INSTRUMENTER =
         Instrumenter.<MessageWithDestination, Void>newBuilder(

diff --git a/...t/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessagePropertySetter.java b/...t/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessagePropertySetter.java
@@ -10,8 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-enum MessagePropertySetter implements TextMapSetter<MessageWithDestination> {
-  INSTANCE;
+final class MessagePropertySetter implements TextMapSetter<MessageWithDestination> {
 
   private static final Logger log = LoggerFactory.getLogger(MessagePropertySetter.class);