fix rebase

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java

@@ -8,20 +8,19 @@
 import akka.http.scaladsl.model.HttpRequest;
 import akka.http.scaladsl.model.HttpResponse;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
-import java.util.Optional;
 
 public final class AkkaHttpServerSingletons {
 
   private static final Instrumenter<HttpRequest, HttpResponse> INSTRUMENTER;
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.create(
+        JavaagentHttpServerInstrumenters.create(
             AkkaHttpUtil.instrumentationName(),
             new AkkaHttpServerAttributesGetter(),
-            Optional.of(AkkaHttpServerHeaders.INSTANCE));
+            AkkaHttpServerHeaders.INSTANCE);
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlySingletons.java

@@ -6,9 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.grizzly;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
-import java.util.Optional;
 import org.glassfish.grizzly.http.HttpRequestPacket;
 import org.glassfish.grizzly.http.HttpResponsePacket;
 
@@ -18,10 +17,10 @@ public final class GrizzlySingletons {
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+        JavaagentHttpServerInstrumenters.create(
             "io.opentelemetry.grizzly-2.3",
             new GrizzlyHttpAttributesGetter(),
-            Optional.of(HttpRequestHeadersGetter.INSTANCE),
+            HttpRequestHeadersGetter.INSTANCE,
             builder ->
                 builder
                     .addContextCustomizer(

instrumentation/jetty/jetty-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12Singletons.java

@@ -6,9 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.jetty.v12_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
-import java.util.Optional;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 
@@ -19,10 +18,10 @@ public final class Jetty12Singletons {
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+        JavaagentHttpServerInstrumenters.create(
             INSTRUMENTATION_NAME,
             new Jetty12HttpAttributesGetter(),
-            Optional.of(Jetty12TextMapGetter.INSTANCE),
+            Jetty12TextMapGetter.INSTANCE,
             builder ->
                 builder.addContextCustomizer(
                     (context, request, attributes) ->

instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java

@@ -6,8 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
-import java.util.Optional;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 
 public final class LibertyDispatcherSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.liberty-dispatcher-20.0";
@@ -16,10 +15,10 @@ public final class LibertyDispatcherSingletons {
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.create(
+        JavaagentHttpServerInstrumenters.create(
             INSTRUMENTATION_NAME,
             new LibertyDispatcherHttpAttributesGetter(),
-            Optional.of(LibertyDispatcherRequestGetter.INSTANCE));
+            LibertyDispatcherRequestGetter.INSTANCE);
   }
 
   public static Instrumenter<LibertyRequest, LibertyResponse> instrumenter() {

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerSingletons.java

@@ -7,9 +7,8 @@
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel;
-import java.util.Optional;
 import org.jboss.netty.handler.codec.http.HttpResponse;
 
 final class NettyServerSingletons {
@@ -18,10 +17,10 @@ final class NettyServerSingletons {
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+        JavaagentHttpServerInstrumenters.create(
             "io.opentelemetry.netty-3.8",
             new NettyHttpServerAttributesGetter(),
-            Optional.of(NettyHeadersGetter.INSTANCE),
+            NettyHeadersGetter.INSTANCE,
             builder ->
                 builder.addContextCustomizer(
                     (context, requestAndChannel, startAttributes) ->

instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterBuilder.java

@@ -11,7 +11,6 @@
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceResolver;
 import io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel;
-import java.util.Optional;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
@@ -22,11 +21,8 @@ public class NettyClientInstrumenterBuilder
   private PeerServiceResolver peerServiceResolver;
 
   public NettyClientInstrumenterBuilder(String instrumentationName, OpenTelemetry openTelemetry) {
-    super(
-        instrumentationName,
-        openTelemetry,
-        new NettyHttpClientAttributesGetter(),
-        Optional.of(HttpRequestHeadersSetter.INSTANCE));
+    super(instrumentationName, openTelemetry, new NettyHttpClientAttributesGetter());
+    setHeaderSetter(HttpRequestHeadersSetter.INSTANCE);
   }
 
   @CanIgnoreReturnValue

instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyServerSingletons.java

@@ -11,16 +11,15 @@
 import io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel;
 import io.opentelemetry.instrumentation.netty.v4.common.internal.server.HttpRequestHeadersGetter;
 import io.opentelemetry.instrumentation.netty.v4.common.internal.server.NettyHttpServerAttributesGetter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
-import java.util.Optional;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 
 public final class NettyServerSingletons {
 
   private static final Instrumenter<HttpRequestAndChannel, HttpResponse> INSTRUMENTER =
-      JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+      JavaagentHttpServerInstrumenters.create(
           "io.opentelemetry.netty-4.0",
           new NettyHttpServerAttributesGetter(),
-          Optional.of(HttpRequestHeadersGetter.INSTANCE),
+          HttpRequestHeadersGetter.INSTANCE,
           builder ->
               builder.addContextCustomizer(
                   (context, requestAndChannel, startAttributes) -> NettyErrorHolder.init(context)));

instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerSingletons.java

@@ -6,9 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.server;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.PekkoHttpUtil;
-import java.util.Optional;
 import org.apache.pekko.http.scaladsl.model.HttpRequest;
 import org.apache.pekko.http.scaladsl.model.HttpResponse;
 
@@ -18,10 +17,10 @@ public final class PekkoHttpServerSingletons {
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.create(
+        JavaagentHttpServerInstrumenters.create(
             PekkoHttpUtil.instrumentationName(),
             new PekkoHttpServerAttributesGetter(),
-            Optional.of(PekkoHttpServerHeaders.INSTANCE));
+            PekkoHttpServerHeaders.INSTANCE);
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletSingletons.java

@@ -9,7 +9,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteGetter;
 import io.opentelemetry.instrumentation.restlet.v1_1.RestletTelemetry;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import org.restlet.data.Request;
 import org.restlet.data.Response;
@@ -20,7 +20,7 @@ public final class RestletSingletons {
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.create(
+        JavaagentHttpServerInstrumenters.create(
             RestletTelemetry.builder(GlobalOpenTelemetry.get()));
   }
 

instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletSingletons.java

@@ -9,16 +9,15 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteGetter;
 import io.opentelemetry.instrumentation.restlet.v2_0.RestletTelemetry;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import org.restlet.Request;
 import org.restlet.Response;
 
 public final class RestletSingletons {
 
   private static final Instrumenter<Request, Response> INSTRUMENTER =
-      JavaagentHttpServerInstrumenterBuilder.create(
-          RestletTelemetry.create(GlobalOpenTelemetry.get()));
+      JavaagentHttpServerInstrumenters.create(RestletTelemetry.create(GlobalOpenTelemetry.get()));
 
   public static Instrumenter<Request, Response> instrumenter() {
     return INSTRUMENTER;

instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletInstrumenterBuilder.java

@@ -15,7 +15,7 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,7 +51,7 @@ public Instrumenter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPO
                     instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter)
                 .setHeaderGetter(new ServletRequestGetter<>(accessor));
     serverBuilder.setSpanNameExtractor(e -> spanNameExtractor);
-    return JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+    return JavaagentHttpServerInstrumenters.create(
         serverBuilder,
         builder -> {
           if (ServletRequestParametersExtractor.enabled()) {

instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatInstrumenterFactory.java

@@ -6,11 +6,10 @@
 package io.opentelemetry.javaagent.instrumentation.tomcat.common;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletAccessor;
 import io.opentelemetry.javaagent.instrumentation.servlet.ServletErrorCauseExtractor;
-import java.util.Optional;
 import org.apache.coyote.Request;
 import org.apache.coyote.Response;
 
@@ -20,10 +19,10 @@ private TomcatInstrumenterFactory() {}
 
   public static <REQUEST, RESPONSE> Instrumenter<Request, Response> create(
       String instrumentationName, ServletAccessor<REQUEST, RESPONSE> accessor) {
-    return JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+    return JavaagentHttpServerInstrumenters.create(
         instrumentationName,
         new TomcatHttpAttributesGetter(),
-        Optional.of(TomcatRequestGetter.INSTANCE),
+        TomcatRequestGetter.INSTANCE,
         builder ->
             builder
                 .setErrorCauseExtractor(new ServletErrorCauseExtractor<>(accessor))

instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowSingletons.java

@@ -6,11 +6,10 @@
 package io.opentelemetry.javaagent.instrumentation.undertow;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
 import io.opentelemetry.javaagent.bootstrap.undertow.UndertowActiveHandlers;
 import io.undertow.server.HttpServerExchange;
-import java.util.Optional;
 
 public final class UndertowSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.undertow-1.4";
@@ -19,10 +18,10 @@ public final class UndertowSingletons {
 
   static {
     INSTRUMENTER =
-        JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+        JavaagentHttpServerInstrumenters.create(
             INSTRUMENTATION_NAME,
             new UndertowHttpAttributesGetter(),
-            Optional.of(UndertowExchangeGetter.INSTANCE),
+            UndertowExchangeGetter.INSTANCE,
             builder ->
                 builder.addContextCustomizer(
                     (context, request, attributes) -> {

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpClientInstrumenters.java

@@ -44,13 +44,13 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       HttpClientAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter,
       TextMapSetter<REQUEST> headerSetter,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
-    DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> DefaultHttpClientInstrumenterBuilder =
+    DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> defaultHttpClientTelemetryBuilder =
         new DefaultHttpClientInstrumenterBuilder<>(
             instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter);
     if (headerSetter != null) {
-      DefaultHttpClientInstrumenterBuilder.setHeaderSetter(headerSetter);
+      defaultHttpClientTelemetryBuilder.setHeaderSetter(headerSetter);
     }
-    return create(DefaultHttpClientInstrumenterBuilder, instrumenterBuilderConsumer);
+    return create(defaultHttpClientTelemetryBuilder, instrumenterBuilderConsumer);
   }
 
   private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpServerInstrumenterBuilder.java → javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpServerInstrumenters.java

@@ -11,41 +11,40 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
-import java.util.Optional;
 import java.util.function.Consumer;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public final class JavaagentHttpServerInstrumenterBuilder {
+public final class JavaagentHttpServerInstrumenters {
 
-  private JavaagentHttpServerInstrumenterBuilder() {}
+  private JavaagentHttpServerInstrumenters() {}
 
   public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       String instrumentationName,
       HttpServerAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter,
-      Optional<TextMapGetter<REQUEST>> headerGetter) {
-    return createWithCustomizer(
-        instrumentationName, httpAttributesGetter, headerGetter, customizer -> {});
+      TextMapGetter<REQUEST> headerGetter) {
+    return create(instrumentationName, httpAttributesGetter, headerGetter, customizer -> {});
   }
 
   public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(Object builder) {
-    return createWithCustomizer(builder, customizer -> {});
+    return create(builder, customizer -> {});
   }
 
-  public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> createWithCustomizer(
+  public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       String instrumentationName,
       HttpServerAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter,
-      Optional<TextMapGetter<REQUEST>> headerGetter,
+      TextMapGetter<REQUEST> headerGetter,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
-    return createWithCustomizer(
+    return create(
         new DefaultHttpServerInstrumenterBuilder<>(
-            instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter),
+                instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter)
+            .setHeaderGetter(headerGetter),
         instrumenterBuilderConsumer);
   }
 
-  public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> createWithCustomizer(
+  public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       Object builder,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
     return DefaultHttpServerInstrumenterBuilder.<REQUEST, RESPONSE>unwrapAndConfigure(