diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractor.java index 670f329d0977..6f50ea2a52b0 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractor.java @@ -35,11 +35,11 @@ private CodeAttributesExtractor(CodeAttributesGetter getter) { @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { - Class cls = getter.codeClass(request); + Class cls = getter.getCodeClass(request); if (cls != null) { internalSet(attributes, SemanticAttributes.CODE_NAMESPACE, cls.getName()); } - internalSet(attributes, SemanticAttributes.CODE_FUNCTION, getter.methodName(request)); + internalSet(attributes, SemanticAttributes.CODE_FUNCTION, getter.getMethodName(request)); } @Override diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesGetter.java index 6a5706de1bab..4e30b94401c0 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesGetter.java @@ -17,8 +17,36 @@ public interface CodeAttributesGetter { @Nullable - Class codeClass(REQUEST request); + default Class getCodeClass(REQUEST request) { + return codeClass(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getCodeClass(Object)} instead. + */ + @Deprecated @Nullable - String methodName(REQUEST request); + default Class codeClass(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getMethodName(REQUEST request) { + return methodName(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getMethodName(Object)} instead. + */ + @Deprecated + @Nullable + default String methodName(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractor.java index cc249381f488..a64fae5cf724 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractor.java @@ -30,14 +30,14 @@ private CodeSpanNameExtractor(CodeAttributesGetter getter) { @Override public String extract(REQUEST request) { - Class cls = getter.codeClass(request); + Class cls = getter.getCodeClass(request); String className = cls != null ? ClassNames.simpleName(cls) : ""; int lambdaIdx = className.indexOf("$$Lambda$"); if (lambdaIdx > -1) { // need to produce low-cardinality name, since lambda class names change with each restart className = className.substring(0, lambdaIdx + "$$Lambda$".length()); } - String methodName = getter.methodName(request); + String methodName = getter.getMethodName(request); if (methodName == null) { return className; } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractor.java index b02d9fd8553e..564043e68ad7 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractor.java @@ -37,7 +37,7 @@ public static DbClientAttributesExtractor public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { super.onStart(attributes, parentContext, request); - internalSet(attributes, SemanticAttributes.DB_STATEMENT, getter.statement(request)); - internalSet(attributes, SemanticAttributes.DB_OPERATION, getter.operation(request)); + internalSet(attributes, SemanticAttributes.DB_STATEMENT, getter.getStatement(request)); + internalSet(attributes, SemanticAttributes.DB_OPERATION, getter.getOperation(request)); } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesGetter.java index ae7cc21af3e0..28d1ede221f9 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesGetter.java @@ -21,8 +21,36 @@ public interface DbClientAttributesGetter extends DbClientCommonAttributesGetter { @Nullable - String statement(REQUEST request); + default String getStatement(REQUEST request) { + return statement(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getStatement(Object)} instead. + */ + @Deprecated @Nullable - String operation(REQUEST request); + default String statement(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getOperation(REQUEST request) { + return operation(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getOperation(Object)} instead. + */ + @Deprecated + @Nullable + default String operation(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesExtractor.java index cbe4bb5c0c1a..a1488968a278 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesExtractor.java @@ -27,11 +27,11 @@ abstract class DbClientCommonAttributesExtractor< @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { - internalSet(attributes, SemanticAttributes.DB_SYSTEM, getter.system(request)); - internalSet(attributes, SemanticAttributes.DB_USER, getter.user(request)); - internalSet(attributes, SemanticAttributes.DB_NAME, getter.name(request)); + internalSet(attributes, SemanticAttributes.DB_SYSTEM, getter.getSystem(request)); + internalSet(attributes, SemanticAttributes.DB_USER, getter.getUser(request)); + internalSet(attributes, SemanticAttributes.DB_NAME, getter.getName(request)); internalSet( - attributes, SemanticAttributes.DB_CONNECTION_STRING, getter.connectionString(request)); + attributes, SemanticAttributes.DB_CONNECTION_STRING, getter.getConnectionString(request)); } @Override diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesGetter.java index 48b9d11f054e..20d97cece50e 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesGetter.java @@ -11,14 +11,70 @@ public interface DbClientCommonAttributesGetter { @Nullable - String system(REQUEST request); + default String getSystem(REQUEST request) { + return system(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSystem(Object)} instead. + */ + @Deprecated @Nullable - String user(REQUEST request); + default String system(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - String name(REQUEST request); + default String getUser(REQUEST request) { + return user(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getUser(Object)} instead. + */ + @Deprecated @Nullable - String connectionString(REQUEST request); + default String user(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getName(REQUEST request) { + return name(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getName(Object)} instead. + */ + @Deprecated + @Nullable + default String name(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getConnectionString(REQUEST request) { + return connectionString(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getConnectionString(Object)} instead. + */ + @Deprecated + @Nullable + default String connectionString(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractor.java index 00afa6d5c5fd..2ff085c0ead4 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractor.java @@ -15,8 +15,8 @@ public abstract class DbClientSpanNameExtractor implements SpanNameExtr * Returns a {@link SpanNameExtractor} that constructs the span name according to DB semantic * conventions: {@code }. * - * @see DbClientAttributesGetter#operation(Object) used to extract {@code }. - * @see DbClientAttributesGetter#name(Object) used to extract {@code }. + * @see DbClientAttributesGetter#getOperation(Object) used to extract {@code }. + * @see DbClientAttributesGetter#getName(Object) used to extract {@code }. */ public static SpanNameExtractor create( DbClientAttributesGetter getter) { @@ -28,7 +28,7 @@ public static SpanNameExtractor create( * conventions: {@code .}. * * @see SqlStatementInfo#getOperation() used to extract {@code }. - * @see DbClientAttributesGetter#name(Object) used to extract {@code }. + * @see DbClientAttributesGetter#getName(Object) used to extract {@code }. * @see SqlStatementInfo#getTable() used to extract {@code }. */ public static SpanNameExtractor create( @@ -73,8 +73,8 @@ private GenericDbClientSpanNameExtractor(DbClientAttributesGetter gette @Override public String extract(REQUEST request) { - String dbName = getter.name(request); - String operation = getter.operation(request); + String dbName = getter.getName(request); + String operation = getter.getOperation(request); return computeSpanName(dbName, operation, null); } } @@ -93,8 +93,8 @@ private SqlClientSpanNameExtractor(SqlClientAttributesGetter getter) { @Override public String extract(REQUEST request) { - String dbName = getter.name(request); - SqlStatementInfo sanitizedStatement = sanitizer.sanitize(getter.rawStatement(request)); + String dbName = getter.getName(request); + SqlStatementInfo sanitizedStatement = sanitizer.sanitize(getter.getRawStatement(request)); return computeSpanName( dbName, sanitizedStatement.getOperation(), sanitizedStatement.getTable()); } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractor.java index 3dc6d76a9a0d..45efc43f2d6d 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractor.java @@ -21,7 +21,7 @@ * *

It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional * {@linkplain SemanticAttributes#DB_SQL_TABLE db.sql.table} attribute. The raw SQL - * statements returned by the {@link SqlClientAttributesGetter#rawStatement(Object)} method are + * statements returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are * sanitized before use, all statement parameters are removed. */ public final class SqlClientAttributesExtractor @@ -59,7 +59,7 @@ public static SqlClientAttributesExtractorBuilder * SqlClientAttributesExtractor} before being set as span attribute. */ @Nullable - String rawStatement(REQUEST request); + default String getRawStatement(REQUEST request) { + return rawStatement(request); + } + + /** + * Get the raw SQL statement. The value returned by this method is later sanitized by the {@link + * SqlClientAttributesExtractor} before being set as span attribute. + * + *

This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getRawStatement(Object)} instead. + */ + @Deprecated + @Nullable + default String rawStatement(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java index d7b35bc7d3af..eba10563b94f 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java @@ -91,13 +91,14 @@ public static HttpClientAttributesExtractorBuilder @Nullable @Override - public String transport(REQUEST request, @Nullable RESPONSE response) { + public String getTransport(REQUEST request, @Nullable RESPONSE response) { return null; } @Nullable @Override - public String peerName(REQUEST request) { + public String getPeerName(REQUEST request) { return null; } @Nullable @Override - public Integer peerPort(REQUEST request) { + public Integer getPeerPort(REQUEST request) { return null; } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java index 18048376cdb0..20a1c68b04b7 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java @@ -22,7 +22,21 @@ public interface HttpClientAttributesGetter // Attributes that always exist in a request @Nullable - String url(REQUEST request); + default String getUrl(REQUEST request) { + return url(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getUrl(Object)} instead. + */ + @Deprecated + @Nullable + default String url(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } // Attributes which are not always available when the request is ready. @@ -33,5 +47,24 @@ public interface HttpClientAttributesGetter * {@code response} is {@code null} or not. */ @Nullable - String flavor(REQUEST request, @Nullable RESPONSE response); + default String getFlavor(REQUEST request, @Nullable RESPONSE response) { + return flavor(request, response); + } + + /** + * Extracts the {@code http.flavor} span attribute. + * + *

This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, whether + * {@code response} is {@code null} or not. + * + *

This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getFlavor(Object, Object)}. + */ + @Deprecated + @Nullable + default String flavor(REQUEST request, @Nullable RESPONSE response) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java index 576615269a46..2be81bfa2865 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java @@ -44,11 +44,11 @@ abstract class HttpCommonAttributesExtractor< @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { - internalSet(attributes, SemanticAttributes.HTTP_METHOD, getter.method(request)); + internalSet(attributes, SemanticAttributes.HTTP_METHOD, getter.getMethod(request)); internalSet(attributes, SemanticAttributes.HTTP_USER_AGENT, userAgent(request)); for (String name : capturedRequestHeaders) { - List values = getter.requestHeader(request, name); + List values = getter.getRequestHeader(request, name); if (!values.isEmpty()) { internalSet(attributes, requestAttributeKey(name), values); } @@ -67,7 +67,7 @@ public void onEnd( attributes, SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, requestContentLength(request)); if (response != null) { - Integer statusCode = getter.statusCode(request, response, error); + Integer statusCode = getter.getStatusCode(request, response, error); if (statusCode != null && statusCode > 0) { internalSet(attributes, SemanticAttributes.HTTP_STATUS_CODE, (long) statusCode); } @@ -78,7 +78,7 @@ public void onEnd( responseContentLength(request, response)); for (String name : capturedResponseHeaders) { - List values = getter.responseHeader(request, response, name); + List values = getter.getResponseHeader(request, response, name); if (!values.isEmpty()) { internalSet(attributes, responseAttributeKey(name), values); } @@ -88,18 +88,18 @@ public void onEnd( @Nullable private String userAgent(REQUEST request) { - return firstHeaderValue(getter.requestHeader(request, "user-agent")); + return firstHeaderValue(getter.getRequestHeader(request, "user-agent")); } @Nullable private Long requestContentLength(REQUEST request) { - return parseNumber(firstHeaderValue(getter.requestHeader(request, "content-length"))); + return parseNumber(firstHeaderValue(getter.getRequestHeader(request, "content-length"))); } @Nullable private Long responseContentLength(REQUEST request, RESPONSE response) { return parseNumber( - firstHeaderValue(getter.responseHeader(request, response, "content-length"))); + firstHeaderValue(getter.getResponseHeader(request, response, "content-length"))); } @Nullable @@ -131,7 +131,7 @@ static final class HttpNetNamePortGetter implements FallbackNamePortGet @Nullable @Override public String name(REQUEST request) { - String host = firstHeaderValue(getter.requestHeader(request, "host")); + String host = firstHeaderValue(getter.getRequestHeader(request, "host")); if (host == null) { return null; } @@ -142,7 +142,7 @@ public String name(REQUEST request) { @Nullable @Override public Integer port(REQUEST request) { - String host = firstHeaderValue(getter.requestHeader(request, "host")); + String host = firstHeaderValue(getter.getRequestHeader(request, "host")); if (host == null) { return null; } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java index 049405534037..fd668d1c6291 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java @@ -16,7 +16,21 @@ public interface HttpCommonAttributesGetter { // Attributes that always exist in a request @Nullable - String method(REQUEST request); + default String getMethod(REQUEST request) { + return method(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getMethod(Object)} instead. + */ + @Deprecated + @Nullable + default String method(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } /** * Extracts all values of header named {@code name} from the request, or an empty list if there @@ -25,7 +39,26 @@ public interface HttpCommonAttributesGetter { *

Implementations of this method must not return a null value; an empty list should be * returned instead. */ - List requestHeader(REQUEST request, String name); + default List getRequestHeader(REQUEST request, String name) { + return requestHeader(request, name); + } + + /** + * Extracts all values of header named {@code name} from the request, or an empty list if there + * were none. + * + *

Implementations of this method must not return a null value; an empty list should be + * returned instead. + * + *

This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getRequestHeader(Object, String)} instead. + */ + @Deprecated + default List requestHeader(REQUEST request, String name) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } // Attributes which are not always available when the request is ready. @@ -36,7 +69,26 @@ public interface HttpCommonAttributesGetter { * {@code response} is non-{@code null}. */ @Nullable - Integer statusCode(REQUEST request, RESPONSE response, @Nullable Throwable error); + default Integer getStatusCode(REQUEST request, RESPONSE response, @Nullable Throwable error) { + return statusCode(request, response, error); + } + + /** + * Extracts the {@code http.status_code} span attribute. + * + *

This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, only when + * {@code response} is non-{@code null}. + * + *

This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getStatusCode(Object, Object, Throwable)} instead. + */ + @Deprecated + @Nullable + default Integer statusCode(REQUEST request, RESPONSE response, @Nullable Throwable error) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } /** * Extracts all values of header named {@code name} from the response, or an empty list if there @@ -48,5 +100,27 @@ public interface HttpCommonAttributesGetter { *

Implementations of this method must not return a null value; an empty list should be * returned instead. */ - List responseHeader(REQUEST request, RESPONSE response, String name); + default List getResponseHeader(REQUEST request, RESPONSE response, String name) { + return responseHeader(request, response, name); + } + + /** + * Extracts all values of header named {@code name} from the response, or an empty list if there + * were none. + * + *

This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, only when + * {@code response} is non-{@code null}. + * + *

Implementations of this method must not return a null value; an empty list should be + * returned instead. + * + *

This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getResponseHeader(Object, Object, String)} instead. + */ + @Deprecated + default List responseHeader(REQUEST request, RESPONSE response, String name) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractor.java index fe6d8df02f75..430d010b1949 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractor.java @@ -89,19 +89,19 @@ public static HttpServerAttributesExtractorBuilder // Attributes that always exist in a request @Nullable - String flavor(REQUEST request); + default String getFlavor(REQUEST request) { + return flavor(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getFlavor(Object)} instead. + */ + @Deprecated @Nullable - String target(REQUEST request); + default String flavor(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - String route(REQUEST request); + default String getTarget(REQUEST request) { + return target(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getTarget(Object)} instead. + */ + @Deprecated @Nullable - String scheme(REQUEST request); + default String target(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getRoute(REQUEST request) { + return route(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getRoute(Object)} instead. + */ + @Deprecated + @Nullable + default String route(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getScheme(REQUEST request) { + return scheme(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getScheme(Object)} instead. + */ + @Deprecated + @Nullable + default String scheme(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractor.java index e68d7728571e..dfa4a33a9970 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractor.java @@ -37,7 +37,7 @@ public String extract(REQUEST request) { if (route != null) { return route; } - String method = getter.method(request); + String method = getter.getMethod(request); if (method != null) { return "HTTP " + method; } @@ -47,7 +47,7 @@ public String extract(REQUEST request) { @Nullable private String extractRoute(REQUEST request) { if (getter instanceof HttpServerAttributesGetter) { - return ((HttpServerAttributesGetter) getter).route(request); + return ((HttpServerAttributesGetter) getter).getRoute(request); } return null; } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractor.java index 1ef9c60598ff..3a578b7255b4 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractor.java @@ -57,7 +57,7 @@ public void extract( @Nullable Throwable error) { if (response != null) { - Integer statusCode = getter.statusCode(request, response, error); + Integer statusCode = getter.getStatusCode(request, response, error); if (statusCode != null) { StatusCode statusCodeObj = statusConverter.statusFromHttpStatus(statusCode); if (statusCodeObj == StatusCode.ERROR) { diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java index 065515bed302..2f4a9eb238b3 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java @@ -67,31 +67,37 @@ public static MessagingAttributesExtractorBuilder values = getter.header(request, name); + List values = getter.getMessageHeader(request, name); if (!values.isEmpty()) { internalSet(attributes, attributeKey(name), values); } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java index 66ad37a704be..d23046eed3cf 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java @@ -19,36 +19,189 @@ public interface MessagingAttributesGetter { @Nullable - String system(REQUEST request); + default String getSystem(REQUEST request) { + return system(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSystem(Object)} instead. + */ + @Deprecated + @Nullable + default String system(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getDestinationKind(REQUEST request) { + return destinationKind(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getDestinationKind(Object)} instead. + */ + @Deprecated + @Nullable + default String destinationKind(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - String destinationKind(REQUEST request); + default String getDestination(REQUEST request) { + return destination(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getDestination(Object)} instead. + */ + @Deprecated @Nullable - String destination(REQUEST request); + default String destination(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + default boolean isTemporaryDestination(REQUEST request) { + return temporaryDestination(request); + } - boolean temporaryDestination(REQUEST request); + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #isTemporaryDestination(Object)} instead. + */ + @Deprecated + default boolean temporaryDestination(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - String protocol(REQUEST request); + default String getProtocol(REQUEST request) { + return protocol(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getProtocol(Object)} instead. + */ + @Deprecated @Nullable - String protocolVersion(REQUEST request); + default String protocol(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - String url(REQUEST request); + default String getProtocolVersion(REQUEST request) { + return protocolVersion(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getProtocolVersion(Object)} instead. + */ + @Deprecated @Nullable - String conversationId(REQUEST request); + default String protocolVersion(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - Long messagePayloadSize(REQUEST request); + default String getUrl(REQUEST request) { + return url(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getUrl(Object)} instead. + */ + @Deprecated @Nullable - Long messagePayloadCompressedSize(REQUEST request); + default String url(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - String messageId(REQUEST request, @Nullable RESPONSE response); + default String getConversationId(REQUEST request) { + return conversationId(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getConversationId(Object)} instead. + */ + @Deprecated + @Nullable + default String conversationId(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default Long getMessagePayloadSize(REQUEST request) { + return messagePayloadSize(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getMessagePayloadSize(Object)} instead. + */ + @Deprecated + @Nullable + default Long messagePayloadSize(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default Long getMessagePayloadCompressedSize(REQUEST request) { + return messagePayloadCompressedSize(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getMessagePayloadCompressedSize(Object)} instead. + */ + @Deprecated + @Nullable + default Long messagePayloadCompressedSize(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getMessageId(REQUEST request, @Nullable RESPONSE response) { + return messageId(request, response); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getMessageId(Object, Object)} instead. + */ + @Deprecated + @Nullable + default String messageId(REQUEST request, @Nullable RESPONSE response) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } /** * Extracts all values of header named {@code name} from the request, or an empty list if there @@ -57,6 +210,23 @@ public interface MessagingAttributesGetter { *

Implementations of this method must not return a null value; an empty list should be * returned instead. */ + // TODO: when removing header(), make sure this method returns emptyList() by default + default List getMessageHeader(REQUEST request, String name) { + return header(request, name); + } + + /** + * Extracts all values of header named {@code name} from the request, or an empty list if there + * were none. + * + *

Implementations of this method must not return a null value; an empty list should be + * returned instead. + * + *

This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getMessageHeader(Object, String)} instead. + */ + @Deprecated default List header(REQUEST request, String name) { return Collections.emptyList(); } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractor.java index d186bd8334ed..70bfb8d209c1 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractor.java @@ -14,7 +14,8 @@ public final class MessagingSpanNameExtractor implements SpanNameExtrac * href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/messaging.md#span-name"> * messaging semantic conventions: {@code }. * - * @see MessagingAttributesGetter#destination(Object) used to extract {@code }. + * @see MessagingAttributesGetter#getDestination(Object) used to extract {@code }. * @see MessageOperation used to extract {@code }. */ public static SpanNameExtractor create( @@ -35,9 +36,9 @@ private MessagingSpanNameExtractor( @Override public String extract(REQUEST request) { String destinationName = - getter.temporaryDestination(request) + getter.isTemporaryDestination(request) ? MessagingAttributesExtractor.TEMP_DESTINATION_NAME - : getter.destination(request); + : getter.getDestination(request); if (destinationName == null) { destinationName = "unknown"; } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetter.java index 3f212247e521..3ab77ac98e40 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetter.java @@ -26,7 +26,7 @@ protected abstract InetSocketAddress getPeerSocketAddress( @Nullable @Override - public String sockFamily(REQUEST request, @Nullable RESPONSE response) { + public String getSockFamily(REQUEST request, @Nullable RESPONSE response) { InetSocketAddress address = getPeerSocketAddress(request, response); if (address == null) { return null; @@ -40,7 +40,7 @@ public String sockFamily(REQUEST request, @Nullable RESPONSE response) { @Override @Nullable - public final String sockPeerAddr(REQUEST request, @Nullable RESPONSE response) { + public final String getSockPeerAddr(REQUEST request, @Nullable RESPONSE response) { InetSocketAddress address = getPeerSocketAddress(request, response); if (address == null) { return null; @@ -54,7 +54,7 @@ public final String sockPeerAddr(REQUEST request, @Nullable RESPONSE response) { @Override @Nullable - public String sockPeerName(REQUEST request, @Nullable RESPONSE response) { + public String getSockPeerName(REQUEST request, @Nullable RESPONSE response) { InetSocketAddress address = getPeerSocketAddress(request, response); if (address == null) { return null; @@ -64,7 +64,7 @@ public String sockPeerName(REQUEST request, @Nullable RESPONSE response) { @Nullable @Override - public Integer sockPeerPort(REQUEST request, @Nullable RESPONSE response) { + public Integer getSockPeerPort(REQUEST request, @Nullable RESPONSE response) { InetSocketAddress address = getPeerSocketAddress(request, response); if (address == null) { return null; diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetter.java index fb2a5e4fa190..fee608505759 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetter.java @@ -29,7 +29,7 @@ public abstract class InetSocketAddressNetServerAttributesGetter @Nullable @Override - public String sockFamily(REQUEST request) { + public String getSockFamily(REQUEST request) { InetSocketAddress address = getPeerSocketAddress(request); if (address == null) { address = getHostSocketAddress(request); @@ -46,25 +46,25 @@ public String sockFamily(REQUEST request) { @Override @Nullable - public final String sockPeerAddr(REQUEST request) { + public final String getSockPeerAddr(REQUEST request) { return getAddress(getPeerSocketAddress(request)); } @Override @Nullable - public final Integer sockPeerPort(REQUEST request) { + public final Integer getSockPeerPort(REQUEST request) { return getPort(getPeerSocketAddress(request)); } @Nullable @Override - public String sockHostAddr(REQUEST request) { + public String getSockHostAddr(REQUEST request) { return getAddress(getHostSocketAddress(request)); } @Nullable @Override - public Integer sockHostPort(REQUEST request) { + public Integer getSockHostPort(REQUEST request) { return getPort(getHostSocketAddress(request)); } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java index d5730be2b234..539f6db2e5b8 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java @@ -18,29 +18,119 @@ public interface NetClientAttributesGetter { @Nullable - String transport(REQUEST request, @Nullable RESPONSE response); + default String getTransport(REQUEST request, @Nullable RESPONSE response) { + return transport(request, response); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getTransport(Object, Object)} instead. + */ + @Deprecated + @Nullable + default String transport(REQUEST request, @Nullable RESPONSE response) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getPeerName(REQUEST request) { + return peerName(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getPeerName(Object)} instead. + */ + @Deprecated + @Nullable + default String peerName(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default Integer getPeerPort(REQUEST request) { + return peerPort(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getPeerPort(Object)} instead. + */ + @Deprecated @Nullable - String peerName(REQUEST request); + default Integer peerPort(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + // TODO: when removing sockFamily(), make sure this method returns null by default @Nullable - Integer peerPort(REQUEST request); + default String getSockFamily(REQUEST request, @Nullable RESPONSE response) { + return sockFamily(request, response); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockFamily(Object, Object)} instead. + */ + @Deprecated @Nullable default String sockFamily(REQUEST request, @Nullable RESPONSE response) { return null; } + // TODO: when removing sockPeerAddr(), make sure this method returns null by default + @Nullable + default String getSockPeerAddr(REQUEST request, @Nullable RESPONSE response) { + return sockPeerAddr(request, response); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockPeerAddr(Object, Object)} instead. + */ + @Deprecated @Nullable default String sockPeerAddr(REQUEST request, @Nullable RESPONSE response) { return null; } + // TODO: when removing sockPeerName(), make sure this method returns null by default + @Nullable + default String getSockPeerName(REQUEST request, @Nullable RESPONSE response) { + return sockPeerName(request, response); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockPeerName(Object, Object)} instead. + */ + @Deprecated @Nullable default String sockPeerName(REQUEST request, @Nullable RESPONSE response) { return null; } + // TODO: when removing sockPeerPort(), make sure this method returns null by default + @Nullable + default Integer getSockPeerPort(REQUEST request, @Nullable RESPONSE response) { + return sockPeerPort(request, response); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockPeerName(Object, Object)} instead. + */ + @Deprecated @Nullable default Integer sockPeerPort(REQUEST request, @Nullable RESPONSE response) { return null; diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java index 72bd87e6b1b8..25a0ad498ed4 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java @@ -18,34 +18,136 @@ public interface NetServerAttributesGetter { @Nullable - String transport(REQUEST request); + default String getTransport(REQUEST request) { + return transport(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getTransport(Object)} instead. + */ + @Deprecated + @Nullable + default String transport(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getHostName(REQUEST request) { + return hostName(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getHostName(Object)} instead. + */ + @Deprecated @Nullable - String hostName(REQUEST request); + default String hostName(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - Integer hostPort(REQUEST request); + default Integer getHostPort(REQUEST request) { + return hostPort(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getHostPort(Object)} instead. + */ + @Deprecated + @Nullable + default Integer hostPort(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + // TODO: when removing sockFamily(), make sure this method returns null by default + @Nullable + default String getSockFamily(REQUEST request) { + return sockFamily(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockFamily(Object)} instead. + */ + @Deprecated @Nullable default String sockFamily(REQUEST request) { return null; } + // TODO: when removing sockPeerAddr(), make sure this method returns null by default + @Nullable + default String getSockPeerAddr(REQUEST request) { + return sockPeerAddr(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockPeerAddr(Object)} instead. + */ + @Deprecated @Nullable default String sockPeerAddr(REQUEST request) { return null; } + // TODO: when removing sockPeerPort(), make sure this method returns null by default + @Nullable + default Integer getSockPeerPort(REQUEST request) { + return sockPeerPort(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockPeerPort(Object)} instead. + */ + @Deprecated @Nullable default Integer sockPeerPort(REQUEST request) { return null; } + // TODO: when removing sockHostAddr(), make sure this method returns null by default + @Nullable + default String getSockHostAddr(REQUEST request) { + return sockHostAddr(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockHostAddr(Object)} instead. + */ + @Deprecated @Nullable default String sockHostAddr(REQUEST request) { return null; } + // TODO: when removing sockHostPort(), make sure this method returns null by default + @Nullable + default Integer getSockHostPort(REQUEST request) { + return sockHostPort(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSockHostPort(Object)} instead. + */ + @Deprecated @Nullable default Integer sockHostPort(REQUEST request) { return null; diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java index 8b7cd2d7fc2c..0db34e79a4a5 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java @@ -57,7 +57,7 @@ public void onEnd( return; } - String peerName = attributesGetter.peerName(request); + String peerName = attributesGetter.getPeerName(request); String peerService = mapToPeerService(peerName); if (peerService != null) { attributes.put(SemanticAttributes.PEER_SERVICE, peerService); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java index 31c14f11f0d5..93b9b5b3c55c 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java @@ -47,26 +47,27 @@ public void onStart(AttributesBuilder attributes, REQUEST request) { public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPONSE response) { - internalSet(attributes, SemanticAttributes.NET_TRANSPORT, getter.transport(request, response)); + internalSet( + attributes, SemanticAttributes.NET_TRANSPORT, getter.getTransport(request, response)); String peerName = extractPeerName(request); - String sockPeerAddr = getter.sockPeerAddr(request, response); + String sockPeerAddr = getter.getSockPeerAddr(request, response); if (sockPeerAddr != null && !sockPeerAddr.equals(peerName)) { internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_ADDR, sockPeerAddr); Integer peerPort = extractPeerPort(request); - Integer sockPeerPort = getter.sockPeerPort(request, response); + Integer sockPeerPort = getter.getSockPeerPort(request, response); if (sockPeerPort != null && sockPeerPort > 0 && !sockPeerPort.equals(peerPort)) { internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_PORT, (long) sockPeerPort); } - String sockFamily = getter.sockFamily(request, response); + String sockFamily = getter.getSockFamily(request, response); if (sockFamily != null && !SemanticAttributes.NetSockFamilyValues.INET.equals(sockFamily)) { internalSet(attributes, SemanticAttributes.NET_SOCK_FAMILY, sockFamily); } - String sockPeerName = getter.sockPeerName(request, response); + String sockPeerName = getter.getSockPeerName(request, response); if (sockPeerName != null && !sockPeerName.equals(peerName)) { internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_NAME, sockPeerName); } @@ -74,7 +75,7 @@ public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPO } private String extractPeerName(REQUEST request) { - String peerName = getter.peerName(request); + String peerName = getter.getPeerName(request); if (peerName == null) { peerName = fallbackNamePortGetter.name(request); } @@ -82,7 +83,7 @@ private String extractPeerName(REQUEST request) { } private Integer extractPeerPort(REQUEST request) { - Integer peerPort = getter.peerPort(request); + Integer peerPort = getter.getPeerPort(request); if (peerPort == null) { peerPort = fallbackNamePortGetter.port(request); } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java index 3b6255c931bb..3ebb60a3aefe 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java @@ -32,17 +32,17 @@ public InternalNetServerAttributesExtractor( } public void onStart(AttributesBuilder attributes, REQUEST request) { - internalSet(attributes, SemanticAttributes.NET_TRANSPORT, getter.transport(request)); + internalSet(attributes, SemanticAttributes.NET_TRANSPORT, getter.getTransport(request)); boolean setSockFamily = false; - String sockPeerAddr = getter.sockPeerAddr(request); + String sockPeerAddr = getter.getSockPeerAddr(request); if (sockPeerAddr != null) { setSockFamily = true; internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_ADDR, sockPeerAddr); - Integer sockPeerPort = getter.sockPeerPort(request); + Integer sockPeerPort = getter.getSockPeerPort(request); if (sockPeerPort != null && sockPeerPort > 0) { internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_PORT, (long) sockPeerPort); } @@ -59,20 +59,20 @@ public void onStart(AttributesBuilder attributes, REQUEST request) { } } - String sockHostAddr = getter.sockHostAddr(request); + String sockHostAddr = getter.getSockHostAddr(request); if (sockHostAddr != null && !sockHostAddr.equals(hostName)) { setSockFamily = true; internalSet(attributes, SemanticAttributes.NET_SOCK_HOST_ADDR, sockHostAddr); - Integer sockHostPort = getter.sockHostPort(request); + Integer sockHostPort = getter.getSockHostPort(request); if (sockHostPort != null && sockHostPort > 0 && !sockHostPort.equals(hostPort)) { internalSet(attributes, SemanticAttributes.NET_SOCK_HOST_PORT, (long) sockHostPort); } } if (setSockFamily) { - String sockFamily = getter.sockFamily(request); + String sockFamily = getter.getSockFamily(request); if (sockFamily != null && !SemanticAttributes.NetSockFamilyValues.INET.equals(sockFamily)) { internalSet(attributes, SemanticAttributes.NET_SOCK_FAMILY, sockFamily); } @@ -80,7 +80,7 @@ public void onStart(AttributesBuilder attributes, REQUEST request) { } private String extractHostName(REQUEST request) { - String peerName = getter.hostName(request); + String peerName = getter.getHostName(request); if (peerName == null) { peerName = fallbackNamePortGetter.name(request); } @@ -88,7 +88,7 @@ private String extractHostName(REQUEST request) { } private Integer extractHostPort(REQUEST request) { - Integer peerPort = getter.hostPort(request); + Integer peerPort = getter.getHostPort(request); if (peerPort == null) { peerPort = fallbackNamePortGetter.port(request); } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesGetter.java index 49f5d47c2414..cfb2e76aa595 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesGetter.java @@ -17,11 +17,53 @@ public interface RpcAttributesGetter { @Nullable - String system(REQUEST request); + default String getSystem(REQUEST request) { + return system(request); + } + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getSystem(Object)} instead. + */ + @Deprecated @Nullable - String service(REQUEST request); + default String system(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } @Nullable - String method(REQUEST request); + default String getService(REQUEST request) { + return service(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getService(Object)} instead. + */ + @Deprecated + @Nullable + default String service(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } + + @Nullable + default String getMethod(REQUEST request) { + return method(request); + } + + /** + * This method is deprecated and will be removed in the subsequent release. + * + * @deprecated Use {@link #getMethod(Object)} instead. + */ + @Deprecated + @Nullable + default String method(REQUEST request) { + throw new UnsupportedOperationException( + "This method is deprecated and will be removed in the subsequent release."); + } } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcCommonAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcCommonAttributesExtractor.java index 8c1ba1e0fe24..618a1f31aca1 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcCommonAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcCommonAttributesExtractor.java @@ -24,9 +24,9 @@ abstract class RpcCommonAttributesExtractor @Override public final void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { - internalSet(attributes, SemanticAttributes.RPC_SYSTEM, getter.system(request)); - internalSet(attributes, SemanticAttributes.RPC_SERVICE, getter.service(request)); - internalSet(attributes, SemanticAttributes.RPC_METHOD, getter.method(request)); + internalSet(attributes, SemanticAttributes.RPC_SYSTEM, getter.getSystem(request)); + internalSet(attributes, SemanticAttributes.RPC_SERVICE, getter.getService(request)); + internalSet(attributes, SemanticAttributes.RPC_METHOD, getter.getMethod(request)); } @Override diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractor.java index 22f70437096b..1ecc8021068b 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractor.java @@ -27,8 +27,8 @@ private RpcSpanNameExtractor(RpcAttributesGetter getter) { @Override public String extract(REQUEST request) { - String service = getter.service(request); - String method = getter.method(request); + String service = getter.getService(request); + String method = getter.getMethod(request); if (service == null || method == null) { return "RPC request"; } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/util/ClassAndMethodAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/util/ClassAndMethodAttributesGetter.java index 2166eaa50850..db02cddad043 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/util/ClassAndMethodAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/util/ClassAndMethodAttributesGetter.java @@ -13,13 +13,13 @@ enum ClassAndMethodAttributesGetter implements CodeAttributesGetter codeClass(ClassAndMethod classAndMethod) { + public Class getCodeClass(ClassAndMethod classAndMethod) { return classAndMethod.declaringClass(); } @Nullable @Override - public String methodName(ClassAndMethod classAndMethod) { + public String getMethodName(ClassAndMethod classAndMethod) { return classAndMethod.methodName(); } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java index 7f96f650041e..fbaa98844255 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java @@ -21,7 +21,7 @@ class CodeAttributesExtractorTest { static final class TestAttributesGetter implements CodeAttributesGetter> { @Override - public Class codeClass(Map request) { + public Class getCodeClass(Map request) { try { String className = request.get("class"); return className == null ? null : Class.forName(className); @@ -31,7 +31,7 @@ public Class codeClass(Map request) { } @Override - public String methodName(Map request) { + public String getMethodName(Map request) { return request.get("methodName"); } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractorTest.java index 5bcf88f892a5..1c0cc3de110a 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractorTest.java @@ -23,8 +23,8 @@ void shouldExtractFullSpanName() { // given Object request = new Object(); - doReturn(TestClass.class).when(getter).codeClass(request); - doReturn("doSomething").when(getter).methodName(request); + doReturn(TestClass.class).when(getter).getCodeClass(request); + doReturn("doSomething").when(getter).getMethodName(request); SpanNameExtractor underTest = CodeSpanNameExtractor.create(getter); @@ -41,8 +41,8 @@ void shouldExtractFullSpanNameForAnonymousClass() { AnonymousBaseClass anon = new AnonymousBaseClass() {}; Object request = new Object(); - doReturn(anon.getClass()).when(getter).codeClass(request); - doReturn("doSomething").when(getter).methodName(request); + doReturn(anon.getClass()).when(getter).getCodeClass(request); + doReturn("doSomething").when(getter).getMethodName(request); SpanNameExtractor underTest = CodeSpanNameExtractor.create(getter); @@ -59,8 +59,8 @@ void shouldExtractFullSpanNameForLambda() { Runnable lambda = () -> {}; Object request = new Object(); - doReturn(lambda.getClass()).when(getter).codeClass(request); - doReturn("doSomething").when(getter).methodName(request); + doReturn(lambda.getClass()).when(getter).getCodeClass(request); + doReturn("doSomething").when(getter).getMethodName(request); SpanNameExtractor underTest = CodeSpanNameExtractor.create(getter); diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractorTest.java index e07ee6966c3d..9ccd8d212d06 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesExtractorTest.java @@ -21,32 +21,32 @@ class DbClientAttributesExtractorTest { static final class TestAttributesGetter implements DbClientAttributesGetter> { @Override - public String system(Map map) { + public String getSystem(Map map) { return map.get("db.system"); } @Override - public String user(Map map) { + public String getUser(Map map) { return map.get("db.user"); } @Override - public String name(Map map) { + public String getName(Map map) { return map.get("db.name"); } @Override - public String connectionString(Map map) { + public String getConnectionString(Map map) { return map.get("db.connection_string"); } @Override - public String statement(Map map) { + public String getStatement(Map map) { return map.get("db.statement"); } @Override - public String operation(Map map) { + public String getOperation(Map map) { return map.get("db.operation"); } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractorTest.java index e88d82e7ecad..d7b4e635095c 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractorTest.java @@ -24,8 +24,8 @@ void shouldExtractFullSpanName() { // given DbRequest dbRequest = new DbRequest(); - when(sqlAttributesGetter.rawStatement(dbRequest)).thenReturn("SELECT * from table"); - when(sqlAttributesGetter.name(dbRequest)).thenReturn("database"); + when(sqlAttributesGetter.getRawStatement(dbRequest)).thenReturn("SELECT * from table"); + when(sqlAttributesGetter.getName(dbRequest)).thenReturn("database"); SpanNameExtractor underTest = DbClientSpanNameExtractor.create(sqlAttributesGetter); @@ -41,8 +41,8 @@ void shouldSkipDbNameIfTableAlreadyHasDbNamePrefix() { // given DbRequest dbRequest = new DbRequest(); - when(sqlAttributesGetter.rawStatement(dbRequest)).thenReturn("SELECT * from another.table"); - when(sqlAttributesGetter.name(dbRequest)).thenReturn("database"); + when(sqlAttributesGetter.getRawStatement(dbRequest)).thenReturn("SELECT * from another.table"); + when(sqlAttributesGetter.getName(dbRequest)).thenReturn("database"); SpanNameExtractor underTest = DbClientSpanNameExtractor.create(sqlAttributesGetter); @@ -58,7 +58,7 @@ void shouldExtractOperationAndTable() { // given DbRequest dbRequest = new DbRequest(); - when(sqlAttributesGetter.rawStatement(dbRequest)).thenReturn("SELECT * from table"); + when(sqlAttributesGetter.getRawStatement(dbRequest)).thenReturn("SELECT * from table"); SpanNameExtractor underTest = DbClientSpanNameExtractor.create(sqlAttributesGetter); @@ -74,8 +74,8 @@ void shouldExtractOperationAndName() { // given DbRequest dbRequest = new DbRequest(); - when(dbAttributesGetter.operation(dbRequest)).thenReturn("SELECT"); - when(dbAttributesGetter.name(dbRequest)).thenReturn("database"); + when(dbAttributesGetter.getOperation(dbRequest)).thenReturn("SELECT"); + when(dbAttributesGetter.getName(dbRequest)).thenReturn("database"); SpanNameExtractor underTest = DbClientSpanNameExtractor.create(dbAttributesGetter); @@ -91,7 +91,7 @@ void shouldExtractOperation() { // given DbRequest dbRequest = new DbRequest(); - when(dbAttributesGetter.operation(dbRequest)).thenReturn("SELECT"); + when(dbAttributesGetter.getOperation(dbRequest)).thenReturn("SELECT"); SpanNameExtractor underTest = DbClientSpanNameExtractor.create(dbAttributesGetter); @@ -107,7 +107,7 @@ void shouldExtractDbName() { // given DbRequest dbRequest = new DbRequest(); - when(dbAttributesGetter.name(dbRequest)).thenReturn("database"); + when(dbAttributesGetter.getName(dbRequest)).thenReturn("database"); SpanNameExtractor underTest = DbClientSpanNameExtractor.create(dbAttributesGetter); diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractorTest.java index 8a9a30f33d86..ff19c443ea61 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractorTest.java @@ -23,27 +23,27 @@ static final class TestAttributesGetter implements SqlClientAttributesGetter> { @Override - public String rawStatement(Map map) { + public String getRawStatement(Map map) { return map.get("db.statement"); } @Override - public String system(Map map) { + public String getSystem(Map map) { return map.get("db.system"); } @Override - public String user(Map map) { + public String getUser(Map map) { return map.get("db.user"); } @Override - public String name(Map map) { + public String getName(Map map) { return map.get("db.name"); } @Override - public String connectionString(Map map) { + public String getConnectionString(Map map) { return map.get("db.connection_string"); } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java index 70aca1e1baa1..eb811e277a7f 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java @@ -37,34 +37,34 @@ static class TestHttpClientAttributesGetter implements HttpClientAttributesGetter, Map> { @Override - public String method(Map request) { + public String getMethod(Map request) { return request.get("method"); } @Override - public String url(Map request) { + public String getUrl(Map request) { return request.get("url"); } @Override - public List requestHeader(Map request, String name) { + public List getRequestHeader(Map request, String name) { String value = request.get("header." + name); return value == null ? emptyList() : asList(value.split(",")); } @Override - public Integer statusCode( + public Integer getStatusCode( Map request, Map response, @Nullable Throwable error) { return Integer.parseInt(response.get("statusCode")); } @Override - public String flavor(Map request, Map response) { + public String getFlavor(Map request, Map response) { return request.get("flavor"); } @Override - public List responseHeader( + public List getResponseHeader( Map request, Map response, String name) { String value = response.get("header." + name); return value == null ? emptyList() : asList(value.split(",")); @@ -76,19 +76,20 @@ static class TestNetClientAttributesGetter @Nullable @Override - public String transport(Map request, @Nullable Map response) { + public String getTransport( + Map request, @Nullable Map response) { return response.get("transport"); } @Nullable @Override - public String peerName(Map request) { + public String getPeerName(Map request) { return request.get("peerName"); } @Nullable @Override - public Integer peerPort(Map request) { + public Integer getPeerPort(Map request) { String statusCode = request.get("peerPort"); return statusCode == null ? null : Integer.parseInt(statusCode); } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java index 3100f3fd856e..60ce73cb7d65 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java @@ -37,45 +37,45 @@ static class TestHttpServerAttributesGetter implements HttpServerAttributesGetter, Map> { @Override - public String method(Map request) { + public String getMethod(Map request) { return (String) request.get("method"); } @Override - public String target(Map request) { + public String getTarget(Map request) { return (String) request.get("target"); } @Override - public String route(Map request) { + public String getRoute(Map request) { return (String) request.get("route"); } @Override - public String scheme(Map request) { + public String getScheme(Map request) { return (String) request.get("scheme"); } @Override - public List requestHeader(Map request, String name) { + public List getRequestHeader(Map request, String name) { String values = (String) request.get("header." + name); return values == null ? emptyList() : asList(values.split(",")); } @Override - public Integer statusCode( + public Integer getStatusCode( Map request, Map response, @Nullable Throwable error) { String value = (String) response.get("statusCode"); return value == null ? null : Integer.parseInt(value); } @Override - public String flavor(Map request) { + public String getFlavor(Map request) { return (String) request.get("flavor"); } @Override - public List responseHeader( + public List getResponseHeader( Map request, Map response, String name) { String values = (String) response.get("header." + name); return values == null ? emptyList() : asList(values.split(",")); @@ -86,19 +86,19 @@ static class TestNetServerAttributesGetter implements NetServerAttributesGetter> { @Nullable @Override - public String transport(Map request) { + public String getTransport(Map request) { return (String) request.get("transport"); } @Nullable @Override - public String hostName(Map request) { + public String getHostName(Map request) { return (String) request.get("hostName"); } @Nullable @Override - public Integer hostPort(Map request) { + public Integer getHostPort(Map request) { return (Integer) request.get("hostPort"); } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractorTest.java index 3507fa2f15ee..65d5010f9a79 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractorTest.java @@ -28,15 +28,15 @@ class HttpSpanNameExtractorTest { @Test void routeAndMethod() { - when(serverGetter.route(anyMap())).thenReturn("/cats/{id}"); - when(serverGetter.method(anyMap())).thenReturn("GET"); + when(serverGetter.getRoute(anyMap())).thenReturn("/cats/{id}"); + when(serverGetter.getMethod(anyMap())).thenReturn("GET"); assertThat(HttpSpanNameExtractor.create(serverGetter).extract(Collections.emptyMap())) .isEqualTo("/cats/{id}"); } @Test void method() { - when(clientGetter.method(anyMap())).thenReturn("GET"); + when(clientGetter.getMethod(anyMap())).thenReturn("GET"); assertThat(HttpSpanNameExtractor.create(clientGetter).extract(Collections.emptyMap())) .isEqualTo("HTTP GET"); } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractorTest.java index 5ee05e8ab9ea..ac83daaba7c8 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractorTest.java @@ -35,7 +35,7 @@ class HttpSpanStatusExtractorTest { @ValueSource(ints = {1, 100, 101, 200, 201, 300, 301, 500, 501, 600, 601}) void hasServerStatus(int statusCode) { StatusCode expectedStatusCode = HttpStatusConverter.SERVER.statusFromHttpStatus(statusCode); - when(serverGetter.statusCode(anyMap(), anyMap(), isNull())).thenReturn(statusCode); + when(serverGetter.getStatusCode(anyMap(), anyMap(), isNull())).thenReturn(statusCode); HttpSpanStatusExtractor.create(serverGetter) .extract(spanStatusBuilder, Collections.emptyMap(), Collections.emptyMap(), null); @@ -51,7 +51,7 @@ void hasServerStatus(int statusCode) { @ValueSource(ints = {1, 100, 101, 200, 201, 300, 301, 400, 401, 500, 501, 600, 601}) void hasClientStatus(int statusCode) { StatusCode expectedStatusCode = HttpStatusConverter.CLIENT.statusFromHttpStatus(statusCode); - when(clientGetter.statusCode(anyMap(), anyMap(), isNull())).thenReturn(statusCode); + when(clientGetter.getStatusCode(anyMap(), anyMap(), isNull())).thenReturn(statusCode); HttpSpanStatusExtractor.create(clientGetter) .extract(spanStatusBuilder, Collections.emptyMap(), Collections.emptyMap(), null); @@ -67,7 +67,7 @@ void hasClientStatus(int statusCode) { @ValueSource(ints = {1, 100, 101, 200, 201, 300, 301, 400, 401, 500, 501, 600, 601}) void hasServerStatusAndException(int statusCode) { Throwable error = new IllegalStateException("test"); - when(serverGetter.statusCode(anyMap(), anyMap(), same(error))).thenReturn(statusCode); + when(serverGetter.getStatusCode(anyMap(), anyMap(), same(error))).thenReturn(statusCode); // Presence of exception overshadows the HTTP status HttpSpanStatusExtractor.create(serverGetter) @@ -80,7 +80,7 @@ void hasServerStatusAndException(int statusCode) { @ValueSource(ints = {1, 100, 101, 200, 201, 300, 301, 400, 401, 500, 501, 600, 601}) void hasClientStatusAndException(int statusCode) { Throwable error = new IllegalStateException("test"); - when(clientGetter.statusCode(anyMap(), anyMap(), same(error))).thenReturn(statusCode); + when(clientGetter.getStatusCode(anyMap(), anyMap(), same(error))).thenReturn(statusCode); // Presence of exception overshadows the HTTP status HttpSpanStatusExtractor.create(clientGetter) @@ -91,7 +91,7 @@ void hasClientStatusAndException(int statusCode) { @Test void hasNoServerStatus_fallsBackToDefault_unset() { - when(serverGetter.statusCode(anyMap(), anyMap(), isNull())).thenReturn(null); + when(serverGetter.getStatusCode(anyMap(), anyMap(), isNull())).thenReturn(null); HttpSpanStatusExtractor.create(serverGetter) .extract(spanStatusBuilder, Collections.emptyMap(), Collections.emptyMap(), null); @@ -101,7 +101,7 @@ void hasNoServerStatus_fallsBackToDefault_unset() { @Test void hasNoClientStatus_fallsBackToDefault_unset() { - when(clientGetter.statusCode(anyMap(), anyMap(), isNull())).thenReturn(null); + when(clientGetter.getStatusCode(anyMap(), anyMap(), isNull())).thenReturn(null); HttpSpanStatusExtractor.create(clientGetter) .extract(spanStatusBuilder, Collections.emptyMap(), Collections.emptyMap(), null); @@ -112,7 +112,7 @@ void hasNoClientStatus_fallsBackToDefault_unset() { @Test void hasNoServerStatus_fallsBackToDefault_error() { Throwable error = new IllegalStateException("test"); - when(serverGetter.statusCode(anyMap(), anyMap(), same(error))).thenReturn(null); + when(serverGetter.getStatusCode(anyMap(), anyMap(), same(error))).thenReturn(null); HttpSpanStatusExtractor.create(serverGetter) .extract(spanStatusBuilder, Collections.emptyMap(), Collections.emptyMap(), error); @@ -123,7 +123,7 @@ void hasNoServerStatus_fallsBackToDefault_error() { @Test void hasNoClientStatus_fallsBackToDefault_error() { IllegalStateException error = new IllegalStateException("test"); - when(clientGetter.statusCode(anyMap(), anyMap(), same(error))).thenReturn(null); + when(clientGetter.getStatusCode(anyMap(), anyMap(), same(error))).thenReturn(null); HttpSpanStatusExtractor.create(clientGetter) .extract(spanStatusBuilder, Collections.emptyMap(), Collections.emptyMap(), error); diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java index 0e0fb0c6dc58..ee17a4bd4a51 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java @@ -119,59 +119,59 @@ enum TestGetter implements MessagingAttributesGetter, String INSTANCE; @Override - public String system(Map request) { + public String getSystem(Map request) { return request.get("system"); } @Override - public String destinationKind(Map request) { + public String getDestinationKind(Map request) { return request.get("destinationKind"); } @Override - public String destination(Map request) { + public String getDestination(Map request) { return request.get("destination"); } @Override - public boolean temporaryDestination(Map request) { + public boolean isTemporaryDestination(Map request) { return request.containsKey("temporaryDestination"); } @Override - public String protocol(Map request) { + public String getProtocol(Map request) { return request.get("protocol"); } @Override - public String protocolVersion(Map request) { + public String getProtocolVersion(Map request) { return request.get("protocolVersion"); } @Override - public String url(Map request) { + public String getUrl(Map request) { return request.get("url"); } @Override - public String conversationId(Map request) { + public String getConversationId(Map request) { return request.get("conversationId"); } @Override - public Long messagePayloadSize(Map request) { + public Long getMessagePayloadSize(Map request) { String payloadSize = request.get("payloadSize"); return payloadSize == null ? null : Long.valueOf(payloadSize); } @Override - public Long messagePayloadCompressedSize(Map request) { + public Long getMessagePayloadCompressedSize(Map request) { String payloadSize = request.get("payloadCompressedSize"); return payloadSize == null ? null : Long.valueOf(payloadSize); } @Override - public String messageId(Map request, String response) { + public String getMessageId(Map request, String response) { return response; } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractorTest.java index d1164d011e81..fb60066816b4 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingSpanNameExtractorTest.java @@ -33,9 +33,9 @@ void shouldExtractSpanName( Message message = new Message(); if (isTemporaryQueue) { - when(getter.temporaryDestination(message)).thenReturn(true); + when(getter.isTemporaryDestination(message)).thenReturn(true); } else { - when(getter.destination(message)).thenReturn(destinationName); + when(getter.getDestination(message)).thenReturn(destinationName); } SpanNameExtractor underTest = MessagingSpanNameExtractor.create(getter, operation); diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java index bdfcd7ea12ed..37563731ae53 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java @@ -25,18 +25,18 @@ class InetSocketAddressNetClientAttributesGetterTest { getter = new InetSocketAddressNetClientAttributesGetter() { @Override - public String transport(InetSocketAddress request, InetSocketAddress response) { + public String getTransport(InetSocketAddress request, InetSocketAddress response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override - public String peerName(InetSocketAddress request) { + public String getPeerName(InetSocketAddress request) { // net.peer.name and net.peer.port are tested in NetClientAttributesExtractorTest return null; } @Override - public Integer peerPort(InetSocketAddress request) { + public Integer getPeerPort(InetSocketAddress request) { // net.peer.name and net.peer.port are tested in NetClientAttributesExtractorTest return null; } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetterTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetterTest.java index 881bca80f664..60cfbbf4798e 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetterTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetterTest.java @@ -25,18 +25,18 @@ class InetSocketAddressNetServerAttributesGetterTest { new InetSocketAddressNetServerAttributesGetter() { @Override - public String transport(Addresses request) { + public String getTransport(Addresses request) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override - public String hostName(Addresses request) { + public String getHostName(Addresses request) { // net.host.name and net.host.port are tested in NetClientAttributesExtractorTest return null; } @Override - public Integer hostPort(Addresses request) { + public Integer getHostPort(Addresses request) { // net.host.name and net.host.port are tested in NetClientAttributesExtractorTest return null; } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java index 63d7c819f0f1..9d6ac3cbfca9 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java @@ -26,38 +26,38 @@ static class TestNetClientAttributesGetter implements NetClientAttributesGetter, Map> { @Override - public String transport(Map request, Map response) { + public String getTransport(Map request, Map response) { return response.get("transport"); } @Override - public String peerName(Map request) { + public String getPeerName(Map request) { return request.get("peerName"); } @Override - public Integer peerPort(Map request) { + public Integer getPeerPort(Map request) { String peerPort = request.get("peerPort"); return peerPort == null ? null : Integer.valueOf(peerPort); } @Override - public String sockFamily(Map request, Map response) { + public String getSockFamily(Map request, Map response) { return response.get("sockFamily"); } @Override - public String sockPeerAddr(Map request, Map response) { + public String getSockPeerAddr(Map request, Map response) { return response.get("sockPeerAddr"); } @Override - public String sockPeerName(Map request, Map response) { + public String getSockPeerName(Map request, Map response) { return response.get("sockPeerName"); } @Override - public Integer sockPeerPort(Map request, Map response) { + public Integer getSockPeerPort(Map request, Map response) { String sockPeerPort = response.get("sockPeerPort"); return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort); } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java index 48c7acd5e5fb..bf5e92e9f04f 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java @@ -26,49 +26,49 @@ static class TestNetServerAttributesGetter implements NetServerAttributesGetter> { @Override - public String transport(Map request) { + public String getTransport(Map request) { return request.get("transport"); } @Nullable @Override - public String hostName(Map request) { + public String getHostName(Map request) { return request.get("hostName"); } @Nullable @Override - public Integer hostPort(Map request) { + public Integer getHostPort(Map request) { String hostPort = request.get("hostPort"); return hostPort == null ? null : Integer.valueOf(hostPort); } @Nullable @Override - public String sockFamily(Map request) { + public String getSockFamily(Map request) { return request.get("sockFamily"); } @Override - public String sockPeerAddr(Map request) { + public String getSockPeerAddr(Map request) { return request.get("sockPeerAddr"); } @Override - public Integer sockPeerPort(Map request) { + public Integer getSockPeerPort(Map request) { String sockPeerPort = request.get("sockPeerPort"); return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort); } @Nullable @Override - public String sockHostAddr(Map request) { + public String getSockHostAddr(Map request) { return request.get("sockHostAddr"); } @Nullable @Override - public Integer sockHostPort(Map request) { + public Integer getSockHostPort(Map request) { String sockHostPort = request.get("sockHostPort"); return sockHostPort == null ? null : Integer.valueOf(sockHostPort); } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java index 773d1b67ca48..97d755f16a24 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java @@ -54,7 +54,7 @@ void shouldNotSetAnyValueIfPeerNameDoesNotMatch() { PeerServiceAttributesExtractor underTest = new PeerServiceAttributesExtractor<>(netAttributesExtractor, peerServiceMapping); - when(netAttributesExtractor.peerName(any())).thenReturn("example2.com"); + when(netAttributesExtractor.getPeerName(any())).thenReturn("example2.com"); Context context = Context.root(); @@ -79,7 +79,7 @@ void shouldSetPeerNameIfItMatches() { PeerServiceAttributesExtractor underTest = new PeerServiceAttributesExtractor<>(netAttributesExtractor, peerServiceMapping); - when(netAttributesExtractor.peerName(any())).thenReturn("example.com"); + when(netAttributesExtractor.getPeerName(any())).thenReturn("example.com"); Context context = Context.root(); diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesExtractorTest.java index b092b6bad876..d14edbc8a0ee 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesExtractorTest.java @@ -23,17 +23,17 @@ enum TestGetter implements RpcAttributesGetter> { INSTANCE; @Override - public String system(Map request) { + public String getSystem(Map request) { return "test"; } @Override - public String service(Map request) { + public String getService(Map request) { return request.get("service"); } @Override - public String method(Map request) { + public String getMethod(Map request) { return request.get("method"); } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractorTest.java index 9c12691c150a..eb908a4198db 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcSpanNameExtractorTest.java @@ -23,8 +23,8 @@ class RpcSpanNameExtractorTest { void normal() { RpcRequest request = new RpcRequest(); - when(getter.service(request)).thenReturn("my.Service"); - when(getter.method(request)).thenReturn("Method"); + when(getter.getService(request)).thenReturn("my.Service"); + when(getter.getMethod(request)).thenReturn("Method"); SpanNameExtractor extractor = RpcSpanNameExtractor.create(getter); assertThat(extractor.extract(request)).isEqualTo("my.Service/Method"); @@ -34,7 +34,7 @@ void normal() { void serviceNull() { RpcRequest request = new RpcRequest(); - when(getter.method(request)).thenReturn("Method"); + when(getter.getMethod(request)).thenReturn("Method"); SpanNameExtractor extractor = RpcSpanNameExtractor.create(getter); assertThat(extractor.extract(request)).isEqualTo("RPC request"); @@ -44,7 +44,7 @@ void serviceNull() { void methodNull() { RpcRequest request = new RpcRequest(); - when(getter.service(request)).thenReturn("my.Service"); + when(getter.getService(request)).thenReturn("my.Service"); SpanNameExtractor extractor = RpcSpanNameExtractor.create(getter); assertThat(extractor.extract(request)).isEqualTo("RPC request"); diff --git a/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java b/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java index de1b7454ad39..175edf184af6 100644 --- a/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java +++ b/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java @@ -61,17 +61,17 @@ enum ConstantHttpAttributesGetter implements HttpClientAttributesGetter requestHeader(Void unused, String name) { + public List getRequestHeader(Void unused, String name) { if (name.equalsIgnoreCase("user-agent")) { return Collections.singletonList("OpenTelemetryBot"); } @@ -79,17 +79,17 @@ public List requestHeader(Void unused, String name) { } @Override - public String flavor(Void unused, @Nullable Void unused2) { + public String getFlavor(Void unused, @Nullable Void unused2) { return SemanticAttributes.HttpFlavorValues.HTTP_2_0; } @Override - public Integer statusCode(Void unused, Void unused2, @Nullable Throwable error) { + public Integer getStatusCode(Void unused, Void unused2, @Nullable Throwable error) { return 200; } @Override - public List responseHeader(Void unused, Void unused2, String name) { + public List getResponseHeader(Void unused, Void unused2, String name) { return Collections.emptyList(); } } @@ -102,19 +102,19 @@ static class ConstantNetAttributesGetter @Nullable @Override - public String transport(Void request, @Nullable Void response) { + public String getTransport(Void request, @Nullable Void response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(Void request) { + public String getPeerName(Void request) { return null; } @Nullable @Override - public Integer peerPort(Void request) { + public Integer getPeerPort(Void request) { return null; } diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java index 0aa413285604..e6ce60f9146d 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java @@ -16,33 +16,33 @@ class AkkaHttpClientAttributesGetter implements HttpClientAttributesGetter { @Override - public String url(HttpRequest httpRequest) { + public String getUrl(HttpRequest httpRequest) { return httpRequest.uri().toString(); } @Override - public String flavor(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { + public String getFlavor(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { return AkkaHttpUtil.flavor(httpRequest); } @Override - public String method(HttpRequest httpRequest) { + public String getMethod(HttpRequest httpRequest) { return httpRequest.method().value(); } @Override - public List requestHeader(HttpRequest httpRequest, String name) { + public List getRequestHeader(HttpRequest httpRequest, String name) { return AkkaHttpUtil.requestHeader(httpRequest, name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequest httpRequest, HttpResponse httpResponse, @Nullable Throwable error) { return httpResponse.status().intValue(); } @Override - public List responseHeader( + public List getResponseHeader( HttpRequest httpRequest, HttpResponse httpResponse, String name) { return AkkaHttpUtil.responseHeader(httpResponse, name); } diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesGetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesGetter.java index 25b143a8b725..8beaa91d037e 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesGetter.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesGetter.java @@ -14,17 +14,17 @@ class AkkaHttpNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { + public String getTransport(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override - public String peerName(HttpRequest httpRequest) { + public String getPeerName(HttpRequest httpRequest) { return httpRequest.uri().authority().host().address(); } @Override - public Integer peerPort(HttpRequest httpRequest) { + public Integer getPeerPort(HttpRequest httpRequest) { return httpRequest.uri().authority().port(); } } diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java index e5ae8720f99f..88d8f3992c11 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java @@ -17,33 +17,34 @@ class AkkaHttpServerAttributesGetter implements HttpServerAttributesGetter { @Override - public String method(HttpRequest request) { + public String getMethod(HttpRequest request) { return request.method().value(); } @Override - public List requestHeader(HttpRequest request, String name) { + public List getRequestHeader(HttpRequest request, String name) { return AkkaHttpUtil.requestHeader(request, name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequest request, HttpResponse httpResponse, @Nullable Throwable error) { return httpResponse.status().intValue(); } @Override - public List responseHeader(HttpRequest request, HttpResponse httpResponse, String name) { + public List getResponseHeader( + HttpRequest request, HttpResponse httpResponse, String name) { return AkkaHttpUtil.responseHeader(httpResponse, name); } @Override - public String flavor(HttpRequest request) { + public String getFlavor(HttpRequest request) { return AkkaHttpUtil.flavor(request); } @Override - public String target(HttpRequest request) { + public String getTarget(HttpRequest request) { String target = request.uri().path().toString(); Option queryString = request.uri().rawQueryString(); if (queryString.isDefined()) { @@ -54,12 +55,12 @@ public String target(HttpRequest request) { @Override @Nullable - public String route(HttpRequest request) { + public String getRoute(HttpRequest request) { return null; } @Override - public String scheme(HttpRequest request) { + public String getScheme(HttpRequest request) { return request.uri().scheme(); } } diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaNetServerAttributesGetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaNetServerAttributesGetter.java index 6f26307ca79f..388f8dc9ca93 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaNetServerAttributesGetter.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaNetServerAttributesGetter.java @@ -14,19 +14,19 @@ class AkkaNetServerAttributesGetter implements NetServerAttributesGetter { INSTANCE; @Override - public String system(DubboRequest request) { + public String getSystem(DubboRequest request) { return "apache_dubbo"; } @Override - public String service(DubboRequest request) { + public String getService(DubboRequest request) { return request.invocation().getInvoker().getInterface().getName(); } @Override - public String method(DubboRequest request) { + public String getMethod(DubboRequest request) { return request.invocation().getMethodName(); } } diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java index 3d0055718bc4..f82e1ea43d92 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java @@ -20,18 +20,18 @@ public final class DubboNetClientAttributesGetter @Override @Nullable - public String transport(DubboRequest request, @Nullable Result response) { + public String getTransport(DubboRequest request, @Nullable Result response) { return null; } @Nullable @Override - public String peerName(DubboRequest request) { + public String getPeerName(DubboRequest request) { return request.url().getHost(); } @Override - public Integer peerPort(DubboRequest request) { + public Integer getPeerPort(DubboRequest request) { return request.url().getPort(); } diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesGetter.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesGetter.java index db5f707ab7d7..6888f6085b8e 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesGetter.java +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesGetter.java @@ -19,19 +19,19 @@ public final class DubboNetServerAttributesGetter @Override @Nullable - public String transport(DubboRequest request) { + public String getTransport(DubboRequest request) { return null; } @Nullable @Override - public String hostName(DubboRequest request) { + public String getHostName(DubboRequest request) { return null; } @Nullable @Override - public Integer hostPort(DubboRequest request) { + public Integer getHostPort(DubboRequest request) { return null; } diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java index 6ba84b3944e4..0d4bdf237107 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java @@ -17,23 +17,23 @@ final class ApacheHttpAsyncClientHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(ApacheHttpClientRequest request) { + public String getMethod(ApacheHttpClientRequest request) { return request.getMethod(); } @Override - public String url(ApacheHttpClientRequest request) { + public String getUrl(ApacheHttpClientRequest request) { return request.getUrl(); } @Override - public List requestHeader(ApacheHttpClientRequest request, String name) { + public List getRequestHeader(ApacheHttpClientRequest request, String name) { return request.getHeader(name); } @Override @Nullable - public Integer statusCode( + public Integer getStatusCode( ApacheHttpClientRequest request, HttpResponse response, @Nullable Throwable error) { StatusLine statusLine = response.getStatusLine(); return statusLine != null ? statusLine.getStatusCode() : null; @@ -41,12 +41,12 @@ public Integer statusCode( @Override @Nullable - public String flavor(ApacheHttpClientRequest request, @Nullable HttpResponse response) { + public String getFlavor(ApacheHttpClientRequest request, @Nullable HttpResponse response) { return request.getFlavor(); } @Override - public List responseHeader( + public List getResponseHeader( ApacheHttpClientRequest request, HttpResponse response, String name) { return headersToList(response.getHeaders(name)); } diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientNetAttributesGetter.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientNetAttributesGetter.java index 31cb00e399b7..817783cb8584 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientNetAttributesGetter.java +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientNetAttributesGetter.java @@ -15,18 +15,18 @@ final class ApacheHttpAsyncClientNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(ApacheHttpClientRequest request, @Nullable HttpResponse response) { + public String getTransport(ApacheHttpClientRequest request, @Nullable HttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(ApacheHttpClientRequest request) { + public String getPeerName(ApacheHttpClientRequest request) { return request.getPeerName(); } @Override - public Integer peerPort(ApacheHttpClientRequest request) { + public Integer getPeerPort(ApacheHttpClientRequest request) { return request.getPeerPort(); } diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java index 34bda395d4bf..5cf35ab424e7 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java @@ -22,47 +22,13 @@ final class ApacheHttpClientHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(HttpMethod request) { + public String getMethod(HttpMethod request) { return request.getName(); } - @Override - public String url(HttpMethod request) { - return getUrl(request); - } - - @Override - public List requestHeader(HttpMethod request, String name) { - Header header = request.getRequestHeader(name); - return header == null ? emptyList() : singletonList(header.getValue()); - } - - @Override - @Nullable - public Integer statusCode(HttpMethod request, HttpMethod response, @Nullable Throwable error) { - StatusLine statusLine = response.getStatusLine(); - return statusLine == null ? null : statusLine.getStatusCode(); - } - - @Override - @Nullable - public String flavor(HttpMethod request, @Nullable HttpMethod response) { - if (request instanceof HttpMethodBase) { - return ((HttpMethodBase) request).isHttp11() - ? SemanticAttributes.HttpFlavorValues.HTTP_1_1 - : SemanticAttributes.HttpFlavorValues.HTTP_1_0; - } - return null; - } - - @Override - public List responseHeader(HttpMethod request, HttpMethod response, String name) { - Header header = response.getResponseHeader(name); - return header == null ? emptyList() : singletonList(header.getValue()); - } - // mirroring implementation HttpMethodBase.getURI(), to avoid converting to URI and back to String - private static String getUrl(HttpMethod request) { + @Override + public String getUrl(HttpMethod request) { HostConfiguration hostConfiguration = request.getHostConfiguration(); if (hostConfiguration == null || hostConfiguration.getProtocol() == null) { String queryString = request.getQueryString(); @@ -90,4 +56,34 @@ private static String getUrl(HttpMethod request) { return url.toString(); } } + + @Override + public List getRequestHeader(HttpMethod request, String name) { + Header header = request.getRequestHeader(name); + return header == null ? emptyList() : singletonList(header.getValue()); + } + + @Override + @Nullable + public Integer getStatusCode(HttpMethod request, HttpMethod response, @Nullable Throwable error) { + StatusLine statusLine = response.getStatusLine(); + return statusLine == null ? null : statusLine.getStatusCode(); + } + + @Override + @Nullable + public String getFlavor(HttpMethod request, @Nullable HttpMethod response) { + if (request instanceof HttpMethodBase) { + return ((HttpMethodBase) request).isHttp11() + ? SemanticAttributes.HttpFlavorValues.HTTP_1_1 + : SemanticAttributes.HttpFlavorValues.HTTP_1_0; + } + return null; + } + + @Override + public List getResponseHeader(HttpMethod request, HttpMethod response, String name) { + Header header = response.getResponseHeader(name); + return header == null ? emptyList() : singletonList(header.getValue()); + } } diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientNetAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientNetAttributesGetter.java index a6009d8fcc10..1129f31a8c0f 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientNetAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientNetAttributesGetter.java @@ -15,20 +15,20 @@ final class ApacheHttpClientNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(HttpMethod request, @Nullable HttpMethod response) { + public String getTransport(HttpMethod request, @Nullable HttpMethod response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(HttpMethod request) { + public String getPeerName(HttpMethod request) { HostConfiguration hostConfiguration = request.getHostConfiguration(); return hostConfiguration != null ? hostConfiguration.getHost() : null; } @Override @Nullable - public Integer peerPort(HttpMethod request) { + public Integer getPeerPort(HttpMethod request) { HostConfiguration hostConfiguration = request.getHostConfiguration(); return hostConfiguration != null ? hostConfiguration.getPort() : null; } diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java index affdb348391c..41dd0c2a07bd 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java @@ -16,34 +16,34 @@ final class ApacheHttpClientHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(ApacheHttpClientRequest request) { + public String getMethod(ApacheHttpClientRequest request) { return request.getMethod(); } @Override - public String url(ApacheHttpClientRequest request) { + public String getUrl(ApacheHttpClientRequest request) { return request.getUrl(); } @Override - public List requestHeader(ApacheHttpClientRequest request, String name) { + public List getRequestHeader(ApacheHttpClientRequest request, String name) { return request.getHeader(name); } @Override - public Integer statusCode( + public Integer getStatusCode( ApacheHttpClientRequest request, HttpResponse response, @Nullable Throwable error) { return response.getStatusLine().getStatusCode(); } @Override @Nullable - public String flavor(ApacheHttpClientRequest request, @Nullable HttpResponse response) { + public String getFlavor(ApacheHttpClientRequest request, @Nullable HttpResponse response) { return request.getFlavor(); } @Override - public List responseHeader( + public List getResponseHeader( ApacheHttpClientRequest request, HttpResponse response, String name) { return headersToList(response.getHeaders(name)); } diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientNetAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientNetAttributesGetter.java index 9cca3ac8b398..f0fea9eda1ca 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientNetAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientNetAttributesGetter.java @@ -14,18 +14,18 @@ final class ApacheHttpClientNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(ApacheHttpClientRequest request, @Nullable HttpResponse response) { + public String getTransport(ApacheHttpClientRequest request, @Nullable HttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(ApacheHttpClientRequest request) { + public String getPeerName(ApacheHttpClientRequest request) { return request.getPeerName(); } @Override - public Integer peerPort(ApacheHttpClientRequest request) { + public Integer getPeerPort(ApacheHttpClientRequest request) { return request.getPeerPort(); } } diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java index c8717f310395..1c7b24f2cb18 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java @@ -17,35 +17,35 @@ enum ApacheHttpClientHttpAttributesGetter INSTANCE; @Override - public String method(ApacheHttpClientRequest request) { + public String getMethod(ApacheHttpClientRequest request) { return request.getMethod(); } @Override @Nullable - public String url(ApacheHttpClientRequest request) { + public String getUrl(ApacheHttpClientRequest request) { return request.getUrl(); } @Override - public List requestHeader(ApacheHttpClientRequest request, String name) { + public List getRequestHeader(ApacheHttpClientRequest request, String name) { return request.getHeader(name); } @Override - public Integer statusCode( + public Integer getStatusCode( ApacheHttpClientRequest request, HttpResponse response, @Nullable Throwable error) { return response.getStatusLine().getStatusCode(); } @Override @Nullable - public String flavor(ApacheHttpClientRequest request, @Nullable HttpResponse response) { + public String getFlavor(ApacheHttpClientRequest request, @Nullable HttpResponse response) { return request.getFlavor(); } @Override - public List responseHeader( + public List getResponseHeader( ApacheHttpClientRequest request, HttpResponse response, String name) { return headersToList(response.getHeaders(name)); } diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientNetAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientNetAttributesGetter.java index b2b3510319ec..a3d984b537da 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientNetAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientNetAttributesGetter.java @@ -15,19 +15,19 @@ final class ApacheHttpClientNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(ApacheHttpClientRequest request, @Nullable HttpResponse response) { + public String getTransport(ApacheHttpClientRequest request, @Nullable HttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(ApacheHttpClientRequest request) { + public String getPeerName(ApacheHttpClientRequest request) { return request.getPeerName(); } @Override @Nullable - public Integer peerPort(ApacheHttpClientRequest request) { + public Integer getPeerPort(ApacheHttpClientRequest request) { return request.getPeerPort(); } diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java index a1f229763493..09d4827005f6 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java @@ -26,12 +26,12 @@ final class ApacheHttpClientHttpAttributesGetter Logger.getLogger(ApacheHttpClientHttpAttributesGetter.class.getName()); @Override - public String method(HttpRequest request) { + public String getMethod(HttpRequest request) { return request.getMethod(); } @Override - public String url(HttpRequest request) { + public String getUrl(HttpRequest request) { // similar to org.apache.hc.core5.http.message.BasicHttpRequest.getUri() // not calling getUri() to avoid unnecessary conversion StringBuilder url = new StringBuilder(); @@ -64,18 +64,19 @@ public String url(HttpRequest request) { } @Override - public List requestHeader(HttpRequest request, String name) { + public List getRequestHeader(HttpRequest request, String name) { return getHeader(request, name); } @Override - public Integer statusCode(HttpRequest request, HttpResponse response, @Nullable Throwable error) { + public Integer getStatusCode( + HttpRequest request, HttpResponse response, @Nullable Throwable error) { return response.getCode(); } @Override @Nullable - public String flavor(HttpRequest request, @Nullable HttpResponse response) { + public String getFlavor(HttpRequest request, @Nullable HttpResponse response) { ProtocolVersion protocolVersion = getVersion(request, response); if (protocolVersion == null) { return null; @@ -100,7 +101,7 @@ public String flavor(HttpRequest request, @Nullable HttpResponse response) { } @Override - public List responseHeader(HttpRequest request, HttpResponse response, String name) { + public List getResponseHeader(HttpRequest request, HttpResponse response, String name) { return getHeader(response, name); } diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientNetAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientNetAttributesGetter.java index d2829dc68097..0f9d0783b7bc 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientNetAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientNetAttributesGetter.java @@ -20,18 +20,18 @@ final class ApacheHttpClientNetAttributesGetter Logger.getLogger(ApacheHttpClientNetAttributesGetter.class.getName()); @Override - public String transport(HttpRequest request, @Nullable HttpResponse response) { + public String getTransport(HttpRequest request, @Nullable HttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(HttpRequest request) { + public String getPeerName(HttpRequest request) { return request.getAuthority().getHostName(); } @Override - public Integer peerPort(HttpRequest request) { + public Integer getPeerPort(HttpRequest request) { int port = request.getAuthority().getPort(); if (port != -1) { return port; diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java index fe91f25b3a9f..43bbaf62bb70 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java @@ -20,23 +20,24 @@ enum ArmeriaHttpClientAttributesGetter INSTANCE; @Override - public String method(RequestContext ctx) { + public String getMethod(RequestContext ctx) { return ctx.method().name(); } @Override - public String url(RequestContext ctx) { + public String getUrl(RequestContext ctx) { return request(ctx).uri().toString(); } @Override - public List requestHeader(RequestContext ctx, String name) { + public List getRequestHeader(RequestContext ctx, String name) { return request(ctx).headers().getAll(name); } @Override @Nullable - public Integer statusCode(RequestContext ctx, RequestLog requestLog, @Nullable Throwable error) { + public Integer getStatusCode( + RequestContext ctx, RequestLog requestLog, @Nullable Throwable error) { HttpStatus status = requestLog.responseHeaders().status(); if (!status.equals(HttpStatus.UNKNOWN)) { return status.code(); @@ -45,7 +46,7 @@ public Integer statusCode(RequestContext ctx, RequestLog requestLog, @Nullable T } @Override - public String flavor(RequestContext ctx, @Nullable RequestLog requestLog) { + public String getFlavor(RequestContext ctx, @Nullable RequestLog requestLog) { SessionProtocol protocol = ctx.sessionProtocol(); if (protocol.isMultiplex()) { return SemanticAttributes.HttpFlavorValues.HTTP_2_0; @@ -55,7 +56,7 @@ public String flavor(RequestContext ctx, @Nullable RequestLog requestLog) { } @Override - public List responseHeader(RequestContext ctx, RequestLog requestLog, String name) { + public List getResponseHeader(RequestContext ctx, RequestLog requestLog, String name) { return requestLog.responseHeaders().getAll(name); } diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java index 5a56fc4c8bc9..537dda338e84 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java @@ -21,29 +21,30 @@ enum ArmeriaHttpServerAttributesGetter INSTANCE; @Override - public String method(RequestContext ctx) { + public String getMethod(RequestContext ctx) { return ctx.method().name(); } @Override - public String target(RequestContext ctx) { + public String getTarget(RequestContext ctx) { return request(ctx).path(); } @Override @Nullable - public String scheme(RequestContext ctx) { + public String getScheme(RequestContext ctx) { return request(ctx).scheme(); } @Override - public List requestHeader(RequestContext ctx, String name) { + public List getRequestHeader(RequestContext ctx, String name) { return request(ctx).headers().getAll(name); } @Override @Nullable - public Integer statusCode(RequestContext ctx, RequestLog requestLog, @Nullable Throwable error) { + public Integer getStatusCode( + RequestContext ctx, RequestLog requestLog, @Nullable Throwable error) { HttpStatus status = requestLog.responseHeaders().status(); if (!status.equals(HttpStatus.UNKNOWN)) { return status.code(); @@ -52,7 +53,7 @@ public Integer statusCode(RequestContext ctx, RequestLog requestLog, @Nullable T } @Override - public String flavor(RequestContext ctx) { + public String getFlavor(RequestContext ctx) { SessionProtocol protocol = ctx.sessionProtocol(); if (protocol.isMultiplex()) { return SemanticAttributes.HttpFlavorValues.HTTP_2_0; @@ -62,13 +63,13 @@ public String flavor(RequestContext ctx) { } @Override - public List responseHeader(RequestContext ctx, RequestLog requestLog, String name) { + public List getResponseHeader(RequestContext ctx, RequestLog requestLog, String name) { return requestLog.responseHeaders().getAll(name); } @Override @Nullable - public String route(RequestContext ctx) { + public String getRoute(RequestContext ctx) { if (ctx instanceof ServiceRequestContext) { return ((ServiceRequestContext) ctx).config().route().patternString(); } diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesGetter.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesGetter.java index def4eeb71829..9caa084dacf6 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesGetter.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesGetter.java @@ -16,19 +16,19 @@ final class ArmeriaNetServerAttributesGetter extends InetSocketAddressNetServerAttributesGetter { @Override - public String transport(RequestContext ctx) { + public String getTransport(RequestContext ctx) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(RequestContext ctx) { + public String getHostName(RequestContext ctx) { return null; } @Nullable @Override - public Integer hostPort(RequestContext ctx) { + public Integer getHostPort(RequestContext ctx) { return null; } diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesGetter.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesGetter.java index be39b313e902..094589bab97d 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesGetter.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesGetter.java @@ -22,18 +22,18 @@ public final class ArmeriaNetClientAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(RequestContext ctx, @Nullable RequestLog requestLog) { + public String getTransport(RequestContext ctx, @Nullable RequestLog requestLog) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(RequestContext ctx) { + public String getPeerName(RequestContext ctx) { return request(ctx).uri().getHost(); } @Override - public Integer peerPort(RequestContext ctx) { + public Integer getPeerPort(RequestContext ctx) { return request(ctx).uri().getPort(); } diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java index d6e912a6e3e3..ab70c37612dd 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java @@ -17,32 +17,32 @@ final class AsyncHttpClientHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(Request request) { + public String getMethod(Request request) { return request.getMethod(); } @Override - public String url(Request request) { + public String getUrl(Request request) { return request.getUri().toUrl(); } @Override - public List requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return request.getHeaders().getOrDefault(name, Collections.emptyList()); } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.getStatusCode(); } @Override - public String flavor(Request request, @Nullable Response response) { + public String getFlavor(Request request, @Nullable Response response) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { return response.getHeaders().getOrDefault(name, Collections.emptyList()); } } diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientNetAttributesGetter.java b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientNetAttributesGetter.java index 128f01184a50..f7beefb39a61 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientNetAttributesGetter.java +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientNetAttributesGetter.java @@ -15,17 +15,17 @@ final class AsyncHttpClientNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(Request request, @Nullable Response response) { + public String getTransport(Request request, @Nullable Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override - public String peerName(Request request) { + public String getPeerName(Request request) { return request.getUri().getHost(); } @Override - public Integer peerPort(Request request) { + public Integer getPeerPort(Request request) { return request.getUri().getPort(); } } diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java index 0605e1ac4806..8e09f846bdd2 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java +++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java @@ -15,33 +15,33 @@ final class AsyncHttpClientHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(RequestContext requestContext) { + public String getMethod(RequestContext requestContext) { return requestContext.getRequest().getMethod(); } @Override - public String url(RequestContext requestContext) { + public String getUrl(RequestContext requestContext) { return requestContext.getRequest().getUri().toUrl(); } @Override - public List requestHeader(RequestContext requestContext, String name) { + public List getRequestHeader(RequestContext requestContext, String name) { return requestContext.getRequest().getHeaders().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( RequestContext requestContext, Response response, @Nullable Throwable error) { return response.getStatusCode(); } @Override - public String flavor(RequestContext requestContext, @Nullable Response response) { + public String getFlavor(RequestContext requestContext, @Nullable Response response) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public List responseHeader( + public List getResponseHeader( RequestContext requestContext, Response response, String name) { return response.getHeaders().getAll(name); } diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientNetAttributesGetter.java b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientNetAttributesGetter.java index b9e4c8cc4f1a..c7120b7b8a14 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientNetAttributesGetter.java +++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientNetAttributesGetter.java @@ -15,18 +15,18 @@ final class AsyncHttpClientNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(RequestContext request, @Nullable Response response) { + public String getTransport(RequestContext request, @Nullable Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(RequestContext requestContext) { + public String getPeerName(RequestContext requestContext) { return requestContext.getRequest().getUri().getHost(); } @Override - public Integer peerPort(RequestContext requestContext) { + public Integer getPeerPort(RequestContext requestContext) { return requestContext.getRequest().getUri().getPort(); } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java index 80d02c9d91d9..431232426cbb 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java @@ -18,34 +18,35 @@ class AwsSdkHttpAttributesGetter implements HttpClientAttributesGetter, Response> { @Override - public String url(Request request) { + public String getUrl(Request request) { return request.getEndpoint().toString(); } @Override @Nullable - public String flavor(Request request, @Nullable Response response) { + public String getFlavor(Request request, @Nullable Response response) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public String method(Request request) { + public String getMethod(Request request) { return request.getHttpMethod().name(); } @Override - public List requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { String value = request.getHeaders().get(name.equals("user-agent") ? "User-Agent" : name); return value == null ? emptyList() : singletonList(value); } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode( + Request request, Response response, @Nullable Throwable error) { return response.getHttpResponse().getStatusCode(); } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { String value = response.getHttpResponse().getHeaders().get(name); return value == null ? emptyList() : singletonList(value); } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkNetAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkNetAttributesGetter.java index 8389ce598f94..9723e807f921 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkNetAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkNetAttributesGetter.java @@ -14,18 +14,18 @@ class AwsSdkNetAttributesGetter implements NetClientAttributesGetter, Response> { @Override - public String transport(Request request, @Nullable Response response) { + public String getTransport(Request request, @Nullable Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(Request request) { + public String getPeerName(Request request) { return request.getEndpoint().getHost(); } @Override - public Integer peerPort(Request request) { + public Integer getPeerPort(Request request) { return request.getEndpoint().getPort(); } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkRpcAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkRpcAttributesGetter.java index cb6ef41fda99..aa0042725867 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkRpcAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkRpcAttributesGetter.java @@ -28,17 +28,17 @@ protected String computeValue(Class type) { }; @Override - public String system(Request request) { + public String getSystem(Request request) { return "aws-api"; } @Override - public String service(Request request) { + public String getService(Request request) { return request.getServiceName(); } @Override - public String method(Request request) { + public String getMethod(Request request) { return OPERATION_NAME.get(request.getOriginalRequest().getClass()); } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkSpanNameExtractor.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkSpanNameExtractor.java index 64aaebfd5b78..f757c4c026e3 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkSpanNameExtractor.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkSpanNameExtractor.java @@ -17,8 +17,8 @@ class AwsSdkSpanNameExtractor implements SpanNameExtractor> { @Override public String extract(Request request) { return qualifiedOperation( - rpcAttributes.service(request), - rpcAttributes.method(request), + rpcAttributes.getService(request), + rpcAttributes.getMethod(request), request.getOriginalRequest().getClass()); } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java index dd9b4362f360..cc069c9376e2 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java @@ -19,7 +19,7 @@ class AwsSdkHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String url(ExecutionAttributes request) { + public String getUrl(ExecutionAttributes request) { SdkHttpRequest httpRequest = request.getAttribute(TracingExecutionInterceptor.SDK_HTTP_REQUEST_ATTRIBUTE); return httpRequest.getUri().toString(); @@ -27,19 +27,19 @@ public String url(ExecutionAttributes request) { @Override @Nullable - public String flavor(ExecutionAttributes request, @Nullable SdkHttpResponse response) { + public String getFlavor(ExecutionAttributes request, @Nullable SdkHttpResponse response) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public String method(ExecutionAttributes request) { + public String getMethod(ExecutionAttributes request) { SdkHttpRequest httpRequest = request.getAttribute(TracingExecutionInterceptor.SDK_HTTP_REQUEST_ATTRIBUTE); return httpRequest.method().name(); } @Override - public List requestHeader(ExecutionAttributes request, String name) { + public List getRequestHeader(ExecutionAttributes request, String name) { SdkHttpRequest httpRequest = request.getAttribute(TracingExecutionInterceptor.SDK_HTTP_REQUEST_ATTRIBUTE); List value = httpRequest.headers().get(name); @@ -47,13 +47,13 @@ public List requestHeader(ExecutionAttributes request, String name) { } @Override - public Integer statusCode( + public Integer getStatusCode( ExecutionAttributes request, SdkHttpResponse response, @Nullable Throwable error) { return response.statusCode(); } @Override - public List responseHeader( + public List getResponseHeader( ExecutionAttributes request, SdkHttpResponse response, String name) { List value = response.headers().get(name); return value == null ? emptyList() : value; diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkNetAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkNetAttributesGetter.java index b48e19d40f7b..23d6e732eaad 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkNetAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkNetAttributesGetter.java @@ -16,20 +16,20 @@ class AwsSdkNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(ExecutionAttributes request, @Nullable SdkHttpResponse response) { + public String getTransport(ExecutionAttributes request, @Nullable SdkHttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(ExecutionAttributes request) { + public String getPeerName(ExecutionAttributes request) { SdkHttpRequest httpRequest = request.getAttribute(TracingExecutionInterceptor.SDK_HTTP_REQUEST_ATTRIBUTE); return httpRequest.host(); } @Override - public Integer peerPort(ExecutionAttributes request) { + public Integer getPeerPort(ExecutionAttributes request) { SdkHttpRequest httpRequest = request.getAttribute(TracingExecutionInterceptor.SDK_HTTP_REQUEST_ATTRIBUTE); return httpRequest.port(); diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRpcAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRpcAttributesGetter.java index 50fe74884156..930a607d7bc9 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRpcAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRpcAttributesGetter.java @@ -13,17 +13,17 @@ enum AwsSdkRpcAttributesGetter implements RpcAttributesGetter userAgent = - AwsSdkInstrumenterFactory.httpAttributesGetter.requestHeader(request, "User-Agent"); + AwsSdkInstrumenterFactory.httpAttributesGetter.getRequestHeader(request, "User-Agent"); if (!userAgent.isEmpty()) { span.setAttribute(SemanticAttributes.HTTP_USER_AGENT, userAgent.get(0)); } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java index dfc357bd8181..6d95455e64af 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java @@ -15,19 +15,19 @@ final class CassandraNetAttributesGetter @Override @Nullable - public String transport(CassandraRequest request, @Nullable ExecutionInfo executionInfo) { + public String getTransport(CassandraRequest request, @Nullable ExecutionInfo executionInfo) { return null; } @Nullable @Override - public String peerName(CassandraRequest request) { + public String getPeerName(CassandraRequest request) { return null; } @Nullable @Override - public Integer peerPort(CassandraRequest request) { + public Integer getPeerPort(CassandraRequest request) { return null; } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java index 7ad044b4c5e8..ab439fe00f52 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java @@ -12,31 +12,31 @@ final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { @Override - public String system(CassandraRequest request) { + public String getSystem(CassandraRequest request) { return SemanticAttributes.DbSystemValues.CASSANDRA; } @Override @Nullable - public String user(CassandraRequest request) { + public String getUser(CassandraRequest request) { return null; } @Override @Nullable - public String name(CassandraRequest request) { + public String getName(CassandraRequest request) { return request.getSession().getLoggedKeyspace(); } @Override @Nullable - public String connectionString(CassandraRequest request) { + public String getConnectionString(CassandraRequest request) { return null; } @Override @Nullable - public String rawStatement(CassandraRequest request) { + public String getRawStatement(CassandraRequest request) { return request.getStatement(); } } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java index 373c2da7389e..5d3dd467e680 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java @@ -17,19 +17,19 @@ final class CassandraNetAttributesGetter @Override @Nullable - public String transport(CassandraRequest request, @Nullable ExecutionInfo executionInfo) { + public String getTransport(CassandraRequest request, @Nullable ExecutionInfo executionInfo) { return null; } @Nullable @Override - public String peerName(CassandraRequest request) { + public String getPeerName(CassandraRequest request) { return null; } @Nullable @Override - public Integer peerPort(CassandraRequest request) { + public Integer getPeerPort(CassandraRequest request) { return null; } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java index 686966166f3c..b56af5fc716c 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java @@ -13,31 +13,31 @@ final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { @Override - public String system(CassandraRequest request) { + public String getSystem(CassandraRequest request) { return SemanticAttributes.DbSystemValues.CASSANDRA; } @Override @Nullable - public String user(CassandraRequest request) { + public String getUser(CassandraRequest request) { return null; } @Override @Nullable - public String name(CassandraRequest request) { + public String getName(CassandraRequest request) { return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null); } @Override @Nullable - public String connectionString(CassandraRequest request) { + public String getConnectionString(CassandraRequest request) { return null; } @Override @Nullable - public String rawStatement(CassandraRequest request) { + public String getRawStatement(CassandraRequest request) { return request.getStatement(); } } diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java index a74b4da0a45c..d65cd3fcc2da 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java @@ -12,37 +12,37 @@ final class CouchbaseAttributesGetter implements DbClientAttributesGetter { @Override - public String system(CouchbaseRequestInfo couchbaseRequest) { + public String getSystem(CouchbaseRequestInfo couchbaseRequest) { return SemanticAttributes.DbSystemValues.COUCHBASE; } @Override @Nullable - public String user(CouchbaseRequestInfo couchbaseRequest) { + public String getUser(CouchbaseRequestInfo couchbaseRequest) { return null; } @Override @Nullable - public String name(CouchbaseRequestInfo couchbaseRequest) { + public String getName(CouchbaseRequestInfo couchbaseRequest) { return couchbaseRequest.bucket(); } @Override @Nullable - public String connectionString(CouchbaseRequestInfo couchbaseRequest) { + public String getConnectionString(CouchbaseRequestInfo couchbaseRequest) { return null; } @Override @Nullable - public String statement(CouchbaseRequestInfo couchbaseRequest) { + public String getStatement(CouchbaseRequestInfo couchbaseRequest) { return couchbaseRequest.statement(); } @Override @Nullable - public String operation(CouchbaseRequestInfo couchbaseRequest) { + public String getOperation(CouchbaseRequestInfo couchbaseRequest) { return couchbaseRequest.operation(); } } diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java index f50729e5932a..ff971d4f19ab 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java @@ -15,7 +15,7 @@ public class CouchbaseNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Nullable @Override - public String transport(CouchbaseRequestInfo couchbaseRequest, @Nullable Void unused) { + public String getTransport(CouchbaseRequestInfo couchbaseRequest, @Nullable Void unused) { return couchbaseRequest.getPeerAddress() != null ? SemanticAttributes.NetTransportValues.IP_TCP : null; @@ -23,13 +23,13 @@ public String transport(CouchbaseRequestInfo couchbaseRequest, @Nullable Void un @Nullable @Override - public String peerName(CouchbaseRequestInfo couchbaseRequest) { + public String getPeerName(CouchbaseRequestInfo couchbaseRequest) { return null; } @Nullable @Override - public Integer peerPort(CouchbaseRequestInfo couchbaseRequest) { + public Integer getPeerPort(CouchbaseRequestInfo couchbaseRequest) { return null; } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestAttributesGetter.java index 0bb4a7eddeb6..e6ae243108c8 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestAttributesGetter.java @@ -13,37 +13,37 @@ final class ElasticsearchRestAttributesGetter implements DbClientAttributesGetter { @Override - public String system(ElasticsearchRestRequest request) { + public String getSystem(ElasticsearchRestRequest request) { return SemanticAttributes.DbSystemValues.ELASTICSEARCH; } @Override @Nullable - public String user(ElasticsearchRestRequest request) { + public String getUser(ElasticsearchRestRequest request) { return null; } @Override @Nullable - public String name(ElasticsearchRestRequest request) { + public String getName(ElasticsearchRestRequest request) { return null; } @Override @Nullable - public String connectionString(ElasticsearchRestRequest request) { + public String getConnectionString(ElasticsearchRestRequest request) { return null; } @Override @Nullable - public String statement(ElasticsearchRestRequest request) { + public String getStatement(ElasticsearchRestRequest request) { return request.getMethod() + " " + request.getOperation(); } @Override @Nullable - public String operation(ElasticsearchRestRequest request) { + public String getOperation(ElasticsearchRestRequest request) { return request.getMethod(); } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestNetResponseAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestNetResponseAttributesGetter.java index 675e8b201ec0..71779c0ba3bf 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestNetResponseAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestNetResponseAttributesGetter.java @@ -15,25 +15,25 @@ final class ElasticsearchRestNetResponseAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(ElasticsearchRestRequest request, Response response) { + public String getTransport(ElasticsearchRestRequest request, Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(ElasticsearchRestRequest request) { + public String getPeerName(ElasticsearchRestRequest request) { return null; } @Override @Nullable - public Integer peerPort(ElasticsearchRestRequest request) { + public Integer getPeerPort(ElasticsearchRestRequest request) { return null; } @Nullable @Override - public String sockFamily( + public String getSockFamily( ElasticsearchRestRequest elasticsearchRestRequest, @Nullable Response response) { if (response != null && response.getHost().getAddress() instanceof Inet6Address) { return "inet6"; @@ -43,7 +43,7 @@ public String sockFamily( @Override @Nullable - public String sockPeerAddr(ElasticsearchRestRequest request, @Nullable Response response) { + public String getSockPeerAddr(ElasticsearchRestRequest request, @Nullable Response response) { if (response != null && response.getHost().getAddress() != null) { return response.getHost().getAddress().getHostAddress(); } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java index 3cdac789a3f0..c2d82509f096 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java @@ -15,19 +15,19 @@ public class Elasticsearch6TransportNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override @Nullable - public String transport(ElasticTransportRequest request, @Nullable ActionResponse response) { + public String getTransport(ElasticTransportRequest request, @Nullable ActionResponse response) { return null; } @Nullable @Override - public String peerName(ElasticTransportRequest request) { + public String getPeerName(ElasticTransportRequest request) { return null; } @Nullable @Override - public Integer peerPort(ElasticTransportRequest request) { + public Integer getPeerPort(ElasticTransportRequest request) { return null; } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java index 0cdbeb22d0e2..39cc4993a3ce 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java @@ -14,25 +14,26 @@ public class ElasticTransportNetResponseAttributesGetter @Override @Nullable - public String transport(ElasticTransportRequest request, @Nullable ActionResponse response) { + public String getTransport(ElasticTransportRequest request, @Nullable ActionResponse response) { return null; } @Override @Nullable - public String peerName(ElasticTransportRequest request) { + public String getPeerName(ElasticTransportRequest request) { return null; } @Override @Nullable - public Integer peerPort(ElasticTransportRequest request) { + public Integer getPeerPort(ElasticTransportRequest request) { return null; } @Override @Nullable - public String sockPeerAddr(ElasticTransportRequest request, @Nullable ActionResponse response) { + public String getSockPeerAddr( + ElasticTransportRequest request, @Nullable ActionResponse response) { if (response != null && response.remoteAddress() != null) { return response.remoteAddress().getAddress(); } @@ -41,7 +42,8 @@ public String sockPeerAddr(ElasticTransportRequest request, @Nullable ActionResp @Nullable @Override - public String sockPeerName(ElasticTransportRequest request, @Nullable ActionResponse response) { + public String getSockPeerName( + ElasticTransportRequest request, @Nullable ActionResponse response) { if (response != null && response.remoteAddress() != null) { return response.remoteAddress().getHost(); } @@ -50,7 +52,8 @@ public String sockPeerName(ElasticTransportRequest request, @Nullable ActionResp @Nullable @Override - public Integer sockPeerPort(ElasticTransportRequest request, @Nullable ActionResponse response) { + public Integer getSockPeerPort( + ElasticTransportRequest request, @Nullable ActionResponse response) { if (response != null && response.remoteAddress() != null) { return response.remoteAddress().getPort(); } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java index 8ef4ddfe58db..43adedb9784b 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java @@ -13,36 +13,36 @@ final class ElasticsearchTransportAttributesGetter implements DbClientAttributesGetter { @Override - public String system(ElasticTransportRequest s) { + public String getSystem(ElasticTransportRequest s) { return SemanticAttributes.DbSystemValues.ELASTICSEARCH; } @Override @Nullable - public String user(ElasticTransportRequest s) { + public String getUser(ElasticTransportRequest s) { return null; } @Override @Nullable - public String name(ElasticTransportRequest s) { + public String getName(ElasticTransportRequest s) { return null; } @Override @Nullable - public String connectionString(ElasticTransportRequest s) { + public String getConnectionString(ElasticTransportRequest s) { return null; } @Override @Nullable - public String statement(ElasticTransportRequest s) { + public String getStatement(ElasticTransportRequest s) { return null; } @Override - public String operation(ElasticTransportRequest action) { + public String getOperation(ElasticTransportRequest action) { return action.getAction().getClass().getSimpleName(); } } diff --git a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraCodeAttributesGetter.java b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraCodeAttributesGetter.java index c3367cc7e73e..e0289f353256 100644 --- a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraCodeAttributesGetter.java +++ b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraCodeAttributesGetter.java @@ -11,13 +11,13 @@ public class FinatraCodeAttributesGetter implements CodeAttributesGetter> { @Nullable @Override - public Class codeClass(Class request) { + public Class getCodeClass(Class request) { return request; } @Nullable @Override - public String methodName(Class request) { + public String getMethodName(Class request) { return null; } } diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java index cc0304c5d5ed..423a6c059e66 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java @@ -17,37 +17,37 @@ final class GeodeDbAttributesGetter implements DbClientAttributesGetter requestHeader(HttpRequest httpRequest, String name) { + public List getRequestHeader(HttpRequest httpRequest, String name) { return httpRequest.getHeaders().getHeaderStringValues(name); } @Override - public String flavor(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { + public String getFlavor(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequest httpRequest, HttpResponse httpResponse, @Nullable Throwable error) { return httpResponse.getStatusCode(); } @Override - public List responseHeader( + public List getResponseHeader( HttpRequest httpRequest, HttpResponse httpResponse, String name) { return httpResponse.getHeaders().getHeaderStringValues(name); } diff --git a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesGetter.java b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesGetter.java index 113685ef5f06..b1f24d861a77 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesGetter.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesGetter.java @@ -15,18 +15,18 @@ final class GoogleHttpClientNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(HttpRequest request, @Nullable HttpResponse response) { + public String getTransport(HttpRequest request, @Nullable HttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(HttpRequest request) { + public String getPeerName(HttpRequest request) { return request.getUrl().getHost(); } @Override - public Integer peerPort(HttpRequest request) { + public Integer getPeerPort(HttpRequest request) { return request.getUrl().getPort(); } } diff --git a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java index 2571aadc4086..adb892bbec6f 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java +++ b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java @@ -18,12 +18,12 @@ final class GrizzlyHttpAttributesGetter implements HttpServerAttributesGetter { @Override - public String method(HttpRequestPacket request) { + public String getMethod(HttpRequestPacket request) { return request.getMethod().getMethodString(); } @Override - public List requestHeader(HttpRequestPacket request, String name) { + public List getRequestHeader(HttpRequestPacket request, String name) { return toHeaderList(request.getHeaders().values(name)); } @@ -37,19 +37,19 @@ private static List toHeaderList(Iterable values) { } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequestPacket request, HttpResponsePacket response, @Nullable Throwable error) { return response.getStatus(); } @Override - public List responseHeader( + public List getResponseHeader( HttpRequestPacket request, HttpResponsePacket response, String name) { return toHeaderList(response.getHeaders().values(name)); } @Override - public String flavor(HttpRequestPacket request) { + public String getFlavor(HttpRequestPacket request) { String flavor = request.getProtocolString(); if (flavor.startsWith("HTTP/")) { flavor = flavor.substring("HTTP/".length()); @@ -59,7 +59,7 @@ public String flavor(HttpRequestPacket request) { @Nullable @Override - public String target(HttpRequestPacket request) { + public String getTarget(HttpRequestPacket request) { String target = request.getRequestURI(); String queryString = request.getQueryString(); if (queryString != null) { @@ -70,12 +70,12 @@ public String target(HttpRequestPacket request) { @Nullable @Override - public String route(HttpRequestPacket request) { + public String getRoute(HttpRequestPacket request) { return null; } @Override - public String scheme(HttpRequestPacket request) { + public String getScheme(HttpRequestPacket request) { return request.isSecure() ? "https" : "http"; } } diff --git a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyNetAttributesGetter.java b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyNetAttributesGetter.java index 586775ff664a..4c457965caec 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyNetAttributesGetter.java +++ b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyNetAttributesGetter.java @@ -16,40 +16,40 @@ final class GrizzlyNetAttributesGetter implements NetServerAttributesGetter { @Override - public String transport(HttpRequestPacket request) { + public String getTransport(HttpRequestPacket request) { return request.getConnection().getTransport() instanceof TCPNIOTransport ? IP_TCP : IP_UDP; } @Nullable @Override - public String hostName(HttpRequestPacket request) { + public String getHostName(HttpRequestPacket request) { return request.getLocalHost(); } @Override - public Integer hostPort(HttpRequestPacket request) { + public Integer getHostPort(HttpRequestPacket request) { return request.getServerPort(); } @Nullable @Override - public String sockPeerAddr(HttpRequestPacket request) { + public String getSockPeerAddr(HttpRequestPacket request) { return request.getRemoteAddress(); } @Override - public Integer sockPeerPort(HttpRequestPacket request) { + public Integer getSockPeerPort(HttpRequestPacket request) { return request.getRemotePort(); } @Nullable @Override - public String sockHostAddr(HttpRequestPacket request) { + public String getSockHostAddr(HttpRequestPacket request) { return request.getLocalAddress(); } @Override - public Integer sockHostPort(HttpRequestPacket request) { + public Integer getSockHostPort(HttpRequestPacket request) { return request.getLocalPort(); } } diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcRpcAttributesGetter.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcRpcAttributesGetter.java index 7c14aa85f581..e681704c4ba8 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcRpcAttributesGetter.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcRpcAttributesGetter.java @@ -17,13 +17,13 @@ enum GrpcRpcAttributesGetter implements RpcAttributesGetter { INSTANCE; @Override - public String system(GrpcRequest request) { + public String getSystem(GrpcRequest request) { return "grpc"; } @Override @Nullable - public String service(GrpcRequest request) { + public String getService(GrpcRequest request) { String fullMethodName = request.getMethod().getFullMethodName(); int slashIndex = fullMethodName.lastIndexOf('/'); if (slashIndex == -1) { @@ -34,7 +34,7 @@ public String service(GrpcRequest request) { @Override @Nullable - public String method(GrpcRequest request) { + public String getMethod(GrpcRequest request) { String fullMethodName = request.getMethod().getFullMethodName(); int slashIndex = fullMethodName.lastIndexOf('/'); if (slashIndex == -1) { diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java index 48a00c59b755..0fdb82fb3612 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java @@ -21,18 +21,18 @@ public final class GrpcNetClientAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(GrpcRequest request, @Nullable Status response) { + public String getTransport(GrpcRequest request, @Nullable Status response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(GrpcRequest grpcRequest) { + public String getPeerName(GrpcRequest grpcRequest) { return grpcRequest.getLogicalHost(); } @Override - public Integer peerPort(GrpcRequest grpcRequest) { + public Integer getPeerPort(GrpcRequest grpcRequest) { return grpcRequest.getLogicalPort(); } diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetServerAttributesGetter.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetServerAttributesGetter.java index 07c5d965a48a..358b21a3d8a0 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetServerAttributesGetter.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetServerAttributesGetter.java @@ -20,18 +20,18 @@ public final class GrpcNetServerAttributesGetter extends InetSocketAddressNetServerAttributesGetter { @Override - public String transport(GrpcRequest request) { + public String getTransport(GrpcRequest request) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(GrpcRequest grpcRequest) { + public String getHostName(GrpcRequest grpcRequest) { return grpcRequest.getLogicalHost(); } @Override - public Integer hostPort(GrpcRequest grpcRequest) { + public Integer getHostPort(GrpcRequest grpcRequest) { return grpcRequest.getLogicalPort(); } diff --git a/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtRpcAttributesGetter.java b/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtRpcAttributesGetter.java index 342b31b4b279..c9d0685773ab 100644 --- a/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtRpcAttributesGetter.java +++ b/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtRpcAttributesGetter.java @@ -12,17 +12,17 @@ enum GwtRpcAttributesGetter implements RpcAttributesGetter { INSTANCE; @Override - public String system(Method method) { + public String getSystem(Method method) { return "gwt"; } @Override - public String service(Method method) { + public String getService(Method method) { return method.getDeclaringClass().getName(); } @Override - public String method(Method method) { + public String getMethod(Method method) { return method.getName(); } } diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java index 56499b72f292..a1a463857972 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java +++ b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java @@ -18,34 +18,34 @@ class HttpUrlHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(HttpURLConnection connection) { + public String getMethod(HttpURLConnection connection) { return connection.getRequestMethod(); } @Override - public String url(HttpURLConnection connection) { + public String getUrl(HttpURLConnection connection) { return connection.getURL().toExternalForm(); } @Override - public List requestHeader(HttpURLConnection connection, String name) { + public List getRequestHeader(HttpURLConnection connection, String name) { String value = connection.getRequestProperty(name); return value == null ? emptyList() : singletonList(value); } @Override - public String flavor(HttpURLConnection connection, @Nullable Integer statusCode) { + public String getFlavor(HttpURLConnection connection, @Nullable Integer statusCode) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public Integer statusCode( + public Integer getStatusCode( HttpURLConnection connection, Integer statusCode, @Nullable Throwable error) { return statusCode; } @Override - public List responseHeader( + public List getResponseHeader( HttpURLConnection connection, Integer statusCode, String name) { String value = connection.getHeaderField(name); return value == null ? emptyList() : singletonList(value); diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlNetAttributesGetter.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlNetAttributesGetter.java index aec4624a8f5f..53698d93e2b0 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlNetAttributesGetter.java +++ b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlNetAttributesGetter.java @@ -14,17 +14,17 @@ class HttpUrlNetAttributesGetter implements NetClientAttributesGetter> { @Override - public String method(HttpRequest httpRequest) { + public String getMethod(HttpRequest httpRequest) { return httpRequest.method(); } @Override - public String url(HttpRequest httpRequest) { + public String getUrl(HttpRequest httpRequest) { return httpRequest.uri().toString(); } @Override - public List requestHeader(HttpRequest httpRequest, String name) { + public List getRequestHeader(HttpRequest httpRequest, String name) { return httpRequest.headers().allValues(name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequest httpRequest, HttpResponse httpResponse, @Nullable Throwable error) { return httpResponse.statusCode(); } @Override - public String flavor(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { + public String getFlavor(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { if (httpResponse != null && httpResponse.version() == Version.HTTP_2) { return SemanticAttributes.HttpFlavorValues.HTTP_2_0; } @@ -45,7 +45,7 @@ public String flavor(HttpRequest httpRequest, @Nullable HttpResponse httpResp } @Override - public List responseHeader( + public List getResponseHeader( HttpRequest httpRequest, HttpResponse httpResponse, String name) { return httpResponse.headers().allValues(name); } diff --git a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpNetAttributesGetter.java b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpNetAttributesGetter.java index 5bfa0715b236..d055be0b18e3 100644 --- a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpNetAttributesGetter.java +++ b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpNetAttributesGetter.java @@ -20,19 +20,19 @@ public class JdkHttpNetAttributesGetter private static final Logger logger = Logger.getLogger(JdkHttpNetAttributesGetter.class.getName()); @Override - public String transport(HttpRequest httpRequest, @Nullable HttpResponse response) { + public String getTransport(HttpRequest httpRequest, @Nullable HttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(HttpRequest httpRequest) { + public String getPeerName(HttpRequest httpRequest) { return httpRequest.uri().getHost(); } @Override @Nullable - public Integer peerPort(HttpRequest httpRequest) { + public Integer getPeerPort(HttpRequest httpRequest) { int port = httpRequest.uri().getPort(); if (port != -1) { return port; diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java index b9a8cee2e897..6b3f4566f143 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java @@ -20,17 +20,17 @@ final class JaxRsClientHttpAttributesGetter @Override @Nullable - public String method(ClientRequest httpRequest) { + public String getMethod(ClientRequest httpRequest) { return httpRequest.getMethod(); } @Override - public String url(ClientRequest httpRequest) { + public String getUrl(ClientRequest httpRequest) { return httpRequest.getURI().toString(); } @Override - public List requestHeader(ClientRequest httpRequest, String name) { + public List getRequestHeader(ClientRequest httpRequest, String name) { List rawHeaders = httpRequest.getHeaders().getOrDefault(name, emptyList()); if (rawHeaders.isEmpty()) { return emptyList(); @@ -43,18 +43,18 @@ public List requestHeader(ClientRequest httpRequest, String name) { } @Override - public String flavor(ClientRequest httpRequest, @Nullable ClientResponse httpResponse) { + public String getFlavor(ClientRequest httpRequest, @Nullable ClientResponse httpResponse) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public Integer statusCode( + public Integer getStatusCode( ClientRequest httpRequest, ClientResponse httpResponse, @Nullable Throwable error) { return httpResponse.getStatus(); } @Override - public List responseHeader( + public List getResponseHeader( ClientRequest httpRequest, ClientResponse httpResponse, String name) { return httpResponse.getHeaders().getOrDefault(name, emptyList()); } diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesGetter.java b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesGetter.java index 513260cad108..6c29adaead1a 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesGetter.java +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesGetter.java @@ -15,18 +15,18 @@ final class JaxRsClientNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(ClientRequest request, @Nullable ClientResponse response) { + public String getTransport(ClientRequest request, @Nullable ClientResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(ClientRequest request) { + public String getPeerName(ClientRequest request) { return request.getURI().getHost(); } @Override - public Integer peerPort(ClientRequest request) { + public Integer getPeerPort(ClientRequest request) { return request.getURI().getPort(); } } diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsCodeAttributesGetter.java b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsCodeAttributesGetter.java index 1059640b7d3c..7cadc024671b 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsCodeAttributesGetter.java +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsCodeAttributesGetter.java @@ -10,12 +10,12 @@ public class JaxrsCodeAttributesGetter implements CodeAttributesGetter { @Override - public Class codeClass(HandlerData handlerData) { + public Class getCodeClass(HandlerData handlerData) { return handlerData.codeClass(); } @Override - public String methodName(HandlerData handlerData) { + public String getMethodName(HandlerData handlerData) { return handlerData.methodName(); } } diff --git a/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/JaxrsCodeAttributesGetter.java b/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/JaxrsCodeAttributesGetter.java index 9276c0492ca0..9eba374574a5 100644 --- a/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/JaxrsCodeAttributesGetter.java +++ b/instrumentation/jaxrs/jaxrs-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/JaxrsCodeAttributesGetter.java @@ -10,12 +10,12 @@ public class JaxrsCodeAttributesGetter implements CodeAttributesGetter { @Override - public Class codeClass(HandlerData handlerData) { + public Class getCodeClass(HandlerData handlerData) { return handlerData.codeClass(); } @Override - public String methodName(HandlerData handlerData) { + public String getMethodName(HandlerData handlerData) { return handlerData.methodName(); } } diff --git a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java b/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java index f68571488fe6..cbdd229e65e7 100644 --- a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java +++ b/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java @@ -10,12 +10,12 @@ public class JaxWsCodeAttributesGetter implements CodeAttributesGetter { @Override - public Class codeClass(JaxWsRequest request) { + public Class getCodeClass(JaxWsRequest request) { return request.codeClass(); } @Override - public String methodName(JaxWsRequest request) { + public String getMethodName(JaxWsRequest request) { return request.methodName(); } } diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceCodeAttributesGetter.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceCodeAttributesGetter.java index a9a45843b0d7..e90fa0308597 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceCodeAttributesGetter.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceCodeAttributesGetter.java @@ -11,12 +11,12 @@ final class DataSourceCodeAttributesGetter implements CodeAttributesGetter { @Override - public Class codeClass(DataSource dataSource) { + public Class getCodeClass(DataSource dataSource) { return dataSource.getClass(); } @Override - public String methodName(DataSource dataSource) { + public String getMethodName(DataSource dataSource) { return "getConnection"; } } diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java index 36e66e3f5e50..45a4e26b95aa 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java @@ -17,32 +17,32 @@ public final class JdbcAttributesGetter implements SqlClientAttributesGetter { @Override - public String system(JedisRequest request) { + public String getSystem(JedisRequest request) { return SemanticAttributes.DbSystemValues.REDIS; } @Override @Nullable - public String user(JedisRequest request) { + public String getUser(JedisRequest request) { return null; } @Override - public String name(JedisRequest request) { + public String getName(JedisRequest request) { return null; } @Override - public String connectionString(JedisRequest request) { + public String getConnectionString(JedisRequest request) { return null; } @Override - public String statement(JedisRequest request) { + public String getStatement(JedisRequest request) { return request.getStatement(); } @Override - public String operation(JedisRequest request) { + public String getOperation(JedisRequest request) { return request.getOperation(); } } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java index d60f986bb4e7..7ecf8007106c 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java @@ -15,18 +15,18 @@ final class JedisNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(JedisRequest jedisRequest, @Nullable Void unused) { + public String getTransport(JedisRequest jedisRequest, @Nullable Void unused) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(JedisRequest jedisRequest) { + public String getPeerName(JedisRequest jedisRequest) { return jedisRequest.getConnection().getHost(); } @Override - public Integer peerPort(JedisRequest jedisRequest) { + public Integer getPeerPort(JedisRequest jedisRequest) { return jedisRequest.getConnection().getPort(); } diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java index 73feb4d12259..9a2aa6f91f92 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java @@ -12,33 +12,33 @@ final class JedisDbAttributesGetter implements DbClientAttributesGetter { @Override - public String system(JedisRequest request) { + public String getSystem(JedisRequest request) { return SemanticAttributes.DbSystemValues.REDIS; } @Override @Nullable - public String user(JedisRequest request) { + public String getUser(JedisRequest request) { return null; } @Override - public String name(JedisRequest request) { + public String getName(JedisRequest request) { return null; } @Override - public String connectionString(JedisRequest request) { + public String getConnectionString(JedisRequest request) { return null; } @Override - public String statement(JedisRequest request) { + public String getStatement(JedisRequest request) { return request.getStatement(); } @Override - public String operation(JedisRequest request) { + public String getOperation(JedisRequest request) { return request.getOperation(); } } diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java index e5e877aff650..fbe9b2216a4f 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java @@ -15,19 +15,19 @@ final class JedisNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(JedisRequest jedisRequest, @Nullable Void unused) { + public String getTransport(JedisRequest jedisRequest, @Nullable Void unused) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(JedisRequest jedisRequest) { + public String getPeerName(JedisRequest jedisRequest) { return null; } @Nullable @Override - public Integer peerPort(JedisRequest jedisRequest) { + public Integer getPeerPort(JedisRequest jedisRequest) { return null; } diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java index cbef35f70605..b3ab95593088 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java @@ -21,23 +21,23 @@ enum JettyClientHttpAttributesGetter implements HttpClientAttributesGetter requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return request.getHeaders().getValuesList(name); } @Override - public String flavor(Request request, @Nullable Response response) { + public String getFlavor(Request request, @Nullable Response response) { if (response == null) { return HTTP_1_1; @@ -61,12 +61,12 @@ public String flavor(Request request, @Nullable Response response) { } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.getStatus(); } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { return response.getHeaders().getValuesList(name); } } diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientNetAttributesGetter.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientNetAttributesGetter.java index e0469fc65765..9244d4428b86 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientNetAttributesGetter.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientNetAttributesGetter.java @@ -19,19 +19,19 @@ public class JettyHttpClientNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(Request request, @Nullable Response response) { + public String getTransport(Request request, @Nullable Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(Request request) { + public String getPeerName(Request request) { return request.getHost(); } @Override @Nullable - public Integer peerPort(Request request) { + public Integer getPeerPort(Request request) { return request.getPort(); } } diff --git a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java index a2acf028fd99..720a7f0bac4c 100644 --- a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java +++ b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java @@ -19,48 +19,48 @@ enum JmsMessageAttributesGetter implements MessagingAttributesGetter header(MessageWithDestination messageWithDestination, String name) { + public List getMessageHeader(MessageWithDestination messageWithDestination, String name) { try { String value = messageWithDestination.message().getStringProperty(name); if (value != null) { diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaBatchProcessAttributesGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaBatchProcessAttributesGetter.java index a674025a7eb5..6d00909bf3a3 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaBatchProcessAttributesGetter.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaBatchProcessAttributesGetter.java @@ -21,18 +21,18 @@ enum KafkaBatchProcessAttributesGetter INSTANCE; @Override - public String system(ConsumerRecords records) { + public String getSystem(ConsumerRecords records) { return "kafka"; } @Override - public String destinationKind(ConsumerRecords records) { + public String getDestinationKind(ConsumerRecords records) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Nullable @Override - public String destination(ConsumerRecords records) { + public String getDestination(ConsumerRecords records) { Set topics = records.partitions().stream().map(TopicPartition::topic).collect(Collectors.toSet()); // only return topic when there's exactly one in the batch @@ -40,54 +40,54 @@ public String destination(ConsumerRecords records) { } @Override - public boolean temporaryDestination(ConsumerRecords records) { + public boolean isTemporaryDestination(ConsumerRecords records) { return false; } @Nullable @Override - public String protocol(ConsumerRecords records) { + public String getProtocol(ConsumerRecords records) { return null; } @Nullable @Override - public String protocolVersion(ConsumerRecords records) { + public String getProtocolVersion(ConsumerRecords records) { return null; } @Nullable @Override - public String url(ConsumerRecords records) { + public String getUrl(ConsumerRecords records) { return null; } @Nullable @Override - public String conversationId(ConsumerRecords records) { + public String getConversationId(ConsumerRecords records) { return null; } @Nullable @Override - public Long messagePayloadSize(ConsumerRecords records) { + public Long getMessagePayloadSize(ConsumerRecords records) { return null; } @Nullable @Override - public Long messagePayloadCompressedSize(ConsumerRecords records) { + public Long getMessagePayloadCompressedSize(ConsumerRecords records) { return null; } @Nullable @Override - public String messageId(ConsumerRecords records, @Nullable Void unused) { + public String getMessageId(ConsumerRecords records, @Nullable Void unused) { return null; } @Override - public List header(ConsumerRecords records, String name) { + public List getMessageHeader(ConsumerRecords records, String name) { return StreamSupport.stream(records.spliterator(), false) .flatMap( consumerRecord -> diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java index abd0d4196a8e..4ce929b5b3d1 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java @@ -23,68 +23,68 @@ public enum KafkaConsumerAttributesGetter INSTANCE; @Override - public String system(ConsumerRecord consumerRecord) { + public String getSystem(ConsumerRecord consumerRecord) { return "kafka"; } @Override - public String destinationKind(ConsumerRecord consumerRecord) { + public String getDestinationKind(ConsumerRecord consumerRecord) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Override - public String destination(ConsumerRecord consumerRecord) { + public String getDestination(ConsumerRecord consumerRecord) { return consumerRecord.topic(); } @Override - public boolean temporaryDestination(ConsumerRecord consumerRecord) { + public boolean isTemporaryDestination(ConsumerRecord consumerRecord) { return false; } @Override @Nullable - public String protocol(ConsumerRecord consumerRecord) { + public String getProtocol(ConsumerRecord consumerRecord) { return null; } @Override @Nullable - public String protocolVersion(ConsumerRecord consumerRecord) { + public String getProtocolVersion(ConsumerRecord consumerRecord) { return null; } @Override @Nullable - public String url(ConsumerRecord consumerRecord) { + public String getUrl(ConsumerRecord consumerRecord) { return null; } @Override @Nullable - public String conversationId(ConsumerRecord consumerRecord) { + public String getConversationId(ConsumerRecord consumerRecord) { return null; } @Override - public Long messagePayloadSize(ConsumerRecord consumerRecord) { + public Long getMessagePayloadSize(ConsumerRecord consumerRecord) { return (long) consumerRecord.serializedValueSize(); } @Override @Nullable - public Long messagePayloadCompressedSize(ConsumerRecord consumerRecord) { + public Long getMessagePayloadCompressedSize(ConsumerRecord consumerRecord) { return null; } @Override @Nullable - public String messageId(ConsumerRecord consumerRecord, @Nullable Void unused) { + public String getMessageId(ConsumerRecord consumerRecord, @Nullable Void unused) { return null; } @Override - public List header(ConsumerRecord consumerRecord, String name) { + public List getMessageHeader(ConsumerRecord consumerRecord, String name) { return StreamSupport.stream(consumerRecord.headers().headers(name).spliterator(), false) .map(header -> new String(header.value(), StandardCharsets.UTF_8)) .collect(Collectors.toList()); diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java index 3f29325097aa..2370d33e21b8 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java @@ -24,70 +24,70 @@ enum KafkaProducerAttributesGetter INSTANCE; @Override - public String system(ProducerRecord producerRecord) { + public String getSystem(ProducerRecord producerRecord) { return "kafka"; } @Override - public String destinationKind(ProducerRecord producerRecord) { + public String getDestinationKind(ProducerRecord producerRecord) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Override - public String destination(ProducerRecord producerRecord) { + public String getDestination(ProducerRecord producerRecord) { return producerRecord.topic(); } @Override - public boolean temporaryDestination(ProducerRecord producerRecord) { + public boolean isTemporaryDestination(ProducerRecord producerRecord) { return false; } @Override @Nullable - public String protocol(ProducerRecord producerRecord) { + public String getProtocol(ProducerRecord producerRecord) { return null; } @Override @Nullable - public String protocolVersion(ProducerRecord producerRecord) { + public String getProtocolVersion(ProducerRecord producerRecord) { return null; } @Override @Nullable - public String url(ProducerRecord producerRecord) { + public String getUrl(ProducerRecord producerRecord) { return null; } @Override @Nullable - public String conversationId(ProducerRecord producerRecord) { + public String getConversationId(ProducerRecord producerRecord) { return null; } @Override @Nullable - public Long messagePayloadSize(ProducerRecord producerRecord) { + public Long getMessagePayloadSize(ProducerRecord producerRecord) { return null; } @Override @Nullable - public Long messagePayloadCompressedSize(ProducerRecord producerRecord) { + public Long getMessagePayloadCompressedSize(ProducerRecord producerRecord) { return null; } @Override @Nullable - public String messageId( + public String getMessageId( ProducerRecord producerRecord, @Nullable RecordMetadata recordMetadata) { return null; } @Override - public List header(ProducerRecord producerRecord, String name) { + public List getMessageHeader(ProducerRecord producerRecord, String name) { return StreamSupport.stream(producerRecord.headers().headers(name).spliterator(), false) .map(header -> new String(header.value(), StandardCharsets.UTF_8)) .collect(Collectors.toList()); diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java index f6d504bfa153..579df437a59a 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java @@ -25,18 +25,18 @@ public enum KafkaReceiveAttributesGetter INSTANCE; @Override - public String system(ConsumerRecords consumerRecords) { + public String getSystem(ConsumerRecords consumerRecords) { return "kafka"; } @Override - public String destinationKind(ConsumerRecords consumerRecords) { + public String getDestinationKind(ConsumerRecords consumerRecords) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Override @Nullable - public String destination(ConsumerRecords consumerRecords) { + public String getDestination(ConsumerRecords consumerRecords) { Set topics = consumerRecords.partitions().stream() .map(TopicPartition::topic) @@ -46,54 +46,54 @@ public String destination(ConsumerRecords consumerRecords) { } @Override - public boolean temporaryDestination(ConsumerRecords consumerRecords) { + public boolean isTemporaryDestination(ConsumerRecords consumerRecords) { return false; } @Override @Nullable - public String protocol(ConsumerRecords consumerRecords) { + public String getProtocol(ConsumerRecords consumerRecords) { return null; } @Override @Nullable - public String protocolVersion(ConsumerRecords consumerRecords) { + public String getProtocolVersion(ConsumerRecords consumerRecords) { return null; } @Override @Nullable - public String url(ConsumerRecords consumerRecords) { + public String getUrl(ConsumerRecords consumerRecords) { return null; } @Override @Nullable - public String conversationId(ConsumerRecords consumerRecords) { + public String getConversationId(ConsumerRecords consumerRecords) { return null; } @Override @Nullable - public Long messagePayloadSize(ConsumerRecords consumerRecords) { + public Long getMessagePayloadSize(ConsumerRecords consumerRecords) { return null; } @Override @Nullable - public Long messagePayloadCompressedSize(ConsumerRecords consumerRecords) { + public Long getMessagePayloadCompressedSize(ConsumerRecords consumerRecords) { return null; } @Override @Nullable - public String messageId(ConsumerRecords consumerRecords, @Nullable Void unused) { + public String getMessageId(ConsumerRecords consumerRecords, @Nullable Void unused) { return null; } @Override - public List header(ConsumerRecords records, String name) { + public List getMessageHeader(ConsumerRecords records, String name) { return StreamSupport.stream(records.spliterator(), false) .flatMap( consumerRecord -> diff --git a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt index 6bc6926a4a6d..277675b88aaa 100644 --- a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt +++ b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt @@ -15,23 +15,23 @@ internal enum class KtorHttpServerAttributesGetter : HttpServerAttributesGetter { INSTANCE, ; - override fun method(request: ApplicationRequest): String { + override fun getMethod(request: ApplicationRequest): String { return request.httpMethod.value } - override fun requestHeader(request: ApplicationRequest, name: String): List { + override fun getRequestHeader(request: ApplicationRequest, name: String): List { return request.headers.getAll(name) ?: emptyList() } - override fun statusCode(request: ApplicationRequest, response: ApplicationResponse, error: Throwable?): Int? { + override fun getStatusCode(request: ApplicationRequest, response: ApplicationResponse, error: Throwable?): Int? { return response.status()?.value } - override fun responseHeader(request: ApplicationRequest, response: ApplicationResponse, name: String): List { + override fun getResponseHeader(request: ApplicationRequest, response: ApplicationResponse, name: String): List { return response.headers.allValues().getAll(name) ?: emptyList() } - override fun flavor(request: ApplicationRequest): String? { + override fun getFlavor(request: ApplicationRequest): String? { return when (request.httpVersion) { "HTTP/1.1" -> SemanticAttributes.HttpFlavorValues.HTTP_1_1 "HTTP/2.0" -> SemanticAttributes.HttpFlavorValues.HTTP_2_0 @@ -39,15 +39,15 @@ internal enum class KtorHttpServerAttributesGetter : } } - override fun target(request: ApplicationRequest): String { + override fun getTarget(request: ApplicationRequest): String { return request.uri } - override fun route(request: ApplicationRequest): String? { + override fun getRoute(request: ApplicationRequest): String? { return null } - override fun scheme(request: ApplicationRequest): String { + override fun getScheme(request: ApplicationRequest): String { return request.origin.scheme } } diff --git a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorNetServerAttributesGetter.kt b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorNetServerAttributesGetter.kt index 8f82a1e46969..b3df806090e7 100644 --- a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorNetServerAttributesGetter.kt +++ b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorNetServerAttributesGetter.kt @@ -11,11 +11,11 @@ import io.opentelemetry.instrumentation.ktor.isIpAddress import io.opentelemetry.semconv.trace.attributes.SemanticAttributes internal class KtorNetServerAttributesGetter : NetServerAttributesGetter { - override fun transport(request: ApplicationRequest): String { + override fun getTransport(request: ApplicationRequest): String { return SemanticAttributes.NetTransportValues.IP_TCP } - override fun sockPeerAddr(request: ApplicationRequest): String? { + override fun getSockPeerAddr(request: ApplicationRequest): String? { val remote = request.local.remoteHost if ("unknown" != remote && isIpAddress(remote)) { return remote @@ -23,11 +23,11 @@ internal class KtorNetServerAttributesGetter : NetServerAttributesGetter { INSTANCE, ; - override fun method(request: ApplicationRequest): String { + override fun getMethod(request: ApplicationRequest): String { return request.httpMethod.value } - override fun requestHeader(request: ApplicationRequest, name: String): List { + override fun getRequestHeader(request: ApplicationRequest, name: String): List { return request.headers.getAll(name) ?: emptyList() } - override fun statusCode(request: ApplicationRequest, response: ApplicationResponse, error: Throwable?): Int? { + override fun getStatusCode(request: ApplicationRequest, response: ApplicationResponse, error: Throwable?): Int? { return response.status()?.value } - override fun responseHeader(request: ApplicationRequest, response: ApplicationResponse, name: String): List { + override fun getResponseHeader(request: ApplicationRequest, response: ApplicationResponse, name: String): List { return response.headers.allValues().getAll(name) ?: emptyList() } - override fun flavor(request: ApplicationRequest): String? { + override fun getFlavor(request: ApplicationRequest): String? { return when (request.httpVersion) { "HTTP/1.1" -> SemanticAttributes.HttpFlavorValues.HTTP_1_1 "HTTP/2.0" -> SemanticAttributes.HttpFlavorValues.HTTP_2_0 @@ -39,15 +39,15 @@ internal enum class KtorHttpServerAttributesGetter : } } - override fun target(request: ApplicationRequest): String { + override fun getTarget(request: ApplicationRequest): String { return request.uri } - override fun route(request: ApplicationRequest): String? { + override fun getRoute(request: ApplicationRequest): String? { return null } - override fun scheme(request: ApplicationRequest): String { + override fun getScheme(request: ApplicationRequest): String { return request.origin.scheme } } diff --git a/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorNetServerAttributesGetter.kt b/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorNetServerAttributesGetter.kt index 3d9a78488dfa..f8172d304d68 100644 --- a/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorNetServerAttributesGetter.kt +++ b/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorNetServerAttributesGetter.kt @@ -11,11 +11,11 @@ import io.opentelemetry.instrumentation.ktor.isIpAddress import io.opentelemetry.semconv.trace.attributes.SemanticAttributes internal class KtorNetServerAttributesGetter : NetServerAttributesGetter { - override fun transport(request: ApplicationRequest): String { + override fun getTransport(request: ApplicationRequest): String { return SemanticAttributes.NetTransportValues.IP_TCP } - override fun sockPeerAddr(request: ApplicationRequest): String? { + override fun getSockPeerAddr(request: ApplicationRequest): String? { val remote = request.local.remoteHost if ("unknown" != remote && isIpAddress(remote)) { return remote @@ -23,11 +23,11 @@ internal class KtorNetServerAttributesGetter : NetServerAttributesGetter> { @Override - public String method(Request request) { + public String getMethod(Request request) { return request.method(); } @Override - public String url(Request request) { + public String getUrl(Request request) { return request.url().toString(); } @Override - public List requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return request.headers(name); } @Override - public String flavor(Request request, @Nullable ApiResponse apiResponse) { + public String getFlavor(Request request, @Nullable ApiResponse apiResponse) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public Integer statusCode( + public Integer getStatusCode( Request request, ApiResponse apiResponse, @Nullable Throwable error) { return apiResponse.getStatusCode(); } @Override - public List responseHeader(Request request, ApiResponse apiResponse, String name) { + public List getResponseHeader(Request request, ApiResponse apiResponse, String name) { return apiResponse.getHeaders().getOrDefault(name, emptyList()); } } diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesGetter.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesGetter.java index 401e7fa980d3..6deb533b4a8e 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesGetter.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesGetter.java @@ -14,17 +14,17 @@ class KubernetesNetAttributesGetter implements NetClientAttributesGetter> { @Override - public String transport(Request request, @Nullable ApiResponse response) { + public String getTransport(Request request, @Nullable ApiResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override - public String peerName(Request request) { + public String getPeerName(Request request) { return request.url().host(); } @Override - public Integer peerPort(Request request) { + public Integer getPeerPort(Request request) { return request.url().port(); } } diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java index c4b8a7280a21..35bcc05eb448 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java @@ -13,17 +13,17 @@ final class LettuceConnectNetAttributesGetter implements NetClientAttributesGett @Override @Nullable - public String transport(RedisURI redisUri, @Nullable Void unused) { + public String getTransport(RedisURI redisUri, @Nullable Void unused) { return null; } @Override - public String peerName(RedisURI redisUri) { + public String getPeerName(RedisURI redisUri) { return redisUri.getHost(); } @Override - public Integer peerPort(RedisURI redisUri) { + public Integer getPeerPort(RedisURI redisUri) { return redisUri.getPort(); } } diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java index fad1477938f2..31cef64648b6 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java @@ -13,35 +13,35 @@ final class LettuceDbAttributesGetter implements DbClientAttributesGetter> { @Override - public String system(RedisCommand request) { + public String getSystem(RedisCommand request) { return SemanticAttributes.DbSystemValues.REDIS; } @Override @Nullable - public String user(RedisCommand request) { + public String getUser(RedisCommand request) { return null; } @Override @Nullable - public String name(RedisCommand request) { + public String getName(RedisCommand request) { return null; } @Override @Nullable - public String connectionString(RedisCommand request) { + public String getConnectionString(RedisCommand request) { return null; } @Override - public String statement(RedisCommand request) { + public String getStatement(RedisCommand request) { return null; } @Override - public String operation(RedisCommand request) { + public String getOperation(RedisCommand request) { return request.getType().name(); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java index fdfcc2e37d5e..db5dcba5a164 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java @@ -13,17 +13,17 @@ final class LettuceConnectNetAttributesGetter implements NetClientAttributesGett @Override @Nullable - public String transport(RedisURI redisUri, @Nullable Void unused) { + public String getTransport(RedisURI redisUri, @Nullable Void unused) { return null; } @Override - public String peerName(RedisURI redisUri) { + public String getPeerName(RedisURI redisUri) { return redisUri.getHost(); } @Override - public Integer peerPort(RedisURI redisUri) { + public Integer getPeerPort(RedisURI redisUri) { return redisUri.getPort(); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java index f1a55c8192bd..f048d3fdcb02 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java @@ -21,30 +21,30 @@ final class LettuceDbAttributesGetter implements DbClientAttributesGetter request) { + public String getSystem(RedisCommand request) { return SemanticAttributes.DbSystemValues.REDIS; } @Override @Nullable - public String user(RedisCommand request) { + public String getUser(RedisCommand request) { return null; } @Override @Nullable - public String name(RedisCommand request) { + public String getName(RedisCommand request) { return null; } @Override @Nullable - public String connectionString(RedisCommand request) { + public String getConnectionString(RedisCommand request) { return null; } @Override - public String statement(RedisCommand request) { + public String getStatement(RedisCommand request) { String command = LettuceInstrumentationUtil.getCommandName(request); List args = request.getArgs() == null @@ -54,7 +54,7 @@ public String statement(RedisCommand request) { } @Override - public String operation(RedisCommand request) { + public String getOperation(RedisCommand request) { return request.getType().name(); } } diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java index af8b387e301b..e1f91bfeec2f 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java @@ -16,19 +16,19 @@ final class LettuceNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(OpenTelemetryEndpoint endpoint, @Nullable Void unused) { + public String getTransport(OpenTelemetryEndpoint endpoint, @Nullable Void unused) { return IP_TCP; } @Nullable @Override - public String peerName(OpenTelemetryEndpoint openTelemetryEndpoint) { + public String getPeerName(OpenTelemetryEndpoint openTelemetryEndpoint) { return null; } @Nullable @Override - public Integer peerPort(OpenTelemetryEndpoint openTelemetryEndpoint) { + public Integer getPeerPort(OpenTelemetryEndpoint openTelemetryEndpoint) { return null; } diff --git a/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java index 28c9380732c9..18f353ddb925 100644 --- a/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java +++ b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java @@ -14,18 +14,18 @@ public class LibertyDispatcherHttpAttributesGetter @Override @Nullable - public String method(LibertyRequest libertyRequest) { + public String getMethod(LibertyRequest libertyRequest) { return libertyRequest.getMethod(); } @Override - public List requestHeader(LibertyRequest libertyRequest, String name) { + public List getRequestHeader(LibertyRequest libertyRequest, String name) { return libertyRequest.getHeaderValues(name); } @Override @Nullable - public String flavor(LibertyRequest libertyRequest) { + public String getFlavor(LibertyRequest libertyRequest) { String flavor = libertyRequest.getProtocol(); if (flavor != null) { // remove HTTP/ prefix to comply with semantic conventions @@ -38,20 +38,20 @@ public String flavor(LibertyRequest libertyRequest) { @Override @Nullable - public Integer statusCode( + public Integer getStatusCode( LibertyRequest libertyRequest, LibertyResponse libertyResponse, @Nullable Throwable error) { return libertyResponse.getStatus(); } @Override - public List responseHeader( + public List getResponseHeader( LibertyRequest libertyRequest, LibertyResponse libertyResponse, String name) { return libertyResponse.getHeaderValues(name); } @Override @Nullable - public String target(LibertyRequest libertyRequest) { + public String getTarget(LibertyRequest libertyRequest) { String requestUri = libertyRequest.getRequestUri(); String queryString = libertyRequest.getQueryString(); if (queryString != null && !queryString.isEmpty()) { @@ -62,13 +62,13 @@ public String target(LibertyRequest libertyRequest) { @Override @Nullable - public String scheme(LibertyRequest libertyRequest) { + public String getScheme(LibertyRequest libertyRequest) { return libertyRequest.getScheme(); } @Override @Nullable - public String route(LibertyRequest libertyRequest) { + public String getRoute(LibertyRequest libertyRequest) { return null; } } diff --git a/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java index 86652e6c5503..7a8b6d6614db 100644 --- a/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java +++ b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java @@ -13,41 +13,41 @@ public class LibertyDispatcherNetAttributesGetter implements NetServerAttributesGetter { @Override - public String transport(LibertyRequest request) { + public String getTransport(LibertyRequest request) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(LibertyRequest request) { + public String getHostName(LibertyRequest request) { return request.request().getURLHost(); } @Override - public Integer hostPort(LibertyRequest request) { + public Integer getHostPort(LibertyRequest request) { return request.request().getURLPort(); } @Override @Nullable - public String sockPeerAddr(LibertyRequest request) { + public String getSockPeerAddr(LibertyRequest request) { return request.dispatcher().getRemoteHostAddress(); } @Override - public Integer sockPeerPort(LibertyRequest request) { + public Integer getSockPeerPort(LibertyRequest request) { return request.dispatcher().getRemotePort(); } @Nullable @Override - public String sockHostAddr(LibertyRequest request) { + public String getSockHostAddr(LibertyRequest request) { return request.dispatcher().getLocalHostAddress(); } @Nullable @Override - public Integer sockHostPort(LibertyRequest request) { + public Integer getSockHostPort(LibertyRequest request) { return request.dispatcher().getLocalPort(); } } diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java index 6ffab51cd418..631cf3d4f672 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java @@ -48,25 +48,25 @@ class MongoDbAttributesGetter implements DbClientAttributesGetter { @Override public String extract(CommandStartedEvent event) { - String operation = dbAttributesGetter.operation(event); - String dbName = dbAttributesGetter.name(event); + String operation = dbAttributesGetter.getOperation(event); + String dbName = dbAttributesGetter.getName(event); if (operation == null) { return dbName == null ? DEFAULT_SPAN_NAME : dbName; } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectHttpAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectHttpAttributesGetter.java index 2f03e7b6ddd9..20ff29b2e9a3 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectHttpAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectHttpAttributesGetter.java @@ -18,36 +18,37 @@ enum NettyConnectHttpAttributesGetter @Nullable @Override - public String url(NettyConnectionRequest nettyConnectionRequest) { + public String getUrl(NettyConnectionRequest nettyConnectionRequest) { return null; } @Nullable @Override - public String flavor(NettyConnectionRequest nettyConnectionRequest, @Nullable Channel channel) { + public String getFlavor( + NettyConnectionRequest nettyConnectionRequest, @Nullable Channel channel) { return null; } @Nullable @Override - public String method(NettyConnectionRequest nettyConnectionRequest) { + public String getMethod(NettyConnectionRequest nettyConnectionRequest) { return null; } @Override - public List requestHeader(NettyConnectionRequest nettyConnectionRequest, String name) { + public List getRequestHeader(NettyConnectionRequest nettyConnectionRequest, String name) { return Collections.emptyList(); } @Nullable @Override - public Integer statusCode( + public Integer getStatusCode( NettyConnectionRequest nettyConnectionRequest, Channel channel, @Nullable Throwable error) { return null; } @Override - public List responseHeader( + public List getResponseHeader( NettyConnectionRequest nettyConnectionRequest, Channel channel, String name) { return Collections.emptyList(); } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectNetAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectNetAttributesGetter.java index 176962881b59..ac114e24d4a1 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectNetAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectNetAttributesGetter.java @@ -20,13 +20,13 @@ final class NettyConnectNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(NettyConnectionRequest request, @Nullable Channel channel) { + public String getTransport(NettyConnectionRequest request, @Nullable Channel channel) { return channel instanceof DatagramChannel ? IP_UDP : IP_TCP; } @Nullable @Override - public String peerName(NettyConnectionRequest request) { + public String getPeerName(NettyConnectionRequest request) { SocketAddress requestedAddress = request.remoteAddressOnStart(); if (requestedAddress instanceof InetSocketAddress) { return ((InetSocketAddress) requestedAddress).getHostString(); @@ -36,7 +36,7 @@ public String peerName(NettyConnectionRequest request) { @Nullable @Override - public Integer peerPort(NettyConnectionRequest request) { + public Integer getPeerPort(NettyConnectionRequest request) { SocketAddress requestedAddress = request.remoteAddressOnStart(); if (requestedAddress instanceof InetSocketAddress) { return ((InetSocketAddress) requestedAddress).getPort(); diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java index d61477eb8a58..6bf2b304aabc 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java @@ -20,7 +20,7 @@ final class NettyHttpClientAttributesGetter @Override @Nullable - public String url(HttpRequestAndChannel requestAndChannel) { + public String getUrl(HttpRequestAndChannel requestAndChannel) { try { String hostHeader = getHost(requestAndChannel); String target = requestAndChannel.request().getUri(); @@ -35,12 +35,13 @@ public String url(HttpRequestAndChannel requestAndChannel) { } private String getHost(HttpRequestAndChannel requestAndChannel) { - List values = requestHeader(requestAndChannel, "host"); + List values = getRequestHeader(requestAndChannel, "host"); return values.isEmpty() ? null : values.get(0); } @Override - public String flavor(HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + public String getFlavor( + HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { String flavor = requestAndChannel.request().getProtocolVersion().toString(); if (flavor.startsWith("HTTP/")) { flavor = flavor.substring("HTTP/".length()); @@ -49,23 +50,23 @@ public String flavor(HttpRequestAndChannel requestAndChannel, @Nullable HttpResp } @Override - public String method(HttpRequestAndChannel requestAndChannel) { + public String getMethod(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.request().getMethod().getName(); } @Override - public List requestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().getCode(); } @Override - public List responseHeader( + public List getResponseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyNetClientAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyNetClientAttributesGetter.java index 3f9fe7b82a1e..5a9973ad5b35 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyNetClientAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyNetClientAttributesGetter.java @@ -20,20 +20,20 @@ final class NettyNetClientAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport( + public String getTransport( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { return requestAndChannel.channel() instanceof DatagramChannel ? IP_UDP : IP_TCP; } @Nullable @Override - public String peerName(HttpRequestAndChannel requestAndChannel) { + public String getPeerName(HttpRequestAndChannel requestAndChannel) { return null; } @Nullable @Override - public Integer peerPort(HttpRequestAndChannel requestAndChannel) { + public Integer getPeerPort(HttpRequestAndChannel requestAndChannel) { return null; } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java index 6a954c8fd8c3..e36e31934677 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java @@ -5,10 +5,9 @@ package io.opentelemetry.javaagent.instrumentation.netty.v3_8.server; -import static io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.HttpSchemeUtil.getScheme; - import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesGetter; import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.HttpSchemeUtil; import java.util.List; import javax.annotation.Nullable; import org.jboss.netty.handler.codec.http.HttpResponse; @@ -17,29 +16,29 @@ final class NettyHttpServerAttributesGetter implements HttpServerAttributesGetter { @Override - public String method(HttpRequestAndChannel requestAndChannel) { + public String getMethod(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.request().getMethod().getName(); } @Override - public List requestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().getCode(); } @Override - public List responseHeader( + public List getResponseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } @Override - public String flavor(HttpRequestAndChannel requestAndChannel) { + public String getFlavor(HttpRequestAndChannel requestAndChannel) { String flavor = requestAndChannel.request().getProtocolVersion().toString(); if (flavor.startsWith("HTTP/")) { flavor = flavor.substring("HTTP/".length()); @@ -48,18 +47,18 @@ public String flavor(HttpRequestAndChannel requestAndChannel) { } @Override - public String target(HttpRequestAndChannel requestAndChannel) { + public String getTarget(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.request().getUri(); } @Override @Nullable - public String route(HttpRequestAndChannel requestAndChannel) { + public String getRoute(HttpRequestAndChannel requestAndChannel) { return null; } @Override - public String scheme(HttpRequestAndChannel requestAndChannel) { - return getScheme(requestAndChannel); + public String getScheme(HttpRequestAndChannel requestAndChannel) { + return HttpSchemeUtil.getScheme(requestAndChannel); } } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyNetServerAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyNetServerAttributesGetter.java index 25be717c9fb7..52c96859cabb 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyNetServerAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyNetServerAttributesGetter.java @@ -19,19 +19,19 @@ final class NettyNetServerAttributesGetter extends InetSocketAddressNetServerAttributesGetter { @Override - public String transport(HttpRequestAndChannel requestAndChannel) { + public String getTransport(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.channel() instanceof DatagramChannel ? IP_UDP : IP_TCP; } @Nullable @Override - public String hostName(HttpRequestAndChannel requestAndChannel) { + public String getHostName(HttpRequestAndChannel requestAndChannel) { return null; } @Nullable @Override - public Integer hostPort(HttpRequestAndChannel requestAndChannel) { + public Integer getHostPort(HttpRequestAndChannel requestAndChannel) { return null; } diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectHttpAttributesGetter.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectHttpAttributesGetter.java index 09823ca3fe19..9504de31d81c 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectHttpAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectHttpAttributesGetter.java @@ -18,36 +18,37 @@ enum NettyConnectHttpAttributesGetter @Nullable @Override - public String url(NettyConnectionRequest nettyConnectionRequest) { + public String getUrl(NettyConnectionRequest nettyConnectionRequest) { return null; } @Nullable @Override - public String flavor(NettyConnectionRequest nettyConnectionRequest, @Nullable Channel channel) { + public String getFlavor( + NettyConnectionRequest nettyConnectionRequest, @Nullable Channel channel) { return null; } @Nullable @Override - public String method(NettyConnectionRequest nettyConnectionRequest) { + public String getMethod(NettyConnectionRequest nettyConnectionRequest) { return null; } @Override - public List requestHeader(NettyConnectionRequest nettyConnectionRequest, String name) { + public List getRequestHeader(NettyConnectionRequest nettyConnectionRequest, String name) { return Collections.emptyList(); } @Nullable @Override - public Integer statusCode( + public Integer getStatusCode( NettyConnectionRequest nettyConnectionRequest, Channel channel, @Nullable Throwable error) { return null; } @Override - public List responseHeader( + public List getResponseHeader( NettyConnectionRequest nettyConnectionRequest, Channel channel, String name) { return Collections.emptyList(); } diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectNetAttributesGetter.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectNetAttributesGetter.java index 00707eac27c4..320d278ed65c 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectNetAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectNetAttributesGetter.java @@ -20,13 +20,13 @@ final class NettyConnectNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(NettyConnectionRequest request, @Nullable Channel channel) { + public String getTransport(NettyConnectionRequest request, @Nullable Channel channel) { return channel instanceof DatagramChannel ? IP_UDP : IP_TCP; } @Nullable @Override - public String peerName(NettyConnectionRequest request) { + public String getPeerName(NettyConnectionRequest request) { SocketAddress requestedAddress = request.remoteAddressOnStart(); if (requestedAddress instanceof InetSocketAddress) { return ((InetSocketAddress) requestedAddress).getHostString(); @@ -36,7 +36,7 @@ public String peerName(NettyConnectionRequest request) { @Nullable @Override - public Integer peerPort(NettyConnectionRequest request) { + public Integer getPeerPort(NettyConnectionRequest request) { SocketAddress requestedAddress = request.remoteAddressOnStart(); if (requestedAddress instanceof InetSocketAddress) { return ((InetSocketAddress) requestedAddress).getPort(); diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyHttpClientAttributesGetter.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyHttpClientAttributesGetter.java index f6c3c0dbd85b..2a0486b1cf99 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyHttpClientAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyHttpClientAttributesGetter.java @@ -20,7 +20,7 @@ final class NettyHttpClientAttributesGetter @Override @Nullable - public String url(HttpRequestAndChannel requestAndChannel) { + public String getUrl(HttpRequestAndChannel requestAndChannel) { try { String hostHeader = getHost(requestAndChannel); String target = requestAndChannel.request().getUri(); @@ -35,12 +35,13 @@ public String url(HttpRequestAndChannel requestAndChannel) { } private String getHost(HttpRequestAndChannel requestAndChannel) { - List values = requestHeader(requestAndChannel, "host"); + List values = getRequestHeader(requestAndChannel, "host"); return values.isEmpty() ? null : values.get(0); } @Override - public String flavor(HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + public String getFlavor( + HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { String flavor = requestAndChannel.request().getProtocolVersion().toString(); if (flavor.startsWith("HTTP/")) { flavor = flavor.substring("HTTP/".length()); @@ -49,23 +50,23 @@ public String flavor(HttpRequestAndChannel requestAndChannel, @Nullable HttpResp } @Override - public String method(HttpRequestAndChannel requestAndChannel) { + public String getMethod(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.request().getMethod().name(); } @Override - public List requestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().code(); } @Override - public List responseHeader( + public List getResponseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyNetClientAttributesGetter.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyNetClientAttributesGetter.java index 5607dd52238e..b3b67f8250dd 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyNetClientAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyNetClientAttributesGetter.java @@ -20,20 +20,20 @@ final class NettyNetClientAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport( + public String getTransport( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { return requestAndChannel.channel() instanceof DatagramChannel ? IP_UDP : IP_TCP; } @Nullable @Override - public String peerName(HttpRequestAndChannel requestAndChannel) { + public String getPeerName(HttpRequestAndChannel requestAndChannel) { return null; } @Nullable @Override - public Integer peerPort(HttpRequestAndChannel requestAndChannel) { + public Integer getPeerPort(HttpRequestAndChannel requestAndChannel) { return null; } diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslNetAttributesGetter.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslNetAttributesGetter.java index de58ef52ab03..84d22b71cdc3 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslNetAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslNetAttributesGetter.java @@ -17,19 +17,19 @@ final class NettySslNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(NettySslRequest request, @Nullable Void unused) { + public String getTransport(NettySslRequest request, @Nullable Void unused) { return request.channel() instanceof DatagramChannel ? IP_UDP : IP_TCP; } @Nullable @Override - public String peerName(NettySslRequest nettySslRequest) { + public String getPeerName(NettySslRequest nettySslRequest) { return null; } @Nullable @Override - public Integer peerPort(NettySslRequest nettySslRequest) { + public Integer getPeerPort(NettySslRequest nettySslRequest) { return null; } diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyHttpServerAttributesGetter.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyHttpServerAttributesGetter.java index 96870a39db2a..d1588fd1fc1b 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyHttpServerAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyHttpServerAttributesGetter.java @@ -5,11 +5,10 @@ package io.opentelemetry.instrumentation.netty.v4.common.internal.server; -import static io.opentelemetry.instrumentation.netty.v4.common.internal.HttpSchemeUtil.getScheme; - import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesGetter; import io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.v4.common.internal.HttpSchemeUtil; import java.util.List; import javax.annotation.Nullable; @@ -17,29 +16,29 @@ final class NettyHttpServerAttributesGetter implements HttpServerAttributesGetter { @Override - public String method(HttpRequestAndChannel requestAndChannel) { + public String getMethod(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.request().getMethod().name(); } @Override - public List requestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().code(); } @Override - public List responseHeader( + public List getResponseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } @Override - public String flavor(HttpRequestAndChannel requestAndChannel) { + public String getFlavor(HttpRequestAndChannel requestAndChannel) { String flavor = requestAndChannel.request().getProtocolVersion().toString(); if (flavor.startsWith("HTTP/")) { flavor = flavor.substring("HTTP/".length()); @@ -48,18 +47,18 @@ public String flavor(HttpRequestAndChannel requestAndChannel) { } @Override - public String target(HttpRequestAndChannel requestAndChannel) { + public String getTarget(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.request().getUri(); } @Override @Nullable - public String route(HttpRequestAndChannel requestAndChannel) { + public String getRoute(HttpRequestAndChannel requestAndChannel) { return null; } @Override - public String scheme(HttpRequestAndChannel requestAndChannel) { - return getScheme(requestAndChannel); + public String getScheme(HttpRequestAndChannel requestAndChannel) { + return HttpSchemeUtil.getScheme(requestAndChannel); } } diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyNetServerAttributesGetter.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyNetServerAttributesGetter.java index a63a281cac2b..2b11edcd585d 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyNetServerAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyNetServerAttributesGetter.java @@ -19,19 +19,19 @@ final class NettyNetServerAttributesGetter extends InetSocketAddressNetServerAttributesGetter { @Override - public String transport(HttpRequestAndChannel requestAndChannel) { + public String getTransport(HttpRequestAndChannel requestAndChannel) { return requestAndChannel.channel() instanceof DatagramChannel ? IP_UDP : IP_TCP; } @Nullable @Override - public String hostName(HttpRequestAndChannel requestAndChannel) { + public String getHostName(HttpRequestAndChannel requestAndChannel) { return null; } @Nullable @Override - public Integer hostPort(HttpRequestAndChannel requestAndChannel) { + public Integer getHostPort(HttpRequestAndChannel requestAndChannel) { return null; } diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java index a4468c4791e3..c3738f3819f0 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java @@ -15,28 +15,28 @@ final class OkHttp2HttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(Request request) { + public String getMethod(Request request) { return request.method(); } @Override - public String url(Request request) { + public String getUrl(Request request) { return request.urlString(); } @Override - public List requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return request.headers(name); } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.code(); } @Override @Nullable - public String flavor(Request request, @Nullable Response response) { + public String getFlavor(Request request, @Nullable Response response) { if (response == null) { return null; } @@ -54,7 +54,7 @@ public String flavor(Request request, @Nullable Response response) { } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { return response.headers(name); } } diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2NetAttributesGetter.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2NetAttributesGetter.java index 851693512ed4..fa2bd7a9aad0 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2NetAttributesGetter.java +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2NetAttributesGetter.java @@ -15,18 +15,18 @@ public final class OkHttp2NetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(Request request, @Nullable Response response) { + public String getTransport(Request request, @Nullable Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(Request request) { + public String getPeerName(Request request) { return request.url().getHost(); } @Override - public Integer peerPort(Request request) { + public Integer getPeerPort(Request request) { return request.url().getPort(); } } diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java index 3c9fff91da13..c7454e38da21 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java @@ -16,24 +16,24 @@ enum OkHttpAttributesGetter implements HttpClientAttributesGetter requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return request.headers(name); } @Override @SuppressWarnings("UnnecessaryDefaultInEnumSwitch") @Nullable - public String flavor(Request request, @Nullable Response response) { + public String getFlavor(Request request, @Nullable Response response) { if (response == null) { return null; } @@ -53,12 +53,12 @@ public String flavor(Request request, @Nullable Response response) { } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.code(); } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { return response.headers(name); } } diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/internal/OkHttpNetAttributesGetter.java b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/internal/OkHttpNetAttributesGetter.java index 49cb058b3ad3..b016a9558f3e 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/internal/OkHttpNetAttributesGetter.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/internal/OkHttpNetAttributesGetter.java @@ -19,18 +19,18 @@ public final class OkHttpNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(Request request, @Nullable Response response) { + public String getTransport(Request request, @Nullable Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(Request request) { + public String getPeerName(Request request) { return request.url().host(); } @Override - public Integer peerPort(Request request) { + public Integer getPeerPort(Request request) { return request.url().port(); } } diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java index 1eb7a2bf59b9..deb77a4211c4 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java +++ b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java @@ -13,37 +13,37 @@ final class OpenSearchRestAttributesGetter implements DbClientAttributesGetter { @Override - public String system(OpenSearchRestRequest request) { + public String getSystem(OpenSearchRestRequest request) { return SemanticAttributes.DbSystemValues.OPENSEARCH; } @Override @Nullable - public String user(OpenSearchRestRequest request) { + public String getUser(OpenSearchRestRequest request) { return null; } @Override @Nullable - public String name(OpenSearchRestRequest request) { + public String getName(OpenSearchRestRequest request) { return null; } @Override @Nullable - public String connectionString(OpenSearchRestRequest request) { + public String getConnectionString(OpenSearchRestRequest request) { return null; } @Override @Nullable - public String statement(OpenSearchRestRequest request) { + public String getStatement(OpenSearchRestRequest request) { return request.getMethod() + " " + request.getOperation(); } @Override @Nullable - public String operation(OpenSearchRestRequest request) { + public String getOperation(OpenSearchRestRequest request) { return request.getMethod(); } } diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestNetResponseAttributesGetter.java b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestNetResponseAttributesGetter.java index b8a945d9e4b4..02695fe3854c 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestNetResponseAttributesGetter.java +++ b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestNetResponseAttributesGetter.java @@ -15,25 +15,25 @@ final class OpenSearchRestNetResponseAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(OpenSearchRestRequest request, Response response) { + public String getTransport(OpenSearchRestRequest request, Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(OpenSearchRestRequest request) { + public String getPeerName(OpenSearchRestRequest request) { return null; } @Override @Nullable - public Integer peerPort(OpenSearchRestRequest request) { + public Integer getPeerPort(OpenSearchRestRequest request) { return null; } @Nullable @Override - public String sockFamily( + public String getSockFamily( OpenSearchRestRequest elasticsearchRestRequest, @Nullable Response response) { if (response != null && response.getHost().getAddress() instanceof Inet6Address) { return "inet6"; @@ -43,7 +43,7 @@ public String sockFamily( @Override @Nullable - public String sockPeerAddr(OpenSearchRestRequest request, @Nullable Response response) { + public String getSockPeerAddr(OpenSearchRestRequest request, @Nullable Response response) { if (response != null && response.getHost().getAddress() != null) { return response.getHost().getAddress().getHostAddress(); } diff --git a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodCodeAttributesGetter.java b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodCodeAttributesGetter.java index 894c02c2a4cf..a9765596c05f 100644 --- a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodCodeAttributesGetter.java +++ b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodCodeAttributesGetter.java @@ -12,12 +12,12 @@ enum MethodCodeAttributesGetter implements CodeAttributesGetter { INSTANCE; @Override - public Class codeClass(Method method) { + public Class getCodeClass(Method method) { return method.getDeclaringClass(); } @Override - public String methodName(Method method) { + public String getMethodName(Method method) { return method.getName(); } } diff --git a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodRequestCodeAttributesGetter.java b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodRequestCodeAttributesGetter.java index d52c4fd33b3f..c5a64a4b9ed2 100644 --- a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodRequestCodeAttributesGetter.java +++ b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/MethodRequestCodeAttributesGetter.java @@ -11,12 +11,12 @@ enum MethodRequestCodeAttributesGetter implements CodeAttributesGetter codeClass(MethodRequest methodRequest) { + public Class getCodeClass(MethodRequest methodRequest) { return methodRequest.method().getDeclaringClass(); } @Override - public String methodName(MethodRequest methodRequest) { + public String getMethodName(MethodRequest methodRequest) { return methodRequest.method().getName(); } } diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodCodeAttributesGetter.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodCodeAttributesGetter.java index 9cf2be6ee753..d15d02b127d6 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodCodeAttributesGetter.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodCodeAttributesGetter.java @@ -12,12 +12,12 @@ enum MethodCodeAttributesGetter implements CodeAttributesGetter { INSTANCE; @Override - public Class codeClass(Method method) { + public Class getCodeClass(Method method) { return method.getDeclaringClass(); } @Override - public String methodName(Method method) { + public String getMethodName(Method method) { return method.getName(); } } diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodRequestCodeAttributesGetter.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodRequestCodeAttributesGetter.java index 55f6136e4dbc..3e4d2be4e61d 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodRequestCodeAttributesGetter.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/MethodRequestCodeAttributesGetter.java @@ -11,12 +11,12 @@ enum MethodRequestCodeAttributesGetter implements CodeAttributesGetter codeClass(MethodRequest methodRequest) { + public Class getCodeClass(MethodRequest methodRequest) { return methodRequest.method().getDeclaringClass(); } @Override - public String methodName(MethodRequest methodRequest) { + public String getMethodName(MethodRequest methodRequest) { return methodRequest.method().getName(); } } diff --git a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java index a5fef3c4552f..fc789bfd7fc2 100644 --- a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java +++ b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java @@ -18,47 +18,47 @@ enum MockHttpServerAttributesGetter implements HttpServerAttributesGetter requestHeader(String s, String name) { + public List getRequestHeader(String s, String name) { return emptyList(); } @Nullable @Override - public Integer statusCode(String s, Void unused, @Nullable Throwable error) { + public Integer getStatusCode(String s, Void unused, @Nullable Throwable error) { return null; } @Override - public List responseHeader(String s, Void unused, String name) { + public List getResponseHeader(String s, Void unused, String name) { return emptyList(); } @Nullable @Override - public String flavor(String s) { + public String getFlavor(String s) { return null; } @Nullable @Override - public String target(String s) { + public String getTarget(String s) { return null; } @Nullable @Override - public String route(String s) { + public String getRoute(String s) { return null; } @Nullable @Override - public String scheme(String s) { + public String getScheme(String s) { return null; } } diff --git a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockNetServerAttributesGetter.java b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockNetServerAttributesGetter.java index e49a3a5001a9..d473e53b5561 100644 --- a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockNetServerAttributesGetter.java +++ b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockNetServerAttributesGetter.java @@ -14,19 +14,19 @@ enum MockNetServerAttributesGetter implements NetServerAttributesGetter @Nullable @Override - public String transport(String s) { + public String getTransport(String s) { return null; } @Nullable @Override - public String hostName(String s) { + public String getHostName(String s) { return null; } @Nullable @Override - public Integer hostPort(String s) { + public Integer getHostPort(String s) { return null; } } diff --git a/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java b/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java index f6cf8a064286..42feba8f6b20 100644 --- a/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java +++ b/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java @@ -16,32 +16,32 @@ final class PlayWsClientHttpAttributesGetter implements HttpClientAttributesGetter { @Override - public String method(Request request) { + public String getMethod(Request request) { return request.getMethod(); } @Override - public String url(Request request) { + public String getUrl(Request request) { return request.getUri().toUrl(); } @Override - public List requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return request.getHeaders().getAll(name); } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.getStatusCode(); } @Override - public String flavor(Request request, @Nullable Response response) { + public String getFlavor(Request request, @Nullable Response response) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { return response.getHeaders().getAll(name); } } diff --git a/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientNetAttributesGetter.java b/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientNetAttributesGetter.java index 59b17fa0b97a..eff748c09b94 100644 --- a/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientNetAttributesGetter.java +++ b/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientNetAttributesGetter.java @@ -16,18 +16,18 @@ final class PlayWsClientNetAttributesGetter extends InetSocketAddressNetClientAttributesGetter { @Override - public String transport(Request request, @Nullable Response response) { + public String getTransport(Request request, @Nullable Response response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(Request request) { + public String getPeerName(Request request) { return request.getUri().getHost(); } @Override - public Integer peerPort(Request request) { + public Integer getPeerPort(Request request) { return request.getUri().getPort(); } diff --git a/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzCodeAttributesGetter.java b/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzCodeAttributesGetter.java index f7f9e5ee28a0..c99ee3f10609 100644 --- a/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzCodeAttributesGetter.java +++ b/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzCodeAttributesGetter.java @@ -11,12 +11,12 @@ public class QuartzCodeAttributesGetter implements CodeAttributesGetter { @Override - public Class codeClass(JobExecutionContext jobExecutionContext) { + public Class getCodeClass(JobExecutionContext jobExecutionContext) { return jobExecutionContext.getJobDetail().getJobClass(); } @Override - public String methodName(JobExecutionContext jobExecutionContext) { + public String getMethodName(JobExecutionContext jobExecutionContext) { return "execute"; } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java index a76f676c8895..ba11e7dbecfe 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java @@ -15,70 +15,70 @@ enum RabbitChannelAttributesGetter implements MessagingAttributesGetter header(ChannelAndMethod channelAndMethod, String name) { + public List getMessageHeader(ChannelAndMethod channelAndMethod, String name) { if (channelAndMethod.getHeaders() != null) { Object value = channelAndMethod.getHeaders().get(name); if (value != null) { diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java index d567567f9907..ee1f9cf1cac6 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java @@ -14,36 +14,36 @@ public class RabbitChannelNetAttributesGetter @Nullable @Override - public String transport(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + public String getTransport(ChannelAndMethod channelAndMethod, @Nullable Void unused) { return null; } @Nullable @Override - public String peerName(ChannelAndMethod channelAndMethod) { + public String getPeerName(ChannelAndMethod channelAndMethod) { return null; } @Nullable @Override - public Integer peerPort(ChannelAndMethod channelAndMethod) { + public Integer getPeerPort(ChannelAndMethod channelAndMethod) { return null; } @Nullable @Override - public String sockPeerAddr(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + public String getSockPeerAddr(ChannelAndMethod channelAndMethod, @Nullable Void unused) { return channelAndMethod.getChannel().getConnection().getAddress().getHostAddress(); } @Override - public Integer sockPeerPort(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + public Integer getSockPeerPort(ChannelAndMethod channelAndMethod, @Nullable Void unused) { return channelAndMethod.getChannel().getConnection().getPort(); } @Nullable @Override - public String sockFamily(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + public String getSockFamily(ChannelAndMethod channelAndMethod, @Nullable Void unused) { if (channelAndMethod.getChannel().getConnection().getAddress() instanceof Inet6Address) { return "inet6"; } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java index e6ff82f35a0d..2fdb040b8a15 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java @@ -15,18 +15,18 @@ enum RabbitDeliveryAttributesGetter implements MessagingAttributesGetter header(DeliveryRequest request, String name) { + public List getMessageHeader(DeliveryRequest request, String name) { Object value = request.getProperties().getHeaders().get(name); if (value != null) { return Collections.singletonList(value.toString()); diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java index 069dbff715e8..00757c4f5f72 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java @@ -17,18 +17,18 @@ enum RabbitReceiveAttributesGetter INSTANCE; @Override - public String system(ReceiveRequest request) { + public String getSystem(ReceiveRequest request) { return "rabbitmq"; } @Override - public String destinationKind(ReceiveRequest request) { + public String getDestinationKind(ReceiveRequest request) { return SemanticAttributes.MessagingDestinationKindValues.QUEUE; } @Nullable @Override - public String destination(ReceiveRequest request) { + public String getDestination(ReceiveRequest request) { if (request.getResponse() != null) { return normalizeExchangeName(request.getResponse().getEnvelope().getExchange()); } else { @@ -41,54 +41,54 @@ private static String normalizeExchangeName(String exchange) { } @Override - public boolean temporaryDestination(ReceiveRequest request) { + public boolean isTemporaryDestination(ReceiveRequest request) { return false; } @Nullable @Override - public String protocol(ReceiveRequest request) { + public String getProtocol(ReceiveRequest request) { return null; } @Nullable @Override - public String protocolVersion(ReceiveRequest request) { + public String getProtocolVersion(ReceiveRequest request) { return null; } @Nullable @Override - public String url(ReceiveRequest request) { + public String getUrl(ReceiveRequest request) { return null; } @Nullable @Override - public String conversationId(ReceiveRequest request) { + public String getConversationId(ReceiveRequest request) { return null; } @Nullable @Override - public Long messagePayloadSize(ReceiveRequest request) { + public Long getMessagePayloadSize(ReceiveRequest request) { return null; } @Nullable @Override - public Long messagePayloadCompressedSize(ReceiveRequest request) { + public Long getMessagePayloadCompressedSize(ReceiveRequest request) { return null; } @Nullable @Override - public String messageId(ReceiveRequest request, @Nullable GetResponse response) { + public String getMessageId(ReceiveRequest request, @Nullable GetResponse response) { return null; } @Override - public List header(ReceiveRequest request, String name) { + public List getMessageHeader(ReceiveRequest request, String name) { GetResponse response = request.getResponse(); if (response != null) { Object value = request.getResponse().getProps().getHeaders().get(name); diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java index 729bb4049c6a..057674cc1d18 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java @@ -15,37 +15,37 @@ public class RabbitReceiveNetAttributesGetter @Nullable @Override - public String transport(ReceiveRequest request, @Nullable GetResponse response) { + public String getTransport(ReceiveRequest request, @Nullable GetResponse response) { return null; } @Nullable @Override - public String peerName(ReceiveRequest request) { + public String getPeerName(ReceiveRequest request) { return null; } @Nullable @Override - public Integer peerPort(ReceiveRequest request) { + public Integer getPeerPort(ReceiveRequest request) { return null; } @Nullable @Override - public String sockPeerAddr(ReceiveRequest request, @Nullable GetResponse response) { + public String getSockPeerAddr(ReceiveRequest request, @Nullable GetResponse response) { return request.getConnection().getAddress().getHostAddress(); } @Nullable @Override - public Integer sockPeerPort(ReceiveRequest request, @Nullable GetResponse response) { + public Integer getSockPeerPort(ReceiveRequest request, @Nullable GetResponse response) { return request.getConnection().getPort(); } @Nullable @Override - public String sockFamily(ReceiveRequest request, @Nullable GetResponse response) { + public String getSockFamily(ReceiveRequest request, @Nullable GetResponse response) { if (request.getConnection().getAddress() instanceof Inet6Address) { return "inet6"; } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java index 4016907d2ca9..d5896d629c09 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java @@ -18,26 +18,26 @@ enum RatpackHttpAttributesGetter implements HttpServerAttributesGetter requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return request.getHeaders().getAll(name); } @Override @Nullable - public String flavor(Request request) { + public String getFlavor(Request request) { switch (request.getProtocol()) { case "HTTP/1.0": return SemanticAttributes.HttpFlavorValues.HTTP_1_0; @@ -71,12 +71,12 @@ public String flavor(Request request) { } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.getStatus().getCode(); } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { return response.getHeaders().getAll(name); } } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java index d06c96d95786..4d53c749d964 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java @@ -18,34 +18,34 @@ enum RatpackHttpClientAttributesGetter @Nullable @Override - public String url(RequestSpec requestSpec) { + public String getUrl(RequestSpec requestSpec) { return requestSpec.getUri().toString(); } @Override - public String flavor(RequestSpec requestSpec, @Nullable HttpResponse httpResponse) { + public String getFlavor(RequestSpec requestSpec, @Nullable HttpResponse httpResponse) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; } @Nullable @Override - public String method(RequestSpec requestSpec) { + public String getMethod(RequestSpec requestSpec) { return requestSpec.getMethod().getName(); } @Override - public List requestHeader(RequestSpec requestSpec, String name) { + public List getRequestHeader(RequestSpec requestSpec, String name) { return requestSpec.getHeaders().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( RequestSpec requestSpec, HttpResponse httpResponse, @Nullable Throwable error) { return httpResponse.getStatusCode(); } @Override - public List responseHeader( + public List getResponseHeader( RequestSpec requestSpec, HttpResponse httpResponse, String name) { return httpResponse.getHeaders().getAll(name); } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetClientAttributesGetter.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetClientAttributesGetter.java index c6b67623f784..9748b38aa103 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetClientAttributesGetter.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetClientAttributesGetter.java @@ -19,18 +19,18 @@ public final class RatpackNetClientAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(RequestSpec request, @Nullable HttpResponse response) { + public String getTransport(RequestSpec request, @Nullable HttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(RequestSpec request) { + public String getPeerName(RequestSpec request) { return request.getUri().getHost(); } @Override - public Integer peerPort(RequestSpec request) { + public Integer getPeerPort(RequestSpec request) { return request.getUri().getPort(); } } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetServerAttributesGetter.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetServerAttributesGetter.java index 2b8082e45220..1e02a070c3df 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetServerAttributesGetter.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/internal/RatpackNetServerAttributesGetter.java @@ -18,20 +18,20 @@ */ public final class RatpackNetServerAttributesGetter implements NetServerAttributesGetter { @Override - public String transport(Request request) { + public String getTransport(Request request) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(Request request) { + public String getHostName(Request request) { PublicAddress publicAddress = getPublicAddress(request); return publicAddress == null ? null : publicAddress.get().getHost(); } @Nullable @Override - public Integer hostPort(Request request) { + public Integer getHostPort(Request request) { PublicAddress publicAddress = getPublicAddress(request); return publicAddress == null ? null : publicAddress.get().getPort(); } @@ -45,7 +45,7 @@ private static PublicAddress getPublicAddress(Request request) { } @Override - public Integer sockPeerPort(Request request) { + public Integer getSockPeerPort(Request request) { return request.getRemoteAddress().getPort(); } } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java index bc045b334ca8..7dc897148aa7 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java @@ -17,7 +17,7 @@ final class ReactorNettyHttpClientAttributesGetter implements HttpClientAttributesGetter { @Override - public String url(HttpClientConfig request) { + public String getUrl(HttpClientConfig request) { String uri = request.uri(); if (isAbsolute(uri)) { return uri; @@ -59,7 +59,7 @@ private static boolean isAbsolute(String uri) { @Nullable @Override - public String flavor(HttpClientConfig request, @Nullable HttpClientResponse response) { + public String getFlavor(HttpClientConfig request, @Nullable HttpClientResponse response) { if (response != null) { String flavor = response.version().text(); if (flavor.startsWith("HTTP/")) { @@ -71,23 +71,23 @@ public String flavor(HttpClientConfig request, @Nullable HttpClientResponse resp } @Override - public String method(HttpClientConfig request) { + public String getMethod(HttpClientConfig request) { return request.method().name(); } @Override - public List requestHeader(HttpClientConfig request, String name) { + public List getRequestHeader(HttpClientConfig request, String name) { return request.headers().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpClientConfig request, HttpClientResponse response, @Nullable Throwable error) { return response.status().code(); } @Override - public List responseHeader( + public List getResponseHeader( HttpClientConfig request, HttpClientResponse response, String name) { return response.responseHeaders().getAll(name); } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesGetter.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesGetter.java index 35b265dfdda8..45c211ae0221 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesGetter.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesGetter.java @@ -18,19 +18,19 @@ final class ReactorNettyNetClientAttributesGetter @Nullable @Override - public String transport(HttpClientConfig request, @Nullable HttpClientResponse response) { + public String getTransport(HttpClientConfig request, @Nullable HttpClientResponse response) { return null; } @Nullable @Override - public String peerName(HttpClientConfig request) { + public String getPeerName(HttpClientConfig request) { return getHost(request); } @Nullable @Override - public Integer peerPort(HttpClientConfig request) { + public Integer getPeerPort(HttpClientConfig request) { return getPort(request); } diff --git a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java index 1ab67dbba85b..66ce1229c6d8 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java +++ b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java @@ -14,36 +14,36 @@ final class RediscalaAttributesGetter implements DbClientAttributesGetter> { @Override - public String system(RedisCommand redisCommand) { + public String getSystem(RedisCommand redisCommand) { return SemanticAttributes.DbSystemValues.REDIS; } @Override @Nullable - public String user(RedisCommand redisCommand) { + public String getUser(RedisCommand redisCommand) { return null; } @Override @Nullable - public String name(RedisCommand redisCommand) { + public String getName(RedisCommand redisCommand) { return null; } @Override @Nullable - public String connectionString(RedisCommand redisCommand) { + public String getConnectionString(RedisCommand redisCommand) { return null; } @Override @Nullable - public String statement(RedisCommand redisCommand) { + public String getStatement(RedisCommand redisCommand) { return null; } @Override - public String operation(RedisCommand redisCommand) { + public String getOperation(RedisCommand redisCommand) { return redisCommand.getClass().getSimpleName().toUpperCase(Locale.ROOT); } } diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java index 0a4999faa729..0faf8c22518b 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java @@ -12,35 +12,35 @@ final class RedissonDbAttributesGetter implements DbClientAttributesGetter { @Override - public String system(RedissonRequest request) { + public String getSystem(RedissonRequest request) { return SemanticAttributes.DbSystemValues.REDIS; } @Nullable @Override - public String user(RedissonRequest request) { + public String getUser(RedissonRequest request) { return null; } @Nullable @Override - public String name(RedissonRequest request) { + public String getName(RedissonRequest request) { return null; } @Override - public String connectionString(RedissonRequest request) { + public String getConnectionString(RedissonRequest request) { return null; } @Override - public String statement(RedissonRequest request) { + public String getStatement(RedissonRequest request) { return request.getStatement(); } @Nullable @Override - public String operation(RedissonRequest request) { + public String getOperation(RedissonRequest request) { return request.getOperation(); } } diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java index d06d159eac06..dbf8a4d96fb1 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java @@ -14,19 +14,19 @@ final class RedissonNetAttributesGetter @Nullable @Override - public String transport(RedissonRequest request, @Nullable Void unused) { + public String getTransport(RedissonRequest request, @Nullable Void unused) { return null; } @Nullable @Override - public String peerName(RedissonRequest redissonRequest) { + public String getPeerName(RedissonRequest redissonRequest) { return null; } @Nullable @Override - public Integer peerPort(RedissonRequest redissonRequest) { + public Integer getPeerPort(RedissonRequest redissonRequest) { return null; } diff --git a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHttpAttributesGetter.java b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHttpAttributesGetter.java index 6116061a7644..f392ec163d3a 100644 --- a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHttpAttributesGetter.java +++ b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHttpAttributesGetter.java @@ -24,13 +24,13 @@ enum RestletHttpAttributesGetter implements HttpServerAttributesGetter requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { Form headers = getHeaders(request); if (headers == null) { return Collections.emptyList(); @@ -59,7 +59,7 @@ public List requestHeader(Request request, String name) { @Override @Nullable - public String flavor(Request request) { + public String getFlavor(Request request) { String version = (String) request.getAttributes().get("org.restlet.http.version"); switch (version) { case "HTTP/1.0": @@ -75,12 +75,12 @@ public String flavor(Request request) { } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.getStatus().getCode(); } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { Form headers = getHeaders(response); if (headers == null) { return Collections.emptyList(); diff --git a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletNetAttributesGetter.java b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletNetAttributesGetter.java index 45d773fdb9fc..a586cb26375e 100644 --- a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletNetAttributesGetter.java +++ b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletNetAttributesGetter.java @@ -15,38 +15,38 @@ final class RestletNetAttributesGetter implements NetServerAttributesGetter { @Override - public String transport(Request request) { + public String getTransport(Request request) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(Request request) { + public String getHostName(Request request) { HttpCall call = httpCall(request); return call == null ? null : call.getHostDomain(); } @Nullable @Override - public Integer hostPort(Request request) { + public Integer getHostPort(Request request) { HttpCall call = httpCall(request); return call == null ? null : call.getServerPort(); } @Override @Nullable - public String sockPeerAddr(Request request) { + public String getSockPeerAddr(Request request) { return request.getClientInfo().getAddress(); } @Override - public Integer sockPeerPort(Request request) { + public Integer getSockPeerPort(Request request) { return request.getClientInfo().getPort(); } @Nullable @Override - public String sockHostAddr(Request request) { + public String getSockHostAddr(Request request) { HttpCall call = httpCall(request); return call == null ? null : call.getServerAddress(); } diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java index 69fc25c81f58..027927a7d64d 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java +++ b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java @@ -26,13 +26,13 @@ public enum RestletHttpAttributesGetter implements HttpServerAttributesGetter requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { Series headers = getHeaders(request); if (headers == null) { return Collections.emptyList(); @@ -61,7 +61,7 @@ public List requestHeader(Request request, String name) { @Override @Nullable - public String flavor(Request request) { + public String getFlavor(Request request) { switch (request.getProtocol().toString()) { case "HTTP/1.0": return SemanticAttributes.HttpFlavorValues.HTTP_1_0; @@ -76,12 +76,12 @@ public String flavor(Request request) { } @Override - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.getStatus().getCode(); } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { Series headers = getHeaders(response); if (headers == null) { return Collections.emptyList(); diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletNetAttributesGetter.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletNetAttributesGetter.java index d956ea6018b9..d2cb5d91e1ce 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletNetAttributesGetter.java +++ b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletNetAttributesGetter.java @@ -79,13 +79,13 @@ public final class RestletNetAttributesGetter implements NetServerAttributesGett } @Override - public String transport(Request request) { + public String getTransport(Request request) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(Request request) { + public String getHostName(Request request) { if (GET_HOST_DOMAIN == null) { return null; } @@ -102,7 +102,7 @@ public String hostName(Request request) { @Nullable @Override - public Integer hostPort(Request request) { + public Integer getHostPort(Request request) { if (GET_SERVER_PORT == null) { return null; } @@ -119,18 +119,18 @@ public Integer hostPort(Request request) { @Override @Nullable - public String sockPeerAddr(Request request) { + public String getSockPeerAddr(Request request) { return request.getClientInfo().getAddress(); } @Override - public Integer sockPeerPort(Request request) { + public Integer getSockPeerPort(Request request) { return request.getClientInfo().getPort(); } @Nullable @Override - public String sockHostAddr(Request request) { + public String getSockHostAddr(Request request) { if (GET_SERVER_ADDRESS == null) { return null; } diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientAttributesGetter.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientAttributesGetter.java index 5480ed71aa5c..7e4ccb02738c 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientAttributesGetter.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientAttributesGetter.java @@ -12,17 +12,17 @@ enum RmiClientAttributesGetter implements RpcAttributesGetter { INSTANCE; @Override - public String system(Method method) { + public String getSystem(Method method) { return "java_rmi"; } @Override - public String service(Method method) { + public String getService(Method method) { return method.getDeclaringClass().getName(); } @Override - public String method(Method method) { + public String getMethod(Method method) { return method.getName(); } } diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerAttributesGetter.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerAttributesGetter.java index 500de061c99a..5f227cf96e65 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerAttributesGetter.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerAttributesGetter.java @@ -12,17 +12,17 @@ enum RmiServerAttributesGetter implements RpcAttributesGetter { INSTANCE; @Override - public String system(ClassAndMethod classAndMethod) { + public String getSystem(ClassAndMethod classAndMethod) { return "java_rmi"; } @Override - public String service(ClassAndMethod classAndMethod) { + public String getService(ClassAndMethod classAndMethod) { return classAndMethod.declaringClass().getName(); } @Override - public String method(ClassAndMethod classAndMethod) { + public String getMethod(ClassAndMethod classAndMethod) { return classAndMethod.methodName(); } } diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java index 9cdfa767af19..ff6a556d09ac 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java @@ -16,70 +16,70 @@ enum RocketMqConsumerAttributeGetter implements MessagingAttributesGetter header(MessageExt request, String name) { + public List getMessageHeader(MessageExt request, String name) { String value = request.getProperties().get(name); if (value != null) { return Collections.singletonList(value); diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java index 97209369e526..4a8d6d83b5db 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java @@ -19,72 +19,72 @@ enum RocketMqProducerAttributeGetter INSTANCE; @Override - public String system(SendMessageContext sendMessageContext) { + public String getSystem(SendMessageContext sendMessageContext) { return "rocketmq"; } @Override - public String destinationKind(SendMessageContext sendMessageContext) { + public String getDestinationKind(SendMessageContext sendMessageContext) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Nullable @Override - public String destination(SendMessageContext sendMessageContext) { + public String getDestination(SendMessageContext sendMessageContext) { Message message = sendMessageContext.getMessage(); return message == null ? null : message.getTopic(); } @Override - public boolean temporaryDestination(SendMessageContext sendMessageContext) { + public boolean isTemporaryDestination(SendMessageContext sendMessageContext) { return false; } @Nullable @Override - public String protocol(SendMessageContext sendMessageContext) { + public String getProtocol(SendMessageContext sendMessageContext) { return null; } @Nullable @Override - public String protocolVersion(SendMessageContext sendMessageContext) { + public String getProtocolVersion(SendMessageContext sendMessageContext) { return null; } @Nullable @Override - public String url(SendMessageContext sendMessageContext) { + public String getUrl(SendMessageContext sendMessageContext) { return null; } @Nullable @Override - public String conversationId(SendMessageContext sendMessageContext) { + public String getConversationId(SendMessageContext sendMessageContext) { return null; } @Nullable @Override - public Long messagePayloadSize(SendMessageContext sendMessageContext) { + public Long getMessagePayloadSize(SendMessageContext sendMessageContext) { return null; } @Nullable @Override - public Long messagePayloadCompressedSize(SendMessageContext sendMessageContext) { + public Long getMessagePayloadCompressedSize(SendMessageContext sendMessageContext) { return null; } @Nullable @Override - public String messageId(SendMessageContext request, @Nullable Void unused) { + public String getMessageId(SendMessageContext request, @Nullable Void unused) { SendResult sendResult = request.getSendResult(); return sendResult == null ? null : sendResult.getMsgId(); } @Override - public List header(SendMessageContext request, String name) { + public List getMessageHeader(SendMessageContext request, String name) { String value = request.getMessage().getProperties().get(name); if (value != null) { return Collections.singletonList(value); diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java index e742a9ee6818..8222b47f3a0f 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java @@ -19,71 +19,71 @@ enum RocketMqConsumerProcessAttributeGetter @Nullable @Override - public String system(MessageView messageView) { + public String getSystem(MessageView messageView) { return "rocketmq"; } @Nullable @Override - public String destinationKind(MessageView messageView) { + public String getDestinationKind(MessageView messageView) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Nullable @Override - public String destination(MessageView messageView) { + public String getDestination(MessageView messageView) { return messageView.getTopic(); } @Override - public boolean temporaryDestination(MessageView messageView) { + public boolean isTemporaryDestination(MessageView messageView) { return false; } @Nullable @Override - public String protocol(MessageView messageView) { + public String getProtocol(MessageView messageView) { return null; } @Nullable @Override - public String protocolVersion(MessageView messageView) { + public String getProtocolVersion(MessageView messageView) { return null; } @Nullable @Override - public String url(MessageView messageView) { + public String getUrl(MessageView messageView) { return null; } @Nullable @Override - public String conversationId(MessageView messageView) { + public String getConversationId(MessageView messageView) { return null; } @Nullable @Override - public Long messagePayloadSize(MessageView messageView) { + public Long getMessagePayloadSize(MessageView messageView) { return (long) messageView.getBody().remaining(); } @Nullable @Override - public Long messagePayloadCompressedSize(MessageView messageView) { + public Long getMessagePayloadCompressedSize(MessageView messageView) { return null; } @Nullable @Override - public String messageId(MessageView messageView, @Nullable ConsumeResult unused) { + public String getMessageId(MessageView messageView, @Nullable ConsumeResult unused) { return messageView.getMessageId().toString(); } @Override - public List header(MessageView messageView, String name) { + public List getMessageHeader(MessageView messageView, String name) { String value = messageView.getProperties().get(name); if (value != null) { return Collections.singletonList(value); diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java index 564838fbb151..332821f8600c 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java @@ -18,66 +18,66 @@ enum RocketMqConsumerReceiveAttributeGetter @Nullable @Override - public String system(ReceiveMessageRequest request) { + public String getSystem(ReceiveMessageRequest request) { return "rocketmq"; } @Nullable @Override - public String destinationKind(ReceiveMessageRequest request) { + public String getDestinationKind(ReceiveMessageRequest request) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Nullable @Override - public String destination(ReceiveMessageRequest request) { + public String getDestination(ReceiveMessageRequest request) { return request.getMessageQueue().getTopic().getName(); } @Override - public boolean temporaryDestination(ReceiveMessageRequest request) { + public boolean isTemporaryDestination(ReceiveMessageRequest request) { return false; } @Nullable @Override - public String protocol(ReceiveMessageRequest request) { + public String getProtocol(ReceiveMessageRequest request) { return null; } @Nullable @Override - public String protocolVersion(ReceiveMessageRequest request) { + public String getProtocolVersion(ReceiveMessageRequest request) { return null; } @Nullable @Override - public String url(ReceiveMessageRequest request) { + public String getUrl(ReceiveMessageRequest request) { return null; } @Nullable @Override - public String conversationId(ReceiveMessageRequest request) { + public String getConversationId(ReceiveMessageRequest request) { return null; } @Nullable @Override - public Long messagePayloadSize(ReceiveMessageRequest request) { + public Long getMessagePayloadSize(ReceiveMessageRequest request) { return null; } @Nullable @Override - public Long messagePayloadCompressedSize(ReceiveMessageRequest request) { + public Long getMessagePayloadCompressedSize(ReceiveMessageRequest request) { return null; } @Nullable @Override - public String messageId(ReceiveMessageRequest request, @Nullable List unused) { + public String getMessageId(ReceiveMessageRequest request, @Nullable List unused) { return null; } } diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java index 13fc3252da92..8f3c197ec48d 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java @@ -19,71 +19,71 @@ enum RocketMqProducerAttributeGetter @Nullable @Override - public String system(PublishingMessageImpl message) { + public String getSystem(PublishingMessageImpl message) { return "rocketmq"; } @Nullable @Override - public String destinationKind(PublishingMessageImpl message) { + public String getDestinationKind(PublishingMessageImpl message) { return SemanticAttributes.MessagingDestinationKindValues.TOPIC; } @Nullable @Override - public String destination(PublishingMessageImpl message) { + public String getDestination(PublishingMessageImpl message) { return message.getTopic(); } @Override - public boolean temporaryDestination(PublishingMessageImpl message) { + public boolean isTemporaryDestination(PublishingMessageImpl message) { return false; } @Nullable @Override - public String protocol(PublishingMessageImpl message) { + public String getProtocol(PublishingMessageImpl message) { return null; } @Nullable @Override - public String protocolVersion(PublishingMessageImpl message) { + public String getProtocolVersion(PublishingMessageImpl message) { return null; } @Nullable @Override - public String url(PublishingMessageImpl message) { + public String getUrl(PublishingMessageImpl message) { return null; } @Nullable @Override - public String conversationId(PublishingMessageImpl message) { + public String getConversationId(PublishingMessageImpl message) { return null; } @Nullable @Override - public Long messagePayloadSize(PublishingMessageImpl message) { + public Long getMessagePayloadSize(PublishingMessageImpl message) { return (long) message.getBody().remaining(); } @Nullable @Override - public Long messagePayloadCompressedSize(PublishingMessageImpl message) { + public Long getMessagePayloadCompressedSize(PublishingMessageImpl message) { return null; } @Nullable @Override - public String messageId(PublishingMessageImpl message, @Nullable SendReceiptImpl sendReceipt) { + public String getMessageId(PublishingMessageImpl message, @Nullable SendReceiptImpl sendReceipt) { return message.getMessageId().toString(); } @Override - public List header(PublishingMessageImpl message, String name) { + public List getMessageHeader(PublishingMessageImpl message, String name) { String value = message.getProperties().get(name); if (value != null) { return Collections.singletonList(value); diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java index b7faef8d1aaf..507c31a65207 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java @@ -23,7 +23,7 @@ public Servlet2HttpAttributesGetter( @Override @Nullable - public Integer statusCode( + public Integer getStatusCode( ServletRequestContext requestContext, ServletResponseContext responseContext, @Nullable Throwable error) { diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java index c5548957ef99..78da671295a8 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java @@ -21,13 +21,13 @@ public ServletHttpAttributesGetter(ServletAccessor accessor) @Override @Nullable - public String method(ServletRequestContext requestContext) { + public String getMethod(ServletRequestContext requestContext) { return accessor.getRequestMethod(requestContext.request()); } @Override @Nullable - public String target(ServletRequestContext requestContext) { + public String getTarget(ServletRequestContext requestContext) { REQUEST request = requestContext.request(); String target = accessor.getRequestUri(request); String queryString = accessor.getRequestQueryString(request); @@ -39,18 +39,18 @@ public String target(ServletRequestContext requestContext) { @Override @Nullable - public String scheme(ServletRequestContext requestContext) { + public String getScheme(ServletRequestContext requestContext) { return accessor.getRequestScheme(requestContext.request()); } @Override - public List requestHeader(ServletRequestContext requestContext, String name) { + public List getRequestHeader(ServletRequestContext requestContext, String name) { return accessor.getRequestHeaderValues(requestContext.request(), name); } @Override @Nullable - public String flavor(ServletRequestContext requestContext) { + public String getFlavor(ServletRequestContext requestContext) { String flavor = accessor.getRequestProtocol(requestContext.request()); if (flavor != null) { // remove HTTP/ prefix to comply with semantic conventions @@ -63,7 +63,7 @@ public String flavor(ServletRequestContext requestContext) { @Override @Nullable - public Integer statusCode( + public Integer getStatusCode( ServletRequestContext requestContext, ServletResponseContext responseContext, @Nullable Throwable error) { @@ -87,7 +87,7 @@ public Integer statusCode( } @Override - public List responseHeader( + public List getResponseHeader( ServletRequestContext requestContext, ServletResponseContext responseContext, String name) { @@ -96,7 +96,7 @@ public List responseHeader( @Override @Nullable - public String route(ServletRequestContext requestContext) { + public String getRoute(ServletRequestContext requestContext) { return null; } } diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletNetAttributesGetter.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletNetAttributesGetter.java index 7410628c5d01..dcba667ac1ed 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletNetAttributesGetter.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletNetAttributesGetter.java @@ -20,43 +20,43 @@ public ServletNetAttributesGetter(ServletAccessor accessor) { @Override @Nullable - public String transport(ServletRequestContext requestContext) { + public String getTransport(ServletRequestContext requestContext) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(ServletRequestContext requestContext) { + public String getHostName(ServletRequestContext requestContext) { return accessor.getRequestServerName(requestContext.request()); } @Nullable @Override - public Integer hostPort(ServletRequestContext requestContext) { + public Integer getHostPort(ServletRequestContext requestContext) { return accessor.getRequestServerPort(requestContext.request()); } @Override @Nullable - public String sockPeerAddr(ServletRequestContext requestContext) { + public String getSockPeerAddr(ServletRequestContext requestContext) { return accessor.getRequestRemoteAddr(requestContext.request()); } @Override @Nullable - public Integer sockPeerPort(ServletRequestContext requestContext) { + public Integer getSockPeerPort(ServletRequestContext requestContext) { return accessor.getRequestRemotePort(requestContext.request()); } @Nullable @Override - public String sockHostAddr(ServletRequestContext requestContext) { + public String getSockHostAddr(ServletRequestContext requestContext) { return accessor.getRequestLocalAddr(requestContext.request()); } @Nullable @Override - public Integer sockHostPort(ServletRequestContext requestContext) { + public Integer getSockHostPort(ServletRequestContext requestContext) { return accessor.getRequestLocalPort(requestContext.request()); } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/aspects/JointPointCodeAttributesExtractor.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/aspects/JointPointCodeAttributesExtractor.java index 3c83bbd3cd11..032325515c3d 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/aspects/JointPointCodeAttributesExtractor.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/aspects/JointPointCodeAttributesExtractor.java @@ -11,12 +11,12 @@ enum JointPointCodeAttributesExtractor implements CodeAttributesGetter codeClass(JoinPointRequest joinPointRequest) { + public Class getCodeClass(JoinPointRequest joinPointRequest) { return joinPointRequest.method().getDeclaringClass(); } @Override - public String methodName(JoinPointRequest joinPointRequest) { + public String getMethodName(JoinPointRequest joinPointRequest) { return joinPointRequest.method().getName(); } } diff --git a/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java b/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java index 36f840040f46..7e51ef3f091b 100644 --- a/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java +++ b/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java @@ -17,71 +17,71 @@ enum SpringMessagingAttributesGetter @Override @Nullable - public String system(MessageWithChannel messageWithChannel) { + public String getSystem(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public String destinationKind(MessageWithChannel messageWithChannel) { + public String getDestinationKind(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public String destination(MessageWithChannel messageWithChannel) { + public String getDestination(MessageWithChannel messageWithChannel) { return null; } @Override - public boolean temporaryDestination(MessageWithChannel messageWithChannel) { + public boolean isTemporaryDestination(MessageWithChannel messageWithChannel) { return false; } @Override @Nullable - public String protocol(MessageWithChannel messageWithChannel) { + public String getProtocol(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public String protocolVersion(MessageWithChannel messageWithChannel) { + public String getProtocolVersion(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public String url(MessageWithChannel messageWithChannel) { + public String getUrl(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public String conversationId(MessageWithChannel messageWithChannel) { + public String getConversationId(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public Long messagePayloadSize(MessageWithChannel messageWithChannel) { + public Long getMessagePayloadSize(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public Long messagePayloadCompressedSize(MessageWithChannel messageWithChannel) { + public Long getMessagePayloadCompressedSize(MessageWithChannel messageWithChannel) { return null; } @Override @Nullable - public String messageId(MessageWithChannel messageWithChannel, @Nullable Void unused) { + public String getMessageId(MessageWithChannel messageWithChannel, @Nullable Void unused) { return null; } @Override - public List header(MessageWithChannel request, String name) { + public List getMessageHeader(MessageWithChannel request, String name) { Object value = request.getMessage().getHeaders().get(name); if (value != null) { return Collections.singletonList(value.toString()); diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java index ec41348108c2..5891f1b29939 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java @@ -15,69 +15,69 @@ enum SpringRabbitMessageAttributesGetter implements MessagingAttributesGetter header(Message message, String name) { + public List getMessageHeader(Message message, String name) { Object value = message.getMessageProperties().getHeaders().get(name); if (value != null) { return Collections.singletonList(value.toString()); diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/client/ClientAttributesGetter.java b/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/client/ClientAttributesGetter.java index 83ba587ae2fd..cc40b591b169 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/client/ClientAttributesGetter.java +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/client/ClientAttributesGetter.java @@ -12,17 +12,17 @@ public enum ClientAttributesGetter implements RpcAttributesGetter { INSTANCE; @Override - public String system(Method method) { + public String getSystem(Method method) { return "spring_rmi"; } @Override - public String service(Method method) { + public String getService(Method method) { return method.getDeclaringClass().getName(); } @Override - public String method(Method method) { + public String getMethod(Method method) { return method.getName(); } } diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/server/ServerAttributesGetter.java b/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/server/ServerAttributesGetter.java index 3652105aecac..96cc9322636e 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/server/ServerAttributesGetter.java +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/server/ServerAttributesGetter.java @@ -12,17 +12,17 @@ public enum ServerAttributesGetter implements RpcAttributesGetter { @Override - public Class codeClass(Runnable runnable) { + public Class getCodeClass(Runnable runnable) { if (runnable instanceof ScheduledMethodRunnable) { ScheduledMethodRunnable scheduledMethodRunnable = (ScheduledMethodRunnable) runnable; return scheduledMethodRunnable.getMethod().getDeclaringClass(); @@ -21,7 +21,7 @@ public Class codeClass(Runnable runnable) { } @Override - public String methodName(Runnable runnable) { + public String getMethodName(Runnable runnable) { if (runnable instanceof ScheduledMethodRunnable) { ScheduledMethodRunnable scheduledMethodRunnable = (ScheduledMethodRunnable) runnable; return scheduledMethodRunnable.getMethod().getName(); diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebHttpAttributesGetter.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebHttpAttributesGetter.java index 8d8eb71bfb38..06c5d6fbeb65 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebHttpAttributesGetter.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebHttpAttributesGetter.java @@ -21,24 +21,25 @@ enum SpringWebHttpAttributesGetter INSTANCE; @Override - public String method(HttpRequest httpRequest) { + public String getMethod(HttpRequest httpRequest) { return httpRequest.getMethod().name(); } @Override @Nullable - public String url(HttpRequest httpRequest) { + public String getUrl(HttpRequest httpRequest) { return httpRequest.getURI().toString(); } @Override - public List requestHeader(HttpRequest httpRequest, String name) { + public List getRequestHeader(HttpRequest httpRequest, String name) { return httpRequest.getHeaders().getOrDefault(name, emptyList()); } @Override @Nullable - public String flavor(HttpRequest httpRequest, @Nullable ClientHttpResponse clientHttpResponse) { + public String getFlavor( + HttpRequest httpRequest, @Nullable ClientHttpResponse clientHttpResponse) { return null; } @@ -82,7 +83,7 @@ public String flavor(HttpRequest httpRequest, @Nullable ClientHttpResponse clien } @Override - public Integer statusCode( + public Integer getStatusCode( HttpRequest httpRequest, ClientHttpResponse clientHttpResponse, @Nullable Throwable error) { if (GET_STATUS_CODE == null || STATUS_CODE_VALUE == null) { @@ -98,7 +99,7 @@ public Integer statusCode( } @Override - public List responseHeader( + public List getResponseHeader( HttpRequest httpRequest, ClientHttpResponse clientHttpResponse, String name) { return clientHttpResponse.getHeaders().getOrDefault(name, emptyList()); } diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebNetAttributesGetter.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebNetAttributesGetter.java index 5ed5e2b317d1..4a47d826ee7a 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebNetAttributesGetter.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebNetAttributesGetter.java @@ -15,18 +15,18 @@ final class SpringWebNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(HttpRequest httpRequest, @Nullable ClientHttpResponse response) { + public String getTransport(HttpRequest httpRequest, @Nullable ClientHttpResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Override @Nullable - public String peerName(HttpRequest httpRequest) { + public String getPeerName(HttpRequest httpRequest) { return httpRequest.getURI().getHost(); } @Override - public Integer peerPort(HttpRequest httpRequest) { + public Integer getPeerPort(HttpRequest httpRequest) { return httpRequest.getURI().getPort(); } } diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerCodeAttributesGetter.java b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerCodeAttributesGetter.java index 5d16a3eb872a..498a0cf682da 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerCodeAttributesGetter.java +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerCodeAttributesGetter.java @@ -11,13 +11,13 @@ public class HandlerCodeAttributesGetter implements CodeAttributesGetter { @Nullable @Override - public Class codeClass(Object handler) { + public Class getCodeClass(Object handler) { return handler.getClass(); } @Nullable @Override - public String methodName(Object handler) { + public String getMethodName(Object handler) { return "handle"; } } diff --git a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/SpringWebfluxHttpAttributesGetter.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/SpringWebfluxHttpAttributesGetter.java index f75e1eff6897..7cb9dc5a210c 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/SpringWebfluxHttpAttributesGetter.java +++ b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/SpringWebfluxHttpAttributesGetter.java @@ -18,35 +18,36 @@ enum SpringWebfluxHttpAttributesGetter INSTANCE; @Override - public String url(ClientRequest request) { + public String getUrl(ClientRequest request) { return request.url().toString(); } @Nullable @Override - public String flavor(ClientRequest request, @Nullable ClientResponse response) { + public String getFlavor(ClientRequest request, @Nullable ClientResponse response) { return null; } @Override - public String method(ClientRequest request) { + public String getMethod(ClientRequest request) { return request.method().name(); } @Override - public List requestHeader(ClientRequest request, String name) { + public List getRequestHeader(ClientRequest request, String name) { return request.headers().getOrDefault(name, emptyList()); } @Override @Nullable - public Integer statusCode( + public Integer getStatusCode( ClientRequest request, ClientResponse response, @Nullable Throwable error) { return StatusCodes.get(response); } @Override - public List responseHeader(ClientRequest request, ClientResponse response, String name) { + public List getResponseHeader( + ClientRequest request, ClientResponse response, String name) { return response.headers().header(name); } } diff --git a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/internal/SpringWebfluxNetAttributesGetter.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/internal/SpringWebfluxNetAttributesGetter.java index 2eb6f63ffe15..8389b617fc90 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/internal/SpringWebfluxNetAttributesGetter.java +++ b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_0/client/internal/SpringWebfluxNetAttributesGetter.java @@ -19,18 +19,18 @@ public final class SpringWebfluxNetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(ClientRequest request, @Nullable ClientResponse response) { + public String getTransport(ClientRequest request, @Nullable ClientResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(ClientRequest request) { + public String getPeerName(ClientRequest request) { return request.url().getHost(); } @Override - public Integer peerPort(ClientRequest request) { + public Integer getPeerPort(ClientRequest request) { return request.url().getPort(); } } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcHttpAttributesGetter.java b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcHttpAttributesGetter.java index 2ff288491415..39f9707e0702 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcHttpAttributesGetter.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcHttpAttributesGetter.java @@ -21,19 +21,19 @@ enum SpringWebMvcHttpAttributesGetter @Override @Nullable - public String method(HttpServletRequest request) { + public String getMethod(HttpServletRequest request) { return request.getMethod(); } @Override - public List requestHeader(HttpServletRequest request, String name) { + public List getRequestHeader(HttpServletRequest request, String name) { Enumeration headers = request.getHeaders(name); return headers == null ? Collections.emptyList() : Collections.list(headers); } @Override @Nullable - public String flavor(HttpServletRequest request) { + public String getFlavor(HttpServletRequest request) { String flavor = request.getProtocol(); if (flavor == null) { return null; @@ -45,7 +45,7 @@ public String flavor(HttpServletRequest request) { } @Override - public Integer statusCode( + public Integer getStatusCode( HttpServletRequest request, HttpServletResponse response, @Nullable Throwable error) { int statusCode; @@ -64,7 +64,7 @@ public Integer statusCode( } @Override - public List responseHeader( + public List getResponseHeader( HttpServletRequest request, HttpServletResponse response, String name) { Collection headers = response.getHeaders(name); if (headers == null) { @@ -78,7 +78,7 @@ public List responseHeader( @Override @Nullable - public String target(HttpServletRequest request) { + public String getTarget(HttpServletRequest request) { String target = request.getRequestURI(); String queryString = request.getQueryString(); if (queryString != null) { @@ -89,13 +89,13 @@ public String target(HttpServletRequest request) { @Override @Nullable - public String route(HttpServletRequest request) { + public String getRoute(HttpServletRequest request) { return null; } @Override @Nullable - public String scheme(HttpServletRequest request) { + public String getScheme(HttpServletRequest request) { return request.getScheme(); } } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcNetAttributesGetter.java b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcNetAttributesGetter.java index 79a9f82daef3..7c5dd604bd9d 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcNetAttributesGetter.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcNetAttributesGetter.java @@ -14,40 +14,40 @@ enum SpringWebMvcNetAttributesGetter implements NetServerAttributesGetter requestHeader(HttpServletRequest request, String name) { + public List getRequestHeader(HttpServletRequest request, String name) { Enumeration headers = request.getHeaders(name); return headers == null ? Collections.emptyList() : Collections.list(headers); } @Override @Nullable - public String flavor(HttpServletRequest request) { + public String getFlavor(HttpServletRequest request) { String flavor = request.getProtocol(); if (flavor == null) { return null; @@ -45,7 +45,7 @@ public String flavor(HttpServletRequest request) { } @Override - public Integer statusCode( + public Integer getStatusCode( HttpServletRequest request, HttpServletResponse response, @Nullable Throwable error) { int statusCode; @@ -64,7 +64,7 @@ public Integer statusCode( } @Override - public List responseHeader( + public List getResponseHeader( HttpServletRequest request, HttpServletResponse response, String name) { Collection headers = response.getHeaders(name); if (headers == null) { @@ -78,7 +78,7 @@ public List responseHeader( @Override @Nullable - public String target(HttpServletRequest request) { + public String getTarget(HttpServletRequest request) { String target = request.getRequestURI(); String queryString = request.getQueryString(); if (queryString != null) { @@ -89,13 +89,13 @@ public String target(HttpServletRequest request) { @Override @Nullable - public String route(HttpServletRequest request) { + public String getRoute(HttpServletRequest request) { return null; } @Override @Nullable - public String scheme(HttpServletRequest request) { + public String getScheme(HttpServletRequest request) { return request.getScheme(); } } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcNetAttributesGetter.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcNetAttributesGetter.java index 982526d699db..5ef8960dd44f 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcNetAttributesGetter.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcNetAttributesGetter.java @@ -14,40 +14,40 @@ enum SpringWebMvcNetAttributesGetter implements NetServerAttributesGetter { @Override - public Class codeClass(SpringWsRequest request) { + public Class getCodeClass(SpringWsRequest request) { return request.getCodeClass(); } @Override - public String methodName(SpringWsRequest request) { + public String getMethodName(SpringWsRequest request) { return request.getMethodName(); } } diff --git a/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedAttributesGetter.java b/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedAttributesGetter.java index 1d416a09b911..f7b5bad904be 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedAttributesGetter.java +++ b/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedAttributesGetter.java @@ -11,37 +11,37 @@ public class SpymemcachedAttributesGetter implements DbClientAttributesGetter { @Override - public String system(SpymemcachedRequest spymemcachedRequest) { + public String getSystem(SpymemcachedRequest spymemcachedRequest) { return "memcached"; } @Override @Nullable - public String user(SpymemcachedRequest spymemcachedRequest) { + public String getUser(SpymemcachedRequest spymemcachedRequest) { return null; } @Override @Nullable - public String name(SpymemcachedRequest spymemcachedRequest) { + public String getName(SpymemcachedRequest spymemcachedRequest) { return null; } @Override @Nullable - public String connectionString(SpymemcachedRequest spymemcachedRequest) { + public String getConnectionString(SpymemcachedRequest spymemcachedRequest) { return null; } @Override @Nullable - public String statement(SpymemcachedRequest spymemcachedRequest) { + public String getStatement(SpymemcachedRequest spymemcachedRequest) { return null; } @Override @Nullable - public String operation(SpymemcachedRequest spymemcachedRequest) { + public String getOperation(SpymemcachedRequest spymemcachedRequest) { return spymemcachedRequest.dbOperation(); } } diff --git a/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/StrutsCodeAttributesGetter.java b/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/StrutsCodeAttributesGetter.java index d3fe955fdd6b..c372ee646f4b 100644 --- a/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/StrutsCodeAttributesGetter.java +++ b/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/StrutsCodeAttributesGetter.java @@ -11,12 +11,12 @@ public class StrutsCodeAttributesGetter implements CodeAttributesGetter { @Override - public Class codeClass(ActionInvocation actionInvocation) { + public Class getCodeClass(ActionInvocation actionInvocation) { return actionInvocation.getAction().getClass(); } @Override - public String methodName(ActionInvocation actionInvocation) { + public String getMethodName(ActionInvocation actionInvocation) { return actionInvocation.getProxy().getMethod(); } } diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java index 3d335e6d594c..140aea246c54 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java +++ b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java @@ -18,13 +18,13 @@ public class TomcatHttpAttributesGetter implements HttpServerAttributesGetter { @Override - public String method(Request request) { + public String getMethod(Request request) { return messageBytesToString(request.method()); } @Override @Nullable - public String target(Request request) { + public String getTarget(Request request) { String target = messageBytesToString(request.requestURI()); String queryString = messageBytesToString(request.queryString()); if (queryString != null) { @@ -35,19 +35,19 @@ public String target(Request request) { @Override @Nullable - public String scheme(Request request) { + public String getScheme(Request request) { MessageBytes schemeMessageBytes = request.scheme(); return schemeMessageBytes.isNull() ? "http" : messageBytesToString(schemeMessageBytes); } @Override - public List requestHeader(Request request, String name) { + public List getRequestHeader(Request request, String name) { return Collections.list(request.getMimeHeaders().values(name)); } @Override @Nullable - public String flavor(Request request) { + public String getFlavor(Request request) { String flavor = messageBytesToString(request.protocol()); if (flavor != null) { // remove HTTP/ prefix to comply with semantic conventions @@ -60,18 +60,18 @@ public String flavor(Request request) { @Override @Nullable - public Integer statusCode(Request request, Response response, @Nullable Throwable error) { + public Integer getStatusCode(Request request, Response response, @Nullable Throwable error) { return response.getStatus(); } @Override - public List responseHeader(Request request, Response response, String name) { + public List getResponseHeader(Request request, Response response, String name) { return Collections.list(response.getMimeHeaders().values(name)); } @Override @Nullable - public String route(Request request) { + public String getRoute(Request request) { return null; } } diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatNetAttributesGetter.java b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatNetAttributesGetter.java index e75d60055224..05e56a209d21 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatNetAttributesGetter.java +++ b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatNetAttributesGetter.java @@ -17,45 +17,45 @@ public class TomcatNetAttributesGetter implements NetServerAttributesGetter { @Override - public String method(HttpServerExchange exchange) { + public String getMethod(HttpServerExchange exchange) { return exchange.getRequestMethod().toString(); } @Override - public List requestHeader(HttpServerExchange exchange, String name) { + public List getRequestHeader(HttpServerExchange exchange, String name) { HeaderValues values = exchange.getRequestHeaders().get(name); return values == null ? Collections.emptyList() : values; } @Override - public String flavor(HttpServerExchange exchange) { + public String getFlavor(HttpServerExchange exchange) { String flavor = exchange.getProtocol().toString(); // remove HTTP/ prefix to comply with semantic conventions if (flavor.startsWith("HTTP/")) { @@ -37,13 +37,13 @@ public String flavor(HttpServerExchange exchange) { } @Override - public Integer statusCode( + public Integer getStatusCode( HttpServerExchange exchange, HttpServerExchange unused, @Nullable Throwable error) { return exchange.getStatusCode(); } @Override - public List responseHeader( + public List getResponseHeader( HttpServerExchange exchange, HttpServerExchange unused, String name) { HeaderValues values = exchange.getResponseHeaders().get(name); return values == null ? Collections.emptyList() : values; @@ -51,7 +51,7 @@ public List responseHeader( @Override @Nullable - public String target(HttpServerExchange exchange) { + public String getTarget(HttpServerExchange exchange) { String requestPath = exchange.getRequestPath(); String queryString = exchange.getQueryString(); if (requestPath != null && queryString != null && !queryString.isEmpty()) { @@ -62,13 +62,13 @@ public String target(HttpServerExchange exchange) { @Override @Nullable - public String scheme(HttpServerExchange exchange) { + public String getScheme(HttpServerExchange exchange) { return exchange.getRequestScheme(); } @Override @Nullable - public String route(HttpServerExchange exchange) { + public String getRoute(HttpServerExchange exchange) { return null; } } diff --git a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowNetAttributesGetter.java b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowNetAttributesGetter.java index 73044ace65b8..62939bae67f0 100644 --- a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowNetAttributesGetter.java +++ b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowNetAttributesGetter.java @@ -15,19 +15,19 @@ public class UndertowNetAttributesGetter extends InetSocketAddressNetServerAttributesGetter { @Override - public String transport(HttpServerExchange exchange) { + public String getTransport(HttpServerExchange exchange) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String hostName(HttpServerExchange exchange) { + public String getHostName(HttpServerExchange exchange) { return exchange.getHostName(); } @Nullable @Override - public Integer hostPort(HttpServerExchange exchange) { + public Integer getHostPort(HttpServerExchange exchange) { return exchange.getHostPort(); } diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/ClientCallableCodeAttributesGetter.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/ClientCallableCodeAttributesGetter.java index d1936c38e471..37c29a30846c 100644 --- a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/ClientCallableCodeAttributesGetter.java +++ b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/ClientCallableCodeAttributesGetter.java @@ -11,12 +11,12 @@ public class ClientCallableCodeAttributesGetter implements CodeAttributesGetter { @Override - public Class codeClass(VaadinClientCallableRequest request) { + public Class getCodeClass(VaadinClientCallableRequest request) { return request.getComponentClass(); } @Override - public String methodName(VaadinClientCallableRequest request) { + public String getMethodName(VaadinClientCallableRequest request) { return request.getMethodName(); } } diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesGetter.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesGetter.java index ea5eac4c950e..22fc45b535d0 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesGetter.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesGetter.java @@ -15,7 +15,7 @@ final class Vertx3HttpAttributesGetter extends AbstractVertxHttpAttributesGetter VirtualField.find(HttpClientRequest.class, VertxRequestInfo.class); @Override - public String url(HttpClientRequest request) { + public String getUrl(HttpClientRequest request) { String uri = request.uri(); // Uri should be relative, but it is possible to misuse vert.x api and pass an absolute uri // where relative is expected. @@ -44,7 +44,7 @@ private static String absoluteUri(VertxRequestInfo requestInfo, String uri) { } @Override - public String method(HttpClientRequest request) { + public String getMethod(HttpClientRequest request) { return request.method().name(); } } diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3NetAttributesGetter.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3NetAttributesGetter.java index 77e8565cc389..8f38a06c0351 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3NetAttributesGetter.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3NetAttributesGetter.java @@ -17,24 +17,24 @@ enum Vertx3NetAttributesGetter INSTANCE; @Override - public String transport(HttpClientRequest request, @Nullable HttpClientResponse response) { + public String getTransport(HttpClientRequest request, @Nullable HttpClientResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(HttpClientRequest request) { + public String getPeerName(HttpClientRequest request) { return null; } @Override - public Integer peerPort(HttpClientRequest request) { + public Integer getPeerPort(HttpClientRequest request) { return null; } @Nullable @Override - public String sockPeerName(HttpClientRequest request, @Nullable HttpClientResponse response) { + public String getSockPeerName(HttpClientRequest request, @Nullable HttpClientResponse response) { if (response == null) { return null; } @@ -44,7 +44,7 @@ public String sockPeerName(HttpClientRequest request, @Nullable HttpClientRespon @Nullable @Override - public Integer sockPeerPort(HttpClientRequest request, @Nullable HttpClientResponse response) { + public Integer getSockPeerPort(HttpClientRequest request, @Nullable HttpClientResponse response) { if (response == null) { return null; } diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesGetter.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesGetter.java index 9a99150c1b0c..4e846b7f3959 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesGetter.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesGetter.java @@ -15,7 +15,7 @@ final class Vertx4HttpAttributesGetter extends AbstractVertxHttpAttributesGetter { @Override - public String url(HttpClientRequest request) { + public String getUrl(HttpClientRequest request) { String uri = request.getURI(); if (!isAbsolute(uri)) { uri = request.absoluteURI(); @@ -28,13 +28,13 @@ private static boolean isAbsolute(String uri) { } @Override - public String method(HttpClientRequest request) { + public String getMethod(HttpClientRequest request) { return request.getMethod().name(); } @Nullable @Override - public String flavor(HttpClientRequest request, @Nullable HttpClientResponse response) { + public String getFlavor(HttpClientRequest request, @Nullable HttpClientResponse response) { HttpVersion version = request.version(); if (version == null) { return null; diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesGetter.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesGetter.java index 1625958f3fa4..08ced3d7689b 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesGetter.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesGetter.java @@ -16,24 +16,24 @@ final class Vertx4NetAttributesGetter implements NetClientAttributesGetter { @Override - public String transport(HttpClientRequest request, @Nullable HttpClientResponse response) { + public String getTransport(HttpClientRequest request, @Nullable HttpClientResponse response) { return SemanticAttributes.NetTransportValues.IP_TCP; } @Nullable @Override - public String peerName(HttpClientRequest request) { + public String getPeerName(HttpClientRequest request) { return request.getHost(); } @Override - public Integer peerPort(HttpClientRequest request) { + public Integer getPeerPort(HttpClientRequest request) { return request.getPort(); } @Nullable @Override - public String sockPeerAddr(HttpClientRequest request, @Nullable HttpClientResponse response) { + public String getSockPeerAddr(HttpClientRequest request, @Nullable HttpClientResponse response) { if (response == null) { return null; } @@ -43,7 +43,7 @@ public String sockPeerAddr(HttpClientRequest request, @Nullable HttpClientRespon @Nullable @Override - public String sockPeerName(HttpClientRequest request, @Nullable HttpClientResponse response) { + public String getSockPeerName(HttpClientRequest request, @Nullable HttpClientResponse response) { if (response == null) { return null; } @@ -53,7 +53,7 @@ public String sockPeerName(HttpClientRequest request, @Nullable HttpClientRespon @Nullable @Override - public Integer sockPeerPort(HttpClientRequest request, @Nullable HttpClientResponse response) { + public Integer getSockPeerPort(HttpClientRequest request, @Nullable HttpClientResponse response) { if (response == null) { return null; } diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java index dd9a9ec221c9..aaa6fac3474a 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java @@ -16,23 +16,23 @@ public abstract class AbstractVertxHttpAttributesGetter @Nullable @Override - public String flavor(HttpClientRequest request, @Nullable HttpClientResponse response) { + public String getFlavor(HttpClientRequest request, @Nullable HttpClientResponse response) { return null; } @Override - public List requestHeader(HttpClientRequest request, String name) { + public List getRequestHeader(HttpClientRequest request, String name) { return request.headers().getAll(name); } @Override - public Integer statusCode( + public Integer getStatusCode( HttpClientRequest request, HttpClientResponse response, @Nullable Throwable error) { return response.statusCode(); } @Override - public List responseHeader( + public List getResponseHeader( HttpClientRequest request, HttpClientResponse response, String name) { return response.headers().getAll(name); }