open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

camel: add stable semconv (#9346)

This commit is contained in:
Lauri Tulmin 2023-08-30 18:24:01 +03:00 committed by GitHub
parent b2e1fabc9f
commit f37386baeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java
View File

@ -23,14 +23,22 @@
package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators; package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators;
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
import static io.opentelemetry.instrumentation.api.internal.HttpConstants._OTHER;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerRoute; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerRoute;
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerRouteSource; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerRouteSource;
import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes;
import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes;
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.Set;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.camel.Endpoint; import org.apache.camel.Endpoint;
import org.apache.camel.Exchange; import org.apache.camel.Exchange;
@ -39,6 +47,7 @@ class HttpSpanDecorator extends BaseSpanDecorator {
private static final String POST_METHOD = "POST"; private static final String POST_METHOD = "POST";
private static final String GET_METHOD = "GET"; private static final String GET_METHOD = "GET";
private static final Set<String> knownMethods = CommonConfig.get().getKnownHttpRequestMethods();
protected String getProtocol() { protected String getProtocol() {
return "http"; return "http";
@ -91,10 +100,27 @@ class HttpSpanDecorator extends BaseSpanDecorator {
String httpUrl = getHttpUrl(exchange, endpoint); String httpUrl = getHttpUrl(exchange, endpoint);
if (httpUrl != null) { if (httpUrl != null) {
attributes.put(SemanticAttributes.HTTP_URL, httpUrl); if (SemconvStability.emitStableHttpSemconv()) {
internalSet(attributes, UrlAttributes.URL_FULL, httpUrl);
} }
attributes.put(SemanticAttributes.HTTP_METHOD, getHttpMethod(exchange, endpoint)); if (SemconvStability.emitOldHttpSemconv()) {
internalSet(attributes, SemanticAttributes.HTTP_URL, httpUrl);
}
}
String method = getHttpMethod(exchange, endpoint);
if (SemconvStability.emitStableHttpSemconv()) {
if (method == null || knownMethods.contains(method)) {
internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, method);
} else {
internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, _OTHER);
internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method);
}
}
if (SemconvStability.emitOldHttpSemconv()) {
internalSet(attributes, SemanticAttributes.HTTP_METHOD, method);
}
} }
private static boolean shouldAppendHttpRoute(CamelDirection camelDirection) { private static boolean shouldAppendHttpRoute(CamelDirection camelDirection) {