Add request param to EndTimeExtractor (#3947)

open-telemetry · Aug 27, 2021 · 585cc55 · 585cc55
1 parent ab9c688
commit 585cc55
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/...api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/EndTimeExtractor.java b/...api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/EndTimeExtractor.java
@@ -14,8 +14,8 @@
  * must be comparable.
  */
 @FunctionalInterface
-public interface EndTimeExtractor<RESPONSE> {
+public interface EndTimeExtractor<REQUEST, RESPONSE> {
 
   /** Returns the timestamp marking the end of the response processing. */
-  Instant extract(@Nullable RESPONSE response);
+  Instant extract(REQUEST request, @Nullable RESPONSE response);
 }
diff --git a/...ion-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java b/...ion-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java
@@ -72,7 +72,7 @@ public static <REQUEST, RESPONSE> InstrumenterBuilder<REQUEST, RESPONSE> newBuil
   private final List<? extends RequestListener> requestListeners;
   private final ErrorCauseExtractor errorCauseExtractor;
   @Nullable private final StartTimeExtractor<REQUEST> startTimeExtractor;
-  @Nullable private final EndTimeExtractor<RESPONSE> endTimeExtractor;
+  @Nullable private final EndTimeExtractor<REQUEST, RESPONSE> endTimeExtractor;
   private final boolean disabled;
   private final SpanSuppressionStrategy spanSuppressionStrategy;
 
@@ -187,7 +187,7 @@ public void end(
     }
 
     if (endTimeExtractor != null) {
-      span.end(endTimeExtractor.extract(response));
+      span.end(endTimeExtractor.extract(request, response));
     } else {
       span.end();
     }

diff --git a/.../src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/.../src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
@@ -54,7 +54,7 @@ public final class InstrumenterBuilder<REQUEST, RESPONSE> {
       SpanStatusExtractor.getDefault();
   ErrorCauseExtractor errorCauseExtractor = ErrorCauseExtractor.jdk();
   @Nullable StartTimeExtractor<REQUEST> startTimeExtractor = null;
-  @Nullable EndTimeExtractor<RESPONSE> endTimeExtractor = null;
+  @Nullable EndTimeExtractor<REQUEST, RESPONSE> endTimeExtractor = null;
   boolean disabled = false;
 
   private boolean enableSpanSuppressionByType = ENABLE_SPAN_SUPPRESSION_BY_TYPE;
@@ -130,7 +130,8 @@ public InstrumenterBuilder<REQUEST, RESPONSE> setErrorCauseExtractor(
    * determining start and end timestamps to the OpenTelemetry SDK.
    */
   public InstrumenterBuilder<REQUEST, RESPONSE> setTimeExtractors(
-      StartTimeExtractor<REQUEST> startTimeExtractor, EndTimeExtractor<RESPONSE> endTimeExtractor) {
+      StartTimeExtractor<REQUEST> startTimeExtractor,
+      EndTimeExtractor<REQUEST, RESPONSE> endTimeExtractor) {
     this.startTimeExtractor = requireNonNull(startTimeExtractor);
     this.endTimeExtractor = requireNonNull(endTimeExtractor);
     return this;

diff --git a/...api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java b/...api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java
@@ -487,7 +487,7 @@ void shouldStartSpanWithGivenStartTime() {
     Instrumenter<Instant, Instant> instrumenter =
         Instrumenter.<Instant, Instant>newBuilder(
                 otelTesting.getOpenTelemetry(), "test", request -> "test span")
-            .setTimeExtractors(request -> request, response -> response)
+            .setTimeExtractors(request -> request, (request, response) -> response)
             .newInstrumenter();
 
     Instant startTime = Instant.ofEpochSecond(100);
@@ -912,12 +912,12 @@ private static void validateInstrumentationTypeSpanPresent(SpanKey spanKey, Cont
   }
 
   private static Instrumenter<Map<String, String>, Map<String, String>> getInstrumenterWithType(
-      boolean enableInstrumenation, AttributesExtractor... attributeExtractors) {
+      boolean enableInstrumentation, AttributesExtractor... attributeExtractors) {
     InstrumenterBuilder<Map<String, String>, Map<String, String>> builder =
         Instrumenter.<Map<String, String>, Map<String, String>>newBuilder(
                 otelTesting.getOpenTelemetry(), "test", unused -> "span")
             .addAttributesExtractors(attributeExtractors)
-            .enableInstrumentationTypeSuppression(enableInstrumenation);
+            .enableInstrumentationTypeSuppression(enableInstrumentation);
 
     return builder.newClientInstrumenter(Map::put);
   }

diff --git a/...javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSingletons.java b/...javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSingletons.java
@@ -36,7 +36,8 @@ public final class JmsSingletons {
         Instrumenter.<MessageWithDestination, Void>newBuilder(
                 otel, INSTRUMENTATION_NAME, spanNameExtractor)
             .addAttributesExtractor(attributesExtractor)
-            .setTimeExtractors(MessageWithDestination::getStartTime, response -> Instant.now())
+            .setTimeExtractors(
+                MessageWithDestination::getStartTime, (request, response) -> Instant.now())
             .newInstrumenter(SpanKindExtractor.alwaysConsumer());
     LISTENER_INSTRUMENTER =
         Instrumenter.<MessageWithDestination, Void>newBuilder(