don't use wrapper types in public api

Author: laurit

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterUtil.java

@@ -6,14 +6,20 @@
 package io.opentelemetry.instrumentation.api.internal;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapSetter;
+import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
 import java.time.Instant;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
 
 /**
@@ -85,5 +91,72 @@ InstrumenterBuilder<REQUEST, RESPONSE> propagateOperationListenersToOnEnd(
     return builder;
   }
 
+  public static <REQUESTFROM, RESPONSEFROM, REQUESTTO, RESPONSETO>
+      UnaryOperator<SpanStatusExtractor<REQUESTTO, RESPONSETO>> convertSpanStatusExtractor(
+          UnaryOperator<SpanStatusExtractor<REQUESTFROM, RESPONSEFROM>> extractor,
+          Function<REQUESTFROM, REQUESTTO> requestConverter,
+          Function<RESPONSEFROM, RESPONSETO> responseConverter,
+          Function<REQUESTTO, REQUESTFROM> requestReverseConverter,
+          Function<RESPONSETO, RESPONSEFROM> responseReverseConverter) {
+    return inputExtractor -> {
+      SpanStatusExtractor<REQUESTFROM, RESPONSEFROM> outputExtractor =
+          extractor.apply(
+              (spanStatusBuilder, requestFrom, responseFrom, error) ->
+                  inputExtractor.extract(
+                      spanStatusBuilder,
+                      requestConverter.apply(requestFrom),
+                      responseFrom == null ? null : responseConverter.apply(responseFrom),
+                      error));
+      return (spanStatusBuilder, requestTo, responseTo, error) ->
+          outputExtractor.extract(
+              spanStatusBuilder,
+              requestReverseConverter.apply(requestTo),
+              responseTo == null ? null : responseReverseConverter.apply(responseTo),
+              error);
+    };
+  }
+
+  public static <REQUESTFROM, REQUESTTO>
+      UnaryOperator<SpanNameExtractor<REQUESTTO>> convertSpanNameExtractor(
+          UnaryOperator<SpanNameExtractor<REQUESTFROM>> extractor,
+          Function<REQUESTFROM, REQUESTTO> requestConverter,
+          Function<REQUESTTO, REQUESTFROM> requestReverseConverter) {
+    return inputExtractor -> {
+      SpanNameExtractor<REQUESTFROM> outputExtractor =
+          extractor.apply(
+              requestFrom -> inputExtractor.extract(requestConverter.apply(requestFrom)));
+      return requestTo -> outputExtractor.extract(requestReverseConverter.apply(requestTo));
+    };
+  }
+
+  public static <REQUESTFROM, RESPONSEFROM, REQUESTTO, RESPONSETO>
+      AttributesExtractor<REQUESTTO, RESPONSETO> convertAttributesExtractor(
+          AttributesExtractor<REQUESTFROM, RESPONSEFROM> extractor,
+          Function<REQUESTTO, REQUESTFROM> requestConverter,
+          Function<RESPONSETO, RESPONSEFROM> responseConverter) {
+    return new AttributesExtractor<REQUESTTO, RESPONSETO>() {
+      @Override
+      public void onStart(
+          AttributesBuilder attributes, Context parentContext, REQUESTTO requestTo) {
+        extractor.onStart(attributes, parentContext, requestConverter.apply(requestTo));
+      }
+
+      @Override
+      public void onEnd(
+          AttributesBuilder attributes,
+          Context context,
+          REQUESTTO requestTo,
+          @Nullable RESPONSETO responseTo,
+          @Nullable Throwable error) {
+        extractor.onEnd(
+            attributes,
+            context,
+            requestConverter.apply(requestTo),
+            responseConverter.apply(responseTo),
+            error);
+      }
+    };
+  }
+
   private InstrumenterUtil() {}
 }

instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java

@@ -5,6 +5,10 @@
 
 package io.opentelemetry.instrumentation.servlet.v3_0;
 
+import static io.opentelemetry.instrumentation.api.internal.InstrumenterUtil.convertAttributesExtractor;
+import static io.opentelemetry.instrumentation.api.internal.InstrumenterUtil.convertSpanNameExtractor;
+import static io.opentelemetry.instrumentation.api.internal.InstrumenterUtil.convertSpanStatusExtractor;
+
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder;
@@ -56,12 +60,14 @@ public final class ServletTelemetryBuilder {
   /** Sets the status extractor for server spans. */
   @CanIgnoreReturnValue
   public ServletTelemetryBuilder setStatusExtractor(
-      UnaryOperator<
-              SpanStatusExtractor<
-                  ServletRequestContext<HttpServletRequest>,
-                  ServletResponseContext<HttpServletResponse>>>
-          statusExtractor) {
-    builder.setStatusExtractor(statusExtractor);
+      UnaryOperator<SpanStatusExtractor<HttpServletRequest, HttpServletResponse>> statusExtractor) {
+    builder.setStatusExtractor(
+        convertSpanStatusExtractor(
+            statusExtractor,
+            ServletRequestContext::new,
+            ServletResponseContext::new,
+            ServletRequestContext::request,
+            ServletResponseContext::response));
     return this;
   }
 
@@ -71,11 +77,10 @@ public ServletTelemetryBuilder setStatusExtractor(
    */
   @CanIgnoreReturnValue
   public ServletTelemetryBuilder addAttributesExtractor(
-      AttributesExtractor<
-              ServletRequestContext<HttpServletRequest>,
-              ServletResponseContext<HttpServletResponse>>
-          attributesExtractor) {
-    builder.addAttributesExtractor(attributesExtractor);
+      AttributesExtractor<HttpServletRequest, HttpServletResponse> attributesExtractor) {
+    builder.addAttributesExtractor(
+        convertAttributesExtractor(
+            attributesExtractor, ServletRequestContext::request, ServletResponseContext::response));
     return this;
   }
 
@@ -135,9 +140,10 @@ public ServletTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
   /** Sets custom server {@link SpanNameExtractor} via transform function. */
   @CanIgnoreReturnValue
   public ServletTelemetryBuilder setSpanNameExtractor(
-      UnaryOperator<SpanNameExtractor<ServletRequestContext<HttpServletRequest>>>
-          serverSpanNameExtractor) {
-    builder.setSpanNameExtractor(serverSpanNameExtractor);
+      UnaryOperator<SpanNameExtractor<HttpServletRequest>> serverSpanNameExtractor) {
+    builder.setSpanNameExtractor(
+        convertSpanNameExtractor(
+            serverSpanNameExtractor, ServletRequestContext::new, ServletRequestContext::request));
     return this;
   }