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

Deprecate old server/client socket getter methods (#9716)

This commit is contained in:
Mateusz Rzeszutek 2023-10-19 17:36:57 +02:00 committed by GitHub
parent eb92c5ec4b
commit e9026cd591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 144 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java
View File

@ -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<REQUEST, RESPONSE>
@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<REQUEST, RESPONSE>
Integer serverPort = attributesGetter.getServerPort(request);
Supplier<String> 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);

12
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java
View File

@ -59,20 +59,20 @@ public interface NetClientAttributesGetter<REQUEST, RESPONSE>
@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);
}
}

24
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java
View File

@ -65,39 +65,39 @@ public interface NetServerAttributesGetter<REQUEST, RESPONSE>
@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);
}
}

1
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java
View File

@ -45,6 +45,7 @@ public final class PeerServiceAttributesExtractor<REQUEST, RESPONSE>
@Override
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {}
@SuppressWarnings("deprecation") // old semconv
@Override
public void onEnd(
AttributesBuilder attributes,

14
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ClientAttributesGetter.java
View File

@ -38,14 +38,16 @@ public interface ClientAttributesGetter<REQUEST, RESPONSE> {
return null;
}
// TODO deprecate
/**
* Returns an {@link InetSocketAddress} object representing the immediate client socket address.
*
* <p>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<REQUEST, RESPONSE> {
* 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<REQUEST, RESPONSE> {
* 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));

16
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/ServerAttributesGetter.java
View File

@ -47,7 +47,12 @@ public interface ServerAttributesGetter<REQUEST, RESPONSE> {
* <p>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<REQUEST, RESPONSE> {
* 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<REQUEST, RESPONSE> {
* 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<REQUEST, RESPONSE> {
* 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));

2
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractorTest.java
View File

@ -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

2
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java
View File

@ -38,7 +38,7 @@ class InetSocketAddressNetClientAttributesGetterTest {
}
@Override
public InetSocketAddress getServerInetSocketAddress(
public InetSocketAddress getNetworkPeerInetSocketAddress(
InetSocketAddress request, InetSocketAddress response) {
return response;
}

6
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetterTest.java
View File

@ -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;
}
}

12
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java
View File

@ -76,20 +76,12 @@ class NetClientAttributesExtractorTest {
}
@Override
public String getServerSocketDomain(Map<String, String> request, Map<String, String> response) {
// we only support the InetSocketAddress case here; nearly no instrumentations override this
// method anyway
return null;
}
@Override
public String getServerSocketAddress(
Map<String, String> request, Map<String, String> response) {
public String getNetworkPeerAddress(Map<String, String> request, Map<String, String> response) {
return response.get("sockPeerAddr");
}
@Override
public Integer getServerSocketPort(Map<String, String> request, Map<String, String> response) {
public Integer getNetworkPeerPort(Map<String, String> request, Map<String, String> response) {
String sockPeerPort = response.get("sockPeerPort");
return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort);
}

8
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java
View File

@ -75,25 +75,25 @@ class NetServerAttributesExtractorTest {
}
@Override
public String getClientSocketAddress(Map<String, String> request, Void response) {
public String getNetworkPeerAddress(Map<String, String> request, Void response) {
return request.get("sockPeerAddr");
}
@Override
public Integer getClientSocketPort(Map<String, String> request, Void response) {
public Integer getNetworkPeerPort(Map<String, String> request, Void response) {
String sockPeerPort = request.get("sockPeerPort");
return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort);
}
@Nullable
@Override
public String getServerSocketAddress(Map<String, String> request, Void response) {
public String getNetworkLocalAddress(Map<String, String> request, Void response) {
return request.get("sockHostAddr");
}
@Nullable
@Override
public Integer getServerSocketPort(Map<String, String> request, Void response) {
public Integer getNetworkLocalPort(Map<String, String> request, Void response) {
String sockHostPort = request.get("sockHostPort");
return sockHostPort == null ? null : Integer.valueOf(sockHostPort);
}

2
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java
View File

@ -77,6 +77,7 @@ class PeerServiceAttributesExtractorTest {
}
@Test
@SuppressWarnings("deprecation") // old semconv
void shouldSetPeerNameIfItMatches() {
// given
Map<String, String> peerServiceMapping = new HashMap<>();
@ -105,6 +106,7 @@ class PeerServiceAttributesExtractorTest {
verify(netAttributesExtractor, never()).getServerSocketDomain(any(), any());
}
@SuppressWarnings("deprecation") // old semconv
@Test
void shouldSetSockPeerNameIfItMatchesAndNoPeerNameProvided() {

10
instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java
View File

@ -76,18 +76,12 @@ class NetClientAttributesExtractorBothSemconvTest {
}
@Override
public String getServerSocketDomain(Map<String, String> request, Map<String, String> response) {
return response.get("sockPeerName");
}
@Override
public String getServerSocketAddress(
Map<String, String> request, Map<String, String> response) {
public String getNetworkPeerAddress(Map<String, String> request, Map<String, String> response) {
return response.get("sockPeerAddr");
}
@Override
public Integer getServerSocketPort(Map<String, String> request, Map<String, String> response) {
public Integer getNetworkPeerPort(Map<String, String> request, Map<String, String> response) {
String sockPeerPort = response.get("sockPeerPort");
return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort);
}

8
instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java
View File

@ -75,25 +75,25 @@ class NetServerAttributesExtractorBothSemconvTest {
}
@Override
public String getClientSocketAddress(Map<String, String> request, Void response) {
public String getNetworkPeerAddress(Map<String, String> request, Void response) {
return request.get("sockPeerAddr");
}
@Override
public Integer getClientSocketPort(Map<String, String> request, Void response) {
public Integer getNetworkPeerPort(Map<String, String> request, Void response) {
String sockPeerPort = request.get("sockPeerPort");
return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort);
}
@Nullable
@Override
public String getServerSocketAddress(Map<String, String> request, Void response) {
public String getNetworkLocalAddress(Map<String, String> request, Void response) {
return request.get("sockHostAddr");
}
@Nullable
@Override
public Integer getServerSocketPort(Map<String, String> request, Void response) {
public Integer getNetworkLocalPort(Map<String, String> request, Void response) {
String sockHostPort = request.get("sockHostPort");
return sockHostPort == null ? null : Integer.valueOf(sockHostPort);
}

5
instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorStableSemconvTest.java
View File

@ -76,13 +76,12 @@ class NetClientAttributesExtractorStableSemconvTest {
}
@Override
public String getServerSocketAddress(
Map<String, String> request, Map<String, String> response) {
public String getNetworkPeerAddress(Map<String, String> request, Map<String, String> response) {
return response.get("sockPeerAddr");
}
@Override
public Integer getServerSocketPort(Map<String, String> request, Map<String, String> response) {
public Integer getNetworkPeerPort(Map<String, String> request, Map<String, String> response) {
String sockPeerPort = response.get("sockPeerPort");
return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort);
}

8
instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorStableSemconvTest.java
View File

@ -75,25 +75,25 @@ class NetServerAttributesExtractorStableSemconvTest {
}
@Override
public String getClientSocketAddress(Map<String, String> request, Void response) {
public String getNetworkPeerAddress(Map<String, String> request, Void response) {
return request.get("sockPeerAddr");
}
@Override
public Integer getClientSocketPort(Map<String, String> request, Void response) {
public Integer getNetworkPeerPort(Map<String, String> request, Void response) {
String sockPeerPort = request.get("sockPeerPort");
return sockPeerPort == null ? null : Integer.valueOf(sockPeerPort);
}
@Nullable
@Override
public String getServerSocketAddress(Map<String, String> request, Void response) {
public String getNetworkLocalAddress(Map<String, String> request, Void response) {
return request.get("sockHostAddr");
}
@Nullable
@Override
public Integer getServerSocketPort(Map<String, String> request, Void response) {
public Integer getNetworkLocalPort(Map<String, String> request, Void response) {
String sockHostPort = request.get("sockHostPort");
return sockHostPort == null ? null : Integer.valueOf(sockHostPort);
}

3
instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java
View File

@ -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;
}
}

4
instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java
View File

@ -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();
}
}

2
instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRequest.java
View File

@ -136,7 +136,7 @@ public final class ApacheHttpClientRequest {
}
@Nullable
public InetSocketAddress getServerSocketAddress() {
public InetSocketAddress getNetworkPeerAddress() {
if (target == null) {
return null;
}

4
instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java
View File

@ -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();
}
}

2
instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java
View File

@ -126,7 +126,7 @@ public final class ApacheHttpClientRequest {
}
@Nullable
public InetSocketAddress getServerSocketAddress() {
public InetSocketAddress getNetworkPeerAddress() {
if (target == null) {
return null;
}

4
instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java
View File

@ -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);
}

2
instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpClientAttributesGetter.java
View File

@ -110,7 +110,7 @@ public enum ArmeriaHttpClientAttributesGetter
@Override
@Nullable
public InetSocketAddress getServerInetSocketAddress(
public InetSocketAddress getNetworkPeerInetSocketAddress(
RequestContext ctx, @Nullable RequestLog requestLog) {
return RequestContextAccess.remoteAddress(ctx);
}

2
instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java
View File

@ -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();

8
instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java
View File

@ -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();
}

2
instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt
View File

@ -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

2
instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorHttpServerAttributesGetter.kt
View File

@ -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

8
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java
View File

@ -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();
}
}

2
instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyConnectHttpAttributesGetter.java
View File

@ -86,7 +86,7 @@ enum NettyConnectHttpAttributesGetter
@Nullable
@Override
public InetSocketAddress getServerInetSocketAddress(
public InetSocketAddress getNetworkPeerInetSocketAddress(
NettyConnectionRequest request, @Nullable Channel channel) {
if (channel == null) {
return null;

2
instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java
View File

@ -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) {

4
instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java
View File

@ -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) {

2
instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectHttpAttributesGetter.java
View File

@ -86,7 +86,7 @@ enum NettyConnectHttpAttributesGetter
@Nullable
@Override
public InetSocketAddress getServerInetSocketAddress(
public InetSocketAddress getNetworkPeerInetSocketAddress(
NettyConnectionRequest request, @Nullable Channel channel) {
if (channel == null) {
return null;

2
instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyHttpClientAttributesGetter.java
View File

@ -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) {

2
instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslNetAttributesGetter.java
View File

@ -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();

4
instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyHttpServerAttributesGetter.java
View File

@ -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) {

2
instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestNetResponseAttributesGetter.java
View File

@ -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();
}

2
instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java
View File

@ -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();

4
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java
View File

@ -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();
}
}

4
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java
View File

@ -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();
}
}

2
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpAttributesGetter.java
View File

@ -106,7 +106,7 @@ enum RatpackHttpAttributesGetter implements HttpServerAttributesGetter<Request,
}
@Override
public Integer getClientSocketPort(Request request, @Nullable Response response) {
public Integer getNetworkPeerPort(Request request, @Nullable Response response) {
return request.getRemoteAddress().getPort();
}
}

2
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java
View File

@ -83,7 +83,7 @@ final class ReactorNettyHttpClientAttributesGetter
@Nullable
@Override
public InetSocketAddress getServerInetSocketAddress(
public InetSocketAddress getNetworkPeerInetSocketAddress(
HttpClientRequest request, @Nullable HttpClientResponse response) {
// we're making use of the fact that HttpClientOperations is both a Connection and an

6
instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHttpAttributesGetter.java
View File

@ -122,18 +122,18 @@ enum RestletHttpAttributesGetter implements HttpServerAttributesGetter<Request,
@Override
@Nullable
public String getClientSocketAddress(Request request, @Nullable Response response) {
public String getNetworkPeerAddress(Request request, @Nullable Response response) {
return request.getClientInfo().getAddress();
}
@Override
public Integer getClientSocketPort(Request request, @Nullable Response response) {
public Integer getNetworkPeerPort(Request request, @Nullable Response response) {
return request.getClientInfo().getPort();
}
@Nullable
@Override
public String getServerSocketAddress(Request request, @Nullable Response response) {
public String getNetworkLocalAddress(Request request, @Nullable Response response) {
HttpCall call = httpCall(request);
return call == null ? null : call.getServerAddress();
}

6
instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java
View File

@ -96,18 +96,18 @@ public enum RestletHttpAttributesGetter implements HttpServerAttributesGetter<Re
@Override
@Nullable
public String getClientSocketAddress(Request request, @Nullable Response response) {
public String getNetworkPeerAddress(Request request, @Nullable Response response) {
return request.getClientInfo().getAddress();
}
@Override
public Integer getClientSocketPort(Request request, @Nullable Response response) {
public Integer getNetworkPeerPort(Request request, @Nullable Response response) {
return request.getClientInfo().getPort();
}
@Nullable
@Override
public String getServerSocketAddress(Request request, @Nullable Response response) {
public String getNetworkLocalAddress(Request request, @Nullable Response response) {
return ServerCallAccess.getServerAddress(request);
}
}

8
instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java
View File

@ -120,7 +120,7 @@ public class ServletHttpAttributesGetter<REQUEST, RESPONSE>
@Override
@Nullable
public String getClientSocketAddress(
public String getNetworkPeerAddress(
ServletRequestContext<REQUEST> requestContext,
@Nullable ServletResponseContext<RESPONSE> response) {
return accessor.getRequestRemoteAddr(requestContext.request());
@ -128,7 +128,7 @@ public class ServletHttpAttributesGetter<REQUEST, RESPONSE>
@Override
@Nullable
public Integer getClientSocketPort(
public Integer getNetworkPeerPort(
ServletRequestContext<REQUEST> requestContext,
@Nullable ServletResponseContext<RESPONSE> response) {
return accessor.getRequestRemotePort(requestContext.request());
@ -136,7 +136,7 @@ public class ServletHttpAttributesGetter<REQUEST, RESPONSE>
@Nullable
@Override
public String getServerSocketAddress(
public String getNetworkLocalAddress(
ServletRequestContext<REQUEST> requestContext,
@Nullable ServletResponseContext<RESPONSE> response) {
return accessor.getRequestLocalAddr(requestContext.request());
@ -144,7 +144,7 @@ public class ServletHttpAttributesGetter<REQUEST, RESPONSE>
@Nullable
@Override
public Integer getServerSocketPort(
public Integer getNetworkLocalPort(
ServletRequestContext<REQUEST> requestContext,
@Nullable ServletResponseContext<RESPONSE> response) {
return accessor.getRequestLocalPort(requestContext.request());

4
instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java
View File

@ -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();
}

8
instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcHttpAttributesGetter.java
View File

@ -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();
}

8
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcHttpAttributesGetter.java
View File

@ -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();
}

8
instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java
View File

@ -92,28 +92,28 @@ public class TomcatHttpAttributesGetter implements HttpServerAttributesGetter<Re
@Override
@Nullable
public String getClientSocketAddress(Request request, @Nullable Response response) {
public String getNetworkPeerAddress(Request request, @Nullable Response response) {
request.action(ActionCode.REQ_HOST_ADDR_ATTRIBUTE, request);
return messageBytesToString(request.remoteAddr());
}
@Override
@Nullable
public Integer getClientSocketPort(Request request, @Nullable Response response) {
public Integer getNetworkPeerPort(Request request, @Nullable Response response) {
request.action(ActionCode.REQ_REMOTEPORT_ATTRIBUTE, request);
return request.getRemotePort();
}
@Nullable
@Override
public String getServerSocketAddress(Request request, @Nullable Response response) {
public String getNetworkLocalAddress(Request request, @Nullable Response response) {
request.action(ActionCode.REQ_LOCAL_ADDR_ATTRIBUTE, request);
return messageBytesToString(request.localAddr());
}
@Nullable
@Override
public Integer getServerSocketPort(Request request, @Nullable Response response) {
public Integer getNetworkLocalPort(Request request, @Nullable Response response) {
request.action(ActionCode.REQ_LOCALPORT_ATTRIBUTE, request);
return request.getLocalPort();
}

4
instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpAttributesGetter.java
View File

@ -97,14 +97,14 @@ public class UndertowHttpAttributesGetter
@Override
@Nullable
public InetSocketAddress getClientInetSocketAddress(
public InetSocketAddress getNetworkPeerInetSocketAddress(
HttpServerExchange exchange, @Nullable HttpServerExchange unused) {
return exchange.getConnection().getPeerAddress(InetSocketAddress.class);
}
@Nullable
@Override
public InetSocketAddress getServerInetSocketAddress(
public InetSocketAddress getNetworkLocalInetSocketAddress(
HttpServerExchange exchange, @Nullable HttpServerExchange unused) {
return exchange.getConnection().getLocalAddress(InetSocketAddress.class);
}

15
instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesGetter.java
View File

@ -70,7 +70,7 @@ final class Vertx4HttpAttributesGetter extends AbstractVertxHttpAttributesGetter
@Nullable
@Override
public String getServerSocketAddress(
public String getNetworkPeerAddress(
HttpClientRequest request, @Nullable HttpClientResponse response) {
if (response == null) {
return null;
@ -81,18 +81,7 @@ final class Vertx4HttpAttributesGetter extends AbstractVertxHttpAttributesGetter
@Nullable
@Override
public String getServerSocketDomain(
HttpClientRequest request, @Nullable HttpClientResponse response) {
if (response == null) {
return null;
}
SocketAddress socketAddress = response.netSocket().remoteAddress();
return socketAddress == null ? null : socketAddress.host();
}
@Nullable
@Override
public Integer getServerSocketPort(
public Integer getNetworkPeerPort(
HttpClientRequest request, @Nullable HttpClientResponse response) {
if (response == null) {
return null;