diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java index b583c91baa..621c57ef43 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java @@ -10,6 +10,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceResolver; import io.opentelemetry.instrumentation.api.instrumenter.url.UrlParser; +import io.opentelemetry.instrumentation.api.internal.SemconvStability; import io.opentelemetry.semconv.SemanticAttributes; import java.util.function.Supplier; import javax.annotation.Nullable; @@ -47,6 +48,7 @@ public final class HttpClientPeerServiceAttributesExtractor @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {} + @SuppressWarnings("deprecation") // old semconv @Override public void onEnd( AttributesBuilder attributes, @@ -64,7 +66,7 @@ public final class HttpClientPeerServiceAttributesExtractor Integer serverPort = attributesGetter.getServerPort(request); Supplier pathSupplier = () -> getUrlPath(attributesGetter, request); String peerService = mapToPeerService(serverAddress, serverPort, pathSupplier); - if (peerService == null) { + if (peerService == null && SemconvStability.emitOldHttpSemconv()) { String serverSocketDomain = attributesGetter.getServerSocketDomain(request, response); Integer serverSocketPort = attributesGetter.getServerSocketPort(request, response); peerService = mapToPeerService(serverSocketDomain, serverSocketPort, null); 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 05d79725d7..969bcd0891 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 @@ -59,20 +59,20 @@ public interface NetClientAttributesGetter @Nullable @Override - default InetSocketAddress getNetworkPeerInetSocketAddress( + default InetSocketAddress getServerInetSocketAddress( REQUEST request, @Nullable RESPONSE response) { - return getServerInetSocketAddress(request, response); + return getNetworkPeerInetSocketAddress(request, response); } @Nullable @Override - default String getNetworkPeerAddress(REQUEST request, @Nullable RESPONSE response) { - return getServerSocketAddress(request, response); + default String getServerSocketAddress(REQUEST request, @Nullable RESPONSE response) { + return getNetworkPeerAddress(request, response); } @Nullable @Override - default Integer getNetworkPeerPort(REQUEST request, @Nullable RESPONSE response) { - return getServerSocketPort(request, response); + default Integer getServerSocketPort(REQUEST request, @Nullable RESPONSE response) { + return getNetworkPeerPort(request, response); } } 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 0343c20aec..73e5a5ab4d 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 @@ -65,39 +65,39 @@ public interface NetServerAttributesGetter @Nullable @Override - default InetSocketAddress getNetworkLocalInetSocketAddress( + default InetSocketAddress getServerInetSocketAddress( REQUEST request, @Nullable RESPONSE response) { - return getServerInetSocketAddress(request, response); + return getNetworkLocalInetSocketAddress(request, response); } @Nullable @Override - default String getNetworkLocalAddress(REQUEST request, @Nullable RESPONSE response) { - return getServerSocketAddress(request, response); + default String getServerSocketAddress(REQUEST request, @Nullable RESPONSE response) { + return getNetworkLocalAddress(request, response); } @Nullable @Override - default Integer getNetworkLocalPort(REQUEST request, @Nullable RESPONSE response) { - return getServerSocketPort(request, response); + default Integer getServerSocketPort(REQUEST request, @Nullable RESPONSE response) { + return getNetworkLocalPort(request, response); } @Nullable @Override - default InetSocketAddress getNetworkPeerInetSocketAddress( + default InetSocketAddress getClientInetSocketAddress( REQUEST request, @Nullable RESPONSE response) { - return getClientInetSocketAddress(request, response); + return getNetworkPeerInetSocketAddress(request, response); } @Nullable @Override - default String getNetworkPeerAddress(REQUEST request, @Nullable RESPONSE response) { - return getClientSocketAddress(request, response); + default String getClientSocketAddress(REQUEST request, @Nullable RESPONSE response) { + return getNetworkPeerAddress(request, response); } @Nullable @Override - default Integer getNetworkPeerPort(REQUEST request, @Nullable RESPONSE response) { - return getClientSocketPort(request, response); + default Integer getClientSocketPort(REQUEST request, @Nullable RESPONSE response) { + return getNetworkPeerPort(request, response); } } 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 bad87e614c..8904254565 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 @@ -45,6 +45,7 @@ public final class PeerServiceAttributesExtractor @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {} + @SuppressWarnings("deprecation") // old semconv @Override public void onEnd( AttributesBuilder attributes, diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ClientAttributesGetter.java index 89b4dad2fc..9a1f9ff9bf 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ClientAttributesGetter.java @@ -38,14 +38,16 @@ public interface ClientAttributesGetter { return null; } - // TODO deprecate - /** * Returns an {@link InetSocketAddress} object representing the immediate client socket address. * *

Implementing this method is equivalent to implementing all of {@link * #getClientSocketAddress(Object, Object)} and {@link #getClientSocketPort(Object, Object)}. + * + * @deprecated Implement {@link NetworkAttributesGetter#getNetworkPeerInetSocketAddress(Object, + * Object)} instead. */ + @Deprecated @Nullable default InetSocketAddress getClientInetSocketAddress( REQUEST request, @Nullable RESPONSE response) { @@ -62,7 +64,11 @@ public interface ClientAttributesGetter { * simply return {@code null}. If the instrumented library does not expose {@link * InetSocketAddress} in its API, you might want to implement this method instead of {@link * #getClientInetSocketAddress(Object, Object)}. + * + * @deprecated Implement {@link NetworkAttributesGetter#getNetworkPeerAddress(Object, Object)} + * instead. */ + @Deprecated @Nullable default String getClientSocketAddress(REQUEST request, @Nullable RESPONSE response) { return InetSocketAddressUtil.getIpAddress(getClientInetSocketAddress(request, response)); @@ -78,7 +84,11 @@ public interface ClientAttributesGetter { * simply return {@code null}. If the instrumented library does not expose {@link * InetSocketAddress} in its API, you might want to implement this method instead of {@link * #getClientInetSocketAddress(Object, Object)}. + * + * @deprecated Implement {@link NetworkAttributesGetter#getNetworkPeerPort(Object, Object)} + * instead. */ + @Deprecated @Nullable default Integer getClientSocketPort(REQUEST request, @Nullable RESPONSE response) { return InetSocketAddressUtil.getPort(getClientInetSocketAddress(request, response)); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ServerAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ServerAttributesGetter.java index df24124d31..18b777e469 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ServerAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ServerAttributesGetter.java @@ -47,7 +47,12 @@ public interface ServerAttributesGetter { *

Implementing this method is equivalent to implementing all of {@link * #getServerSocketDomain(Object, Object)}, {@link #getServerSocketAddress(Object, Object)} and * {@link #getServerSocketPort(Object, Object)}. + * + * @deprecated Implement {@link NetworkAttributesGetter#getNetworkPeerInetSocketAddress(Object, + * Object)} or {@link NetworkAttributesGetter#getNetworkLocalInetSocketAddress(Object, + * Object)} instead. */ + @Deprecated @Nullable default InetSocketAddress getServerInetSocketAddress( REQUEST request, @Nullable RESPONSE response) { @@ -64,7 +69,10 @@ public interface ServerAttributesGetter { * simply return {@code null}. If the instrumented library does not expose {@link * InetSocketAddress} in its API, you might want to implement this method instead of {@link * #getServerInetSocketAddress(Object, Object)}. + * + * @deprecated This method is deprecated and will be removed without replacement. */ + @Deprecated @Nullable default String getServerSocketDomain(REQUEST request, @Nullable RESPONSE response) { return InetSocketAddressUtil.getDomainName(getServerInetSocketAddress(request, response)); @@ -80,7 +88,11 @@ public interface ServerAttributesGetter { * simply return {@code null}. If the instrumented library does not expose {@link * InetSocketAddress} in its API, you might want to implement this method instead of {@link * #getServerInetSocketAddress(Object, Object)}. + * + * @deprecated Implement {@link NetworkAttributesGetter#getNetworkPeerAddress(Object, Object)} or + * {@link NetworkAttributesGetter#getNetworkLocalAddress(Object, Object)} instead. */ + @Deprecated @Nullable default String getServerSocketAddress(REQUEST request, @Nullable RESPONSE response) { return InetSocketAddressUtil.getIpAddress(getServerInetSocketAddress(request, response)); @@ -96,7 +108,11 @@ public interface ServerAttributesGetter { * simply return {@code null}. If the instrumented library does not expose {@link * InetSocketAddress} in its API, you might want to implement this method instead of {@link * #getServerInetSocketAddress(Object, Object)}. + * + * @deprecated Implement {@link NetworkAttributesGetter#getNetworkPeerPort(Object, Object)} or + * {@link NetworkAttributesGetter#getNetworkLocalPort(Object, Object)} instead. */ + @Deprecated @Nullable default Integer getServerSocketPort(REQUEST request, @Nullable RESPONSE response) { return InetSocketAddressUtil.getPort(getServerInetSocketAddress(request, response)); diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractorTest.java index ab08aca02e..47cbcc3159 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractorTest.java @@ -76,6 +76,7 @@ class HttpClientPeerServiceAttributesExtractorTest { assertTrue(endAttributes.build().isEmpty()); } + @SuppressWarnings("deprecation") // old semconv @Test void shouldSetPeerNameIfItMatches() { // given @@ -106,6 +107,7 @@ class HttpClientPeerServiceAttributesExtractorTest { verify(httpAttributesExtractor, never()).getServerSocketDomain(any(), any()); } + @SuppressWarnings("deprecation") // old semconv @Test void shouldSetSockPeerNameIfItMatchesAndNoPeerNameProvided() { // given 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 72341c84e7..e53f7e56fe 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 @@ -38,7 +38,7 @@ class InetSocketAddressNetClientAttributesGetterTest { } @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( InetSocketAddress request, InetSocketAddress response) { return response; } 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 c06874fc80..a17a2d769d 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 @@ -39,12 +39,14 @@ class InetSocketAddressNetServerAttributesGetterTest { } @Override - public InetSocketAddress getClientInetSocketAddress(Addresses request, Addresses response) { + public InetSocketAddress getNetworkPeerInetSocketAddress( + Addresses request, Addresses response) { return request.peer; } @Override - public InetSocketAddress getServerInetSocketAddress(Addresses request, Addresses response) { + public InetSocketAddress getNetworkLocalInetSocketAddress( + Addresses request, Addresses response) { return request.host; } } 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 7911045108..79fbf5bdec 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 @@ -76,20 +76,12 @@ class NetClientAttributesExtractorTest { } @Override - public String getServerSocketDomain(Map request, Map response) { - // we only support the InetSocketAddress case here; nearly no instrumentations override this - // method anyway - return null; - } - - @Override - public String getServerSocketAddress( - Map request, Map response) { + public String getNetworkPeerAddress(Map request, Map response) { return response.get("sockPeerAddr"); } @Override - public Integer getServerSocketPort(Map request, Map response) { + public Integer getNetworkPeerPort(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 e4d9b443dc..ac33299102 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 @@ -75,25 +75,25 @@ class NetServerAttributesExtractorTest { } @Override - public String getClientSocketAddress(Map request, Void response) { + public String getNetworkPeerAddress(Map request, Void response) { return request.get("sockPeerAddr"); } @Override - public Integer getClientSocketPort(Map request, Void response) { + public Integer getNetworkPeerPort(Map request, Void response) { String sockPeerPort = request.get("sockPeerPort"); return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort); } @Nullable @Override - public String getServerSocketAddress(Map request, Void response) { + public String getNetworkLocalAddress(Map request, Void response) { return request.get("sockHostAddr"); } @Nullable @Override - public Integer getServerSocketPort(Map request, Void response) { + public Integer getNetworkLocalPort(Map request, Void response) { 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 c1595b817b..cf5a10ed96 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 @@ -77,6 +77,7 @@ class PeerServiceAttributesExtractorTest { } @Test + @SuppressWarnings("deprecation") // old semconv void shouldSetPeerNameIfItMatches() { // given Map peerServiceMapping = new HashMap<>(); @@ -105,6 +106,7 @@ class PeerServiceAttributesExtractorTest { verify(netAttributesExtractor, never()).getServerSocketDomain(any(), any()); } + @SuppressWarnings("deprecation") // old semconv @Test void shouldSetSockPeerNameIfItMatchesAndNoPeerNameProvided() { diff --git a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java index bde4b7d32f..57c317f524 100644 --- a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java +++ b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java @@ -76,18 +76,12 @@ class NetClientAttributesExtractorBothSemconvTest { } @Override - public String getServerSocketDomain(Map request, Map response) { - return response.get("sockPeerName"); - } - - @Override - public String getServerSocketAddress( - Map request, Map response) { + public String getNetworkPeerAddress(Map request, Map response) { return response.get("sockPeerAddr"); } @Override - public Integer getServerSocketPort(Map request, Map response) { + public Integer getNetworkPeerPort(Map request, Map response) { String sockPeerPort = response.get("sockPeerPort"); return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort); } diff --git a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java index 7d938f1316..0ec7850701 100644 --- a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java +++ b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java @@ -75,25 +75,25 @@ class NetServerAttributesExtractorBothSemconvTest { } @Override - public String getClientSocketAddress(Map request, Void response) { + public String getNetworkPeerAddress(Map request, Void response) { return request.get("sockPeerAddr"); } @Override - public Integer getClientSocketPort(Map request, Void response) { + public Integer getNetworkPeerPort(Map request, Void response) { String sockPeerPort = request.get("sockPeerPort"); return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort); } @Nullable @Override - public String getServerSocketAddress(Map request, Void response) { + public String getNetworkLocalAddress(Map request, Void response) { return request.get("sockHostAddr"); } @Nullable @Override - public Integer getServerSocketPort(Map request, Void response) { + public Integer getNetworkLocalPort(Map request, Void response) { String sockHostPort = request.get("sockHostPort"); return sockHostPort == null ? null : Integer.valueOf(sockHostPort); } diff --git a/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorStableSemconvTest.java b/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorStableSemconvTest.java index 65f0c7311e..ee6d78dab4 100644 --- a/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorStableSemconvTest.java +++ b/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorStableSemconvTest.java @@ -76,13 +76,12 @@ class NetClientAttributesExtractorStableSemconvTest { } @Override - public String getServerSocketAddress( - Map request, Map response) { + public String getNetworkPeerAddress(Map request, Map response) { return response.get("sockPeerAddr"); } @Override - public Integer getServerSocketPort(Map request, Map response) { + public Integer getNetworkPeerPort(Map request, Map response) { String sockPeerPort = response.get("sockPeerPort"); return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort); } diff --git a/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorStableSemconvTest.java b/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorStableSemconvTest.java index 9259e91115..38bc5b0eb0 100644 --- a/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorStableSemconvTest.java +++ b/instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorStableSemconvTest.java @@ -75,25 +75,25 @@ class NetServerAttributesExtractorStableSemconvTest { } @Override - public String getClientSocketAddress(Map request, Void response) { + public String getNetworkPeerAddress(Map request, Void response) { return request.get("sockPeerAddr"); } @Override - public Integer getClientSocketPort(Map request, Void response) { + public Integer getNetworkPeerPort(Map request, Void response) { String sockPeerPort = request.get("sockPeerPort"); return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort); } @Nullable @Override - public String getServerSocketAddress(Map request, Void response) { + public String getNetworkLocalAddress(Map request, Void response) { return request.get("sockHostAddr"); } @Nullable @Override - public Integer getServerSocketPort(Map request, Void response) { + public Integer getNetworkLocalPort(Map request, Void response) { String sockHostPort = request.get("sockHostPort"); return sockHostPort == null ? null : Integer.valueOf(sockHostPort); } 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 1bca3dca20..0ebb434293 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 @@ -111,7 +111,8 @@ public class InstrumenterBenchmark { } @Override - public InetSocketAddress getServerInetSocketAddress(Void request, @Nullable Void response) { + public InetSocketAddress getNetworkPeerInetSocketAddress( + Void request, @Nullable Void response) { return PEER_ADDRESS; } } 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 fc1d06f124..e8d847939a 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 @@ -71,8 +71,8 @@ final class ApacheHttpAsyncClientHttpAttributesGetter @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( ApacheHttpClientRequest request, @Nullable HttpResponse response) { - return request.getServerSocketAddress(); + return request.getNetworkPeerAddress(); } } diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRequest.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRequest.java index 12421cce67..244e10c892 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRequest.java +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRequest.java @@ -136,7 +136,7 @@ public final class ApacheHttpClientRequest { } @Nullable - public InetSocketAddress getServerSocketAddress() { + public InetSocketAddress getNetworkPeerAddress() { if (target == null) { return null; } 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 1917485722..e7ff02c260 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 @@ -71,8 +71,8 @@ enum ApacheHttpClientHttpAttributesGetter @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( ApacheHttpClientRequest request, @Nullable HttpResponse response) { - return request.getServerSocketAddress(); + return request.getNetworkPeerAddress(); } } diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java index b1d7c18085..4d5a267463 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java @@ -126,7 +126,7 @@ public final class ApacheHttpClientRequest { } @Nullable - public InetSocketAddress getServerSocketAddress() { + public InetSocketAddress getNetworkPeerAddress() { if (target == null) { return null; } 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 7f8901563a..9de2e6ea50 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 @@ -103,14 +103,14 @@ enum ArmeriaHttpServerAttributesGetter @Override @Nullable - public InetSocketAddress getClientInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( RequestContext ctx, @Nullable RequestLog requestLog) { return RequestContextAccess.remoteAddress(ctx); } @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkLocalInetSocketAddress( RequestContext ctx, @Nullable RequestLog log) { return RequestContextAccess.localAddress(ctx); } diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java index 035547992f..0d20977f9b 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java @@ -110,7 +110,7 @@ public enum ArmeriaHttpClientAttributesGetter @Override @Nullable - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( RequestContext ctx, @Nullable RequestLog requestLog) { return RequestContextAccess.remoteAddress(ctx); } 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 e5835554f7..00925cf39a 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 @@ -93,7 +93,7 @@ final class AsyncHttpClientHttpAttributesGetter @Override @Nullable - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( RequestContext request, @Nullable Response response) { if (response != null && response.getRemoteAddress() instanceof InetSocketAddress) { return (InetSocketAddress) response.getRemoteAddress(); diff --git a/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java b/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java index d9f5d55222..827d357bc7 100644 --- a/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java +++ b/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java @@ -132,26 +132,26 @@ final class GrizzlyHttpAttributesGetter @Nullable @Override - public String getClientSocketAddress( + public String getNetworkPeerAddress( HttpRequestPacket request, @Nullable HttpResponsePacket response) { return request.getRemoteAddress(); } @Override - public Integer getClientSocketPort( + public Integer getNetworkPeerPort( HttpRequestPacket request, @Nullable HttpResponsePacket response) { return request.getRemotePort(); } @Nullable @Override - public String getServerSocketAddress( + public String getNetworkLocalAddress( HttpRequestPacket request, @Nullable HttpResponsePacket response) { return request.getLocalAddress(); } @Override - public Integer getServerSocketPort( + public Integer getNetworkLocalPort( HttpRequestPacket request, @Nullable HttpResponsePacket response) { return request.getLocalPort(); } 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 2cb7f6c8d9..a9f1c53386 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 @@ -49,7 +49,7 @@ internal enum class KtorHttpServerAttributesGetter : override fun getNetworkProtocolVersion(request: ApplicationRequest, response: ApplicationResponse?): String? = if (request.httpVersion.startsWith("HTTP/")) request.httpVersion.substring("HTTP/".length) else null - override fun getClientSocketAddress(request: ApplicationRequest, response: ApplicationResponse?): String? { + override fun getNetworkPeerAddress(request: ApplicationRequest, response: ApplicationResponse?): String? { val remote = request.local.remoteHost if ("unknown" != remote && isIpAddress(remote)) { return remote diff --git a/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorHttpServerAttributesGetter.kt b/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorHttpServerAttributesGetter.kt index 8bb05aa50b..4caa85d0ad 100644 --- a/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorHttpServerAttributesGetter.kt +++ b/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorHttpServerAttributesGetter.kt @@ -57,7 +57,7 @@ internal enum class KtorHttpServerAttributesGetter : return request.local.port } - override fun getClientSocketAddress(request: ApplicationRequest, response: ApplicationResponse?): String? { + override fun getNetworkPeerAddress(request: ApplicationRequest, response: ApplicationResponse?): String? { val remote = request.local.remoteHost if ("unknown" != remote && isIpAddress(remote)) { return remote 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 933ed13d29..176c7ca65a 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 @@ -89,24 +89,24 @@ public class LibertyDispatcherHttpAttributesGetter @Override @Nullable - public String getClientSocketAddress(LibertyRequest request, @Nullable LibertyResponse response) { + public String getNetworkPeerAddress(LibertyRequest request, @Nullable LibertyResponse response) { return request.getClientSocketAddress(); } @Override - public Integer getClientSocketPort(LibertyRequest request, @Nullable LibertyResponse response) { + public Integer getNetworkPeerPort(LibertyRequest request, @Nullable LibertyResponse response) { return request.getClientSocketPort(); } @Nullable @Override - public String getServerSocketAddress(LibertyRequest request, @Nullable LibertyResponse response) { + public String getNetworkLocalAddress(LibertyRequest request, @Nullable LibertyResponse response) { return request.getServerSocketAddress(); } @Nullable @Override - public Integer getServerSocketPort(LibertyRequest request, @Nullable LibertyResponse response) { + public Integer getNetworkLocalPort(LibertyRequest request, @Nullable LibertyResponse response) { return request.getServerSocketPort(); } } 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 cc738ef288..a5298f37d8 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 @@ -86,7 +86,7 @@ enum NettyConnectHttpAttributesGetter @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( NettyConnectionRequest request, @Nullable Channel channel) { if (channel == null) { return null; 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 0c176395b7..aa06a02eeb 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 @@ -110,7 +110,7 @@ final class NettyHttpClientAttributesGetter @Override @Nullable - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().getRemoteAddress(); if (address instanceof InetSocketAddress) { 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 434c9509b3..a71425be58 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 @@ -105,7 +105,7 @@ final class NettyHttpServerAttributesGetter @Override @Nullable - public InetSocketAddress getClientInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().getRemoteAddress(); if (address instanceof InetSocketAddress) { @@ -116,7 +116,7 @@ final class NettyHttpServerAttributesGetter @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkLocalInetSocketAddress( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().getLocalAddress(); if (address instanceof InetSocketAddress) { 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 c866c3371b..9ab8f8e795 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 @@ -86,7 +86,7 @@ enum NettyConnectHttpAttributesGetter @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( NettyConnectionRequest request, @Nullable Channel channel) { if (channel == null) { return null; 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 a64629df0e..8fa2d4c2b1 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 @@ -110,7 +110,7 @@ final class NettyHttpClientAttributesGetter @Override @Nullable - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.remoteAddress(); if (address instanceof InetSocketAddress) { 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 f222f02632..7ab3f2ddfb 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 @@ -42,7 +42,7 @@ final class NettySslNetAttributesGetter @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( NettySslRequest request, @Nullable Void unused) { if (request.remoteAddress() instanceof InetSocketAddress) { return (InetSocketAddress) request.remoteAddress(); 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 5d04c6957e..b9fde47717 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 @@ -105,7 +105,7 @@ final class NettyHttpServerAttributesGetter @Override @Nullable - public InetSocketAddress getClientInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.remoteAddress(); if (address instanceof InetSocketAddress) { @@ -116,7 +116,7 @@ final class NettyHttpServerAttributesGetter @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkLocalInetSocketAddress( HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().localAddress(); if (address instanceof InetSocketAddress) { 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 66af50f54d..43d36bc868 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 @@ -55,7 +55,7 @@ final class OpenSearchRestNetResponseAttributesGetter @Override @Nullable - public String getServerSocketAddress(OpenSearchRestRequest request, @Nullable Response response) { + public String getNetworkPeerAddress(OpenSearchRestRequest request, @Nullable Response response) { if (response != null && response.getHost().getAddress() != null) { return response.getHost().getAddress().getHostAddress(); } 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 017b6b46c6..87aadea1ad 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 @@ -54,7 +54,7 @@ final class PlayWsClientHttpAttributesGetter @Override @Nullable - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( Request request, @Nullable Response response) { if (response != null && response.getRemoteAddress() instanceof InetSocketAddress) { return (InetSocketAddress) response.getRemoteAddress(); 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 9cd04a538e..f459d5339b 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 @@ -50,12 +50,12 @@ public class RabbitChannelNetAttributesGetter @Nullable @Override - public String getServerSocketAddress(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + public String getNetworkPeerAddress(ChannelAndMethod channelAndMethod, @Nullable Void unused) { return channelAndMethod.getChannel().getConnection().getAddress().getHostAddress(); } @Override - public Integer getServerSocketPort(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + public Integer getNetworkPeerPort(ChannelAndMethod channelAndMethod, @Nullable Void unused) { return channelAndMethod.getChannel().getConnection().getPort(); } } 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 28f10b3fd2..01f7868a04 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 @@ -51,13 +51,13 @@ public class RabbitReceiveNetAttributesGetter @Nullable @Override - public String getServerSocketAddress(ReceiveRequest request, @Nullable GetResponse response) { + public String getNetworkPeerAddress(ReceiveRequest request, @Nullable GetResponse response) { return request.getConnection().getAddress().getHostAddress(); } @Nullable @Override - public Integer getServerSocketPort(ReceiveRequest request, @Nullable GetResponse response) { + public Integer getNetworkPeerPort(ReceiveRequest request, @Nullable GetResponse response) { return request.getConnection().getPort(); } } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpAttributesGetter.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpAttributesGetter.java index 1d28a2ae46..7581db23cb 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpAttributesGetter.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpAttributesGetter.java @@ -106,7 +106,7 @@ enum RatpackHttpAttributesGetter implements HttpServerAttributesGetter @Override @Nullable - public String getClientSocketAddress( + public String getNetworkPeerAddress( ServletRequestContext requestContext, @Nullable ServletResponseContext response) { return accessor.getRequestRemoteAddr(requestContext.request()); @@ -128,7 +128,7 @@ public class ServletHttpAttributesGetter @Override @Nullable - public Integer getClientSocketPort( + public Integer getNetworkPeerPort( ServletRequestContext requestContext, @Nullable ServletResponseContext response) { return accessor.getRequestRemotePort(requestContext.request()); @@ -136,7 +136,7 @@ public class ServletHttpAttributesGetter @Nullable @Override - public String getServerSocketAddress( + public String getNetworkLocalAddress( ServletRequestContext requestContext, @Nullable ServletResponseContext response) { return accessor.getRequestLocalAddr(requestContext.request()); @@ -144,7 +144,7 @@ public class ServletHttpAttributesGetter @Nullable @Override - public Integer getServerSocketPort( + public Integer getNetworkLocalPort( ServletRequestContext requestContext, @Nullable ServletResponseContext response) { return accessor.getRequestLocalPort(requestContext.request()); diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java index fdf79cbf33..dcc78750dc 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java @@ -94,14 +94,14 @@ enum WebfluxServerHttpAttributesGetter @Nullable @Override - public InetSocketAddress getClientInetSocketAddress( + public InetSocketAddress getNetworkPeerInetSocketAddress( ServerWebExchange request, @Nullable ServerWebExchange response) { return request.getRequest().getRemoteAddress(); } @Nullable @Override - public InetSocketAddress getServerInetSocketAddress( + public InetSocketAddress getNetworkLocalInetSocketAddress( ServerWebExchange request, @Nullable ServerWebExchange response) { return request.getRequest().getLocalAddress(); } 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 5acf91a8fa..9853a0fb44 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 @@ -116,26 +116,26 @@ enum SpringWebMvcHttpAttributesGetter @Override @Nullable - public String getClientSocketAddress( + public String getNetworkPeerAddress( HttpServletRequest request, @Nullable HttpServletResponse response) { return request.getRemoteAddr(); } @Override - public Integer getClientSocketPort( + public Integer getNetworkPeerPort( HttpServletRequest request, @Nullable HttpServletResponse response) { return request.getRemotePort(); } @Nullable @Override - public String getServerSocketAddress( + public String getNetworkLocalAddress( HttpServletRequest request, @Nullable HttpServletResponse response) { return request.getLocalAddr(); } @Override - public Integer getServerSocketPort( + public Integer getNetworkLocalPort( HttpServletRequest request, @Nullable HttpServletResponse respo) { return request.getLocalPort(); } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcHttpAttributesGetter.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcHttpAttributesGetter.java index 797505beae..238769e13a 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcHttpAttributesGetter.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcHttpAttributesGetter.java @@ -116,26 +116,26 @@ enum SpringWebMvcHttpAttributesGetter @Override @Nullable - public String getClientSocketAddress( + public String getNetworkPeerAddress( HttpServletRequest request, @Nullable HttpServletResponse response) { return request.getRemoteAddr(); } @Override - public Integer getClientSocketPort( + public Integer getNetworkPeerPort( HttpServletRequest request, @Nullable HttpServletResponse response) { return request.getRemotePort(); } @Nullable @Override - public String getServerSocketAddress( + public String getNetworkLocalAddress( HttpServletRequest request, @Nullable HttpServletResponse response) { return request.getLocalAddr(); } @Override - public Integer getServerSocketPort( + public Integer getNetworkLocalPort( HttpServletRequest request, @Nullable HttpServletResponse response) { return request.getLocalPort(); } 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 9a35d383e9..ff1e261ebe 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 @@ -92,28 +92,28 @@ public class TomcatHttpAttributesGetter implements HttpServerAttributesGetter