responseHeaders) {
+ httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
+ return this;
+ }
+
+ /**
+ * Configures the instrumentation to recognize an alternative set of HTTP request methods.
+ *
+ * By default, this instrumentation defines "known" methods as the ones listed in RFC9110 and the PATCH
+ * method defined in RFC5789.
+ *
+ *
Note: calling this method overrides the default known method sets completely; it does
+ * not supplement it.
+ *
+ * @param knownMethods A set of recognized HTTP request methods.
+ * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
+ */
+ @CanIgnoreReturnValue
+ public DefaultHttpClientInstrumenterBuilder setKnownMethods(
+ Set knownMethods) {
+ httpAttributesExtractorBuilder.setKnownMethods(knownMethods);
+ httpSpanNameExtractorBuilder.setKnownMethods(knownMethods);
+ return this;
+ }
+
+ @CanIgnoreReturnValue
+ public DefaultHttpClientInstrumenterBuilder setHeaderSetter(
+ @Nullable TextMapSetter headerSetter) {
+ this.headerSetter = headerSetter;
+ return this;
+ }
+
+ /**
+ * Configures the instrumentation to emit experimental HTTP client metrics.
+ *
+ * @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
+ * are to be emitted.
+ */
+ @CanIgnoreReturnValue
+ public DefaultHttpClientInstrumenterBuilder
+ setEmitExperimentalHttpClientMetrics(boolean emitExperimentalHttpClientMetrics) {
+ this.emitExperimentalHttpClientMetrics = emitExperimentalHttpClientMetrics;
+ return this;
+ }
+
+ /** Sets custom {@link SpanNameExtractor} via transform function. */
+ @CanIgnoreReturnValue
+ public DefaultHttpClientInstrumenterBuilder setSpanNameExtractor(
+ Function, ? extends SpanNameExtractor>
+ spanNameExtractorTransformer) {
+ this.spanNameExtractorTransformer = spanNameExtractorTransformer;
+ return this;
+ }
+
+ /** Sets custom {@link PeerServiceResolver}. */
+ @CanIgnoreReturnValue
+ public DefaultHttpClientInstrumenterBuilder setPeerServiceResolver(
+ PeerServiceResolver peerServiceResolver) {
+ return addAttributeExtractor(
+ HttpClientPeerServiceAttributesExtractor.create(attributesGetter, peerServiceResolver));
+ }
+
+ @CanIgnoreReturnValue
+ public DefaultHttpClientInstrumenterBuilder setBuilderCustomizer(
+ Consumer> builderCustomizer) {
+ this.builderCustomizer = builderCustomizer;
+ return this;
+ }
+
+ public Instrumenter build() {
+
+ SpanNameExtractor spanNameExtractor =
+ spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
+
+ InstrumenterBuilder builder =
+ Instrumenter.builder(
+ openTelemetry, instrumentationName, spanNameExtractor)
+ .setSpanStatusExtractor(HttpSpanStatusExtractor.create(attributesGetter))
+ .addAttributesExtractor(httpAttributesExtractorBuilder.build())
+ .addAttributesExtractors(additionalExtractors)
+ .addOperationMetrics(HttpClientMetrics.get());
+ if (emitExperimentalHttpClientMetrics) {
+ builder
+ .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
+ .addOperationMetrics(HttpClientExperimentalMetrics.get());
+ }
+ builderCustomizer.accept(builder);
+
+ if (headerSetter != null) {
+ return builder.buildClientInstrumenter(headerSetter);
+ }
+ return builder.buildInstrumenter(SpanKindExtractor.alwaysClient());
+ }
+
+ public OpenTelemetry getOpenTelemetry() {
+ return openTelemetry;
+ }
+
+ @CanIgnoreReturnValue
+ public DefaultHttpClientInstrumenterBuilder configure(CommonConfig config) {
+ set(config::getKnownHttpRequestMethods, this::setKnownMethods);
+ set(config::getClientRequestHeaders, this::setCapturedRequestHeaders);
+ set(config::getClientResponseHeaders, this::setCapturedResponseHeaders);
+ set(config::getPeerServiceResolver, this::setPeerServiceResolver);
+ set(
+ config::shouldEmitExperimentalHttpClientTelemetry,
+ this::setEmitExperimentalHttpClientMetrics);
+ return this;
+ }
+
+ private static void set(Supplier supplier, Consumer consumer) {
+ T t = supplier.get();
+ if (t != null) {
+ consumer.accept(t);
+ }
+ }
+}
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
new file mode 100644
index 000000000000..b229a7126e48
--- /dev/null
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.incubator.builder.internal;
+
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.CommonConfig;
+import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
+import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpServerExperimentalMetrics;
+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 io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
+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.HttpServerRouteBuilder;
+import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
+import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
+import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class DefaultHttpServerInstrumenterBuilder {
+
+ private final String instrumentationName;
+ private final OpenTelemetry openTelemetry;
+
+ private final List> additionalExtractors =
+ new ArrayList<>();
+ private Function<
+ SpanStatusExtractor,
+ ? extends SpanStatusExtractor>
+ statusExtractorTransformer = Function.identity();
+ private final HttpServerAttributesExtractorBuilder
+ httpAttributesExtractorBuilder;
+ private final HttpSpanNameExtractorBuilder httpSpanNameExtractorBuilder;
+
+ @Nullable private TextMapGetter headerGetter;
+ private Function, ? extends SpanNameExtractor>
+ spanNameExtractorTransformer = Function.identity();
+ private final HttpServerRouteBuilder httpServerRouteBuilder;
+ private final HttpServerAttributesGetter attributesGetter;
+ private boolean emitExperimentalHttpServerMetrics = false;
+
+ public DefaultHttpServerInstrumenterBuilder(
+ String instrumentationName,
+ OpenTelemetry openTelemetry,
+ HttpServerAttributesGetter attributesGetter) {
+ this.instrumentationName = instrumentationName;
+ this.openTelemetry = openTelemetry;
+ httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(attributesGetter);
+ httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
+ httpServerRouteBuilder = HttpServerRoute.builder(attributesGetter);
+ this.attributesGetter = attributesGetter;
+ }
+
+ /**
+ * Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
+ * items.
+ */
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder addAttributesExtractor(
+ AttributesExtractor attributesExtractor) {
+ additionalExtractors.add(attributesExtractor);
+ return this;
+ }
+
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder setStatusExtractor(
+ Function<
+ SpanStatusExtractor,
+ ? extends SpanStatusExtractor>
+ statusExtractor) {
+ this.statusExtractorTransformer = statusExtractor;
+ return this;
+ }
+
+ /**
+ * Configures the HTTP request headers that will be captured as span attributes.
+ *
+ * @param requestHeaders A list of HTTP header names.
+ */
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder setCapturedRequestHeaders(
+ List requestHeaders) {
+ httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
+ return this;
+ }
+
+ /**
+ * Configures the HTTP response headers that will be captured as span attributes.
+ *
+ * @param responseHeaders A list of HTTP header names.
+ */
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder setCapturedResponseHeaders(
+ List responseHeaders) {
+ httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
+ return this;
+ }
+
+ /**
+ * Configures the instrumentation to recognize an alternative set of HTTP request methods.
+ *
+ * By default, this instrumentation defines "known" methods as the ones listed in RFC9110 and the PATCH
+ * method defined in RFC5789.
+ *
+ *
Note: calling this method overrides the default known method sets completely; it does
+ * not supplement it.
+ *
+ * @param knownMethods A set of recognized HTTP request methods.
+ * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
+ */
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder setKnownMethods(
+ Set knownMethods) {
+ httpAttributesExtractorBuilder.setKnownMethods(knownMethods);
+ httpSpanNameExtractorBuilder.setKnownMethods(knownMethods);
+ httpServerRouteBuilder.setKnownMethods(knownMethods);
+ return this;
+ }
+
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder setHeaderGetter(
+ @Nullable TextMapGetter headerGetter) {
+ this.headerGetter = headerGetter;
+ return this;
+ }
+
+ /**
+ * Configures the instrumentation to emit experimental HTTP server metrics.
+ *
+ * @param emitExperimentalHttpServerMetrics {@code true} if the experimental HTTP server metrics
+ * are to be emitted.
+ */
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder
+ setEmitExperimentalHttpServerMetrics(boolean emitExperimentalHttpServerMetrics) {
+ this.emitExperimentalHttpServerMetrics = emitExperimentalHttpServerMetrics;
+ return this;
+ }
+
+ /** Sets custom {@link SpanNameExtractor} via transform function. */
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder setSpanNameExtractor(
+ Function, ? extends SpanNameExtractor>
+ spanNameExtractorTransformer) {
+ this.spanNameExtractorTransformer = spanNameExtractorTransformer;
+ return this;
+ }
+
+ public Instrumenter build() {
+ InstrumenterBuilder builder = builder();
+
+ if (headerGetter != null) {
+ return builder.buildServerInstrumenter(headerGetter);
+ }
+ return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());
+ }
+
+ private InstrumenterBuilder builder() {
+ SpanNameExtractor spanNameExtractor =
+ spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
+
+ InstrumenterBuilder builder =
+ Instrumenter.builder(
+ openTelemetry, instrumentationName, spanNameExtractor)
+ .setSpanStatusExtractor(
+ statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
+ .addAttributesExtractor(httpAttributesExtractorBuilder.build())
+ .addAttributesExtractors(additionalExtractors)
+ .addContextCustomizer(httpServerRouteBuilder.build())
+ .addOperationMetrics(HttpServerMetrics.get());
+ if (emitExperimentalHttpServerMetrics) {
+ builder
+ .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
+ .addOperationMetrics(HttpServerExperimentalMetrics.get());
+ }
+
+ return builder;
+ }
+
+ @CanIgnoreReturnValue
+ public DefaultHttpServerInstrumenterBuilder configure(CommonConfig config) {
+ set(config::getKnownHttpRequestMethods, this::setKnownMethods);
+ set(config::getServerRequestHeaders, this::setCapturedRequestHeaders);
+ set(config::getServerResponseHeaders, this::setCapturedResponseHeaders);
+ set(
+ config::shouldEmitExperimentalHttpServerTelemetry,
+ this::setEmitExperimentalHttpServerMetrics);
+ return this;
+ }
+
+ private static void set(Supplier supplier, Consumer consumer) {
+ T t = supplier.get();
+ if (t != null) {
+ consumer.accept(t);
+ }
+ }
+}
diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/CommonConfig.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java
similarity index 94%
rename from javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/CommonConfig.java
rename to instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java
index f6d5a5479001..23875d7e8b5f 100644
--- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/CommonConfig.java
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.javaagent.bootstrap.internal;
+package io.opentelemetry.instrumentation.api.incubator.config.internal;
import static java.util.Collections.emptyMap;
@@ -21,12 +21,6 @@
*/
public final class CommonConfig {
- private static final CommonConfig instance = new CommonConfig(InstrumentationConfig.get());
-
- public static CommonConfig get() {
- return instance;
- }
-
private final PeerServiceResolver peerServiceResolver;
private final List clientRequestHeaders;
private final List clientResponseHeaders;
@@ -41,7 +35,7 @@ public static CommonConfig get() {
private final String loggingSpanIdKey;
private final String loggingTraceFlagsKey;
- CommonConfig(InstrumentationConfig config) {
+ public CommonConfig(InstrumentationConfig config) {
peerServiceResolver =
PeerServiceResolver.create(
config.getMap("otel.instrumentation.common.peer-service-mapping", emptyMap()));
diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/EnduserConfig.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/EnduserConfig.java
similarity index 97%
rename from javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/EnduserConfig.java
rename to instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/EnduserConfig.java
index fbde1c90aaa2..b44057c75f90 100644
--- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/EnduserConfig.java
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/EnduserConfig.java
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.javaagent.bootstrap.internal;
+package io.opentelemetry.instrumentation.api.incubator.config.internal;
import java.util.Objects;
diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/InstrumentationConfig.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/InstrumentationConfig.java
similarity index 63%
rename from javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/InstrumentationConfig.java
rename to instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/InstrumentationConfig.java
index fc4b7aabc6c2..8ce777b270a7 100644
--- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/InstrumentationConfig.java
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/InstrumentationConfig.java
@@ -3,15 +3,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.javaagent.bootstrap.internal;
+package io.opentelemetry.instrumentation.api.incubator.config.internal;
import static java.util.Collections.emptyList;
-import static java.util.Objects.requireNonNull;
import java.time.Duration;
import java.util.List;
import java.util.Map;
-import java.util.logging.Logger;
import javax.annotation.Nullable;
/**
@@ -28,72 +26,44 @@
* This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
-public abstract class InstrumentationConfig {
-
- private static final Logger logger = Logger.getLogger(InstrumentationConfig.class.getName());
-
- private static final InstrumentationConfig DEFAULT = new EmptyInstrumentationConfig();
-
- // lazy initialized, so that javaagent can set it
- private static volatile InstrumentationConfig instance = DEFAULT;
-
- /**
- * Sets the instrumentation configuration singleton. This method is only supposed to be called
- * once, during the agent initialization, just before {@link InstrumentationConfig#get()} is used
- * for the first time.
- *
- *
This method is internal and is hence not for public use. Its API is unstable and can change
- * at any time.
- */
- public static void internalInitializeConfig(InstrumentationConfig config) {
- if (instance != DEFAULT) {
- logger.warning("InstrumentationConfig#instance was already set earlier");
- return;
- }
- instance = requireNonNull(config);
- }
-
- /** Returns the global instrumentation configuration. */
- public static InstrumentationConfig get() {
- return instance;
- }
+public interface InstrumentationConfig {
/**
* Returns a string-valued configuration property or {@code null} if a property with name {@code
* name} has not been configured.
*/
@Nullable
- public abstract String getString(String name);
+ String getString(String name);
/**
* Returns a string-valued configuration property or {@code defaultValue} if a property with name
* {@code name} has not been configured.
*/
- public abstract String getString(String name, String defaultValue);
+ String getString(String name, String defaultValue);
/**
* Returns a boolean-valued configuration property or {@code defaultValue} if a property with name
* {@code name} has not been configured.
*/
- public abstract boolean getBoolean(String name, boolean defaultValue);
+ boolean getBoolean(String name, boolean defaultValue);
/**
* Returns an integer-valued configuration property or {@code defaultValue} if a property with
* name {@code name} has not been configured or when parsing has failed.
*/
- public abstract int getInt(String name, int defaultValue);
+ int getInt(String name, int defaultValue);
/**
* Returns a long-valued configuration property or {@code defaultValue} if a property with name
* {@code name} has not been configured or when parsing has failed.
*/
- public abstract long getLong(String name, long defaultValue);
+ long getLong(String name, long defaultValue);
/**
* Returns a double-valued configuration property or {@code defaultValue} if a property with name
* {@code name} has not been configured or when parsing has failed.
*/
- public abstract double getDouble(String name, double defaultValue);
+ double getDouble(String name, double defaultValue);
/**
* Returns a duration-valued configuration property or {@code defaultValue} if a property with
@@ -113,13 +83,13 @@ public static InstrumentationConfig get() {
*
*
Examples: 10s, 20ms, 5000
*/
- public abstract Duration getDuration(String name, Duration defaultValue);
+ Duration getDuration(String name, Duration defaultValue);
/**
* This is the same as calling {@code getList(String, List)} with the defaultValue equal to the
* emptyList()/
*/
- public List getList(String name) {
+ default List getList(String name) {
return getList(name, emptyList());
}
@@ -128,7 +98,7 @@ public List getList(String name) {
* {@code name} has not been configured. The format of the original value must be comma-separated,
* e.g. {@code one,two,three}. The returned list is unmodifiable.
*/
- public abstract List getList(String name, List defaultValue);
+ List getList(String name, List defaultValue);
/**
* Returns a map-valued configuration property or {@code defaultValue} if a property with name
@@ -136,5 +106,5 @@ public List getList(String name) {
* value must be comma-separated for each key, with an '=' separating the key and value, e.g.
* {@code key=value,anotherKey=anotherValue}. The returned map is unmodifiable.
*/
- public abstract Map getMap(String name, Map defaultValue);
+ Map getMap(String name, Map defaultValue);
}
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetrics.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetrics.java
index 0beb49456245..dd08cbe493ff 100644
--- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetrics.java
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetrics.java
@@ -24,9 +24,9 @@
* {@link OperationListener} which keeps track of non-stable
* HTTP client metrics: the
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpclientrequestbodysize">the
* request size and
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpclientresponsebodysize">
* the response size.
*/
public final class HttpClientExperimentalMetrics implements OperationListener {
@@ -53,7 +53,7 @@ public static OperationMetrics get() {
private HttpClientExperimentalMetrics(Meter meter) {
LongHistogramBuilder requestSizeBuilder =
meter
- .histogramBuilder("http.client.request.size")
+ .histogramBuilder("http.client.request.body.size")
.setUnit("By")
.setDescription("Size of HTTP client request bodies.")
.ofLongs();
@@ -61,7 +61,7 @@ private HttpClientExperimentalMetrics(Meter meter) {
requestSize = requestSizeBuilder.build();
LongHistogramBuilder responseSizeBuilder =
meter
- .histogramBuilder("http.client.response.size")
+ .histogramBuilder("http.client.response.body.size")
.setUnit("By")
.setDescription("Size of HTTP client response bodies.")
.ofLongs();
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetrics.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetrics.java
index d6bf144385d5..7c91292f513e 100644
--- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetrics.java
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetrics.java
@@ -28,9 +28,9 @@
* HTTP server metrics: the
* number of in-flight request, the
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpserverrequestbodysize">the
* request size and the
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpserverresponsebodysize">the
* response size.
*/
public final class HttpServerExperimentalMetrics implements OperationListener {
@@ -65,7 +65,7 @@ private HttpServerExperimentalMetrics(Meter meter) {
activeRequests = activeRequestsBuilder.build();
LongHistogramBuilder requestSizeBuilder =
meter
- .histogramBuilder("http.server.request.size")
+ .histogramBuilder("http.server.request.body.size")
.setUnit("By")
.setDescription("Size of HTTP server request bodies.")
.ofLongs();
@@ -73,7 +73,7 @@ private HttpServerExperimentalMetrics(Meter meter) {
requestSize = requestSizeBuilder.build();
LongHistogramBuilder responseSizeBuilder =
meter
- .histogramBuilder("http.server.response.size")
+ .histogramBuilder("http.server.response.body.size")
.setUnit("By")
.setDescription("Size of HTTP server response bodies.")
.ofLongs();
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java
new file mode 100644
index 000000000000..8ada61c1683f
--- /dev/null
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableList;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
+import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
+import io.opentelemetry.semconv.ErrorAttributes;
+import io.opentelemetry.semconv.ServerAttributes;
+import java.util.List;
+
+final class MessagingMetricsAdvice {
+ static final List DURATION_SECONDS_BUCKETS =
+ unmodifiableList(
+ asList(0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1.0, 2.5, 5.0, 7.5, 10.0));
+
+ // copied from MessagingIncubatingAttributes
+ private static final AttributeKey MESSAGING_SYSTEM =
+ AttributeKey.stringKey("messaging.system");
+ private static final AttributeKey MESSAGING_DESTINATION_NAME =
+ AttributeKey.stringKey("messaging.destination.name");
+ private static final AttributeKey MESSAGING_OPERATION =
+ AttributeKey.stringKey("messaging.operation");
+ private static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT =
+ AttributeKey.longKey("messaging.batch.message_count");
+
+ static void applyPublishDurationAdvice(DoubleHistogramBuilder builder) {
+ if (!(builder instanceof ExtendedDoubleHistogramBuilder)) {
+ return;
+ }
+ ((ExtendedDoubleHistogramBuilder) builder)
+ .setAttributesAdvice(
+ asList(
+ MESSAGING_SYSTEM,
+ MESSAGING_DESTINATION_NAME,
+ MESSAGING_OPERATION,
+ MESSAGING_BATCH_MESSAGE_COUNT,
+ ErrorAttributes.ERROR_TYPE,
+ ServerAttributes.SERVER_PORT,
+ ServerAttributes.SERVER_ADDRESS));
+ }
+
+ private MessagingMetricsAdvice() {}
+}
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetrics.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetrics.java
new file mode 100644
index 000000000000..44d5b243744a
--- /dev/null
+++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetrics.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
+
+import static java.util.logging.Level.FINE;
+
+import com.google.auto.value.AutoValue;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.metrics.DoubleHistogram;
+import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
+import io.opentelemetry.api.metrics.Meter;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.ContextKey;
+import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
+import io.opentelemetry.instrumentation.api.instrumenter.OperationMetrics;
+import io.opentelemetry.instrumentation.api.internal.OperationMetricsUtil;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+/**
+ * {@link OperationListener} which keeps track of Producer
+ * metrics.
+ */
+public final class MessagingProducerMetrics implements OperationListener {
+ private static final double NANOS_PER_S = TimeUnit.SECONDS.toNanos(1);
+
+ private static final ContextKey MESSAGING_PRODUCER_METRICS_STATE =
+ ContextKey.named("messaging-producer-metrics-state");
+ private static final Logger logger = Logger.getLogger(MessagingProducerMetrics.class.getName());
+
+ private final DoubleHistogram publishDurationHistogram;
+
+ private MessagingProducerMetrics(Meter meter) {
+ DoubleHistogramBuilder durationBuilder =
+ meter
+ .histogramBuilder("messaging.publish.duration")
+ .setDescription("Measures the duration of publish operation.")
+ .setExplicitBucketBoundariesAdvice(MessagingMetricsAdvice.DURATION_SECONDS_BUCKETS)
+ .setUnit("s");
+ MessagingMetricsAdvice.applyPublishDurationAdvice(durationBuilder);
+ publishDurationHistogram = durationBuilder.build();
+ }
+
+ public static OperationMetrics get() {
+ return OperationMetricsUtil.create("messaging produce", MessagingProducerMetrics::new);
+ }
+
+ @Override
+ @CanIgnoreReturnValue
+ public Context onStart(Context context, Attributes startAttributes, long startNanos) {
+ return context.with(
+ MESSAGING_PRODUCER_METRICS_STATE,
+ new AutoValue_MessagingProducerMetrics_State(startAttributes, startNanos));
+ }
+
+ @Override
+ public void onEnd(Context context, Attributes endAttributes, long endNanos) {
+ MessagingProducerMetrics.State state = context.get(MESSAGING_PRODUCER_METRICS_STATE);
+ if (state == null) {
+ logger.log(
+ FINE,
+ "No state present when ending context {0}. Cannot record produce publish metrics.",
+ context);
+ return;
+ }
+
+ Attributes attributes = state.startAttributes().toBuilder().putAll(endAttributes).build();
+
+ publishDurationHistogram.record(
+ (endNanos - state.startTimeNanos()) / NANOS_PER_S, attributes, context);
+ }
+
+ @AutoValue
+ abstract static class State {
+
+ abstract Attributes startAttributes();
+
+ abstract long startTimeNanos();
+ }
+}
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java
index 9d8748ab61c4..b15b58f71df7 100644
--- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java
+++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java
@@ -83,7 +83,7 @@ void collectsMetrics() {
.satisfiesExactlyInAnyOrder(
metric ->
assertThat(metric)
- .hasName("http.client.request.size")
+ .hasName("http.client.request.body.size")
.hasUnit("By")
.hasDescription("Size of HTTP client request bodies.")
.hasHistogramSatisfying(
@@ -109,7 +109,7 @@ void collectsMetrics() {
.hasSpanId("090a0b0c0d0e0f00")))),
metric ->
assertThat(metric)
- .hasName("http.client.response.size")
+ .hasName("http.client.response.body.size")
.hasUnit("By")
.hasDescription("Size of HTTP client response bodies.")
.hasHistogramSatisfying(
@@ -140,13 +140,13 @@ void collectsMetrics() {
.satisfiesExactlyInAnyOrder(
metric ->
assertThat(metric)
- .hasName("http.client.request.size")
+ .hasName("http.client.request.body.size")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(point -> point.hasSum(200 /* bytes */))),
metric ->
assertThat(metric)
- .hasName("http.client.response.size")
+ .hasName("http.client.response.body.size")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(point -> point.hasSum(400 /* bytes */))));
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java
index 95cc458ab13a..13796304b236 100644
--- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java
+++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java
@@ -147,7 +147,7 @@ void collectsMetrics() {
.hasSpanId(spanContext1.getSpanId())))),
metric ->
assertThat(metric)
- .hasName("http.server.request.size")
+ .hasName("http.server.request.body.size")
.hasUnit("By")
.hasDescription("Size of HTTP server request bodies.")
.hasHistogramSatisfying(
@@ -172,7 +172,7 @@ void collectsMetrics() {
.hasSpanId(spanContext1.getSpanId())))),
metric ->
assertThat(metric)
- .hasName("http.server.response.size")
+ .hasName("http.server.response.body.size")
.hasUnit("By")
.hasDescription("Size of HTTP server response bodies.")
.hasHistogramSatisfying(
@@ -216,7 +216,7 @@ void collectsMetrics() {
.hasSpanId(spanContext2.getSpanId())))),
metric ->
assertThat(metric)
- .hasName("http.server.request.size")
+ .hasName("http.server.request.body.size")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
@@ -230,7 +230,7 @@ void collectsMetrics() {
.hasSpanId(spanContext2.getSpanId())))),
metric ->
assertThat(metric)
- .hasName("http.server.response.size")
+ .hasName("http.server.response.body.size")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java
new file mode 100644
index 000000000000..491387253ee9
--- /dev/null
+++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
+
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TraceFlags;
+import io.opentelemetry.api.trace.TraceState;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
+import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
+import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
+import io.opentelemetry.semconv.ServerAttributes;
+import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+
+class MessagingProducerMetricsTest {
+
+ private static final double[] DURATION_BUCKETS =
+ MessagingMetricsAdvice.DURATION_SECONDS_BUCKETS.stream().mapToDouble(d -> d).toArray();
+
+ @Test
+ void collectsMetrics() {
+ InMemoryMetricReader metricReader = InMemoryMetricReader.create();
+ SdkMeterProvider meterProvider =
+ SdkMeterProvider.builder().registerMetricReader(metricReader).build();
+
+ OperationListener listener = MessagingProducerMetrics.get().create(meterProvider.get("test"));
+
+ Attributes requestAttributes =
+ Attributes.builder()
+ .put(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "pulsar")
+ .put(
+ MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
+ "persistent://public/default/topic")
+ .put(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish")
+ .put(ServerAttributes.SERVER_PORT, 6650)
+ .put(ServerAttributes.SERVER_ADDRESS, "localhost")
+ .build();
+
+ Attributes responseAttributes =
+ Attributes.builder()
+ .put(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "1:1:0:0")
+ .put(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2)
+ .build();
+
+ Context parent =
+ Context.root()
+ .with(
+ Span.wrap(
+ SpanContext.create(
+ "ff01020304050600ff0a0b0c0d0e0f00",
+ "090a0b0c0d0e0f00",
+ TraceFlags.getSampled(),
+ TraceState.getDefault())));
+
+ Context context1 = listener.onStart(parent, requestAttributes, nanos(100));
+
+ assertThat(metricReader.collectAllMetrics()).isEmpty();
+
+ Context context2 = listener.onStart(Context.root(), requestAttributes, nanos(150));
+
+ assertThat(metricReader.collectAllMetrics()).isEmpty();
+
+ listener.onEnd(context1, responseAttributes, nanos(250));
+
+ assertThat(metricReader.collectAllMetrics())
+ .satisfiesExactlyInAnyOrder(
+ metric ->
+ OpenTelemetryAssertions.assertThat(metric)
+ .hasName("messaging.publish.duration")
+ .hasUnit("s")
+ .hasDescription("Measures the duration of publish operation.")
+ .hasHistogramSatisfying(
+ histogram ->
+ histogram.hasPointsSatisfying(
+ point ->
+ point
+ .hasSum(0.15 /* seconds */)
+ .hasAttributesSatisfying(
+ equalTo(
+ MessagingIncubatingAttributes.MESSAGING_SYSTEM,
+ "pulsar"),
+ equalTo(
+ MessagingIncubatingAttributes
+ .MESSAGING_DESTINATION_NAME,
+ "persistent://public/default/topic"),
+ equalTo(ServerAttributes.SERVER_PORT, 6650),
+ equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"))
+ .hasExemplarsSatisfying(
+ exemplar ->
+ exemplar
+ .hasTraceId("ff01020304050600ff0a0b0c0d0e0f00")
+ .hasSpanId("090a0b0c0d0e0f00"))
+ .hasBucketBoundaries(DURATION_BUCKETS))));
+
+ listener.onEnd(context2, responseAttributes, nanos(300));
+
+ assertThat(metricReader.collectAllMetrics())
+ .satisfiesExactlyInAnyOrder(
+ metric ->
+ OpenTelemetryAssertions.assertThat(metric)
+ .hasName("messaging.publish.duration")
+ .hasHistogramSatisfying(
+ histogram ->
+ histogram.hasPointsSatisfying(
+ point -> point.hasSum(0.3 /* seconds */))));
+ }
+
+ private static long nanos(int millis) {
+ return TimeUnit.MILLISECONDS.toNanos(millis);
+ }
+}
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java
index cee163f4a12e..a51990317067 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java
@@ -11,6 +11,7 @@
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
+import io.opentelemetry.context.ContextKey;
import io.opentelemetry.instrumentation.api.internal.HttpRouteState;
import io.opentelemetry.instrumentation.api.internal.InstrumenterAccess;
import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil;
@@ -41,6 +42,9 @@
*/
public class Instrumenter {
+ private static final ContextKey START_OPERATION_LISTENERS =
+ ContextKey.named("instrumenter-start-operation-listeners");
+
/**
* Returns a new {@link InstrumenterBuilder}.
*
@@ -74,6 +78,7 @@ public static InstrumenterBuilder builder
private final ContextCustomizer[] contextCustomizers;
private final OperationListener[] operationListeners;
private final ErrorCauseExtractor errorCauseExtractor;
+ private final boolean propagateOperationListenersToOnEnd;
private final boolean enabled;
private final SpanSuppressor spanSuppressor;
@@ -89,6 +94,7 @@ public static InstrumenterBuilder builder
this.contextCustomizers = builder.contextCustomizers.toArray(new ContextCustomizer[0]);
this.operationListeners = builder.buildOperationListeners().toArray(new OperationListener[0]);
this.errorCauseExtractor = builder.errorCauseExtractor;
+ this.propagateOperationListenersToOnEnd = builder.propagateOperationListenersToOnEnd;
this.enabled = builder.enabled;
this.spanSuppressor = builder.buildSpanSuppressor();
}
@@ -198,6 +204,15 @@ private Context doStart(Context parentContext, REQUEST request, @Nullable Instan
context = operationListeners[i].onStart(context, attributes, startNanos);
}
}
+ if (propagateOperationListenersToOnEnd || context.get(START_OPERATION_LISTENERS) != null) {
+ // when start and end are not called on the same instrumenter we need to use the operation
+ // listeners that were used during start in end to correctly handle metrics like
+ // http.server.active_requests that is recorded both in start and end
+ //
+ // need to also add when there is already START_OPERATION_LISTENERS, otherwise this
+ // instrumenter will call its parent's operation listeners in doEnd
+ context = context.with(START_OPERATION_LISTENERS, operationListeners);
+ }
if (localRoot) {
context = LocalRootSpan.store(context, span);
@@ -228,6 +243,10 @@ private void doEnd(
}
span.setAllAttributes(attributes);
+ OperationListener[] operationListeners = context.get(START_OPERATION_LISTENERS);
+ if (operationListeners == null) {
+ operationListeners = this.operationListeners;
+ }
if (operationListeners.length != 0) {
long endNanos = getNanos(endTime);
for (int i = operationListeners.length - 1; i >= 0; i--) {
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
index 8c68cd0890d4..6b41ae6c60ab 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
@@ -66,6 +66,7 @@ public final class InstrumenterBuilder {
SpanStatusExtractor spanStatusExtractor =
SpanStatusExtractor.getDefault();
ErrorCauseExtractor errorCauseExtractor = ErrorCauseExtractor.getDefault();
+ boolean propagateOperationListenersToOnEnd = false;
boolean enabled = true;
InstrumenterBuilder(
@@ -370,6 +371,10 @@ private Set getSpanKeysFromAttributesExtractors() {
.collect(Collectors.toSet());
}
+ private void propagateOperationListenersToOnEnd() {
+ propagateOperationListenersToOnEnd = true;
+ }
+
private interface InstrumenterConstructor {
Instrumenter create(InstrumenterBuilder builder);
@@ -406,6 +411,12 @@ public Instrumenter buildDownstreamInstrumenter(
SpanKindExtractor spanKindExtractor) {
return builder.buildDownstreamInstrumenter(setter, spanKindExtractor);
}
+
+ @Override
+ public void propagateOperationListenersToOnEnd(
+ InstrumenterBuilder builder) {
+ builder.propagateOperationListenersToOnEnd();
+ }
});
}
}
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterBuilderAccess.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterBuilderAccess.java
index d8c40af3e47a..2c660577b17c 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterBuilderAccess.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterBuilderAccess.java
@@ -26,4 +26,7 @@ Instrumenter buildDownstreamInstrumenter(
InstrumenterBuilder builder,
TextMapSetter setter,
SpanKindExtractor spanKindExtractor);
+
+ void propagateOperationListenersToOnEnd(
+ InstrumenterBuilder builder);
}
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterUtil.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterUtil.java
index 24648b4b2fb6..d61a6e8fe367 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterUtil.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterUtil.java
@@ -67,5 +67,11 @@ public static Instrumenter buildDownstrea
builder, setter, spanKindExtractor);
}
+ public static void propagateOperationListenersToOnEnd(
+ InstrumenterBuilder builder) {
+ // instrumenterBuilderAccess is guaranteed to be non-null here
+ instrumenterBuilderAccess.propagateOperationListenersToOnEnd(builder);
+ }
+
private InstrumenterUtil() {}
}
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts b/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts
index 0c4f96c18022..ff1e6c9cccfc 100644
--- a/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts
+++ b/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts
@@ -42,6 +42,22 @@ dependencies {
latestDepTestLibrary("com.typesafe.akka:akka-stream_2.13:+")
}
+testing {
+ suites {
+ val javaRouteTest by registering(JvmTestSuite::class) {
+ dependencies {
+ if (findProperty("testLatestDeps") as Boolean) {
+ implementation("com.typesafe.akka:akka-http_2.13:+")
+ implementation("com.typesafe.akka:akka-stream_2.13:+")
+ } else {
+ implementation("com.typesafe.akka:akka-http_2.12:10.2.0")
+ implementation("com.typesafe.akka:akka-stream_2.12:2.6.21")
+ }
+ }
+ }
+ }
+}
+
tasks {
withType().configureEach {
// required on jdk17
@@ -52,6 +68,10 @@ tasks {
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
}
+
+ check {
+ dependsOn(testing.suites)
+ }
}
if (findProperty("testLatestDeps") as Boolean) {
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/javaRouteTest/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerJavaRouteTest.java b/instrumentation/akka/akka-http-10.0/javaagent/src/javaRouteTest/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerJavaRouteTest.java
new file mode 100644
index 000000000000..be1357c8d9bf
--- /dev/null
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/javaRouteTest/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerJavaRouteTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.akkahttp;
+
+import static akka.http.javadsl.server.PathMatchers.integerSegment;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import akka.actor.ActorSystem;
+import akka.http.javadsl.Http;
+import akka.http.javadsl.ServerBinding;
+import akka.http.javadsl.server.AllDirectives;
+import akka.http.javadsl.server.Route;
+import io.opentelemetry.instrumentation.test.utils.PortUtils;
+import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.testing.internal.armeria.client.WebClient;
+import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest;
+import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
+import io.opentelemetry.testing.internal.armeria.common.HttpMethod;
+import java.util.concurrent.CompletionStage;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class AkkaHttpServerJavaRouteTest extends AllDirectives {
+ @RegisterExtension
+ private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
+
+ private final WebClient client = WebClient.of();
+
+ @Test
+ void testRoute() {
+ ActorSystem system = ActorSystem.create("my-system");
+ int port = PortUtils.findOpenPort();
+ Http http = Http.get(system);
+
+ Route route =
+ concat(
+ pathEndOrSingleSlash(() -> complete("root")),
+ pathPrefix(
+ "test",
+ () ->
+ concat(
+ pathSingleSlash(() -> complete("test")),
+ path(integerSegment(), (i) -> complete("ok")))));
+
+ CompletionStage binding = http.newServerAt("localhost", port).bind(route);
+ try {
+ AggregatedHttpRequest request =
+ AggregatedHttpRequest.of(HttpMethod.GET, "h1c://localhost:" + port + "/test/1");
+ AggregatedHttpResponse response = client.execute(request).aggregate().join();
+
+ assertThat(response.status().code()).isEqualTo(200);
+ assertThat(response.contentUtf8()).isEqualTo("ok");
+
+ testing.waitAndAssertTraces(
+ trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("GET /test/*")));
+ } finally {
+ binding.thenCompose(ServerBinding::unbind).thenAccept(unbound -> system.terminate());
+ }
+ }
+}
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java
index feac2dac6281..aa20eeec9f93 100644
--- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java
@@ -8,17 +8,8 @@
import akka.http.scaladsl.model.HttpRequest;
import akka.http.scaladsl.model.HttpResponse;
import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
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.semconv.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-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.JavaagentHttpClientInstrumenters;
import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
public class AkkaHttpClientSingletons {
@@ -28,31 +19,9 @@ public class AkkaHttpClientSingletons {
static {
SETTER = new HttpHeaderSetter(GlobalOpenTelemetry.getPropagators());
- AkkaHttpClientAttributesGetter httpAttributesGetter = new AkkaHttpClientAttributesGetter();
- InstrumenterBuilder builder =
- Instrumenter.builder(
- GlobalOpenTelemetry.get(),
- AkkaHttpUtil.instrumentationName(),
- HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(
- HttpClientAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .addAttributesExtractor(
- HttpClientPeerServiceAttributesExtractor.create(
- httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
- .addOperationMetrics(HttpClientMetrics.get());
- if (CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
- INSTRUMENTER = builder.buildInstrumenter(SpanKindExtractor.alwaysClient());
+ INSTRUMENTER =
+ JavaagentHttpClientInstrumenters.create(
+ AkkaHttpUtil.instrumentationName(), new AkkaHttpClientAttributesGetter());
}
public static Instrumenter instrumenter() {
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java
index 71338fca4212..af0a3d61da82 100644
--- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java
@@ -17,7 +17,7 @@
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.AgentCommonConfig;
import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
public final class AkkaHttpServerSingletons {
@@ -31,21 +31,21 @@ public final class AkkaHttpServerSingletons {
GlobalOpenTelemetry.get(),
AkkaHttpUtil.instrumentationName(),
HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
+ .setKnownMethods(AgentCommonConfig.get().getKnownHttpRequestMethods())
.build())
.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
.addAttributesExtractor(
HttpServerAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getServerRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getServerResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
+ .setCapturedRequestHeaders(AgentCommonConfig.get().getServerRequestHeaders())
+ .setCapturedResponseHeaders(AgentCommonConfig.get().getServerResponseHeaders())
+ .setKnownMethods(AgentCommonConfig.get().getKnownHttpRequestMethods())
.build())
.addOperationMetrics(HttpServerMetrics.get())
.addContextCustomizer(
HttpServerRoute.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
+ .setKnownMethods(AgentCommonConfig.get().getKnownHttpRequestMethods())
.build());
- if (CommonConfig.get().shouldEmitExperimentalHttpServerTelemetry()) {
+ if (AgentCommonConfig.get().shouldEmitExperimentalHttpServerTelemetry()) {
builder
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
.addOperationMetrics(HttpServerExperimentalMetrics.get());
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaRouteHolder.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaRouteHolder.java
index 9fa98d8c2add..3f192e5c7d2c 100644
--- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaRouteHolder.java
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaRouteHolder.java
@@ -19,7 +19,7 @@ public class AkkaRouteHolder implements ImplicitContextKeyed {
private static final ContextKey KEY = named("opentelemetry-akka-route");
private String route = "";
- private boolean newSegment;
+ private boolean newSegment = true;
private boolean endMatched;
private final Deque stack = new ArrayDeque<>();
@@ -70,6 +70,15 @@ public static void restore() {
}
}
+ // reset the state to when save was called
+ public static void reset() {
+ AkkaRouteHolder holder = Context.current().get(KEY);
+ if (holder != null) {
+ holder.route = holder.stack.peek();
+ holder.newSegment = true;
+ }
+ }
+
@Override
public Context storeInContext(Context context) {
return context.with(KEY, this);
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/RouteConcatenationInstrumentation.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/RouteConcatenationInstrumentation.java
index de13aba9fb30..eb13f402bc1e 100644
--- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/RouteConcatenationInstrumentation.java
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/RouteConcatenationInstrumentation.java
@@ -17,14 +17,26 @@ public class RouteConcatenationInstrumentation implements TypeInstrumentation {
@Override
public ElementMatcher typeMatcher() {
return namedOneOf(
+ // scala 2.11
"akka.http.scaladsl.server.RouteConcatenation$RouteWithConcatenation$$anonfun$$tilde$1",
+ // scala 2.12 and later
"akka.http.scaladsl.server.RouteConcatenation$RouteWithConcatenation");
}
@Override
public void transform(TypeTransformer transformer) {
transformer.applyAdviceToMethod(
- namedOneOf("apply", "$anonfun$$tilde$1"), this.getClass().getName() + "$ApplyAdvice");
+ namedOneOf(
+ // scala 2.11
+ "apply",
+ // scala 2.12 and later
+ "$anonfun$$tilde$1"),
+ this.getClass().getName() + "$ApplyAdvice");
+
+ // This advice seems to be only needed when defining routes with java dsl. Since java dsl tests
+ // use scala 2.12 we are going to skip instrumenting this for scala 2.11.
+ transformer.applyAdviceToMethod(
+ namedOneOf("$anonfun$$tilde$2"), this.getClass().getName() + "$Apply2Advice");
}
@SuppressWarnings("unused")
@@ -43,4 +55,13 @@ public static void onExit() {
AkkaRouteHolder.restore();
}
}
+
+ @SuppressWarnings("unused")
+ public static class Apply2Advice {
+
+ @Advice.OnMethodEnter(suppress = Throwable.class)
+ public static void onEnter() {
+ AkkaRouteHolder.reset();
+ }
+ }
}
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerRouteTest.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerRouteTest.scala
new file mode 100644
index 000000000000..3920c6aeb15e
--- /dev/null
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerRouteTest.scala
@@ -0,0 +1,113 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.akkahttp
+
+import akka.actor.ActorSystem
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.server.Directives.{
+ IntNumber,
+ complete,
+ concat,
+ path,
+ pathEndOrSingleSlash,
+ pathPrefix,
+ pathSingleSlash
+}
+import akka.http.scaladsl.server.Route
+import akka.stream.ActorMaterializer
+import io.opentelemetry.instrumentation.test.utils.PortUtils
+import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension
+import io.opentelemetry.sdk.testing.assertj.{SpanDataAssert, TraceAssert}
+import io.opentelemetry.testing.internal.armeria.client.WebClient
+import io.opentelemetry.testing.internal.armeria.common.{
+ AggregatedHttpRequest,
+ HttpMethod
+}
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.{AfterAll, Test, TestInstance}
+import org.junit.jupiter.api.extension.RegisterExtension
+
+import java.net.{URI, URISyntaxException}
+import java.util.function.Consumer
+import scala.concurrent.duration.DurationInt
+import scala.concurrent.Await
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class AkkaHttpServerRouteTest {
+ @RegisterExtension private val testing: AgentInstrumentationExtension =
+ AgentInstrumentationExtension.create
+ private val client: WebClient = WebClient.of()
+
+ implicit val system: ActorSystem = ActorSystem("my-system")
+ implicit val materializer: ActorMaterializer = ActorMaterializer()
+
+ private def buildAddress(port: Int): URI = try
+ new URI("http://localhost:" + port + "/")
+ catch {
+ case exception: URISyntaxException =>
+ throw new IllegalStateException(exception)
+ }
+
+ @Test def testSimple(): Unit = {
+ val route = path("test") {
+ complete("ok")
+ }
+
+ test(route, "/test", "GET /test")
+ }
+
+ @Test def testRoute(): Unit = {
+ val route = concat(
+ pathEndOrSingleSlash {
+ complete("root")
+ },
+ pathPrefix("test") {
+ concat(
+ pathSingleSlash {
+ complete("test")
+ },
+ path(IntNumber) { _ =>
+ complete("ok")
+ }
+ )
+ }
+ )
+
+ test(route, "/test/1", "GET /test/*")
+ }
+
+ def test(route: Route, path: String, spanName: String): Unit = {
+ val port = PortUtils.findOpenPort
+ val address: URI = buildAddress(port)
+ val binding =
+ Await.result(Http().bindAndHandle(route, "localhost", port), 10.seconds)
+ try {
+ val request = AggregatedHttpRequest.of(
+ HttpMethod.GET,
+ address.resolve(path).toString
+ )
+ val response = client.execute(request).aggregate.join
+ assertThat(response.status.code).isEqualTo(200)
+ assertThat(response.contentUtf8).isEqualTo("ok")
+
+ testing.waitAndAssertTraces(new Consumer[TraceAssert] {
+ override def accept(trace: TraceAssert): Unit =
+ trace.hasSpansSatisfyingExactly(new Consumer[SpanDataAssert] {
+ override def accept(span: SpanDataAssert): Unit = {
+ span.hasName(spanName)
+ }
+ })
+ })
+ } finally {
+ binding.unbind()
+ }
+ }
+
+ @AfterAll
+ def cleanUp(): Unit = {
+ system.terminate()
+ }
+}
diff --git a/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java b/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java
index 98f7306bfd56..550f469ad9df 100644
--- a/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java
+++ b/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java
@@ -9,7 +9,7 @@
import io.opentelemetry.instrumentation.apachedubbo.v2_7.DubboTelemetry;
import io.opentelemetry.instrumentation.apachedubbo.v2_7.internal.DubboClientNetworkAttributesGetter;
import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceAttributesExtractor;
-import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.rpc.Filter;
import org.apache.dubbo.rpc.Invocation;
@@ -27,7 +27,7 @@ public OpenTelemetryFilter() {
.addAttributesExtractor(
PeerServiceAttributesExtractor.create(
new DubboClientNetworkAttributesGetter(),
- CommonConfig.get().getPeerServiceResolver()))
+ AgentCommonConfig.get().getPeerServiceResolver()))
.build()
.newFilter();
}
diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java
index cc0605af1092..6a2af90f730e 100644
--- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java
+++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java
@@ -5,17 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-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.JavaagentHttpClientInstrumenters;
import org.apache.http.HttpResponse;
public final class ApacheHttpAsyncClientSingletons {
@@ -24,33 +15,11 @@ public final class ApacheHttpAsyncClientSingletons {
private static final Instrumenter INSTRUMENTER;
static {
- ApacheHttpAsyncClientHttpAttributesGetter httpAttributesGetter =
- new ApacheHttpAsyncClientHttpAttributesGetter();
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- GlobalOpenTelemetry.get(),
- INSTRUMENTATION_NAME,
- HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(
- HttpClientAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .addAttributesExtractor(
- HttpClientPeerServiceAttributesExtractor.create(
- httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
- .addOperationMetrics(HttpClientMetrics.get());
- if (CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
- INSTRUMENTER = builder.buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+ INSTRUMENTER =
+ JavaagentHttpClientInstrumenters.create(
+ INSTRUMENTATION_NAME,
+ new ApacheHttpAsyncClientHttpAttributesGetter(),
+ HttpHeaderSetter.INSTANCE);
}
public static Instrumenter instrumenter() {
diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java
index d54ca9c2f35b..ef8e120c78c9 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java
@@ -5,17 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-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.JavaagentHttpClientInstrumenters;
import org.apache.commons.httpclient.HttpMethod;
public final class ApacheHttpClientSingletons {
@@ -24,33 +15,11 @@ public final class ApacheHttpClientSingletons {
private static final Instrumenter INSTRUMENTER;
static {
- ApacheHttpClientHttpAttributesGetter httpAttributesGetter =
- new ApacheHttpClientHttpAttributesGetter();
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- GlobalOpenTelemetry.get(),
- INSTRUMENTATION_NAME,
- HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(
- HttpClientAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .addAttributesExtractor(
- HttpClientPeerServiceAttributesExtractor.create(
- httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
- .addOperationMetrics(HttpClientMetrics.get());
- if (CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
- INSTRUMENTER = builder.buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+ INSTRUMENTER =
+ JavaagentHttpClientInstrumenters.create(
+ INSTRUMENTATION_NAME,
+ new ApacheHttpClientHttpAttributesGetter(),
+ HttpHeaderSetter.INSTANCE);
}
public static Instrumenter instrumenter() {
diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java
index 146dd8f08727..a93209c3f42a 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java
@@ -5,17 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-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.JavaagentHttpClientInstrumenters;
import org.apache.http.HttpResponse;
public final class ApacheHttpClientSingletons {
@@ -24,33 +15,11 @@ public final class ApacheHttpClientSingletons {
private static final Instrumenter INSTRUMENTER;
static {
- ApacheHttpClientHttpAttributesGetter httpAttributesGetter =
- new ApacheHttpClientHttpAttributesGetter();
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- GlobalOpenTelemetry.get(),
- INSTRUMENTATION_NAME,
- HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(
- HttpClientAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .addAttributesExtractor(
- HttpClientPeerServiceAttributesExtractor.create(
- httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
- .addOperationMetrics(HttpClientMetrics.get());
- if (CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
- INSTRUMENTER = builder.buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+ INSTRUMENTER =
+ JavaagentHttpClientInstrumenters.create(
+ INSTRUMENTATION_NAME,
+ new ApacheHttpClientHttpAttributesGetter(),
+ HttpHeaderSetter.INSTANCE);
}
public static Instrumenter instrumenter() {
diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java
index daf0d8c6889e..3526ca01436a 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java
@@ -7,20 +7,10 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
+import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
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.semconv.http.HttpClientAttributesExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
@@ -30,24 +20,12 @@
public final class ApacheHttpClientTelemetryBuilder {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-4.3";
-
- private final OpenTelemetry openTelemetry;
-
- private final List>
- additionalExtractors = new ArrayList<>();
- private final HttpClientAttributesExtractorBuilder
- httpAttributesExtractorBuilder =
- HttpClientAttributesExtractor.builder(ApacheHttpClientHttpAttributesGetter.INSTANCE);
- private final HttpSpanNameExtractorBuilder httpSpanNameExtractorBuilder =
- HttpSpanNameExtractor.builder(ApacheHttpClientHttpAttributesGetter.INSTANCE);
- private Function<
- SpanNameExtractor,
- ? extends SpanNameExtractor>
- spanNameExtractorTransformer = Function.identity();
- private boolean emitExperimentalHttpClientMetrics = false;
+ private final DefaultHttpClientInstrumenterBuilder builder;
ApacheHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {
- this.openTelemetry = openTelemetry;
+ builder =
+ new DefaultHttpClientInstrumenterBuilder<>(
+ INSTRUMENTATION_NAME, openTelemetry, ApacheHttpClientHttpAttributesGetter.INSTANCE);
}
/**
@@ -58,7 +36,7 @@ public final class ApacheHttpClientTelemetryBuilder {
public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
AttributesExtractor
attributesExtractor) {
- additionalExtractors.add(attributesExtractor);
+ builder.addAttributeExtractor(attributesExtractor);
return this;
}
@@ -69,7 +47,7 @@ public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List requestHeaders) {
- httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
+ builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@@ -80,7 +58,7 @@ public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List r
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List responseHeaders) {
- httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
+ builder.setCapturedResponseHeaders(responseHeaders);
return this;
}
@@ -99,8 +77,7 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setKnownMethods(Set knownMethods) {
- httpAttributesExtractorBuilder.setKnownMethods(knownMethods);
- httpSpanNameExtractorBuilder.setKnownMethods(knownMethods);
+ builder.setKnownMethods(knownMethods);
return this;
}
@@ -113,7 +90,7 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Set knownMethods
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
boolean emitExperimentalHttpClientMetrics) {
- this.emitExperimentalHttpClientMetrics = emitExperimentalHttpClientMetrics;
+ builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
return this;
}
@@ -124,7 +101,7 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
SpanNameExtractor,
? extends SpanNameExtractor>
spanNameExtractorTransformer) {
- this.spanNameExtractorTransformer = spanNameExtractorTransformer;
+ builder.setSpanNameExtractor(spanNameExtractorTransformer);
return this;
}
@@ -133,29 +110,7 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
* ApacheHttpClientTelemetryBuilder}.
*/
public ApacheHttpClientTelemetry build() {
- ApacheHttpClientHttpAttributesGetter httpAttributesGetter =
- ApacheHttpClientHttpAttributesGetter.INSTANCE;
- SpanNameExtractor spanNameExtractor =
- spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- openTelemetry, INSTRUMENTATION_NAME, spanNameExtractor)
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(httpAttributesExtractorBuilder.build())
- .addAttributesExtractors(additionalExtractors)
- .addOperationMetrics(HttpClientMetrics.get());
- if (emitExperimentalHttpClientMetrics) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
-
- Instrumenter instrumenter =
- builder
- // We manually inject because we need to inject internal requests for redirects.
- .buildInstrumenter(SpanKindExtractor.alwaysClient());
-
- return new ApacheHttpClientTelemetry(instrumenter, openTelemetry.getPropagators());
+ return new ApacheHttpClientTelemetry(
+ builder.build(), builder.getOpenTelemetry().getPropagators());
}
}
diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java
index 8f6ccbdd6a02..e1cc0a667cef 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java
@@ -5,17 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-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.JavaagentHttpClientInstrumenters;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
@@ -25,33 +16,11 @@ public final class ApacheHttpClientSingletons {
private static final Instrumenter INSTRUMENTER;
static {
- ApacheHttpClientHttpAttributesGetter httpAttributesGetter =
- new ApacheHttpClientHttpAttributesGetter();
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- GlobalOpenTelemetry.get(),
- INSTRUMENTATION_NAME,
- HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(
- HttpClientAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .addAttributesExtractor(
- HttpClientPeerServiceAttributesExtractor.create(
- httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
- .addOperationMetrics(HttpClientMetrics.get());
- if (CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
- INSTRUMENTER = builder.buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+ INSTRUMENTER =
+ JavaagentHttpClientInstrumenters.create(
+ INSTRUMENTATION_NAME,
+ new ApacheHttpClientHttpAttributesGetter(),
+ HttpHeaderSetter.INSTANCE);
}
public static Instrumenter instrumenter() {
diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java
index 176555846849..e9a5eb273de0 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java
@@ -7,20 +7,10 @@
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
+import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
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.semconv.http.HttpClientAttributesExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
@@ -30,26 +20,13 @@
public final class ApacheHttpClient5TelemetryBuilder {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-5.2";
-
- private final OpenTelemetry openTelemetry;
-
- private final List>
- additionalExtractors = new ArrayList<>();
- private final HttpClientAttributesExtractorBuilder
- httpAttributesExtractorBuilder =
- HttpClientAttributesExtractor.builder(ApacheHttpClient5HttpAttributesGetter.INSTANCE);
-
- private final HttpSpanNameExtractorBuilder
- httpSpanNameExtractorBuilder =
- HttpSpanNameExtractor.builder(ApacheHttpClient5HttpAttributesGetter.INSTANCE);
- private Function<
- SpanNameExtractor,
- ? extends SpanNameExtractor>
- spanNameExtractorTransformer = Function.identity();
- private boolean emitExperimentalHttpClientMetrics = false;
+ private final DefaultHttpClientInstrumenterBuilder
+ builder;
ApacheHttpClient5TelemetryBuilder(OpenTelemetry openTelemetry) {
- this.openTelemetry = openTelemetry;
+ builder =
+ new DefaultHttpClientInstrumenterBuilder<>(
+ INSTRUMENTATION_NAME, openTelemetry, ApacheHttpClient5HttpAttributesGetter.INSTANCE);
}
/**
@@ -60,7 +37,7 @@ public final class ApacheHttpClient5TelemetryBuilder {
public ApacheHttpClient5TelemetryBuilder addAttributeExtractor(
AttributesExtractor
attributesExtractor) {
- additionalExtractors.add(attributesExtractor);
+ builder.addAttributeExtractor(attributesExtractor);
return this;
}
@@ -71,7 +48,7 @@ public ApacheHttpClient5TelemetryBuilder addAttributeExtractor(
*/
@CanIgnoreReturnValue
public ApacheHttpClient5TelemetryBuilder setCapturedRequestHeaders(List requestHeaders) {
- httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
+ builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@@ -83,7 +60,7 @@ public ApacheHttpClient5TelemetryBuilder setCapturedRequestHeaders(List
@CanIgnoreReturnValue
public ApacheHttpClient5TelemetryBuilder setCapturedResponseHeaders(
List responseHeaders) {
- httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
+ builder.setCapturedResponseHeaders(responseHeaders);
return this;
}
@@ -102,8 +79,7 @@ public ApacheHttpClient5TelemetryBuilder setCapturedResponseHeaders(
*/
@CanIgnoreReturnValue
public ApacheHttpClient5TelemetryBuilder setKnownMethods(Set knownMethods) {
- httpAttributesExtractorBuilder.setKnownMethods(knownMethods);
- httpSpanNameExtractorBuilder.setKnownMethods(knownMethods);
+ builder.setKnownMethods(knownMethods);
return this;
}
@@ -116,7 +92,7 @@ public ApacheHttpClient5TelemetryBuilder setKnownMethods(Set knownMethod
@CanIgnoreReturnValue
public ApacheHttpClient5TelemetryBuilder setEmitExperimentalHttpClientMetrics(
boolean emitExperimentalHttpClientMetrics) {
- this.emitExperimentalHttpClientMetrics = emitExperimentalHttpClientMetrics;
+ builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
return this;
}
@@ -127,7 +103,7 @@ public ApacheHttpClient5TelemetryBuilder setSpanNameExtractor(
SpanNameExtractor,
? extends SpanNameExtractor>
spanNameExtractorTransformer) {
- this.spanNameExtractorTransformer = spanNameExtractorTransformer;
+ builder.setSpanNameExtractor(spanNameExtractorTransformer);
return this;
}
@@ -136,29 +112,7 @@ public ApacheHttpClient5TelemetryBuilder setSpanNameExtractor(
* ApacheHttpClient5TelemetryBuilder}.
*/
public ApacheHttpClient5Telemetry build() {
- ApacheHttpClient5HttpAttributesGetter httpAttributesGetter =
- ApacheHttpClient5HttpAttributesGetter.INSTANCE;
- SpanNameExtractor spanNameExtractor =
- spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- openTelemetry, INSTRUMENTATION_NAME, spanNameExtractor)
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(httpAttributesExtractorBuilder.build())
- .addAttributesExtractors(additionalExtractors)
- .addOperationMetrics(HttpClientMetrics.get());
- if (emitExperimentalHttpClientMetrics) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
-
- Instrumenter instrumenter =
- builder
- // We manually inject because we need to inject internal requests for redirects.
- .buildInstrumenter(SpanKindExtractor.alwaysClient());
-
- return new ApacheHttpClient5Telemetry(instrumenter, openTelemetry.getPropagators());
+ return new ApacheHttpClient5Telemetry(
+ builder.build(), builder.getOpenTelemetry().getPropagators());
}
}
diff --git a/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/MetaDataHelper.java b/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/MetaDataHelper.java
index 15645b8ea6f7..4414e6eeb628 100644
--- a/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/MetaDataHelper.java
+++ b/instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/MetaDataHelper.java
@@ -9,7 +9,7 @@
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan;
-import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
import org.apache.shenyu.common.dto.MetaData;
public final class MetaDataHelper {
@@ -58,7 +58,7 @@ public final class MetaDataHelper {
static {
CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
- InstrumentationConfig.get()
+ AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.apache-shenyu.experimental-span-attributes", false);
}
diff --git a/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java b/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java
index 99a3b2c6c17f..8f4800ebca34 100644
--- a/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java
+++ b/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java
@@ -11,7 +11,7 @@
import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaTelemetry;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaHttpClientAttributesGetter;
-import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import java.util.function.Function;
// Holds singleton references to decorators to match against during suppression.
@@ -24,19 +24,19 @@ public final class ArmeriaSingletons {
static {
ArmeriaTelemetry telemetry =
ArmeriaTelemetry.builder(GlobalOpenTelemetry.get())
- .setCapturedClientRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedClientResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setCapturedServerRequestHeaders(CommonConfig.get().getServerRequestHeaders())
- .setCapturedServerResponseHeaders(CommonConfig.get().getServerResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
+ .setCapturedClientRequestHeaders(AgentCommonConfig.get().getClientRequestHeaders())
+ .setCapturedClientResponseHeaders(AgentCommonConfig.get().getClientResponseHeaders())
+ .setCapturedServerRequestHeaders(AgentCommonConfig.get().getServerRequestHeaders())
+ .setCapturedServerResponseHeaders(AgentCommonConfig.get().getServerResponseHeaders())
+ .setKnownMethods(AgentCommonConfig.get().getKnownHttpRequestMethods())
.addClientAttributeExtractor(
HttpClientPeerServiceAttributesExtractor.create(
ArmeriaHttpClientAttributesGetter.INSTANCE,
- CommonConfig.get().getPeerServiceResolver()))
+ AgentCommonConfig.get().getPeerServiceResolver()))
.setEmitExperimentalHttpClientMetrics(
- CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry())
+ AgentCommonConfig.get().shouldEmitExperimentalHttpClientTelemetry())
.setEmitExperimentalHttpServerMetrics(
- CommonConfig.get().shouldEmitExperimentalHttpServerTelemetry())
+ AgentCommonConfig.get().shouldEmitExperimentalHttpServerTelemetry())
.build();
CLIENT_DECORATOR = telemetry.newClientDecorator();
diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java
index 7963e1d2b3d0..c886631a93cc 100644
--- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java
+++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java
@@ -7,17 +7,8 @@
import com.ning.http.client.Request;
import com.ning.http.client.Response;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-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.JavaagentHttpClientInstrumenters;
public final class AsyncHttpClientSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-1.9";
@@ -25,33 +16,11 @@ public final class AsyncHttpClientSingletons {
private static final Instrumenter INSTRUMENTER;
static {
- AsyncHttpClientHttpAttributesGetter httpAttributesGetter =
- new AsyncHttpClientHttpAttributesGetter();
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- GlobalOpenTelemetry.get(),
- INSTRUMENTATION_NAME,
- HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(
- HttpClientAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .addAttributesExtractor(
- HttpClientPeerServiceAttributesExtractor.create(
- httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
- .addOperationMetrics(HttpClientMetrics.get());
- if (CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
- INSTRUMENTER = builder.buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+ INSTRUMENTER =
+ JavaagentHttpClientInstrumenters.create(
+ INSTRUMENTATION_NAME,
+ new AsyncHttpClientHttpAttributesGetter(),
+ HttpHeaderSetter.INSTANCE);
}
public static Instrumenter instrumenter() {
diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/build.gradle.kts b/instrumentation/async-http-client/async-http-client-2.0/javaagent/build.gradle.kts
index 30b722110c08..9c573a0fd4ec 100644
--- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/build.gradle.kts
@@ -18,14 +18,32 @@ dependencies {
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
}
-otelJava {
- // AHC uses Unsafe and so does not run on later java version
- maxJavaVersionForTests.set(JavaVersion.VERSION_1_8)
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+val testJavaVersion =
+ gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
+ ?: JavaVersion.current()
+
+if (!latestDepTest) {
+ otelJava {
+ // AHC uses Unsafe and so does not run on later java version
+ maxJavaVersionForTests.set(JavaVersion.VERSION_1_8)
+ }
+}
+
+tasks.withType().configureEach {
+ systemProperty("testLatestDeps", latestDepTest)
+ // async-http-client 3.0 requires java 11
+ // We are not using minJavaVersionSupported for latestDepTest because that way the instrumentation
+ // gets compiled with java 11 when running latestDepTest. This causes play-mvc-2.4 latest dep tests
+ // to fail because they require java 8 and instrumentation compiled with java 11 won't apply.
+ if (latestDepTest && testJavaVersion.isJava8) {
+ enabled = false
+ }
}
// async-http-client 2.0.0 does not work with Netty versions newer than this due to referencing an
// internal file.
-if (!(findProperty("testLatestDeps") as Boolean)) {
+if (!latestDepTest) {
configurations.configureEach {
if (!name.contains("muzzle")) {
resolutionStrategy {
diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java
index 56e8706a3317..2e140594f0bd 100644
--- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java
+++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java
@@ -5,17 +5,8 @@
package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpClientMetrics;
-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.JavaagentHttpClientInstrumenters;
import org.asynchttpclient.Response;
public final class AsyncHttpClientSingletons {
@@ -24,33 +15,11 @@ public final class AsyncHttpClientSingletons {
private static final Instrumenter INSTRUMENTER;
static {
- AsyncHttpClientHttpAttributesGetter httpAttributesGetter =
- new AsyncHttpClientHttpAttributesGetter();
-
- InstrumenterBuilder builder =
- Instrumenter.builder(
- GlobalOpenTelemetry.get(),
- INSTRUMENTATION_NAME,
- HttpSpanNameExtractor.builder(httpAttributesGetter)
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
- .addAttributesExtractor(
- HttpClientAttributesExtractor.builder(httpAttributesGetter)
- .setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
- .setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
- .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
- .build())
- .addAttributesExtractor(
- HttpClientPeerServiceAttributesExtractor.create(
- httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
- .addOperationMetrics(HttpClientMetrics.get());
- if (CommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()) {
- builder
- .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
- .addOperationMetrics(HttpClientExperimentalMetrics.get());
- }
- INSTRUMENTER = builder.buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+ INSTRUMENTER =
+ JavaagentHttpClientInstrumenters.create(
+ INSTRUMENTATION_NAME,
+ new AsyncHttpClientHttpAttributesGetter(),
+ HttpHeaderSetter.INSTANCE);
}
public static Instrumenter instrumenter() {
diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientTest.java b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientTest.java
index e8b25349aca9..6e968d6b9759 100644
--- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientTest.java
+++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientTest.java
@@ -10,11 +10,14 @@
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult;
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
+import java.lang.reflect.Method;
import java.net.URI;
+import java.time.Duration;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import org.asynchttpclient.AsyncCompletionHandler;
import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.Dsl;
import org.asynchttpclient.Request;
import org.asynchttpclient.RequestBuilder;
@@ -31,11 +34,26 @@ class AsyncHttpClientTest extends AbstractHttpClientTest {
private static final int CONNECTION_TIMEOUT_MS = (int) CONNECTION_TIMEOUT.toMillis();
// request timeout is needed in addition to connect timeout on async-http-client versions 2.1.0+
- private static final AsyncHttpClient client =
- Dsl.asyncHttpClient(
- Dsl.config()
- .setConnectTimeout(CONNECTION_TIMEOUT_MS)
- .setRequestTimeout(CONNECTION_TIMEOUT_MS));
+ private static final AsyncHttpClient client = Dsl.asyncHttpClient(configureTimeout(Dsl.config()));
+
+ private static DefaultAsyncHttpClientConfig.Builder configureTimeout(
+ DefaultAsyncHttpClientConfig.Builder builder) {
+ setTimeout(builder, "setConnectTimeout", CONNECTION_TIMEOUT_MS);
+ setTimeout(builder, "setRequestTimeout", CONNECTION_TIMEOUT_MS);
+ return builder;
+ }
+
+ private static void setTimeout(
+ DefaultAsyncHttpClientConfig.Builder builder, String methodName, int timeout) {
+ boolean testLatestDeps = Boolean.getBoolean("testLatestDeps");
+ try {
+ Method method =
+ builder.getClass().getMethod(methodName, testLatestDeps ? Duration.class : int.class);
+ method.invoke(builder, testLatestDeps ? Duration.ofMillis(timeout) : timeout);
+ } catch (Exception exception) {
+ throw new IllegalStateException("Failed to set timeout " + methodName, exception);
+ }
+ }
@Override
public Request buildRequest(String method, URI uri, Map headers) {
diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamHandler.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamHandler.java
index fced56818f52..ae6a42bd6de4 100644
--- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamHandler.java
+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamHandler.java
@@ -7,6 +7,7 @@
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.ApiGatewayProxyRequest;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.AwsLambdaFunctionInstrumenter;
@@ -67,49 +68,55 @@ protected TracingRequestStreamHandler(
@Override
public void handleRequest(InputStream input, OutputStream output, Context context)
throws IOException {
-
ApiGatewayProxyRequest proxyRequest = ApiGatewayProxyRequest.forStream(input);
- AwsLambdaRequest request =
- AwsLambdaRequest.create(context, proxyRequest, proxyRequest.getHeaders());
+ AwsLambdaRequest request = createRequest(input, context, proxyRequest);
io.opentelemetry.context.Context parentContext = instrumenter.extract(request);
if (!instrumenter.shouldStart(parentContext, request)) {
- doHandleRequest(proxyRequest.freshStream(), output, context);
+ doHandleRequest(proxyRequest.freshStream(), output, context, request);
return;
}
io.opentelemetry.context.Context otelContext = instrumenter.start(parentContext, request);
+ Throwable error = null;
try (Scope ignored = otelContext.makeCurrent()) {
doHandleRequest(
proxyRequest.freshStream(),
- new OutputStreamWrapper(output, otelContext, request, openTelemetrySdk),
- context);
+ new OutputStreamWrapper(output, otelContext),
+ context,
+ request);
} catch (Throwable t) {
- instrumenter.end(otelContext, request, null, t);
- LambdaUtils.forceFlush(openTelemetrySdk, flushTimeoutNanos, TimeUnit.NANOSECONDS);
+ error = t;
throw t;
+ } finally {
+ instrumenter.end(otelContext, request, null, error);
+ LambdaUtils.forceFlush(openTelemetrySdk, flushTimeoutNanos, TimeUnit.NANOSECONDS);
}
}
+ protected AwsLambdaRequest createRequest(
+ InputStream input, Context context, ApiGatewayProxyRequest proxyRequest) throws IOException {
+ return AwsLambdaRequest.create(context, proxyRequest, proxyRequest.getHeaders());
+ }
+
+ protected void doHandleRequest(
+ InputStream input, OutputStream output, Context context, AwsLambdaRequest request)
+ throws IOException {
+ doHandleRequest(input, output, context);
+ }
+
protected abstract void doHandleRequest(InputStream input, OutputStream output, Context context)
throws IOException;
- private class OutputStreamWrapper extends OutputStream {
+ private static class OutputStreamWrapper extends OutputStream {
private final OutputStream delegate;
private final io.opentelemetry.context.Context otelContext;
- private final AwsLambdaRequest request;
- private final OpenTelemetrySdk openTelemetrySdk;
private OutputStreamWrapper(
- OutputStream delegate,
- io.opentelemetry.context.Context otelContext,
- AwsLambdaRequest request,
- OpenTelemetrySdk openTelemetrySdk) {
+ OutputStream delegate, io.opentelemetry.context.Context otelContext) {
this.delegate = delegate;
this.otelContext = otelContext;
- this.request = request;
- this.openTelemetrySdk = openTelemetrySdk;
}
@Override
@@ -135,8 +142,8 @@ public void flush() throws IOException {
@Override
public void close() throws IOException {
delegate.close();
- instrumenter.end(otelContext, request, null, null);
- LambdaUtils.forceFlush(openTelemetrySdk, flushTimeoutNanos, TimeUnit.NANOSECONDS);
+ Span span = Span.fromContext(otelContext);
+ span.addEvent("Output stream closed");
}
}
}
diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamWrapper.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamWrapper.java
index 18ceb38cbf1b..d20564ffc805 100644
--- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamWrapper.java
+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/TracingRequestStreamWrapper.java
@@ -23,7 +23,7 @@
*/
public class TracingRequestStreamWrapper extends TracingRequestStreamHandler {
- private final WrappedLambda wrappedLambda;
+ protected final WrappedLambda wrappedLambda;
public TracingRequestStreamWrapper() {
this(
@@ -32,7 +32,8 @@ public TracingRequestStreamWrapper() {
}
// Visible for testing
- TracingRequestStreamWrapper(OpenTelemetrySdk openTelemetrySdk, WrappedLambda wrappedLambda) {
+ protected TracingRequestStreamWrapper(
+ OpenTelemetrySdk openTelemetrySdk, WrappedLambda wrappedLambda) {
super(openTelemetrySdk, WrapperConfiguration.flushTimeout());
this.wrappedLambda = wrappedLambda;
}
diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionInstrumenter.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionInstrumenter.java
index 4136e7bed954..9341bf6f79dc 100644
--- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionInstrumenter.java
+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionInstrumenter.java
@@ -11,6 +11,7 @@
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.internal.ContextPropagationDebug;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import javax.annotation.Nullable;
@@ -48,11 +49,20 @@ public void end(
public Context extract(AwsLambdaRequest input) {
ContextPropagationDebug.debugContextLeakIfEnabled();
+ // Look in both the http headers and the custom client context
+ Map headers = input.getHeaders();
+ if (input.getAwsContext() != null && input.getAwsContext().getClientContext() != null) {
+ Map customContext = input.getAwsContext().getClientContext().getCustom();
+ if (customContext != null) {
+ headers = new HashMap<>(headers);
+ headers.putAll(customContext);
+ }
+ }
return openTelemetry
.getPropagators()
.getTextMapPropagator()
- .extract(Context.root(), input.getHeaders(), MapGetter.INSTANCE);
+ .extract(Context.root(), headers, MapGetter.INSTANCE);
}
private enum MapGetter implements TextMapGetter> {
diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/InstrumenterExtractionTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/InstrumenterExtractionTest.java
new file mode 100644
index 000000000000..cb19d1e56879
--- /dev/null
+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/InstrumenterExtractionTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awslambdacore.v1_0.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.amazonaws.services.lambda.runtime.ClientContext;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest;
+import java.util.HashMap;
+import org.junit.jupiter.api.Test;
+
+class InstrumenterExtractionTest {
+ @Test
+ public void useCustomContext() {
+ AwsLambdaFunctionInstrumenter instr =
+ AwsLambdaFunctionInstrumenterFactory.createInstrumenter(
+ OpenTelemetry.propagating(
+ ContextPropagators.create(W3CTraceContextPropagator.getInstance())));
+ com.amazonaws.services.lambda.runtime.Context awsContext =
+ mock(com.amazonaws.services.lambda.runtime.Context.class);
+ ClientContext clientContext = mock(ClientContext.class);
+ when(awsContext.getClientContext()).thenReturn(clientContext);
+ HashMap customMap = new HashMap<>();
+ customMap.put("traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01");
+ when(clientContext.getCustom()).thenReturn(customMap);
+
+ AwsLambdaRequest input = AwsLambdaRequest.create(awsContext, new HashMap<>(), new HashMap<>());
+
+ Context extracted = instr.extract(input);
+ SpanContext spanContext = Span.fromContext(extracted).getSpanContext();
+ assertThat(spanContext.getTraceId()).isEqualTo("4bf92f3577b34da6a3ce929d0e0e4736");
+ assertThat(spanContext.getSpanId()).isEqualTo("00f067aa0ba902b7");
+ }
+}
diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts
index d035a0ffc7d9..b414e5a45350 100644
--- a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts
+++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts
@@ -12,8 +12,6 @@ dependencies {
implementation("com.google.guava:guava")
- implementation("org.apache.groovy:groovy")
implementation("io.opentelemetry:opentelemetry-api")
- implementation("org.spockframework:spock-core")
implementation("com.github.stefanbirkner:system-lambda")
}
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationHelper.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationHelper.java
index 8783d93ef8bd..d55898e75053 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationHelper.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationHelper.java
@@ -10,7 +10,7 @@
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal.AwsLambdaEventsInstrumenterFactory;
import io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal.AwsLambdaSqsInstrumenterFactory;
-import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
public final class AwsLambdaInstrumentationHelper {
@@ -18,7 +18,7 @@ public final class AwsLambdaInstrumentationHelper {
.AwsLambdaFunctionInstrumenter
FUNCTION_INSTRUMENTER =
AwsLambdaEventsInstrumenterFactory.createInstrumenter(
- GlobalOpenTelemetry.get(), CommonConfig.get().getKnownHttpRequestMethods());
+ GlobalOpenTelemetry.get(), AgentCommonConfig.get().getKnownHttpRequestMethods());
public static io.opentelemetry.instrumentation.awslambdacore.v1_0.internal
.AwsLambdaFunctionInstrumenter
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts
index 6918c6fbfab0..452d42189590 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts
@@ -18,6 +18,13 @@ dependencies {
// in public API.
library("com.amazonaws:aws-lambda-java-events:2.2.1")
+ // By default, "aws-lambda-java-serialization" library is enabled in the classpath
+ // at the AWS Lambda environment except "java8" runtime which is deprecated.
+ // But it is available at "java8.al2" runtime, so it is still can be used
+ // by Java 8 based Lambda functions.
+ // So that is the reason that why we add it as compile only dependency.
+ compileOnly("com.amazonaws:aws-lambda-java-serialization:1.1.5")
+
// We need Jackson for wrappers to reproduce the serialization does when Lambda invokes a RequestHandler with event
// since Lambda will only be able to invoke the wrapper itself with a generic Object.
// Note that Lambda itself uses Jackson, but does not expose it to the function so we need to include it here.
@@ -33,6 +40,7 @@ dependencies {
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
testImplementation("com.google.guava:guava")
+ testImplementation("com.amazonaws:aws-lambda-java-serialization:1.1.5")
testImplementation(project(":instrumentation:aws-lambda:aws-lambda-events-2.2:testing"))
testImplementation("uk.org.webcompere:system-stubs-jupiter")
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParameters.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParameters.java
index ecc3a33d7003..53e68280bade 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParameters.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParameters.java
@@ -6,6 +6,7 @@
package io.opentelemetry.instrumentation.awslambdaevents.v2_2;
import com.amazonaws.services.lambda.runtime.Context;
+import java.io.InputStream;
import java.lang.reflect.Method;
import java.util.function.BiFunction;
@@ -27,5 +28,35 @@ static Object[] toArray(
return parameters;
}
+ static Object[] toParameters(Method targetMethod, T input, Context context) {
+ Class[] parameterTypes = targetMethod.getParameterTypes();
+ Object[] parameters = new Object[parameterTypes.length];
+ for (int i = 0; i < parameterTypes.length; i++) {
+ Class clazz = parameterTypes[i];
+ boolean isContext = clazz.equals(Context.class);
+ if (isContext) {
+ parameters[i] = context;
+ } else if (i == 0) {
+ parameters[0] = input;
+ }
+ }
+ return parameters;
+ }
+
+ static Object toInput(
+ Method targetMethod,
+ InputStream inputStream,
+ BiFunction, Object> mapper) {
+ Class[] parameterTypes = targetMethod.getParameterTypes();
+ for (int i = 0; i < parameterTypes.length; i++) {
+ Class clazz = parameterTypes[i];
+ boolean isContext = clazz.equals(Context.class);
+ if (i == 0 && !isContext) {
+ return mapper.apply(inputStream, clazz);
+ }
+ }
+ return null;
+ }
+
private LambdaParameters() {}
}
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestApiGatewayWrapper.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestApiGatewayWrapper.java
index 00eb6e88e53b..711b7e3079a0 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestApiGatewayWrapper.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestApiGatewayWrapper.java
@@ -8,8 +8,8 @@
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
-import com.fasterxml.jackson.core.JsonProcessingException;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda;
+import io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal.SerializationUtil;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import java.util.function.BiFunction;
@@ -35,12 +35,7 @@ public TracingRequestApiGatewayWrapper() {
// Visible for testing
static T map(APIGatewayProxyRequestEvent event, Class clazz) {
- try {
- return OBJECT_MAPPER.readValue(event.getBody(), clazz);
- } catch (JsonProcessingException e) {
- throw new IllegalStateException(
- "Could not map API Gateway event body to requested parameter type: " + clazz, e);
- }
+ return SerializationUtil.fromJson(event.getBody(), clazz);
}
@Override
@@ -52,12 +47,8 @@ protected APIGatewayProxyResponseEvent doHandleRequest(
if (result instanceof APIGatewayProxyResponseEvent) {
event = (APIGatewayProxyResponseEvent) result;
} else {
- try {
- event = new APIGatewayProxyResponseEvent();
- event.setBody(OBJECT_MAPPER.writeValueAsString(result));
- } catch (JsonProcessingException e) {
- throw new IllegalStateException("Could not serialize return value.", e);
- }
+ event = new APIGatewayProxyResponseEvent();
+ event.setBody(SerializationUtil.toJson(result));
}
return event;
}
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapper.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapper.java
index 5cbeec41cfee..484ee169d623 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapper.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapper.java
@@ -5,32 +5,90 @@
package io.opentelemetry.instrumentation.awslambdaevents.v2_2;
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.TracingRequestStreamWrapper;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.ApiGatewayProxyRequest;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda;
+import io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal.SerializationUtil;
import io.opentelemetry.sdk.OpenTelemetrySdk;
-import java.util.function.BiFunction;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
/**
- * Wrapper for {@link io.opentelemetry.instrumentation.awslambdacore.v1_0.TracingRequestHandler}.
- * Allows for wrapping a regular lambda, not proxied through API Gateway. Therefore, HTTP headers
- * propagation is not supported.
+ * Wrapper for {@link com.amazonaws.services.lambda.runtime.RequestHandler} based Lambda handlers.
*/
-public class TracingRequestWrapper extends TracingRequestWrapperBase {
+public class TracingRequestWrapper extends TracingRequestStreamWrapper {
public TracingRequestWrapper() {
- super(TracingRequestWrapper::map);
+ super();
}
// Visible for testing
- TracingRequestWrapper(
- OpenTelemetrySdk openTelemetrySdk,
- WrappedLambda wrappedLambda,
- BiFunction, Object> mapper) {
- super(openTelemetrySdk, wrappedLambda, mapper);
+ TracingRequestWrapper(OpenTelemetrySdk openTelemetrySdk, WrappedLambda wrappedLambda) {
+ super(openTelemetrySdk, wrappedLambda);
+ }
+
+ @Override
+ protected final AwsLambdaRequest createRequest(
+ InputStream inputStream, Context context, ApiGatewayProxyRequest proxyRequest) {
+ Method targetMethod = wrappedLambda.getRequestTargetMethod();
+ Object input = LambdaParameters.toInput(targetMethod, inputStream, TracingRequestWrapper::map);
+ return AwsLambdaRequest.create(context, input, extractHeaders(input));
+ }
+
+ protected Map extractHeaders(Object input) {
+ if (input instanceof APIGatewayProxyRequestEvent) {
+ return MapUtils.emptyIfNull(((APIGatewayProxyRequestEvent) input).getHeaders());
+ }
+ return Collections.emptyMap();
+ }
+
+ @Override
+ protected final void doHandleRequest(
+ InputStream input, OutputStream output, Context context, AwsLambdaRequest request) {
+ Method targetMethod = wrappedLambda.getRequestTargetMethod();
+ Object[] parameters = LambdaParameters.toParameters(targetMethod, request.getInput(), context);
+ try {
+ Object result = targetMethod.invoke(wrappedLambda.getTargetObject(), parameters);
+ SerializationUtil.toJson(output, result);
+ } catch (IllegalAccessException e) {
+ throw new IllegalStateException("Method is inaccessible", e);
+ } catch (InvocationTargetException e) {
+ throw (e.getCause() instanceof RuntimeException
+ ? (RuntimeException) e.getCause()
+ : new IllegalStateException(e.getTargetException()));
+ }
+ }
+
+ @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
+ // Used for testing
+ OUTPUT handleRequest(INPUT input, Context context) throws IOException {
+ byte[] inputJsonData = SerializationUtil.toJsonData(input);
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(inputJsonData);
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+ super.handleRequest(inputStream, outputStream, context);
+
+ byte[] outputJsonData = outputStream.toByteArray();
+ return (OUTPUT)
+ SerializationUtil.fromJson(
+ new ByteArrayInputStream(outputJsonData),
+ wrappedLambda.getRequestTargetMethod().getReturnType());
}
// Visible for testing
- static T map(Object jsonMap, Class clazz) {
+ static T map(InputStream inputStream, Class clazz) {
try {
- return OBJECT_MAPPER.convertValue(jsonMap, clazz);
+ return SerializationUtil.fromJson(inputStream, clazz);
} catch (IllegalArgumentException e) {
throw new IllegalStateException(
"Could not map input to requested parameter type: " + clazz, e);
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperBase.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperBase.java
index c435e03d2e9b..5169c8f121ee 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperBase.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperBase.java
@@ -7,8 +7,6 @@
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.TracingRequestHandler;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils;
@@ -29,10 +27,6 @@
*/
abstract class TracingRequestWrapperBase extends TracingRequestHandler {
- protected static final ObjectMapper OBJECT_MAPPER =
- new ObjectMapper()
- .registerModule(new CustomJodaModule())
- .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
private final WrappedLambda wrappedLambda;
private final Method targetMethod;
private final BiFunction, Object> parameterMapper;
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/CustomJodaModule.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/CustomJodaModule.java
similarity index 96%
rename from instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/CustomJodaModule.java
rename to instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/CustomJodaModule.java
index a1991b468145..1be598ae8ffb 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/CustomJodaModule.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/CustomJodaModule.java
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package io.opentelemetry.instrumentation.awslambdaevents.v2_2;
+package io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SerializationUtil.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SerializationUtil.java
new file mode 100644
index 000000000000..81649340e649
--- /dev/null
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SerializationUtil.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal;
+
+import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
+import com.amazonaws.services.lambda.runtime.serialization.events.LambdaEventSerializers;
+import com.amazonaws.services.lambda.runtime.serialization.factories.JacksonFactory;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class SerializationUtil {
+
+ private static final int DEFAULT_BUFFER_SIZE = 1024;
+
+ private static final ClassValue> serializerCache =
+ new ClassValue>() {
+ @Override
+ protected PojoSerializer computeValue(Class type) {
+ return createSerializer(type);
+ }
+ };
+
+ private static PojoSerializer createSerializer(Class clazz) {
+ try {
+ if (LambdaEventSerializers.isLambdaSupportedEvent(clazz.getName())) {
+ return LambdaEventSerializers.serializerFor(clazz, clazz.getClassLoader());
+ }
+ return JacksonFactory.getInstance().getSerializer(clazz);
+ } catch (NoClassDefFoundError e) {
+ // For "java8" runtime, "aws-lambda-java-serialization" library
+ // is not available in the classpath by default.
+ // So fall back to object mapper based legacy serialization.
+ return new ObjectMapperPojoSerializer(clazz);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public static PojoSerializer getSerializer(Class clazz) {
+ return (PojoSerializer) serializerCache.get(clazz);
+ }
+
+ public static T fromJson(String json, Class clazz) {
+ PojoSerializer serializer = getSerializer(clazz);
+ return serializer.fromJson(json);
+ }
+
+ public static T fromJson(InputStream inputStream, Class clazz) {
+ PojoSerializer serializer = getSerializer(clazz);
+ return serializer.fromJson(inputStream);
+ }
+
+ @SuppressWarnings("unchecked")
+ public static void toJson(OutputStream outputStream, T obj) {
+ if (obj != null) {
+ PojoSerializer serializer = getSerializer((Class) obj.getClass());
+ serializer.toJson(obj, outputStream);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public static String toJson(T obj) {
+ if (obj == null) {
+ return null;
+ }
+ PojoSerializer serializer = getSerializer((Class) obj.getClass());
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+ serializer.toJson(obj, outputStream);
+ return new String(outputStream.toByteArray(), StandardCharsets.UTF_8);
+ }
+
+ public static byte[] toJsonData(T obj) {
+ if (obj == null) {
+ return new byte[] {};
+ }
+ ByteArrayOutputStream os = new ByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
+ SerializationUtil.toJson(os, obj);
+ return os.toByteArray();
+ }
+
+ private static class ObjectMapperPojoSerializer implements PojoSerializer {
+
+ private final ObjectMapper objectMapper =
+ new ObjectMapper()
+ .registerModule(new CustomJodaModule())
+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ private final Class clazz;
+
+ ObjectMapperPojoSerializer(Class clazz) {
+ this.clazz = clazz;
+ }
+
+ @Override
+ public T fromJson(InputStream input) {
+ try {
+ return objectMapper.readValue(input, clazz);
+ } catch (IOException e) {
+ throw new IllegalStateException("Could not deserialize from JSON input stream.", e);
+ }
+ }
+
+ @Override
+ public T fromJson(String input) {
+ try {
+ return objectMapper.readValue(input, clazz);
+ } catch (IOException e) {
+ throw new IllegalStateException("Could not deserialize from JSON string.", e);
+ }
+ }
+
+ @Override
+ public void toJson(T value, OutputStream output) {
+ try {
+ objectMapper.writeValue(output, value);
+ } catch (IOException e) {
+ throw new IllegalStateException("Could not serialize to JSON.", e);
+ }
+ }
+ }
+
+ private SerializationUtil() {}
+}
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java
index 87cb651713ba..12bef1d95082 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java
@@ -19,6 +19,7 @@
import io.opentelemetry.sdk.trace.data.StatusData;
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes;
+import java.io.IOException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -54,12 +55,9 @@ void tearDown() {
key = WrappedLambda.OTEL_LAMBDA_HANDLER_ENV_KEY,
value =
"io.opentelemetry.instrumentation.awslambdaevents.v2_2.AwsLambdaWrapperTest$TestRequestHandlerString::handleRequest")
- void handlerTraced() {
+ void handlerTraced() throws IOException {
TracingRequestWrapper wrapper =
- new TracingRequestWrapper(
- testing.getOpenTelemetrySdk(),
- WrappedLambda.fromConfiguration(),
- TracingRequestWrapper::map);
+ new TracingRequestWrapper(testing.getOpenTelemetrySdk(), WrappedLambda.fromConfiguration());
Object result = wrapper.handleRequest("hello", context);
assertThat(result).isEqualTo("world");
@@ -84,10 +82,7 @@ void handlerTraced() {
"io.opentelemetry.instrumentation.awslambdaevents.v2_2.AwsLambdaWrapperTest$TestRequestHandlerString::handleRequest")
void handlerTracedWithException() {
TracingRequestWrapper wrapper =
- new TracingRequestWrapper(
- testing.getOpenTelemetrySdk(),
- WrappedLambda.fromConfiguration(),
- TracingRequestWrapper::map);
+ new TracingRequestWrapper(testing.getOpenTelemetrySdk(), WrappedLambda.fromConfiguration());
Throwable thrown = catchThrowable(() -> wrapper.handleRequest("goodbye", context));
assertThat(thrown).isInstanceOf(IllegalArgumentException.class);
@@ -112,12 +107,9 @@ void handlerTracedWithException() {
key = WrappedLambda.OTEL_LAMBDA_HANDLER_ENV_KEY,
value =
"io.opentelemetry.instrumentation.awslambdaevents.v2_2.AwsLambdaWrapperTest$TestRequestHandlerInteger::handleRequest")
- void handlerTraced_integer() {
+ void handlerTraced_integer() throws IOException {
TracingRequestWrapper wrapper =
- new TracingRequestWrapper(
- testing.getOpenTelemetrySdk(),
- WrappedLambda.fromConfiguration(),
- TracingRequestWrapper::map);
+ new TracingRequestWrapper(testing.getOpenTelemetrySdk(), WrappedLambda.fromConfiguration());
Object result = wrapper.handleRequest(1, context);
assertThat(result).isEqualTo("world");
@@ -140,12 +132,9 @@ void handlerTraced_integer() {
key = WrappedLambda.OTEL_LAMBDA_HANDLER_ENV_KEY,
value =
"io.opentelemetry.instrumentation.awslambdaevents.v2_2.AwsLambdaWrapperTest$TestRequestHandlerCustomType::handleRequest")
- void handlerTraced_custom() {
+ void handlerTraced_custom() throws IOException {
TracingRequestWrapper wrapper =
- new TracingRequestWrapper(
- testing.getOpenTelemetrySdk(),
- WrappedLambda.fromConfiguration(),
- TracingRequestWrapper::map);
+ new TracingRequestWrapper(testing.getOpenTelemetrySdk(), WrappedLambda.fromConfiguration());
CustomType ct = new CustomType();
ct.key = "hello there";
ct.value = "General Kenobi";
@@ -188,9 +177,28 @@ public String handleRequest(Integer input, Context context) {
}
}
+ @SuppressWarnings("UnusedMethod")
private static class CustomType {
String key;
String value;
+
+ // Need getter/setter of all the attributes for serialization/deserialization
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
}
public static final class TestRequestHandlerCustomType
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParametersTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParametersTest.java
index 2bf8357f4334..f738b5a34932 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParametersTest.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/LambdaParametersTest.java
@@ -9,6 +9,8 @@
import static org.mockito.Mockito.mock;
import com.amazonaws.services.lambda.runtime.Context;
+import io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal.SerializationUtil;
+import java.io.ByteArrayInputStream;
import java.lang.reflect.Method;
import org.junit.jupiter.api.Test;
@@ -16,6 +18,10 @@ class LambdaParametersTest {
public void onlyContext(Context context) {}
+ public void noContext(String one) {}
+
+ public void contextOnSecond(String one, Context context) {}
+
public void contextOnThird(String one, String two, Context context) {}
@Test
@@ -30,6 +36,31 @@ void shouldSetContextOnFirstPosition() throws NoSuchMethodException {
assertThat(params[0]).isEqualTo(context);
}
+ @Test
+ void shouldOnlySetInputWhenNoContext() throws NoSuchMethodException {
+ // given
+ Context context = mock(Context.class);
+ Method method = getClass().getMethod("noContext", String.class);
+ // when
+ Object[] params = LambdaParameters.toArray(method, "", context, (o, c) -> o);
+ // then
+ assertThat(params).hasSize(1);
+ assertThat(params[0]).isEqualTo("");
+ }
+
+ @Test
+ void shouldSetContextOnTheSecondPosition() throws NoSuchMethodException {
+ // given
+ Context context = mock(Context.class);
+ Method method = getClass().getMethod("contextOnSecond", String.class, Context.class);
+ // when
+ Object[] params = LambdaParameters.toArray(method, "", context, (o, c) -> o);
+ // then
+ assertThat(params).hasSize(2);
+ assertThat(params[0]).isEqualTo("");
+ assertThat(params[1]).isEqualTo(context);
+ }
+
@Test
void shouldSetContextOnTheLastPosition() throws NoSuchMethodException {
// given
@@ -44,4 +75,103 @@ void shouldSetContextOnTheLastPosition() throws NoSuchMethodException {
assertThat(params[1]).isNull();
assertThat(params[2]).isEqualTo(context);
}
+
+ @Test
+ void shouldNotResolveInputWhenNoInput() throws NoSuchMethodException {
+ // given
+ Method method = getClass().getMethod("onlyContext", Context.class);
+ String giveInput = "testInput";
+ // when
+ Object resolvedInput =
+ LambdaParameters.toInput(
+ method,
+ new ByteArrayInputStream(SerializationUtil.toJsonData(giveInput)),
+ (i, c) -> SerializationUtil.fromJson(i, c));
+ // then
+ assertThat(resolvedInput).isNull();
+ }
+
+ @Test
+ void shouldResolveInputWithContext() throws NoSuchMethodException {
+ // given
+ Method method = getClass().getMethod("contextOnSecond", String.class, Context.class);
+ String givenInput = "testInput";
+ // when
+ Object resolvedInput =
+ LambdaParameters.toInput(
+ method,
+ new ByteArrayInputStream(SerializationUtil.toJsonData(givenInput)),
+ (i, c) -> SerializationUtil.fromJson(i, c));
+ // then
+ assertThat(resolvedInput).isNotNull();
+ assertThat(resolvedInput).isEqualTo(givenInput);
+ }
+
+ @Test
+ void shouldResolveInputWithoutContext() throws NoSuchMethodException {
+ // given
+ Method method = getClass().getMethod("noContext", String.class);
+ String givenInput = "testInput";
+ // when
+ Object resolvedInput =
+ LambdaParameters.toInput(
+ method,
+ new ByteArrayInputStream(SerializationUtil.toJsonData(givenInput)),
+ (i, c) -> SerializationUtil.fromJson(i, c));
+ // then
+ assertThat(resolvedInput).isNotNull();
+ assertThat(resolvedInput).isEqualTo(givenInput);
+ }
+
+ @Test
+ void shouldResolveParametersWhenOnlyContext() throws NoSuchMethodException {
+ // given
+ Context context = mock(Context.class);
+ Method method = getClass().getMethod("onlyContext", Context.class);
+ // when
+ Object[] params = LambdaParameters.toParameters(method, "", context);
+ // then
+ assertThat(params).hasSize(1);
+ assertThat(params[0]).isEqualTo(context);
+ }
+
+ @Test
+ void shouldResolveParametersWhenNoContext() throws NoSuchMethodException {
+ // given
+ Context context = mock(Context.class);
+ Method method = getClass().getMethod("noContext", String.class);
+ // when
+ Object[] params = LambdaParameters.toParameters(method, "", context);
+ // then
+ assertThat(params).hasSize(1);
+ assertThat(params[0]).isEqualTo("");
+ }
+
+ @Test
+ void shouldResolveParametersWhenContextOnTheSecondPosition() throws NoSuchMethodException {
+ // given
+ Context context = mock(Context.class);
+ Method method = getClass().getMethod("contextOnSecond", String.class, Context.class);
+ // when
+ Object[] params = LambdaParameters.toParameters(method, "", context);
+ // then
+ assertThat(params).hasSize(2);
+ assertThat(params[0]).isEqualTo("");
+ assertThat(params[1]).isEqualTo(context);
+ }
+
+ @Test
+ void shouldResolveParametersWhenContextOnTheLastPosition() throws NoSuchMethodException {
+ // given
+ Context context = mock(Context.class);
+ Method method =
+ getClass().getMethod("contextOnThird", String.class, String.class, Context.class);
+ // when
+ Object[] params = LambdaParameters.toParameters(method, "", context);
+ // then
+ assertThat(params).hasSize(3);
+ assertThat(params[0]).isEqualTo("");
+ assertThat(params[1]).isNull();
+ assertThat(params[2]).isEqualTo(context);
+ }
}
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperStandardEventsTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperStandardEventsTest.java
index 620d084a1b04..c25d911ed1cb 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperStandardEventsTest.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperStandardEventsTest.java
@@ -5,7 +5,7 @@
package io.opentelemetry.instrumentation.awslambdaevents.v2_2;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import com.amazonaws.services.lambda.runtime.Context;
@@ -15,198 +15,215 @@
import com.amazonaws.services.lambda.runtime.events.SNSEvent;
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
import com.amazonaws.services.lambda.runtime.events.ScheduledEvent;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda;
+import io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal.SerializationUtil;
import io.opentelemetry.sdk.OpenTelemetrySdk;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
class TracingRequestWrapperStandardEventsTest {
- private static final String SUCCESS = "success";
- private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
- private static final Map, String> EVENTS_JSON = buildEventExamples();
+ private static final Map, EventInfo> EVENTS_JSON = buildEventExamples();
private final OpenTelemetrySdk sdk = OpenTelemetrySdk.builder().build();
private final Context context = mock(Context.class);
private TracingRequestWrapper wrapper;
- private static Map, String> buildEventExamples() {
- Map, String> events = new HashMap<>();
+ static final class EventInfo {
+ final Class eventType;
+ final String eventBody;
+
+ EventInfo(Class eventType, String eventBody) {
+ this.eventType = eventType;
+ this.eventBody = eventBody;
+ }
+ }
+
+ private static Map, EventInfo> buildEventExamples() {
+ Map, EventInfo> events = new HashMap<>();
events.put(
ScheduledEventRequestHandler.class,
- "{\n"
- + " \"version\": \"0\",\n"
- + " \"id\": \"53dc4d37-cffa-4f76-80c9-8b7d4a4d2eaa\",\n"
- + " \"detail-type\": \"Scheduled Event\",\n"
- + " \"source\": \"aws.events\",\n"
- + " \"account\": \"123456789012\",\n"
- + " \"time\": \"2015-10-08T16:53:06Z\",\n"
- + " \"region\": \"us-east-1\",\n"
- + " \"resources\": [\n"
- + " \"arn:aws:events:us-east-1:123456789012:rule/my-scheduled-rule\"\n"
- + " ],\n"
- + " \"detail\": {}\n"
- + "}");
+ new EventInfo(
+ ScheduledEvent.class,
+ "{\n"
+ + " \"version\": \"0\",\n"
+ + " \"id\": \"53dc4d37-cffa-4f76-80c9-8b7d4a4d2eaa\",\n"
+ + " \"detail-type\": \"Scheduled Event\",\n"
+ + " \"source\": \"aws.events\",\n"
+ + " \"account\": \"123456789012\",\n"
+ + " \"time\": \"2015-10-08T16:53:06Z\",\n"
+ + " \"region\": \"us-east-1\",\n"
+ + " \"resources\": [\n"
+ + " \"arn:aws:events:us-east-1:123456789012:rule/my-scheduled-rule\"\n"
+ + " ],\n"
+ + " \"detail\": {}\n"
+ + "}"));
events.put(
KinesisEventRequestHandler.class,
- "{\n"
- + " \"Records\": [\n"
- + " {\n"
- + " \"kinesis\": {\n"
- + " \"kinesisSchemaVersion\": \"1.0\",\n"
- + " \"partitionKey\": \"1\",\n"
- + " \"sequenceNumber\": \"49590338271490256608559692538361571095921575989136588898\",\n"
- + " \"data\": \"SGVsbG8sIHRoaXMgaXMgYSB0ZXN0Lg==\",\n"
- + " \"approximateArrivalTimestamp\": 1545084650.987\n"
- + " },\n"
- + " \"eventSource\": \"aws:kinesis\",\n"
- + " \"eventVersion\": \"1.0\",\n"
- + " \"eventID\": \"shardId-000000000006:49590338271490256608559692538361571095921575989136588898\",\n"
- + " \"eventName\": \"aws:kinesis:record\",\n"
- + " \"invokeIdentityArn\": \"arn:aws:iam::123456789012:role/lambda-role\",\n"
- + " \"awsRegion\": \"us-east-2\",\n"
- + " \"eventSourceARN\": \"arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream\"\n"
- + " },\n"
- + " {\n"
- + " \"kinesis\": {\n"
- + " \"kinesisSchemaVersion\": \"1.0\",\n"
- + " \"partitionKey\": \"1\",\n"
- + " \"sequenceNumber\": \"49590338271490256608559692540925702759324208523137515618\",\n"
- + " \"data\": \"VGhpcyBpcyBvbmx5IGEgdGVzdC4=\",\n"
- + " \"approximateArrivalTimestamp\": 1545084711.166\n"
- + " },\n"
- + " \"eventSource\": \"aws:kinesis\",\n"
- + " \"eventVersion\": \"1.0\",\n"
- + " \"eventID\": \"shardId-000000000006:49590338271490256608559692540925702759324208523137515618\",\n"
- + " \"eventName\": \"aws:kinesis:record\",\n"
- + " \"invokeIdentityArn\": \"arn:aws:iam::123456789012:role/lambda-role\",\n"
- + " \"awsRegion\": \"us-east-2\",\n"
- + " \"eventSourceARN\": \"arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream\"\n"
- + " }\n"
- + " ]\n"
- + "}");
+ new EventInfo(
+ KinesisEvent.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"kinesis\": {\n"
+ + " \"kinesisSchemaVersion\": \"1.0\",\n"
+ + " \"partitionKey\": \"1\",\n"
+ + " \"sequenceNumber\": \"49590338271490256608559692538361571095921575989136588898\",\n"
+ + " \"data\": \"SGVsbG8sIHRoaXMgaXMgYSB0ZXN0Lg==\",\n"
+ + " \"approximateArrivalTimestamp\": 1545084650.987\n"
+ + " },\n"
+ + " \"eventSource\": \"aws:kinesis\",\n"
+ + " \"eventVersion\": \"1.0\",\n"
+ + " \"eventID\": \"shardId-000000000006:49590338271490256608559692538361571095921575989136588898\",\n"
+ + " \"eventName\": \"aws:kinesis:record\",\n"
+ + " \"invokeIdentityArn\": \"arn:aws:iam::123456789012:role/lambda-role\",\n"
+ + " \"awsRegion\": \"us-east-2\",\n"
+ + " \"eventSourceARN\": \"arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream\"\n"
+ + " },\n"
+ + " {\n"
+ + " \"kinesis\": {\n"
+ + " \"kinesisSchemaVersion\": \"1.0\",\n"
+ + " \"partitionKey\": \"1\",\n"
+ + " \"sequenceNumber\": \"49590338271490256608559692540925702759324208523137515618\",\n"
+ + " \"data\": \"VGhpcyBpcyBvbmx5IGEgdGVzdC4=\",\n"
+ + " \"approximateArrivalTimestamp\": 1545084711.166\n"
+ + " },\n"
+ + " \"eventSource\": \"aws:kinesis\",\n"
+ + " \"eventVersion\": \"1.0\",\n"
+ + " \"eventID\": \"shardId-000000000006:49590338271490256608559692540925702759324208523137515618\",\n"
+ + " \"eventName\": \"aws:kinesis:record\",\n"
+ + " \"invokeIdentityArn\": \"arn:aws:iam::123456789012:role/lambda-role\",\n"
+ + " \"awsRegion\": \"us-east-2\",\n"
+ + " \"eventSourceARN\": \"arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream\"\n"
+ + " }\n"
+ + " ]\n"
+ + "}"));
events.put(
SqsEventRequestHandler.class,
- "{\n"
- + " \"Records\": [\n"
- + " {\n"
- + " \"messageId\": \"059f36b4-87a3-44ab-83d2-661975830a7d\",\n"
- + " \"receiptHandle\": \"AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...\",\n"
- + " \"body\": \"Test message.\",\n"
- + " \"attributes\": {\n"
- + " \"ApproximateReceiveCount\": \"1\",\n"
- + " \"SentTimestamp\": \"1545082649183\",\n"
- + " \"SenderId\": \"AIDAIENQZJOLO23YVJ4VO\",\n"
- + " \"ApproximateFirstReceiveTimestamp\": \"1545082649185\"\n"
- + " },\n"
- + " \"messageAttributes\": {},\n"
- + " \"md5OfBody\": \"e4e68fb7bd0e697a0ae8f1bb342846b3\",\n"
- + " \"eventSource\": \"aws:sqs\",\n"
- + " \"eventSourceARN\": \"arn:aws:sqs:us-east-2:123456789012:my-queue\",\n"
- + " \"awsRegion\": \"us-east-2\"\n"
- + " },\n"
- + " {\n"
- + " \"messageId\": \"2e1424d4-f796-459a-8184-9c92662be6da\",\n"
- + " \"receiptHandle\": \"AQEBzWwaftRI0KuVm4tP+/7q1rGgNqicHq...\",\n"
- + " \"body\": \"Test message.\",\n"
- + " \"attributes\": {\n"
- + " \"ApproximateReceiveCount\": \"1\",\n"
- + " \"SentTimestamp\": \"1545082650636\",\n"
- + " \"SenderId\": \"AIDAIENQZJOLO23YVJ4VO\",\n"
- + " \"ApproximateFirstReceiveTimestamp\": \"1545082650649\"\n"
- + " },\n"
- + " \"messageAttributes\": {},\n"
- + " \"md5OfBody\": \"e4e68fb7bd0e697a0ae8f1bb342846b3\",\n"
- + " \"eventSource\": \"aws:sqs\",\n"
- + " \"eventSourceARN\": \"arn:aws:sqs:us-east-2:123456789012:my-queue\",\n"
- + " \"awsRegion\": \"us-east-2\"\n"
- + " }\n"
- + " ]\n"
- + "}");
+ new EventInfo(
+ SQSEvent.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"messageId\": \"059f36b4-87a3-44ab-83d2-661975830a7d\",\n"
+ + " \"receiptHandle\": \"AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...\",\n"
+ + " \"body\": \"Test message.\",\n"
+ + " \"attributes\": {\n"
+ + " \"ApproximateReceiveCount\": \"1\",\n"
+ + " \"SentTimestamp\": \"1545082649183\",\n"
+ + " \"SenderId\": \"AIDAIENQZJOLO23YVJ4VO\",\n"
+ + " \"ApproximateFirstReceiveTimestamp\": \"1545082649185\"\n"
+ + " },\n"
+ + " \"messageAttributes\": {},\n"
+ + " \"md5OfBody\": \"e4e68fb7bd0e697a0ae8f1bb342846b3\",\n"
+ + " \"eventSource\": \"aws:sqs\",\n"
+ + " \"eventSourceARN\": \"arn:aws:sqs:us-east-2:123456789012:my-queue\",\n"
+ + " \"awsRegion\": \"us-east-2\"\n"
+ + " },\n"
+ + " {\n"
+ + " \"messageId\": \"2e1424d4-f796-459a-8184-9c92662be6da\",\n"
+ + " \"receiptHandle\": \"AQEBzWwaftRI0KuVm4tP+/7q1rGgNqicHq...\",\n"
+ + " \"body\": \"Test message.\",\n"
+ + " \"attributes\": {\n"
+ + " \"ApproximateReceiveCount\": \"1\",\n"
+ + " \"SentTimestamp\": \"1545082650636\",\n"
+ + " \"SenderId\": \"AIDAIENQZJOLO23YVJ4VO\",\n"
+ + " \"ApproximateFirstReceiveTimestamp\": \"1545082650649\"\n"
+ + " },\n"
+ + " \"messageAttributes\": {},\n"
+ + " \"md5OfBody\": \"e4e68fb7bd0e697a0ae8f1bb342846b3\",\n"
+ + " \"eventSource\": \"aws:sqs\",\n"
+ + " \"eventSourceARN\": \"arn:aws:sqs:us-east-2:123456789012:my-queue\",\n"
+ + " \"awsRegion\": \"us-east-2\"\n"
+ + " }\n"
+ + " ]\n"
+ + "}"));
events.put(
S3EventRequestHandler.class,
- "{\n"
- + " \"Records\": [\n"
- + " {\n"
- + " \"eventVersion\": \"2.1\",\n"
- + " \"eventSource\": \"aws:s3\",\n"
- + " \"awsRegion\": \"us-east-2\",\n"
- + " \"eventTime\": \"2019-09-03T19:37:27.192Z\",\n"
- + " \"eventName\": \"ObjectCreated:Put\",\n"
- + " \"userIdentity\": {\n"
- + " \"principalId\": \"AWS:AIDAINPONIXQXHT3IKHL2\"\n"
- + " },\n"
- + " \"requestParameters\": {\n"
- + " \"sourceIPAddress\": \"205.255.255.255\"\n"
- + " },\n"
- + " \"responseElements\": {\n"
- + " \"x-amz-request-id\": \"D82B88E5F771F645\",\n"
- + " \"x-amz-id-2\": \"vlR7PnpV2Ce81l0PRw6jlUpck7Jo5ZsQjryTjKlc5aLWGVHPZLj5NeC6qMa0emYBDXOo6QBU0Wo=\"\n"
- + " },\n"
- + " \"s3\": {\n"
- + " \"s3SchemaVersion\": \"1.0\",\n"
- + " \"configurationId\": \"828aa6fc-f7b5-4305-8584-487c791949c1\",\n"
- + " \"bucket\": {\n"
- + " \"name\": \"DOC-EXAMPLE-BUCKET\",\n"
- + " \"ownerIdentity\": {\n"
- + " \"principalId\": \"A3I5XTEXAMAI3E\"\n"
- + " },\n"
- + " \"arn\": \"arn:aws:s3:::lambda-artifacts-deafc19498e3f2df\"\n"
- + " },\n"
- + " \"object\": {\n"
- + " \"key\": \"b21b84d653bb07b05b1e6b33684dc11b\",\n"
- + " \"size\": 1305107,\n"
- + " \"eTag\": \"b21b84d653bb07b05b1e6b33684dc11b\",\n"
- + " \"sequencer\": \"0C0F6F405D6ED209E1\"\n"
- + " }\n"
- + " }\n"
- + " }\n"
- + " ]\n"
- + "}");
+ new EventInfo(
+ S3Event.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"eventVersion\": \"2.1\",\n"
+ + " \"eventSource\": \"aws:s3\",\n"
+ + " \"awsRegion\": \"us-east-2\",\n"
+ + " \"eventTime\": \"2019-09-03T19:37:27.192Z\",\n"
+ + " \"eventName\": \"ObjectCreated:Put\",\n"
+ + " \"userIdentity\": {\n"
+ + " \"principalId\": \"AWS:AIDAINPONIXQXHT3IKHL2\"\n"
+ + " },\n"
+ + " \"requestParameters\": {\n"
+ + " \"sourceIPAddress\": \"205.255.255.255\"\n"
+ + " },\n"
+ + " \"responseElements\": {\n"
+ + " \"x-amz-request-id\": \"D82B88E5F771F645\",\n"
+ + " \"x-amz-id-2\": \"vlR7PnpV2Ce81l0PRw6jlUpck7Jo5ZsQjryTjKlc5aLWGVHPZLj5NeC6qMa0emYBDXOo6QBU0Wo=\"\n"
+ + " },\n"
+ + " \"s3\": {\n"
+ + " \"s3SchemaVersion\": \"1.0\",\n"
+ + " \"configurationId\": \"828aa6fc-f7b5-4305-8584-487c791949c1\",\n"
+ + " \"bucket\": {\n"
+ + " \"name\": \"DOC-EXAMPLE-BUCKET\",\n"
+ + " \"ownerIdentity\": {\n"
+ + " \"principalId\": \"A3I5XTEXAMAI3E\"\n"
+ + " },\n"
+ + " \"arn\": \"arn:aws:s3:::lambda-artifacts-deafc19498e3f2df\"\n"
+ + " },\n"
+ + " \"object\": {\n"
+ + " \"key\": \"b21b84d653bb07b05b1e6b33684dc11b\",\n"
+ + " \"size\": 1305107,\n"
+ + " \"eTag\": \"b21b84d653bb07b05b1e6b33684dc11b\",\n"
+ + " \"sequencer\": \"0C0F6F405D6ED209E1\"\n"
+ + " }\n"
+ + " }\n"
+ + " }\n"
+ + " ]\n"
+ + "}"));
events.put(
SnsEventRequestHandler.class,
- "{\n"
- + " \"Records\": [\n"
- + " {\n"
- + " \"EventVersion\": \"1.0\",\n"
- + " \"EventSubscriptionArn\": \"arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486\",\n"
- + " \"EventSource\": \"aws:sns\",\n"
- + " \"Sns\": {\n"
- + " \"SignatureVersion\": \"1\",\n"
- + " \"Timestamp\": \"2019-01-02T12:45:07.000Z\",\n"
- + " \"Signature\": \"tcc6faL2yUC6dgZdmrwh1Y4cGa/ebXEkAi6RibDsvpi+tE/1+82j...65r==\",\n"
- + " \"SigningCertUrl\": \"https://sns.us-east-2.amazonaws.com/SimpleNotificationService-ac565b8b1a6c5d002d285f9598aa1d9b.pem\",\n"
- + " \"MessageId\": \"95df01b4-ee98-5cb9-9903-4c221d41eb5e\",\n"
- + " \"Message\": \"Hello from SNS!\",\n"
- + " \"MessageAttributes\": {\n"
- + " \"Test\": {\n"
- + " \"Type\": \"String\",\n"
- + " \"Value\": \"TestString\"\n"
- + " },\n"
- + " \"TestBinary\": {\n"
- + " \"Type\": \"Binary\",\n"
- + " \"Value\": \"TestBinary\"\n"
- + " }\n"
- + " },\n"
- + " \"Type\": \"Notification\",\n"
- + " \"UnsubscribeUrl\": \"https://sns.us-east-2.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-2:123456789012:test-lambda:21be56ed-a058-49f5-8c98-aedd2564c486\",\n"
- + " \"TopicArn\":\"arn:aws:sns:us-east-2:123456789012:sns-lambda\",\n"
- + " \"Subject\": \"TestInvoke\"\n"
- + " }\n"
- + " }\n"
- + " ]\n"
- + "}");
-
+ new EventInfo(
+ SNSEvent.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"EventVersion\": \"1.0\",\n"
+ + " \"EventSubscriptionArn\": \"arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486\",\n"
+ + " \"EventSource\": \"aws:sns\",\n"
+ + " \"Sns\": {\n"
+ + " \"SignatureVersion\": \"1\",\n"
+ + " \"Timestamp\": \"2019-01-02T12:45:07.000Z\",\n"
+ + " \"Signature\": \"tcc6faL2yUC6dgZdmrwh1Y4cGa/ebXEkAi6RibDsvpi+tE/1+82j...65r==\",\n"
+ + " \"SigningCertUrl\": \"https://sns.us-east-2.amazonaws.com/SimpleNotificationService-ac565b8b1a6c5d002d285f9598aa1d9b.pem\",\n"
+ + " \"MessageId\": \"95df01b4-ee98-5cb9-9903-4c221d41eb5e\",\n"
+ + " \"Message\": \"Hello from SNS!\",\n"
+ + " \"MessageAttributes\": {\n"
+ + " \"Test\": {\n"
+ + " \"Type\": \"String\",\n"
+ + " \"Value\": \"TestString\"\n"
+ + " },\n"
+ + " \"TestBinary\": {\n"
+ + " \"Type\": \"Binary\",\n"
+ + " \"Value\": \"TestBinary\"\n"
+ + " }\n"
+ + " },\n"
+ + " \"Type\": \"Notification\",\n"
+ + " \"UnsubscribeUrl\": \"https://sns.us-east-2.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-2:123456789012:test-lambda:21be56ed-a058-49f5-8c98-aedd2564c486\",\n"
+ + " \"TopicArn\":\"arn:aws:sns:us-east-2:123456789012:sns-lambda\",\n"
+ + " \"Subject\": \"TestInvoke\"\n"
+ + " }\n"
+ + " }\n"
+ + " ]\n"
+ + "}"));
return events;
}
private TracingRequestWrapper buildWrapper(Class targetClass) {
WrappedLambda wrappedLambda = new WrappedLambda(targetClass, "handleRequest");
- return new TracingRequestWrapper(sdk, wrappedLambda, TracingRequestWrapper::map);
+ return new TracingRequestWrapper(sdk, wrappedLambda);
}
@ParameterizedTest
@@ -218,46 +235,61 @@ private TracingRequestWrapper buildWrapper(Class targetClass) {
S3EventRequestHandler.class,
SnsEventRequestHandler.class
})
- void handleScheduledEvent(Class targetClass) throws JsonProcessingException {
+ void handleLambdaEvent(Class targetClass) throws IOException {
wrapper = buildWrapper(targetClass);
- Object parsedScheduledEvent =
- OBJECT_MAPPER.readValue(EVENTS_JSON.get(targetClass), Object.class);
- assertEquals(SUCCESS, wrapper.doHandleRequest(parsedScheduledEvent, context));
+ EventInfo eventInfo = EVENTS_JSON.get(targetClass);
+
+ Object input = SerializationUtil.fromJson(eventInfo.eventBody, eventInfo.eventType);
+
+ // Call to object based "O handleRequest(I input, Context context)" method
+ // delegates to the stream based
+ // "handleRequest(InputStream input, OutputStream output, Context context)" method.
+ // So serialization/deserialization of both input and outputs are triggered to be verified here.
+ Object output = wrapper.handleRequest(input, context);
+
+ assertThat(input.getClass()).isEqualTo(output.getClass());
+
+ // "equals" methods are not properly implemented of Lambda events,
+ // so we are comparing them over their serialized json data
+ String inputJson = SerializationUtil.toJson(input);
+ String outputJson = SerializationUtil.toJson(output);
+ assertThat(inputJson).isEqualTo(outputJson);
}
public static class ScheduledEventRequestHandler
- implements RequestHandler {
+ implements RequestHandler {
@Override
- public String handleRequest(ScheduledEvent i, Context cntxt) {
- return SUCCESS;
+ public ScheduledEvent handleRequest(ScheduledEvent i, Context cntxt) {
+ return i;
}
}
- public static class KinesisEventRequestHandler implements RequestHandler {
+ public static class KinesisEventRequestHandler
+ implements RequestHandler {
@Override
- public String handleRequest(KinesisEvent i, Context cntxt) {
- return SUCCESS;
+ public KinesisEvent handleRequest(KinesisEvent i, Context cntxt) {
+ return i;
}
}
- public static class SqsEventRequestHandler implements RequestHandler {
+ public static class SqsEventRequestHandler implements RequestHandler {
@Override
- public String handleRequest(SQSEvent i, Context cntxt) {
- return SUCCESS;
+ public SQSEvent handleRequest(SQSEvent i, Context cntxt) {
+ return i;
}
}
- public static class S3EventRequestHandler implements RequestHandler {
+ public static class S3EventRequestHandler implements RequestHandler {
@Override
- public String handleRequest(S3Event i, Context cntxt) {
- return SUCCESS;
+ public S3Event handleRequest(S3Event i, Context cntxt) {
+ return i;
}
}
- public static class SnsEventRequestHandler implements RequestHandler {
+ public static class SnsEventRequestHandler implements RequestHandler {
@Override
- public String handleRequest(SNSEvent i, Context cntxt) {
- return SUCCESS;
+ public SNSEvent handleRequest(SNSEvent i, Context cntxt) {
+ return i;
}
}
}
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SerializationUtilTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SerializationUtilTest.java
new file mode 100644
index 000000000000..7711d15779c3
--- /dev/null
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SerializationUtilTest.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awslambdaevents.v2_2.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
+import com.amazonaws.services.lambda.runtime.events.S3Event;
+import com.amazonaws.services.lambda.runtime.events.SNSEvent;
+import com.amazonaws.services.lambda.runtime.events.SQSEvent;
+import com.amazonaws.services.lambda.runtime.events.ScheduledEvent;
+import com.amazonaws.services.lambda.runtime.events.models.s3.S3EventNotification;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import org.joda.time.DateTime;
+import org.junit.jupiter.api.Test;
+
+public class SerializationUtilTest {
+
+ private static final Map, String> events = buildEventExamples();
+
+ private static Map, String> buildEventExamples() {
+ Map, String> events = new HashMap<>();
+ events.put(
+ ScheduledEvent.class,
+ "{\n"
+ + " \"version\": \"0\",\n"
+ + " \"id\": \"53dc4d37-cffa-4f76-80c9-8b7d4a4d2eaa\",\n"
+ + " \"detail-type\": \"Scheduled Event\",\n"
+ + " \"source\": \"aws.events\",\n"
+ + " \"account\": \"123456789012\",\n"
+ + " \"time\": \"2015-10-08T16:53:06Z\",\n"
+ + " \"region\": \"us-east-1\",\n"
+ + " \"resources\": [\n"
+ + " \"arn:aws:events:us-east-1:123456789012:rule/my-scheduled-rule\"\n"
+ + " ],\n"
+ + " \"detail\": {}\n"
+ + "}");
+ events.put(
+ KinesisEvent.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"kinesis\": {\n"
+ + " \"kinesisSchemaVersion\": \"1.0\",\n"
+ + " \"partitionKey\": \"1\",\n"
+ + " \"sequenceNumber\": \"49590338271490256608559692538361571095921575989136588898\",\n"
+ + " \"data\": \"SGVsbG8sIHRoaXMgaXMgYSB0ZXN0Lg==\",\n"
+ + " \"approximateArrivalTimestamp\": 1545084650.987\n"
+ + " },\n"
+ + " \"eventSource\": \"aws:kinesis\",\n"
+ + " \"eventVersion\": \"1.0\",\n"
+ + " \"eventID\": \"shardId-000000000006:49590338271490256608559692538361571095921575989136588898\",\n"
+ + " \"eventName\": \"aws:kinesis:record\",\n"
+ + " \"invokeIdentityArn\": \"arn:aws:iam::123456789012:role/lambda-role\",\n"
+ + " \"awsRegion\": \"us-east-2\",\n"
+ + " \"eventSourceARN\": \"arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream\"\n"
+ + " },\n"
+ + " {\n"
+ + " \"kinesis\": {\n"
+ + " \"kinesisSchemaVersion\": \"1.0\",\n"
+ + " \"partitionKey\": \"1\",\n"
+ + " \"sequenceNumber\": \"49590338271490256608559692540925702759324208523137515618\",\n"
+ + " \"data\": \"VGhpcyBpcyBvbmx5IGEgdGVzdC4=\",\n"
+ + " \"approximateArrivalTimestamp\": 1545084711.166\n"
+ + " },\n"
+ + " \"eventSource\": \"aws:kinesis\",\n"
+ + " \"eventVersion\": \"1.0\",\n"
+ + " \"eventID\": \"shardId-000000000006:49590338271490256608559692540925702759324208523137515618\",\n"
+ + " \"eventName\": \"aws:kinesis:record\",\n"
+ + " \"invokeIdentityArn\": \"arn:aws:iam::123456789012:role/lambda-role\",\n"
+ + " \"awsRegion\": \"us-east-2\",\n"
+ + " \"eventSourceARN\": \"arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream\"\n"
+ + " }\n"
+ + " ]\n"
+ + "}");
+ events.put(
+ SQSEvent.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"messageId\": \"059f36b4-87a3-44ab-83d2-661975830a7d\",\n"
+ + " \"receiptHandle\": \"AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...\",\n"
+ + " \"body\": \"Test message.\",\n"
+ + " \"attributes\": {\n"
+ + " \"ApproximateReceiveCount\": \"1\",\n"
+ + " \"SentTimestamp\": \"1545082649183\",\n"
+ + " \"SenderId\": \"AIDAIENQZJOLO23YVJ4VO\",\n"
+ + " \"ApproximateFirstReceiveTimestamp\": \"1545082649185\"\n"
+ + " },\n"
+ + " \"messageAttributes\": {},\n"
+ + " \"md5OfBody\": \"e4e68fb7bd0e697a0ae8f1bb342846b3\",\n"
+ + " \"eventSource\": \"aws:sqs\",\n"
+ + " \"eventSourceARN\": \"arn:aws:sqs:us-east-2:123456789012:my-queue\",\n"
+ + " \"awsRegion\": \"us-east-2\"\n"
+ + " },\n"
+ + " {\n"
+ + " \"messageId\": \"2e1424d4-f796-459a-8184-9c92662be6da\",\n"
+ + " \"receiptHandle\": \"AQEBzWwaftRI0KuVm4tP+/7q1rGgNqicHq...\",\n"
+ + " \"body\": \"Test message.\",\n"
+ + " \"attributes\": {\n"
+ + " \"ApproximateReceiveCount\": \"1\",\n"
+ + " \"SentTimestamp\": \"1545082650636\",\n"
+ + " \"SenderId\": \"AIDAIENQZJOLO23YVJ4VO\",\n"
+ + " \"ApproximateFirstReceiveTimestamp\": \"1545082650649\"\n"
+ + " },\n"
+ + " \"messageAttributes\": {},\n"
+ + " \"md5OfBody\": \"e4e68fb7bd0e697a0ae8f1bb342846b3\",\n"
+ + " \"eventSource\": \"aws:sqs\",\n"
+ + " \"eventSourceARN\": \"arn:aws:sqs:us-east-2:123456789012:my-queue\",\n"
+ + " \"awsRegion\": \"us-east-2\"\n"
+ + " }\n"
+ + " ]\n"
+ + "}");
+ events.put(
+ S3Event.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"eventVersion\": \"2.1\",\n"
+ + " \"eventSource\": \"aws:s3\",\n"
+ + " \"awsRegion\": \"us-east-2\",\n"
+ + " \"eventTime\": \"2019-09-03T19:37:27.192Z\",\n"
+ + " \"eventName\": \"ObjectCreated:Put\",\n"
+ + " \"userIdentity\": {\n"
+ + " \"principalId\": \"AWS:AIDAINPONIXQXHT3IKHL2\"\n"
+ + " },\n"
+ + " \"requestParameters\": {\n"
+ + " \"sourceIPAddress\": \"205.255.255.255\"\n"
+ + " },\n"
+ + " \"responseElements\": {\n"
+ + " \"x-amz-request-id\": \"D82B88E5F771F645\",\n"
+ + " \"x-amz-id-2\": \"vlR7PnpV2Ce81l0PRw6jlUpck7Jo5ZsQjryTjKlc5aLWGVHPZLj5NeC6qMa0emYBDXOo6QBU0Wo=\"\n"
+ + " },\n"
+ + " \"s3\": {\n"
+ + " \"s3SchemaVersion\": \"1.0\",\n"
+ + " \"configurationId\": \"828aa6fc-f7b5-4305-8584-487c791949c1\",\n"
+ + " \"bucket\": {\n"
+ + " \"name\": \"DOC-EXAMPLE-BUCKET\",\n"
+ + " \"ownerIdentity\": {\n"
+ + " \"principalId\": \"A3I5XTEXAMAI3E\"\n"
+ + " },\n"
+ + " \"arn\": \"arn:aws:s3:::lambda-artifacts-deafc19498e3f2df\"\n"
+ + " },\n"
+ + " \"object\": {\n"
+ + " \"key\": \"b21b84d653bb07b05b1e6b33684dc11b\",\n"
+ + " \"size\": 1305107,\n"
+ + " \"eTag\": \"b21b84d653bb07b05b1e6b33684dc11b\",\n"
+ + " \"sequencer\": \"0C0F6F405D6ED209E1\"\n"
+ + " }\n"
+ + " }\n"
+ + " }\n"
+ + " ]\n"
+ + "}");
+ events.put(
+ SNSEvent.class,
+ "{\n"
+ + " \"Records\": [\n"
+ + " {\n"
+ + " \"EventVersion\": \"1.0\",\n"
+ + " \"EventSubscriptionArn\": \"arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486\",\n"
+ + " \"EventSource\": \"aws:sns\",\n"
+ + " \"Sns\": {\n"
+ + " \"SignatureVersion\": \"1\",\n"
+ + " \"Timestamp\": \"2019-01-02T12:45:07.000Z\",\n"
+ + " \"Signature\": \"tcc6faL2yUC6dgZdmrwh1Y4cGa/ebXEkAi6RibDsvpi+tE/1+82j...65r==\",\n"
+ + " \"SigningCertUrl\": \"https://sns.us-east-2.amazonaws.com/SimpleNotificationService-ac565b8b1a6c5d002d285f9598aa1d9b.pem\",\n"
+ + " \"MessageId\": \"95df01b4-ee98-5cb9-9903-4c221d41eb5e\",\n"
+ + " \"Message\": \"Hello from SNS!\",\n"
+ + " \"MessageAttributes\": {\n"
+ + " \"Test\": {\n"
+ + " \"Type\": \"String\",\n"
+ + " \"Value\": \"TestString\"\n"
+ + " },\n"
+ + " \"TestBinary\": {\n"
+ + " \"Type\": \"Binary\",\n"
+ + " \"Value\": \"TestBinary\"\n"
+ + " }\n"
+ + " },\n"
+ + " \"Type\": \"Notification\",\n"
+ + " \"UnsubscribeUrl\": \"https://sns.us-east-2.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-2:123456789012:test-lambda:21be56ed-a058-49f5-8c98-aedd2564c486\",\n"
+ + " \"TopicArn\":\"arn:aws:sns:us-east-2:123456789012:sns-lambda\",\n"
+ + " \"Subject\": \"TestInvoke\"\n"
+ + " }\n"
+ + " }\n"
+ + " ]\n"
+ + "}");
+ return events;
+ }
+
+ private static void assertScheduledEvent(ScheduledEvent event) {
+ assertThat(event).isNotNull();
+ assertThat(event.getSource()).isEqualTo("aws.events");
+ assertThat(event.getDetailType()).isEqualTo("Scheduled Event");
+ assertThat(event.getAccount()).isEqualTo("123456789012");
+ assertThat(event.getId()).isEqualTo("53dc4d37-cffa-4f76-80c9-8b7d4a4d2eaa");
+ assertThat(event.getRegion()).isEqualTo("us-east-1");
+ assertThat(event.getTime().getMillis())
+ .isEqualTo(new DateTime("2015-10-08T16:53:06Z").getMillis());
+ }
+
+ private static void assertKinesisEvent(KinesisEvent event) {
+ assertThat(event).isNotNull();
+ assertThat(event.getRecords()).isNotNull();
+ assertThat(event.getRecords().size()).isEqualTo(2);
+ KinesisEvent.KinesisEventRecord record = event.getRecords().get(0);
+ assertThat(record.getEventSource()).isEqualTo("aws:kinesis");
+ assertThat(record.getEventSourceARN())
+ .isEqualTo("arn:aws:kinesis:us-east-2:123456789012:stream/lambda-stream");
+ assertThat(record.getEventName()).isEqualTo("aws:kinesis:record");
+ assertThat(record.getEventID())
+ .isEqualTo("shardId-000000000006:49590338271490256608559692538361571095921575989136588898");
+ assertThat(record.getKinesis().getPartitionKey()).isEqualTo("1");
+ assertThat(record.getKinesis().getSequenceNumber())
+ .isEqualTo("49590338271490256608559692538361571095921575989136588898");
+ assertThat(new String(record.getKinesis().getData().array(), StandardCharsets.UTF_8))
+ .isEqualTo("Hello, this is a test.");
+ }
+
+ private static void assertSqsEvent(SQSEvent event) {
+ assertThat(event).isNotNull();
+ assertThat(event.getRecords()).isNotNull();
+ assertThat(event.getRecords().size()).isEqualTo(2);
+ SQSEvent.SQSMessage record = event.getRecords().get(0);
+ assertThat(record.getEventSource()).isEqualTo("aws:sqs");
+ assertThat(record.getEventSourceArn()).isEqualTo("arn:aws:sqs:us-east-2:123456789012:my-queue");
+ assertThat(record.getMessageId()).isEqualTo("059f36b4-87a3-44ab-83d2-661975830a7d");
+ assertThat(record.getBody()).isEqualTo("Test message.");
+ assertThat(record.getMd5OfBody()).isEqualTo("e4e68fb7bd0e697a0ae8f1bb342846b3");
+ assertThat(record.getReceiptHandle()).isEqualTo("AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...");
+ }
+
+ private static void assertS3Event(S3Event event) {
+ assertThat(event).isNotNull();
+ assertThat(event.getRecords()).isNotNull();
+ assertThat(event.getRecords().size()).isEqualTo(1);
+ S3EventNotification.S3EventNotificationRecord record = event.getRecords().get(0);
+ assertThat(record.getEventSource()).isEqualTo("aws:s3");
+ assertThat(record.getEventName()).isEqualTo("ObjectCreated:Put");
+ assertThat(record.getS3().getBucket().getName()).isEqualTo("DOC-EXAMPLE-BUCKET");
+ assertThat(record.getS3().getBucket().getArn())
+ .isEqualTo("arn:aws:s3:::lambda-artifacts-deafc19498e3f2df");
+ assertThat(record.getS3().getObject().getKey()).isEqualTo("b21b84d653bb07b05b1e6b33684dc11b");
+ }
+
+ private static void assertSnsEvent(SNSEvent event) {
+ assertThat(event).isNotNull();
+ assertThat(event.getRecords()).isNotNull();
+ assertThat(event.getRecords().size()).isEqualTo(1);
+ SNSEvent.SNSRecord record = event.getRecords().get(0);
+ assertThat(record.getEventSource()).isEqualTo("aws:sns");
+ assertThat(record.getEventSubscriptionArn())
+ .isEqualTo(
+ "arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486");
+ assertThat(record.getSNS().getMessageId()).isEqualTo("95df01b4-ee98-5cb9-9903-4c221d41eb5e");
+ assertThat(record.getSNS().getMessage()).isEqualTo("Hello from SNS!");
+ assertThat(record.getSNS().getType()).isEqualTo("Notification");
+ assertThat(record.getSNS().getTopicArn())
+ .isEqualTo("arn:aws:sns:us-east-2:123456789012:sns-lambda");
+ assertThat(record.getSNS().getSubject()).isEqualTo("TestInvoke");
+ }
+
+ @Test
+ void scheduledEventDeserializedFromStringJson() {
+ String eventBody = events.get(ScheduledEvent.class);
+ ScheduledEvent event = SerializationUtil.fromJson(eventBody, ScheduledEvent.class);
+
+ assertScheduledEvent(event);
+ }
+
+ @Test
+ void scheduledEventDeserializedFromInputStreamJson() {
+ String eventBody = events.get(ScheduledEvent.class);
+ ScheduledEvent event =
+ SerializationUtil.fromJson(
+ new ByteArrayInputStream(eventBody.getBytes(StandardCharsets.UTF_8)),
+ ScheduledEvent.class);
+
+ assertScheduledEvent(event);
+ }
+
+ @Test
+ void kinesisEventDeserializedFromStringJson() {
+ String eventBody = events.get(KinesisEvent.class);
+ KinesisEvent event = SerializationUtil.fromJson(eventBody, KinesisEvent.class);
+
+ assertKinesisEvent(event);
+ }
+
+ @Test
+ void kinesisEventDeserializedFromInputStreamJson() {
+ String eventBody = events.get(KinesisEvent.class);
+ KinesisEvent event =
+ SerializationUtil.fromJson(
+ new ByteArrayInputStream(eventBody.getBytes(StandardCharsets.UTF_8)),
+ KinesisEvent.class);
+
+ assertKinesisEvent(event);
+ }
+
+ @Test
+ void sqsEventDeserializedFromStringJson() {
+ String eventBody = events.get(SQSEvent.class);
+ SQSEvent event = SerializationUtil.fromJson(eventBody, SQSEvent.class);
+
+ assertSqsEvent(event);
+ }
+
+ @Test
+ void sqsEventDeserializedFromInputStreamJson() {
+ String eventBody = events.get(SQSEvent.class);
+ SQSEvent event =
+ SerializationUtil.fromJson(
+ new ByteArrayInputStream(eventBody.getBytes(StandardCharsets.UTF_8)), SQSEvent.class);
+
+ assertSqsEvent(event);
+ }
+
+ @Test
+ void s3EventDeserializedFromStringJson() {
+ String eventBody = events.get(S3Event.class);
+ S3Event event = SerializationUtil.fromJson(eventBody, S3Event.class);
+
+ assertS3Event(event);
+ }
+
+ @Test
+ void s3EventDeserializedFromInputStreamJson() {
+ String eventBody = events.get(S3Event.class);
+ S3Event event =
+ SerializationUtil.fromJson(
+ new ByteArrayInputStream(eventBody.getBytes(StandardCharsets.UTF_8)), S3Event.class);
+
+ assertS3Event(event);
+ }
+
+ @Test
+ void snsEventDeserializedFromStringJson() {
+ String eventBody = events.get(SNSEvent.class);
+ SNSEvent event = SerializationUtil.fromJson(eventBody, SNSEvent.class);
+
+ assertSnsEvent(event);
+ }
+
+ @Test
+ void snsEventDeserializedFromInputStreamJson() {
+ String eventBody = events.get(SNSEvent.class);
+ SNSEvent event =
+ SerializationUtil.fromJson(
+ new ByteArrayInputStream(eventBody.getBytes(StandardCharsets.UTF_8)), SNSEvent.class);
+
+ assertSnsEvent(event);
+ }
+}
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts
index 8d7e6c135dce..9eb92feeae0f 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts
@@ -13,8 +13,6 @@ dependencies {
implementation("com.google.guava:guava")
- implementation("org.apache.groovy:groovy")
implementation("io.opentelemetry:opentelemetry-api")
- implementation("org.spockframework:spock-core")
implementation("com.github.stefanbirkner:system-lambda")
}
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java
index a3aa56398c7d..ff02429b910c 100644
--- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java
+++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java
@@ -12,12 +12,14 @@
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import java.util.List;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
// TODO: Copy & paste with only trivial adaptions from v2
-abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule {
+abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule
+ implements ExperimentalInstrumentationModule {
protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) {
super("aws-sdk", "aws-sdk-1.11", additionalInstrumentationName);
@@ -29,8 +31,8 @@ public boolean isHelperClass(String className) {
}
@Override
- public boolean isIndyModule() {
- return false;
+ public String getModuleGroup() {
+ return "aws-sdk";
}
@Override
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java
index d5ba3d2c5add..89a4a6c8f673 100644
--- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java
+++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java
@@ -10,10 +10,12 @@
import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import java.util.List;
@AutoService(InstrumentationModule.class)
-public class AwsSdkInstrumentationModule extends InstrumentationModule {
+public class AwsSdkInstrumentationModule extends InstrumentationModule
+ implements ExperimentalInstrumentationModule {
public AwsSdkInstrumentationModule() {
super("aws-sdk", "aws-sdk-1.11", "aws-sdk-1.11-core");
}
@@ -24,8 +26,8 @@ public boolean isHelperClass(String className) {
}
@Override
- public boolean isIndyModule() {
- return false;
+ public String getModuleGroup() {
+ return "aws-sdk";
}
@Override
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java
index dee44d73f0b8..872c7303507a 100644
--- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java
+++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java
@@ -14,8 +14,8 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
/**
* A {@link RequestHandler2} for use in the agent. Unlike library instrumentation, the agent will
@@ -36,7 +36,7 @@ public class TracingRequestHandler extends RequestHandler2 {
public static final RequestHandler2 tracingHandler =
AwsSdkTelemetry.builder(GlobalOpenTelemetry.get())
.setCaptureExperimentalSpanAttributes(
- InstrumentationConfig.get()
+ AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.aws-sdk.experimental-span-attributes", false))
.setMessagingReceiveInstrumentationEnabled(
ExperimentalConfig.get().messagingReceiveInstrumentationEnabled())
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
index 4cfaae6135b2..9f83480f5511 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
@@ -13,6 +13,7 @@ muzzle {
excludeInstrumentationName("aws-sdk-2.2-sqs")
excludeInstrumentationName("aws-sdk-2.2-sns")
+ excludeInstrumentationName("aws-sdk-2.2-lambda")
// several software.amazon.awssdk artifacts are missing for this version
skip("2.17.200")
@@ -43,6 +44,7 @@ muzzle {
extraDependency("software.amazon.awssdk:protocol-core")
excludeInstrumentationName("aws-sdk-2.2-sns")
+ excludeInstrumentationName("aws-sdk-2.2-lambda")
// several software.amazon.awssdk artifacts are missing for this version
skip("2.17.200")
@@ -57,6 +59,21 @@ muzzle {
extraDependency("software.amazon.awssdk:protocol-core")
excludeInstrumentationName("aws-sdk-2.2-sqs")
+ excludeInstrumentationName("aws-sdk-2.2-lambda")
+
+ // several software.amazon.awssdk artifacts are missing for this version
+ skip("2.17.200")
+ }
+ pass {
+ group.set("software.amazon.awssdk")
+ module.set("lambda")
+ versions.set("[2.17.0,)")
+ // Used by all SDK services, the only case it isn't is an SDK extension such as a custom HTTP
+ // client, which is not target of instrumentation anyways.
+ extraDependency("software.amazon.awssdk:protocol-core")
+
+ excludeInstrumentationName("aws-sdk-2.2-sqs")
+ excludeInstrumentationName("aws-sdk-2.2-sns")
// several software.amazon.awssdk artifacts are missing for this version
skip("2.17.200")
@@ -81,6 +98,7 @@ dependencies {
testLibrary("software.amazon.awssdk:dynamodb:2.2.0")
testLibrary("software.amazon.awssdk:ec2:2.2.0")
testLibrary("software.amazon.awssdk:kinesis:2.2.0")
+ testLibrary("software.amazon.awssdk:lambda:2.2.0")
testLibrary("software.amazon.awssdk:rds:2.2.0")
testLibrary("software.amazon.awssdk:s3:2.2.0")
testLibrary("software.amazon.awssdk:sqs:2.2.0")
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAdviceBridge.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAdviceBridge.java
new file mode 100644
index 000000000000..3aaa17525137
--- /dev/null
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAdviceBridge.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awssdk.v2_2;
+
+public final class LambdaAdviceBridge {
+ private LambdaAdviceBridge() {}
+
+ public static void referenceForMuzzleOnly() {
+ throw new UnsupportedOperationException(
+ LambdaImpl.class.getName() + " referencing for muzzle, should never be actually called");
+ }
+}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java
new file mode 100644
index 000000000000..575bb5ec7fbc
--- /dev/null
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
+
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static net.bytebuddy.matcher.ElementMatchers.none;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.instrumentation.awssdk.v2_2.LambdaAdviceBridge;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@AutoService(InstrumentationModule.class)
+public class LambdaInstrumentationModule extends AbstractAwsSdkInstrumentationModule {
+
+ public LambdaInstrumentationModule() {
+ super("aws-sdk-2.2-lambda");
+ }
+
+ @Override
+ public ElementMatcher.Junction classLoaderMatcher() {
+ return hasClassesNamed(
+ "software.amazon.awssdk.services.lambda.model.InvokeRequest",
+ "software.amazon.awssdk.protocols.jsoncore.JsonNode");
+ }
+
+ @Override
+ public void doTransform(TypeTransformer transformer) {
+ transformer.applyAdviceToMethod(
+ none(), LambdaInstrumentationModule.class.getName() + "$RegisterAdvice");
+ }
+
+ @SuppressWarnings("unused")
+ public static class RegisterAdvice {
+ @Advice.OnMethodExit(suppress = Throwable.class)
+ public static void onExit() {
+ // (indirectly) using LambdaImpl class here to make sure it is available from LambdaAccess
+ // (injected into app classloader) and checked by Muzzle
+ LambdaAdviceBridge.referenceForMuzzleOnly();
+ }
+ }
+}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/Aws2LambdaTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/Aws2LambdaTest.java
new file mode 100644
index 000000000000..0991e804956e
--- /dev/null
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/Aws2LambdaTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
+
+import io.opentelemetry.instrumentation.awssdk.v2_2.AbstractAws2LambdaTest;
+import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+
+class Aws2LambdaTest extends AbstractAws2LambdaTest {
+
+ @RegisterExtension
+ private static final AgentInstrumentationExtension testing =
+ AgentInstrumentationExtension.create();
+
+ @Override
+ protected InstrumentationExtension getTesting() {
+ return testing;
+ }
+
+ @Override
+ protected boolean canTestLambdaInvoke() {
+ // only supported since 2.17.0
+ return Boolean.getBoolean("testLatestDeps");
+ }
+
+ @Override
+ protected ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
+ return ClientOverrideConfiguration.builder();
+ }
+}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts
index 94e90a82ff61..7f621f4977d2 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts
@@ -17,13 +17,11 @@ dependencies {
testLibrary("software.amazon.awssdk:dynamodb:2.2.0")
testLibrary("software.amazon.awssdk:ec2:2.2.0")
testLibrary("software.amazon.awssdk:kinesis:2.2.0")
+ testLibrary("software.amazon.awssdk:lambda:2.2.0")
testLibrary("software.amazon.awssdk:rds:2.2.0")
testLibrary("software.amazon.awssdk:s3:2.2.0")
testLibrary("software.amazon.awssdk:sqs:2.2.0")
testLibrary("software.amazon.awssdk:sns:2.2.0")
-
- // last version that does not use json protocol
- latestDepTestLibrary("software.amazon.awssdk:sqs:2.21.17")
}
tasks {
@@ -31,5 +29,6 @@ tasks {
systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", true)
systemProperty("otel.instrumentation.aws-sdk.experimental-record-individual-http-error", true)
systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "test-message-header")
+ systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
}
}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java
index b4870cf3edda..dddb124eb938 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java
@@ -10,8 +10,8 @@
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
import io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkTelemetry;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
import java.util.List;
public final class AwsSdkSingletons {
@@ -28,7 +28,7 @@ public final class AwsSdkSingletons {
private static boolean hasAgentConfiguration() {
try {
- Class.forName("io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig");
+ Class.forName("io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig");
return true;
} catch (ClassNotFoundException e) {
return false;
@@ -69,7 +69,7 @@ private static boolean recordIndividualHttpError() {
private static boolean getBoolean(String name, boolean defaultValue) {
if (HAS_INSTRUMENTATION_CONFIG) {
- return InstrumentationConfig.get().getBoolean(name, defaultValue);
+ return AgentInstrumentationConfig.get().getBoolean(name, defaultValue);
} else {
return ConfigPropertiesUtil.getBoolean(name, defaultValue);
}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts
index 862df156ae14..e4be5bdfe30a 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts
@@ -7,8 +7,11 @@ dependencies {
library("software.amazon.awssdk:aws-core:2.2.0")
library("software.amazon.awssdk:sqs:2.2.0")
+ library("software.amazon.awssdk:lambda:2.2.0")
library("software.amazon.awssdk:sns:2.2.0")
library("software.amazon.awssdk:aws-json-protocol:2.2.0")
+ // json-utils was added in 2.17.0
+ compileOnly("software.amazon.awssdk:json-utils:2.17.0")
compileOnly(project(":muzzle")) // For @NoMuzzle
testImplementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
@@ -38,10 +41,24 @@ testing {
implementation("software.amazon.awssdk:aws-core:+")
implementation("software.amazon.awssdk:aws-json-protocol:+")
implementation("software.amazon.awssdk:dynamodb:+")
+ implementation("software.amazon.awssdk:lambda:+")
} else {
implementation("software.amazon.awssdk:aws-core:2.2.0")
implementation("software.amazon.awssdk:aws-json-protocol:2.2.0")
implementation("software.amazon.awssdk:dynamodb:2.2.0")
+ implementation("software.amazon.awssdk:lambda:2.2.0")
+ }
+ }
+ }
+
+ val testLambda by registering(JvmTestSuite::class) {
+ dependencies {
+ implementation(project())
+ implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
+ if (findProperty("testLatestDeps") as Boolean) {
+ implementation("software.amazon.awssdk:lambda:+")
+ } else {
+ implementation("software.amazon.awssdk:lambda:2.17.0")
}
}
}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAccess.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAccess.java
new file mode 100644
index 000000000000..33d792c0c826
--- /dev/null
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAccess.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awssdk.v2_2;
+
+import io.opentelemetry.context.Context;
+import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle;
+import software.amazon.awssdk.core.SdkRequest;
+
+final class LambdaAccess {
+ private LambdaAccess() {}
+
+ private static final boolean enabled = PluginImplUtil.isImplPresent("LambdaImpl");
+
+ @NoMuzzle
+ public static SdkRequest modifyRequest(SdkRequest request, Context otelContext) {
+ return enabled ? LambdaImpl.modifyRequest(request, otelContext) : null;
+ }
+}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaImpl.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaImpl.java
new file mode 100644
index 000000000000..fae5edf5e12a
--- /dev/null
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaImpl.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awssdk.v2_2;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.protocols.jsoncore.JsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.ObjectJsonNode;
+import software.amazon.awssdk.protocols.jsoncore.internal.StringJsonNode;
+import software.amazon.awssdk.services.lambda.model.InvokeRequest;
+
+// this class is only used from LambdaAccess from method with @NoMuzzle annotation
+
+// Direct lambda invocations (e.g., not through an api gateway) currently strip
+// away the otel propagation headers (but leave x-ray ones intact). Use the
+// custom client context header as an additional propagation mechanism for this
+// very specific scenario. For reference, the header is named "X-Amz-Client-Context" but the api to
+// manipulate it abstracts that away. The client context field is documented in
+// https://docs.aws.amazon.com/lambda/latest/api/API_Invoke.html#API_Invoke_RequestParameters
+
+final class LambdaImpl {
+ static {
+ // Force loading of InvokeRequest; this ensures that an exception is thrown at this point when
+ // the Lambda library is not present, which will cause DirectLambdaAccess to have
+ // enabled=false in library mode.
+ @SuppressWarnings("unused")
+ String invokeRequestName = InvokeRequest.class.getName();
+ // was added in 2.17.0
+ @SuppressWarnings("unused")
+ String jsonNodeName = JsonNode.class.getName();
+ }
+
+ private static final String CLIENT_CONTEXT_CUSTOM_FIELDS_KEY = "custom";
+ static final int MAX_CLIENT_CONTEXT_LENGTH = 3583; // visible for testing
+
+ private LambdaImpl() {}
+
+ @Nullable
+ static SdkRequest modifyRequest(
+ SdkRequest request, io.opentelemetry.context.Context otelContext) {
+ if (isDirectLambdaInvocation(request)) {
+ return modifyOrAddCustomContextHeader((InvokeRequest) request, otelContext);
+ }
+ return null;
+ }
+
+ static boolean isDirectLambdaInvocation(SdkRequest request) {
+ return request instanceof InvokeRequest;
+ }
+
+ static SdkRequest modifyOrAddCustomContextHeader(
+ InvokeRequest request, io.opentelemetry.context.Context otelContext) {
+ InvokeRequest.Builder builder = request.toBuilder();
+ // Unfortunately the value of this thing is a base64-encoded json with a character limit; also
+ // therefore not comma-composable like many http headers
+ String clientContextString = request.clientContext();
+ String clientContextJsonString = "{}";
+ if (clientContextString != null && !clientContextString.isEmpty()) {
+ clientContextJsonString =
+ new String(Base64.getDecoder().decode(clientContextString), StandardCharsets.UTF_8);
+ }
+ JsonNode jsonNode = JsonNode.parser().parse(clientContextJsonString);
+ if (!jsonNode.isObject()) {
+ return null;
+ }
+ JsonNode customNode =
+ jsonNode
+ .asObject()
+ .computeIfAbsent(
+ CLIENT_CONTEXT_CUSTOM_FIELDS_KEY, (k) -> new ObjectJsonNode(new LinkedHashMap<>()));
+ if (!customNode.isObject()) {
+ return null;
+ }
+ Map map = customNode.asObject();
+ GlobalOpenTelemetry.getPropagators()
+ .getTextMapPropagator()
+ .inject(otelContext, map, (nodes, key, value) -> nodes.put(key, new StringJsonNode(value)));
+ if (map.isEmpty()) {
+ return null;
+ }
+
+ // turn it back into a string (json encode)
+ String newJson = jsonNode.toString();
+
+ // turn it back into a base64 string
+ String newJson64 = Base64.getEncoder().encodeToString(newJson.getBytes(StandardCharsets.UTF_8));
+ // check it for length (err on the safe side with >=)
+ if (newJson64.length() >= MAX_CLIENT_CONTEXT_LENGTH) {
+ return null;
+ }
+ builder.clientContext(newJson64);
+ return builder.build();
+ }
+}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
index 4b718e0abc40..ada21457d45b 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
@@ -212,6 +212,10 @@ public SdkRequest modifyRequest(
if (modifiedRequest != null) {
return modifiedRequest;
}
+ modifiedRequest = LambdaAccess.modifyRequest(request, otelContext);
+ if (modifiedRequest != null) {
+ return modifiedRequest;
+ }
// Insert other special handling here, following the same pattern as SQS and SNS.
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java
index 756d09ef61d6..0e8309d6e059 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java
@@ -16,7 +16,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
@@ -25,11 +25,10 @@
import software.amazon.awssdk.services.dynamodb.model.UpdateTableRequest;
import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-public class FieldMapperTest {
+class FieldMapperTest {
@Test
- public void shouldMapNestedField() {
-
+ void shouldMapNestedField() {
// given
AwsSdkRequest awsSdkRequest = UpdateTable;
MethodHandleFactory methodHandleFactory = new MethodHandleFactory();
@@ -56,8 +55,7 @@ public void shouldMapNestedField() {
}
@Test
- public void shouldMapRequestFieldsOnly() {
-
+ void shouldMapRequestFieldsOnly() {
// given
AwsSdkRequest awsSdkRequest = BatchWriteItem;
MethodHandleFactory methodHandleFactory = new MethodHandleFactory();
@@ -76,8 +74,7 @@ public void shouldMapRequestFieldsOnly() {
}
@Test
- public void shouldMapResponseFieldsOnly() {
-
+ void shouldMapResponseFieldsOnly() {
// given
AwsSdkRequest awsSdkRequest = BatchWriteItem;
MethodHandleFactory methodHandleFactory = new MethodHandleFactory();
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/QueryProtocolModelTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/QueryProtocolModelTest.java
index d5ab73e541da..f18f75f5948f 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/QueryProtocolModelTest.java
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/QueryProtocolModelTest.java
@@ -12,7 +12,8 @@
class QueryProtocolModelTest extends AbstractQueryProtocolModelTest {
@RegisterExtension
- public final LibraryInstrumentationExtension testing = LibraryInstrumentationExtension.create();
+ private static final LibraryInstrumentationExtension testing =
+ LibraryInstrumentationExtension.create();
@Override
protected ClientOverrideConfiguration.Builder createClientOverrideConfigurationBuilder() {
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/SerializerTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/SerializerTest.java
index aa267e524041..b2616dcaddc2 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/SerializerTest.java
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/SerializerTest.java
@@ -13,14 +13,14 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.SdkPojo;
import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-public class SerializerTest {
+class SerializerTest {
@Test
- public void shouldSerializeSimpleString() {
+ void shouldSerializeSimpleString() {
// given
// when
String serialized = new Serializer().serialize("simpleString");
@@ -29,7 +29,7 @@ public void shouldSerializeSimpleString() {
}
@Test
- public void shouldSerializeSdkPojo() {
+ void shouldSerializeSdkPojo() {
// given
SdkPojo sdkPojo =
ProvisionedThroughput.builder().readCapacityUnits(1L).writeCapacityUnits(2L).build();
@@ -40,7 +40,7 @@ public void shouldSerializeSdkPojo() {
}
@Test
- public void shouldSerializeCollection() {
+ void shouldSerializeCollection() {
// given
List collection = Arrays.asList("one", "two", "three");
// when
@@ -50,7 +50,7 @@ public void shouldSerializeCollection() {
}
@Test
- public void shouldSerializeEmptyCollectionAsNull() {
+ void shouldSerializeEmptyCollectionAsNull() {
// given
List collection = Collections.emptyList();
// when
@@ -60,7 +60,7 @@ public void shouldSerializeEmptyCollectionAsNull() {
}
@Test
- public void shouldSerializeMapAsKeyCollection() {
+ void shouldSerializeMapAsKeyCollection() {
// given
Map map = new HashMap<>();
map.put("uno", 1L);
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/testLambda/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2LambdaTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/testLambda/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2LambdaTest.java
new file mode 100644
index 000000000000..3bfe7788e066
--- /dev/null
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/testLambda/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2LambdaTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awssdk.v2_2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.services.lambda.model.InvokeRequest;
+
+class Aws2LambdaTest extends AbstractAws2LambdaTest {
+
+ @RegisterExtension
+ private static final LibraryInstrumentationExtension testing =
+ LibraryInstrumentationExtension.create();
+
+ private static Context context;
+ private static AwsSdkTelemetry telemetry;
+
+ @BeforeAll
+ static void setup() {
+ testing.runWithHttpServerSpan(
+ () -> {
+ context = Context.current();
+ });
+
+ telemetry = AwsSdkTelemetry.create(testing.getOpenTelemetry());
+ }
+
+ @Override
+ protected InstrumentationExtension getTesting() {
+ return testing;
+ }
+
+ @Override
+ protected ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
+ return ClientOverrideConfiguration.builder()
+ .addExecutionInterceptor(telemetry.newExecutionInterceptor());
+ }
+
+ private static String base64ify(String json) {
+ return Base64.getEncoder().encodeToString(json.getBytes(StandardCharsets.UTF_8));
+ }
+
+ @Test
+ void noExistingClientContext() {
+ InvokeRequest request = InvokeRequest.builder().build();
+
+ InvokeRequest newRequest =
+ (InvokeRequest) LambdaImpl.modifyOrAddCustomContextHeader(request, context);
+
+ String newClientContext = newRequest.clientContext();
+ newClientContext =
+ new String(Base64.getDecoder().decode(newClientContext), StandardCharsets.UTF_8);
+ assertThat(newClientContext.contains("traceparent")).isTrue();
+ }
+
+ @Test
+ void withExistingClientContext() {
+ String clientContext =
+ base64ify(
+ "{\"otherStuff\": \"otherValue\", \"custom\": {\"preExisting\": \"somevalue\"} }");
+ InvokeRequest request = InvokeRequest.builder().clientContext(clientContext).build();
+
+ InvokeRequest newRequest =
+ (InvokeRequest) LambdaImpl.modifyOrAddCustomContextHeader(request, context);
+
+ String newClientContext = newRequest.clientContext();
+ newClientContext =
+ new String(Base64.getDecoder().decode(newClientContext), StandardCharsets.UTF_8);
+ assertThat(newClientContext.contains("traceparent")).isTrue();
+ assertThat(newClientContext.contains("preExisting")).isTrue();
+ assertThat(newClientContext.contains("otherStuff")).isTrue();
+ }
+
+ @Test
+ void exceedingMaximumLengthDoesNotModify() {
+ // awkward way to build a valid json that is almost but not quite too long
+ StringBuilder buffer = new StringBuilder("x");
+ String long64edClientContext = "";
+ while (true) {
+ buffer.append("x");
+ String newClientContext = base64ify("{\"" + buffer + "\": \"" + buffer + "\"}");
+ if (newClientContext.length() >= LambdaImpl.MAX_CLIENT_CONTEXT_LENGTH) {
+ break;
+ }
+ long64edClientContext = newClientContext;
+ }
+
+ InvokeRequest request = InvokeRequest.builder().clientContext(long64edClientContext).build();
+ assertThat(request.clientContext().equals(long64edClientContext)).isTrue();
+
+ InvokeRequest newRequest =
+ (InvokeRequest) LambdaImpl.modifyOrAddCustomContextHeader(request, context);
+ assertThat(newRequest).isNull(); // null return means no modification performed
+ }
+}
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts
index 9981aa9a1965..f9c0791bd205 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
compileOnly("software.amazon.awssdk:dynamodb:2.2.0")
compileOnly("software.amazon.awssdk:ec2:2.2.0")
compileOnly("software.amazon.awssdk:kinesis:2.2.0")
+ compileOnly("software.amazon.awssdk:lambda:2.2.0")
compileOnly("software.amazon.awssdk:rds:2.2.0")
compileOnly("software.amazon.awssdk:s3:2.2.0")
compileOnly("software.amazon.awssdk:sqs:2.2.0")
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2LambdaTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2LambdaTest.java
new file mode 100644
index 000000000000..64c8a48a6c77
--- /dev/null
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2LambdaTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awssdk.v2_2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
+import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
+import io.opentelemetry.testing.internal.armeria.common.MediaType;
+import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.lambda.LambdaClient;
+import software.amazon.awssdk.services.lambda.LambdaClientBuilder;
+import software.amazon.awssdk.services.lambda.model.InvokeRequest;
+import software.amazon.awssdk.services.lambda.model.InvokeResponse;
+
+public abstract class AbstractAws2LambdaTest {
+
+ @RegisterExtension
+ private static final MockWebServerExtension server = new MockWebServerExtension();
+
+ private static final StaticCredentialsProvider CREDENTIALS_PROVIDER =
+ StaticCredentialsProvider.create(
+ AwsBasicCredentials.create("my-access-key", "my-secret-key"));
+
+ protected abstract InstrumentationExtension getTesting();
+
+ protected abstract ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder();
+
+ protected boolean canTestLambdaInvoke() {
+ return true;
+ }
+
+ @Test
+ void testInvokeLambda() {
+ Assumptions.assumeTrue(canTestLambdaInvoke());
+
+ LambdaClientBuilder builder = LambdaClient.builder();
+ builder
+ .overrideConfiguration(createOverrideConfigurationBuilder().build())
+ .endpointOverride(server.httpUri());
+ builder.region(Region.AP_NORTHEAST_1).credentialsProvider(CREDENTIALS_PROVIDER);
+ LambdaClient client = builder.build();
+
+ server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, "ok"));
+
+ InvokeRequest request = InvokeRequest.builder().functionName("test").build();
+ InvokeResponse response = client.invoke(request);
+ assertThat(response.statusCode()).isEqualTo(200);
+ assertThat(response.payload().asUtf8String()).isEqualTo("ok");
+
+ String clientContextHeader =
+ server.takeRequest().request().headers().get("x-amz-client-context");
+ assertThat(clientContextHeader).isNotEmpty();
+ String clientContextJson =
+ new String(Base64.getDecoder().decode(clientContextHeader), StandardCharsets.UTF_8);
+ assertThat(clientContextJson).contains("traceparent");
+
+ getTesting()
+ .waitAndAssertTraces(
+ trace ->
+ trace.hasSpansSatisfyingExactly(
+ span -> span.hasName("Lambda.Invoke").hasKind(SpanKind.CLIENT).hasNoParent()));
+ }
+}
diff --git a/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts b/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts
index 25dbbc455e5e..67250df40347 100644
--- a/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts
+++ b/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
plugins {
- id("com.github.johnrengelman.shadow")
-
+ id("com.gradleup.shadow")
id("otel.java-conventions")
}
diff --git a/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts b/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts
index 590937930dee..ebcd721e7c19 100644
--- a/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts
+++ b/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
plugins {
- id("com.github.johnrengelman.shadow")
-
+ id("com.gradleup.shadow")
id("otel.java-conventions")
}
diff --git a/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts b/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
index 940331b69140..423f391f7e29 100644
--- a/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
+++ b/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
plugins {
- id("com.github.johnrengelman.shadow")
-
+ id("com.gradleup.shadow")
id("otel.java-conventions")
}
diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java
index 322bed6a7117..1fe50b3abbda 100644
--- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java
+++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java
@@ -26,7 +26,7 @@
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.context.Context;
-import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
import io.opentelemetry.javaagent.instrumentation.apachecamel.SpanDecorator;
import java.util.Collections;
@@ -41,7 +41,7 @@
class BaseSpanDecorator implements SpanDecorator {
static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
- InstrumentationConfig.get()
+ AgentInstrumentationConfig.get()
.getBoolean("otel.instrumentation.camel.experimental-span-attributes", false);
static final String DEFAULT_OPERATION_NAME = "CamelOperation";
diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java
index 2db260a9f088..45b368a043f1 100644
--- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java
+++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java
@@ -25,7 +25,7 @@
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlStatementSanitizer;
-import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
import java.net.URI;
@@ -36,7 +36,7 @@
class DbSpanDecorator extends BaseSpanDecorator {
private static final SqlStatementSanitizer sanitizer =
- SqlStatementSanitizer.create(CommonConfig.get().isStatementSanitizationEnabled());
+ SqlStatementSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());
private final String component;
private final String system;
diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java
index dfa923590d18..8e1c8b49f3fb 100644
--- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java
+++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java
@@ -30,7 +30,7 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
-import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
import io.opentelemetry.semconv.HttpAttributes;
import io.opentelemetry.semconv.UrlAttributes;
@@ -45,7 +45,8 @@ class HttpSpanDecorator extends BaseSpanDecorator {
private static final String POST_METHOD = "POST";
private static final String GET_METHOD = "GET";
- private static final Set