add http server builder

Author: zeitlinger

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

@@ -7,22 +7,18 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpServerExperimentalMetrics;
+import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerTelemetryBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractor;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerMetrics;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenterBuilder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public final class ServletInstrumenterBuilder<REQUEST, RESPONSE> {
 
@@ -49,43 +45,28 @@ public Instrumenter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPO
       HttpServerAttributesGetter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>
           httpAttributesGetter) {
 
-    ServletErrorCauseExtractor<REQUEST, RESPONSE> errorCauseExtractor =
-        new ServletErrorCauseExtractor<>(accessor);
-    AttributesExtractor<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>
-        additionalAttributesExtractor = new ServletAdditionalAttributesExtractor<>(accessor);
+    DefaultHttpServerTelemetryBuilder<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>> serverBuilder = new DefaultHttpServerTelemetryBuilder<>(
+        instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter,
+        Optional.of(new ServletRequestGetter<>(accessor)));
+    serverBuilder.setSpanNameExtractor(e -> spanNameExtractor);
+    return JavaagentHttpServerInstrumenterBuilder.createWithCustomizer(
+        serverBuilder,
+        builder -> {
+          if (ServletRequestParametersExtractor.enabled()) {
+            AttributesExtractor<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>
+                requestParametersExtractor = new ServletRequestParametersExtractor<>(accessor);
+            builder.addAttributesExtractor(requestParametersExtractor);
+          }
+          for (ContextCustomizer<? super ServletRequestContext<REQUEST>> contextCustomizer :
+              contextCustomizers) {
+            builder.addContextCustomizer(contextCustomizer);
+          }
 
-    InstrumenterBuilder<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>> builder =
-        Instrumenter.<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>builder(
-                GlobalOpenTelemetry.get(), instrumentationName, spanNameExtractor)
-            .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
-            .setErrorCauseExtractor(errorCauseExtractor)
-            .addAttributesExtractor(
-                HttpServerAttributesExtractor.builder(httpAttributesGetter)
-                    .setCapturedRequestHeaders(CommonConfig.get().getServerRequestHeaders())
-                    .setCapturedResponseHeaders(CommonConfig.get().getServerResponseHeaders())
-                    .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
-                    .build())
-            .addAttributesExtractor(additionalAttributesExtractor)
-            .addOperationMetrics(HttpServerMetrics.get())
-            .addContextCustomizer(
-                HttpServerRoute.builder(httpAttributesGetter)
-                    .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
-                    .build());
-    if (ServletRequestParametersExtractor.enabled()) {
-      AttributesExtractor<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>
-          requestParametersExtractor = new ServletRequestParametersExtractor<>(accessor);
-      builder.addAttributesExtractor(requestParametersExtractor);
-    }
-    for (ContextCustomizer<? super ServletRequestContext<REQUEST>> contextCustomizer :
-        contextCustomizers) {
-      builder.addContextCustomizer(contextCustomizer);
-    }
-    if (CommonConfig.get().shouldEmitExperimentalHttpServerTelemetry()) {
-      builder
-          .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
-          .addOperationMetrics(HttpServerExperimentalMetrics.get());
-    }
-    return builder.buildServerInstrumenter(new ServletRequestGetter<>(accessor));
+          builder
+              .addAttributesExtractor(
+                  new ServletAdditionalAttributesExtractor<>(accessor))
+              .setErrorCauseExtractor(new ServletErrorCauseExtractor<>(accessor));
+        });
   }
 
   public Instrumenter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>> build(