how to debug tests

zeitlinger · zeitlinger · commit ab9b52b7a45e · 2024-09-27T07:14:55.000+02:00
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java
@@ -172,15 +172,15 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setBuilderCustomi
   }
 
   public Instrumenter<REQUEST, RESPONSE> build() {
-    InstrumenterBuilder<REQUEST, RESPONSE> builder = builder();
+    InstrumenterBuilder<REQUEST, RESPONSE> builder = instrumenterBuilder();
 
     if (headerGetter != null) {
       return builder.buildServerInstrumenter(headerGetter);
     }
     return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());
   }
 
-  public InstrumenterBuilder<REQUEST, RESPONSE> builder() {
+  public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
     SpanNameExtractor<? super REQUEST> spanNameExtractor =
         spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
 
@@ -199,11 +199,7 @@ public InstrumenterBuilder<REQUEST, RESPONSE> builder() {
           .addOperationMetrics(HttpServerExperimentalMetrics.get());
     }
     builderCustomizer.accept(builder);
-
-    if (headerGetter != null) {
-      return builder.buildServerInstrumenter(headerGetter);
-    }
-    return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());
+    return builder;
   }
 
   @CanIgnoreReturnValue
diff --git a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTracing.kt b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTracing.kt
@@ -40,7 +40,8 @@ class KtorServerTracing private constructor(
         DefaultHttpServerInstrumenterBuilder(
           INSTRUMENTATION_NAME,
           openTelemetry,
-          KtorHttpServerAttributesGetter.INSTANCE
+          KtorHttpServerAttributesGetter.INSTANCE,
+          null
         )
     }
 
@@ -111,7 +112,7 @@ class KtorServerTracing private constructor(
       }
 
       val instrumenter = InstrumenterUtil.buildUpstreamInstrumenter(
-        configuration.builder.builder(),
+        configuration.builder.instrumenterBuilder(),
         ApplicationRequestGetter,
         configuration.spanKindExtractor(SpanKindExtractor.alwaysServer())
       )
diff --git a/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorServerTracing.kt b/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorServerTracing.kt
@@ -234,7 +234,7 @@ class KtorServerTracing private constructor(
       require(configuration.isOpenTelemetryInitialized()) { "OpenTelemetry must be set" }
 
       val instrumenter = InstrumenterUtil.buildUpstreamInstrumenter(
-        configuration.serverBuilder.builder(),
+        configuration.serverBuilder.instrumenterBuilder(),
         ApplicationRequestGetter,
         configuration.spanKindExtractor(SpanKindExtractor.alwaysServer())
       )
diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java
@@ -36,7 +36,10 @@ public final class RatpackTelemetryBuilder {
             .setHeaderSetter(RequestHeaderSetter.INSTANCE);
     serverBuilder =
         new DefaultHttpServerInstrumenterBuilder<>(
-                INSTRUMENTATION_NAME, openTelemetry, RatpackHttpAttributesGetter.INSTANCE, RatpackGetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            openTelemetry,
+            RatpackHttpAttributesGetter.INSTANCE,
+            RatpackGetter.INSTANCE);
   }
 
   /**
@@ -151,7 +154,9 @@ public RatpackTelemetryBuilder setEmitExperimentalHttpServerMetrics(
   /** Sets custom client {@link SpanNameExtractor} via transform function. */
   @CanIgnoreReturnValue
   public RatpackTelemetryBuilder setClientSpanNameExtractor(
-      Function<SpanNameExtractor<? super RequestSpec>, ? extends SpanNameExtractor<? super RequestSpec>>
+      Function<
+              SpanNameExtractor<? super RequestSpec>,
+              ? extends SpanNameExtractor<? super RequestSpec>>
           clientSpanNameExtractor) {
     clientBuilder.setSpanNameExtractor(clientSpanNameExtractor);
     return this;
diff --git a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java
@@ -95,7 +95,7 @@ public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
   /** Sets custom {@link SpanNameExtractor} via transform function. */
   @CanIgnoreReturnValue
   public RestletTelemetryBuilder setSpanNameExtractor(
-      Function<SpanNameExtractor<Request>, ? extends SpanNameExtractor<? super Request>>
+      Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
           spanNameExtractorTransformer) {
     builder.setSpanNameExtractor(spanNameExtractorTransformer);
     return this;
diff --git a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/internal/RestletTelemetryBuilderFactory.java b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/internal/RestletTelemetryBuilderFactory.java
@@ -22,7 +22,9 @@ private RestletTelemetryBuilderFactory() {}
   public static DefaultHttpServerInstrumenterBuilder<Request, Response> create(
       OpenTelemetry openTelemetry) {
     return new DefaultHttpServerInstrumenterBuilder<>(
-            INSTRUMENTATION_NAME, openTelemetry, RestletHttpAttributesGetter.INSTANCE)
-        .setHeaderGetter(RestletHeadersGetter.INSTANCE);
+        INSTRUMENTATION_NAME,
+        openTelemetry,
+        RestletHttpAttributesGetter.INSTANCE,
+        RestletHeadersGetter.INSTANCE);
   }
 }
diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java
@@ -95,7 +95,7 @@ public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
   /** Sets custom {@link SpanNameExtractor} via transform function. */
   @CanIgnoreReturnValue
   public RestletTelemetryBuilder setSpanNameExtractor(
-      Function<SpanNameExtractor<Request>, ? extends SpanNameExtractor<? super Request>>
+      Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
           spanNameExtractorTransformer) {
     builder.setSpanNameExtractor(spanNameExtractorTransformer);
     return this;
diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletTelemetryBuilderFactory.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletTelemetryBuilderFactory.java
@@ -20,7 +20,9 @@ private RestletTelemetryBuilderFactory() {}
   public static DefaultHttpServerInstrumenterBuilder<Request, Response> create(
       OpenTelemetry openTelemetry) {
     return new DefaultHttpServerInstrumenterBuilder<>(
-            "io.opentelemetry.restlet-2.0", openTelemetry, RestletHttpAttributesGetter.INSTANCE)
-        .setHeaderGetter(new RestletHeadersGetter());
+        "io.opentelemetry.restlet-2.0",
+        openTelemetry,
+        RestletHttpAttributesGetter.INSTANCE,
+        new RestletHeadersGetter());
   }
 }
diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletInstrumenterBuilder.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletInstrumenterBuilder.java
@@ -57,8 +57,10 @@ public Instrumenter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPO
             ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>>
         serverBuilder =
             new DefaultHttpServerInstrumenterBuilder<>(
-                    instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter)
-                .setHeaderGetter(new ServletRequestGetter<>(accessor));
+                instrumentationName,
+                GlobalOpenTelemetry.get(),
+                httpAttributesGetter,
+                new ServletRequestGetter<>(accessor));
     serverBuilder.setSpanNameExtractor(e -> spanNameExtractor);
 
     return JavaagentHttpServerInstrumenters.create(
diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpServerInstrumenters.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpServerInstrumenters.java
@@ -44,7 +44,7 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
         instrumenterBuilderConsumer);
   }
 
-  private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
+  public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> builder,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
     return builder

Original file line number	Diff line number	Diff line change
`@@ -172,15 +172,15 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setBuilderCustomi`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`public Instrumenter<REQUEST, RESPONSE> build() {`
`175`		`- InstrumenterBuilder<REQUEST, RESPONSE> builder = builder();`
	`175`	`+ InstrumenterBuilder<REQUEST, RESPONSE> builder = instrumenterBuilder();`
`176`	`176`
`177`	`177`	`if (headerGetter != null) {`
`178`	`178`	`return builder.buildServerInstrumenter(headerGetter);`
`179`	`179`	`}`
`180`	`180`	`return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());`
`181`	`181`	`}`
`182`	`182`
`183`		`- public InstrumenterBuilder<REQUEST, RESPONSE> builder() {`
	`183`	`+ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {`
`184`	`184`	`SpanNameExtractor<? super REQUEST> spanNameExtractor =`
`185`	`185`	`spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());`
`186`	`186`
`@@ -199,11 +199,7 @@ public InstrumenterBuilder<REQUEST, RESPONSE> builder() {`
`199`	`199`	`.addOperationMetrics(HttpServerExperimentalMetrics.get());`
`200`	`200`	`}`
`201`	`201`	`builderCustomizer.accept(builder);`
`202`		`-`
`203`		`- if (headerGetter != null) {`
`204`		`- return builder.buildServerInstrumenter(headerGetter);`
`205`		`- }`
`206`		`- return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());`
	`202`	`+ return builder;`
`207`	`203`	`}`
`208`	`204`
`209`	`205`	`@CanIgnoreReturnValue`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ class KtorServerTracing private constructor(`
`40`	`40`	`DefaultHttpServerInstrumenterBuilder(`
`41`	`41`	`INSTRUMENTATION_NAME,`
`42`	`42`	`openTelemetry,`
`43`		`- KtorHttpServerAttributesGetter.INSTANCE`
	`43`	`+ KtorHttpServerAttributesGetter.INSTANCE,`
	`44`	`+ null`
`44`	`45`	`)`
`45`	`46`	`}`
`46`	`47`
`@@ -111,7 +112,7 @@ class KtorServerTracing private constructor(`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`val instrumenter = InstrumenterUtil.buildUpstreamInstrumenter(`
`114`		`- configuration.builder.builder(),`
	`115`	`+ configuration.builder.instrumenterBuilder(),`
`115`	`116`	`ApplicationRequestGetter,`
`116`	`117`	`configuration.spanKindExtractor(SpanKindExtractor.alwaysServer())`
`117`	`118`	`)`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ class KtorServerTracing private constructor(`
`234`	`234`	`require(configuration.isOpenTelemetryInitialized()) { "OpenTelemetry must be set" }`
`235`	`235`
`236`	`236`	`val instrumenter = InstrumenterUtil.buildUpstreamInstrumenter(`
`237`		`- configuration.serverBuilder.builder(),`
	`237`	`+ configuration.serverBuilder.instrumenterBuilder(),`
`238`	`238`	`ApplicationRequestGetter,`
`239`	`239`	`configuration.spanKindExtractor(SpanKindExtractor.alwaysServer())`
`240`	`240`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ private RestletTelemetryBuilderFactory() {}`
`22`	`22`	`public static DefaultHttpServerInstrumenterBuilder<Request, Response> create(`
`23`	`23`	`OpenTelemetry openTelemetry) {`
`24`	`24`	`return new DefaultHttpServerInstrumenterBuilder<>(`
`25`		`- INSTRUMENTATION_NAME, openTelemetry, RestletHttpAttributesGetter.INSTANCE)`
`26`		`- .setHeaderGetter(RestletHeadersGetter.INSTANCE);`
	`25`	`+ INSTRUMENTATION_NAME,`
	`26`	`+ openTelemetry,`
	`27`	`+ RestletHttpAttributesGetter.INSTANCE,`
	`28`	`+ RestletHeadersGetter.INSTANCE);`
`27`	`29`	`}`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ private RestletTelemetryBuilderFactory() {}`
`20`	`20`	`public static DefaultHttpServerInstrumenterBuilder<Request, Response> create(`
`21`	`21`	`OpenTelemetry openTelemetry) {`
`22`	`22`	`return new DefaultHttpServerInstrumenterBuilder<>(`
`23`		`- "io.opentelemetry.restlet-2.0", openTelemetry, RestletHttpAttributesGetter.INSTANCE)`
`24`		`- .setHeaderGetter(new RestletHeadersGetter());`
	`23`	`+ "io.opentelemetry.restlet-2.0",`
	`24`	`+ openTelemetry,`
	`25`	`+ RestletHttpAttributesGetter.INSTANCE,`
	`26`	`+ new RestletHeadersGetter());`
`25`	`27`	`}`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(`
`44`	`44`	`instrumenterBuilderConsumer);`
`45`	`45`	`}`
`46`	`46`
`47`		`- private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(`
	`47`	`+ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(`
`48`	`48`	`DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> builder,`
`49`	`49`	`Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {`
`50`	`50`	`return builder`