Convert TextMapSetters to enums

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java

@@ -64,9 +64,8 @@ public String get(Map<String, Object> map, String key) {
  }
  }
 
- private static class MapSetter implements TextMapSetter<Map<String, Object>> {
-
- private static final MapSetter INSTANCE = new MapSetter();
+ private enum MapSetter implements TextMapSetter<Map<String, Object>> {
+ INSTANCE;
 
  @Override
  public void set(Map<String, Object> carrier, String key, String value) {

instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersSetter.java

@@ -7,7 +7,8 @@
 
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-final class DubboHeadersSetter implements TextMapSetter<DubboRequest> {
+enum DubboHeadersSetter implements TextMapSetter<DubboRequest> {
+ INSTANCE;
 
  @Override
  public void set(DubboRequest request, String key, String value) {

instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java

@@ -84,6 +84,6 @@ public DubboTracing build() {
 
  return new DubboTracing(
  serverInstrumenterBuilder.newServerInstrumenter(new DubboHeadersGetter()),
- clientInstrumenterBuilder.newClientInstrumenter(new DubboHeadersSetter()));
+ clientInstrumenterBuilder.newClientInstrumenter(DubboHeadersSetter.INSTANCE));
  }
 }

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java

@@ -39,7 +39,7 @@ public final class ApacheHttpAsyncClientSingletons {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter() {

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/HttpHeaderSetter.java

@@ -7,7 +7,8 @@
 
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class HttpHeaderSetter implements TextMapSetter<ApacheHttpClientRequest> {
+enum HttpHeaderSetter implements TextMapSetter<ApacheHttpClientRequest> {
+ INSTANCE;
 
  @Override
  public void set(ApacheHttpClientRequest carrier, String key, String value) {

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java

@@ -39,7 +39,7 @@ public final class ApacheHttpClientSingletons {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<HttpMethod, HttpMethod> instrumenter() {

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/HttpHeaderSetter.java

@@ -9,7 +9,8 @@
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
 
-final class HttpHeaderSetter implements TextMapSetter<HttpMethod> {
+enum HttpHeaderSetter implements TextMapSetter<HttpMethod> {
+ INSTANCE;
 
  @Override
  public void set(HttpMethod carrier, String key, String value) {

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java

@@ -39,7 +39,7 @@ public final class ApacheHttpClientSingletons {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter() {

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/HttpHeaderSetter.java

@@ -7,7 +7,8 @@
 
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-final class HttpHeaderSetter implements TextMapSetter<ApacheHttpClientRequest> {
+enum HttpHeaderSetter implements TextMapSetter<ApacheHttpClientRequest> {
+ INSTANCE;
 
  @Override
  public void set(ApacheHttpClientRequest carrier, String key, String value) {

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java

@@ -40,7 +40,7 @@ public final class ApacheHttpClientSingletons {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<ClassicHttpRequest, HttpResponse> instrumenter() {

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/HttpHeaderSetter.java

@@ -8,7 +8,8 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 
-final class HttpHeaderSetter implements TextMapSetter<ClassicHttpRequest> {
+enum HttpHeaderSetter implements TextMapSetter<ClassicHttpRequest> {
+ INSTANCE;
 
  @Override
  public void set(ClassicHttpRequest carrier, String key, String value) {

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java

@@ -148,7 +148,7 @@ public ArmeriaTracing build() {
  }
 
  return new ArmeriaTracing(
- clientInstrumenterBuilder.newClientInstrumenter(new ClientRequestContextSetter()),
+ clientInstrumenterBuilder.newClientInstrumenter(ClientRequestContextSetter.INSTANCE),
  serverInstrumenterBuilder.newServerInstrumenter(new RequestContextGetter()));
  }
 }

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java

@@ -9,7 +9,8 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import javax.annotation.Nullable;
 
-final class ClientRequestContextSetter implements TextMapSetter<ClientRequestContext> {
+enum ClientRequestContextSetter implements TextMapSetter<ClientRequestContext> {
+ INSTANCE;
 
  @Override
  public void set(@Nullable ClientRequestContext carrier, String key, String value) {

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java

@@ -40,7 +40,7 @@ public final class AsyncHttpClientSingletons {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<Request, Response> instrumenter() {

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/HttpHeaderSetter.java

@@ -8,7 +8,8 @@
 import com.ning.http.client.Request;
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class HttpHeaderSetter implements TextMapSetter<Request> {
+enum HttpHeaderSetter implements TextMapSetter<Request> {
+ INSTANCE;
 
  @Override
  public void set(Request carrier, String key, String value) {

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java

@@ -41,7 +41,7 @@ public final class AsyncHttpClientSingletons {
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addAttributesExtractor(new AsyncHttpClientAdditionalAttributesExtractor())
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<RequestContext, Response> instrumenter() {

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/HttpHeaderSetter.java

@@ -7,7 +7,8 @@
 
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class HttpHeaderSetter implements TextMapSetter<RequestContext> {
+enum HttpHeaderSetter implements TextMapSetter<RequestContext> {
+ INSTANCE;
 
  @Override
  public void set(RequestContext carrier, String key, String value) {

instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientSingletons.java

@@ -40,7 +40,7 @@ public class GoogleHttpClientSingletons {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/HttpHeaderSetter.java

@@ -8,7 +8,8 @@
 import com.google.api.client.http.HttpRequest;
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class HttpHeaderSetter implements TextMapSetter<HttpRequest> {
+enum HttpHeaderSetter implements TextMapSetter<HttpRequest> {
+ INSTANCE;
 
  @Override
  public void set(HttpRequest carrier, String key, String value) {

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/HttpHeaderSetter.java

@@ -8,7 +8,8 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import org.eclipse.jetty.client.api.Request;
 
-final class HttpHeaderSetter implements TextMapSetter<Request> {
+enum HttpHeaderSetter implements TextMapSetter<Request> {
+ INSTANCE;
 
  @Override
  public void set(Request request, String key, String value) {

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientInstrumenterBuilder.java

@@ -64,6 +64,6 @@ public Instrumenter<Request, Response> build() {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractors(additionalExtractors)
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 }

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSingletons.java

@@ -32,7 +32,7 @@ private static Instrumenter<MessageWithDestination, Void> buildProducerInstrumen
  return Instrumenter.<MessageWithDestination, Void>builder(
  GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanNameExtractor)
  .addAttributesExtractor(attributesExtractor)
- .newProducerInstrumenter(new MessagePropertySetter());
+ .newProducerInstrumenter(MessagePropertySetter.INSTANCE);
  }
 
  private static Instrumenter<MessageWithDestination, Void> buildConsumerInstrumenter() {

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessagePropertySetter.java

@@ -10,11 +10,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final class MessagePropertySetter implements TextMapSetter<MessageWithDestination> {
+enum MessagePropertySetter implements TextMapSetter<MessageWithDestination> {
+ INSTANCE;
 
  private static final Logger logger = LoggerFactory.getLogger(MessagePropertySetter.class);
 
- static final String DASH = "__dash__";
+ private static final String DASH = "__dash__";
 
  @Override
  public void set(MessageWithDestination carrier, String key, String value) {

instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracing.java

@@ -33,7 +33,7 @@ public final class KafkaTracing {
 
  private static final TextMapGetter<ConsumerRecord<?, ?>> GETTER = new KafkaConsumerRecordGetter();
 
- private static final TextMapSetter<Headers> SETTER = new KafkaHeadersSetter();
+ private static final TextMapSetter<Headers> SETTER = KafkaHeadersSetter.INSTANCE;
 
  private final OpenTelemetry openTelemetry;
  private final Instrumenter<ProducerRecord<?, ?>, Void> producerInstrumenter;

instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersSetter.java

@@ -9,7 +9,8 @@
 import java.nio.charset.StandardCharsets;
 import org.apache.kafka.common.header.Headers;
 
-public final class KafkaHeadersSetter implements TextMapSetter<Headers> {
+public enum KafkaHeadersSetter implements TextMapSetter<Headers> {
+ INSTANCE;
 
  @Override
  public void set(Headers headers, String key, String value) {

instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaPropagation.java

@@ -14,7 +14,7 @@
 
 public final class KafkaPropagation {
 
- private static final KafkaHeadersSetter SETTER = new KafkaHeadersSetter();
+ private static final KafkaHeadersSetter SETTER = KafkaHeadersSetter.INSTANCE;
 
  private static final boolean CLIENT_PROPAGATION_ENABLED =
  Config.get().getBoolean("otel.instrumentation.kafka.client-propagation.enabled", true);

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpRequestHeadersSetter.java

@@ -9,7 +9,8 @@
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel;
 import javax.annotation.Nullable;
 
-final class HttpRequestHeadersSetter implements TextMapSetter<HttpRequestAndChannel> {
+enum HttpRequestHeadersSetter implements TextMapSetter<HttpRequestAndChannel> {
+ INSTANCE;
 
  @Override
  public void set(@Nullable HttpRequestAndChannel carrier, String key, String value) {

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java

@@ -44,7 +44,7 @@ public final class NettyClientSingletons {
  .addRequestMetrics(HttpClientMetrics.get())
  .addContextCustomizer(
  (context, requestAndChannel, startAttributes) -> NettyErrorHolder.init(context))
- .newClientInstrumenter(new HttpRequestHeadersSetter());
+ .newClientInstrumenter(HttpRequestHeadersSetter.INSTANCE);
 
  NettyConnectNetAttributesExtractor nettyConnectAttributesExtractor =
  new NettyConnectNetAttributesExtractor();

instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/HttpRequestHeadersSetter.java

@@ -8,7 +8,8 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.javaagent.instrumentation.netty.common.HttpRequestAndChannel;
 
-final class HttpRequestHeadersSetter implements TextMapSetter<HttpRequestAndChannel> {
+enum HttpRequestHeadersSetter implements TextMapSetter<HttpRequestAndChannel> {
+ INSTANCE;
 
  @Override
  public void set(HttpRequestAndChannel requestAndChannel, String key, String value) {

instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/NettyClientInstrumenterFactory.java

@@ -43,7 +43,7 @@ public Instrumenter<HttpRequestAndChannel, HttpResponse> createHttpInstrumenter(
  .addAttributesExtractor(netClientAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netClientAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpRequestHeadersSetter());
+ .newClientInstrumenter(HttpRequestHeadersSetter.INSTANCE);
  }
 
  public NettyConnectInstrumenter createConnectInstrumenter() {

instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/RequestHeaderSetter.java

@@ -10,9 +10,8 @@
 import okhttp3.Request;
 
 /** Helper class to inject span context into request headers. */
-final class RequestHeaderSetter implements TextMapSetter<Request.Builder> {
-
- static final RequestHeaderSetter SETTER = new RequestHeaderSetter();
+enum RequestHeaderSetter implements TextMapSetter<Request.Builder> {
+ INSTANCE;
 
  @Override
  public void set(@Nullable Request.Builder carrier, String key, String value) {

instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/TracingInterceptor.java

@@ -55,7 +55,9 @@ public Response intercept(Chain chain) throws IOException {
  // thus we must use Instrumenter<Request, Response>, and Request is immutable
  private Request injectContextToRequest(Request request, Context context) {
  Request.Builder requestBuilder = request.newBuilder();
- propagators.getTextMapPropagator().inject(context, requestBuilder, RequestHeaderSetter.SETTER);
+ propagators
+ .getTextMapPropagator()
+ .inject(context, requestBuilder, RequestHeaderSetter.INSTANCE);
  return requestBuilder.build();
  }
 }

instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/HttpHeaderSetter.java

@@ -8,7 +8,8 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import play.shaded.ahc.org.asynchttpclient.Request;
 
-public class HttpHeaderSetter implements TextMapSetter<Request> {
+enum HttpHeaderSetter implements TextMapSetter<Request> {
+ INSTANCE;
 
  @Override
  public void set(Request carrier, String key, String value) {

instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientSingletons.java

@@ -40,7 +40,7 @@ public class PlayWsClientSingletons {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor))
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpHeaderSetter());
+ .newClientInstrumenter(HttpHeaderSetter.INSTANCE);
  }
 
  public static Instrumenter<Request, Response> instrumenter() {

instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/HttpRequestSetter.java

@@ -8,7 +8,9 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import org.springframework.http.HttpRequest;
 
-final class HttpRequestSetter implements TextMapSetter<HttpRequest> {
+enum HttpRequestSetter implements TextMapSetter<HttpRequest> {
+ INSTANCE;
+
  @Override
  public void set(HttpRequest httpRequest, String key, String value) {
  httpRequest.getHeaders().set(key, value);

instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/SpringWebTracingBuilder.java

@@ -72,7 +72,7 @@ public SpringWebTracing build() {
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractors(additionalExtractors)
  .addRequestMetrics(HttpClientMetrics.get())
- .newClientInstrumenter(new HttpRequestSetter());
+ .newClientInstrumenter(HttpRequestSetter.INSTANCE);
 
  return new SpringWebTracing(instrumenter);
  }