fix tests, part 1

open-telemetry · Oct 16, 2023 · e978372 · e978372
1 parent 7b8a70b
commit e978372
Show file tree

Hide file tree

Showing 32 changed files with 89 additions and 100 deletions.
diff --git a/...io/opentelemetry/instrumentation/api/instrumenter/network/NetworkAttributesExtractor.java b/...io/opentelemetry/instrumentation/api/instrumenter/network/NetworkAttributesExtractor.java
@@ -41,7 +41,8 @@ public static <REQUEST, RESPONSE> NetworkAttributesExtractor<REQUEST, RESPONSE>
             AddressAndPortExtractor.noop(),
             AddressAndPortExtractor.noop(),
             /* captureLocalSocketAttributes= */ true,
-            /* captureOldPeerDomainAttribute= */ false,
+            // capture the old net.sock.peer.name attr for backwards compatibility
+            /* captureOldPeerDomainAttribute= */ true,
             SemconvStability.emitStableHttpSemconv(),
             SemconvStability.emitOldHttpSemconv());
   }

diff --git a/...io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboNetworkServerAttributesGetter.java b/...io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboNetworkServerAttributesGetter.java
@@ -5,15 +5,15 @@
 
 package io.opentelemetry.instrumentation.apachedubbo.v2_7;
 
-import io.opentelemetry.instrumentation.api.instrumenter.network.ClientAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
 import java.net.InetSocketAddress;
 import javax.annotation.Nullable;
 import org.apache.dubbo.rpc.Result;
 
 final class DubboNetworkServerAttributesGetter
     implements ServerAttributesGetter<DubboRequest, Result>,
-        ClientAttributesGetter<DubboRequest, Result> {
+        NetworkAttributesGetter<DubboRequest, Result> {
 
   @Nullable
   @Override
@@ -29,14 +29,14 @@ public Integer getServerPort(DubboRequest request) {
 
   @Nullable
   @Override
-  public InetSocketAddress getServerInetSocketAddress(
+  public InetSocketAddress getNetworkLocalInetSocketAddress(
       DubboRequest request, @Nullable Result result) {
     return request.localAddress();
   }
 
   @Override
   @Nullable
-  public InetSocketAddress getClientInetSocketAddress(
+  public InetSocketAddress getNetworkPeerInetSocketAddress(
       DubboRequest request, @Nullable Result result) {
     return request.remoteAddress();
   }

diff --git a/...rc/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java b/...rc/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java
@@ -12,7 +12,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ClientAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcClientAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcServerAttributesExtractor;
@@ -72,14 +72,15 @@ public DubboTelemetry build() {
             .addAttributesExtractor(RpcServerAttributesExtractor.create(rpcAttributesGetter))
             .addAttributesExtractor(
                 ServerAttributesExtractor.createForServerSide(netServerAttributesGetter))
-            .addAttributesExtractor(ClientAttributesExtractor.create(netServerAttributesGetter))
+            .addAttributesExtractor(NetworkAttributesExtractor.create(netServerAttributesGetter))
             .addAttributesExtractors(attributesExtractors);
 
     InstrumenterBuilder<DubboRequest, Result> clientInstrumenterBuilder =
         Instrumenter.<DubboRequest, Result>builder(
                 openTelemetry, INSTRUMENTATION_NAME, spanNameExtractor)
             .addAttributesExtractor(RpcClientAttributesExtractor.create(rpcAttributesGetter))
             .addAttributesExtractor(ServerAttributesExtractor.create(netClientAttributesGetter))
+            .addAttributesExtractor(NetworkAttributesExtractor.create(netClientAttributesGetter))
             .addAttributesExtractors(attributesExtractors);
 
     if (peerService != null) {

diff --git a/...lemetry/instrumentation/apachedubbo/v2_7/internal/DubboClientNetworkAttributesGetter.java b/...lemetry/instrumentation/apachedubbo/v2_7/internal/DubboClientNetworkAttributesGetter.java
@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.apachedubbo.v2_7.internal;
 
 import io.opentelemetry.instrumentation.apachedubbo.v2_7.DubboRequest;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
 import java.net.InetSocketAddress;
 import javax.annotation.Nullable;
@@ -16,7 +17,8 @@
  * any time.
  */
 public final class DubboClientNetworkAttributesGetter
-    implements ServerAttributesGetter<DubboRequest, Result> {
+    implements ServerAttributesGetter<DubboRequest, Result>,
+        NetworkAttributesGetter<DubboRequest, Result> {
 
   @Nullable
   @Override
@@ -31,7 +33,7 @@ public Integer getServerPort(DubboRequest request) {
 
   @Override
   @Nullable
-  public InetSocketAddress getServerInetSocketAddress(
+  public InetSocketAddress getNetworkPeerInetSocketAddress(
       DubboRequest request, @Nullable Result response) {
     return request.remoteAddress();
   }

diff --git a/...t/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/...t/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java
@@ -115,6 +115,9 @@ void restComponentServerAndClientCallWithJettyBackend() {
                                 val -> val.isInstanceOf(String.class)),
                             satisfies(
                                 SemanticAttributes.NET_SOCK_PEER_PORT,
+                                val -> val.isInstanceOf(Long.class)),
+                            satisfies(
+                                SemanticAttributes.NET_SOCK_HOST_PORT,
                                 val -> val.isInstanceOf(Long.class))),
                 span ->
                     span.hasName("GET /api/{module}/unit/{unitId}")

diff --git a/...ntelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetworkAttributesGetter.java b/...ntelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetworkAttributesGetter.java
@@ -6,16 +6,16 @@
 package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0;
 
 import com.datastax.driver.core.ExecutionInfo;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import java.net.InetSocketAddress;
 import javax.annotation.Nullable;
 
 final class CassandraNetworkAttributesGetter
-    implements ServerAttributesGetter<CassandraRequest, ExecutionInfo> {
+    implements NetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
 
   @Override
   @Nullable
-  public InetSocketAddress getServerInetSocketAddress(
+  public InetSocketAddress getNetworkPeerInetSocketAddress(
       CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
     return executionInfo == null ? null : executionInfo.getQueriedHost().getSocketAddress();
   }

diff --git a/...n/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java b/...n/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
 import io.opentelemetry.semconv.SemanticAttributes;
 
@@ -37,7 +37,7 @@ public final class CassandraSingletons {
                         CommonConfig.get().isStatementSanitizationEnabled())
                     .build())
             .addAttributesExtractor(
-                ServerAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
+                NetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
             .buildInstrumenter(SpanKindExtractor.alwaysClient());
   }
 

diff --git a/...ntelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetworkAttributesGetter.java b/...ntelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetworkAttributesGetter.java
@@ -7,17 +7,17 @@
 
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import com.datastax.oss.driver.api.core.metadata.Node;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
 final class CassandraNetworkAttributesGetter
-    implements ServerAttributesGetter<CassandraRequest, ExecutionInfo> {
+    implements NetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
 
   @Override
   @Nullable
-  public InetSocketAddress getServerInetSocketAddress(
+  public InetSocketAddress getNetworkPeerInetSocketAddress(
       CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
     if (executionInfo == null) {
       return null;

diff --git a/...n/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java b/...n/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
 import io.opentelemetry.semconv.SemanticAttributes;
 
@@ -36,7 +36,7 @@ public final class CassandraSingletons {
                         CommonConfig.get().isStatementSanitizationEnabled())
                     .build())
             .addAttributesExtractor(
-                ServerAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
+                NetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
             .addAttributesExtractor(new CassandraAttributesExtractor())
             .buildInstrumenter(SpanKindExtractor.alwaysClient());
   }

diff --git a/...ava/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetworkAttributesGetter.java b/...ava/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetworkAttributesGetter.java
@@ -7,17 +7,17 @@
 
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import com.datastax.oss.driver.api.core.metadata.Node;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
 final class CassandraNetworkAttributesGetter
-    implements ServerAttributesGetter<CassandraRequest, ExecutionInfo> {
+    implements NetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
 
   @Override
   @Nullable
-  public InetSocketAddress getServerInetSocketAddress(
+  public InetSocketAddress getNetworkPeerInetSocketAddress(
       CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
     if (executionInfo == null) {
       return null;

diff --git a/.../main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java b/.../main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java
@@ -12,7 +12,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.semconv.SemanticAttributes;
 
 /** A builder of {@link CassandraTelemetry}. */
@@ -59,7 +59,7 @@ protected Instrumenter<CassandraRequest, ExecutionInfo> createInstrumenter(
                 .setStatementSanitizationEnabled(statementSanitizationEnabled)
                 .build())
         .addAttributesExtractor(
-            ServerAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
+            NetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
         .addAttributesExtractor(new CassandraAttributesExtractor())
         .buildInstrumenter(SpanKindExtractor.alwaysClient());
   }

diff --git a/...ntelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetworkAttributesGetter.java b/...ntelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetworkAttributesGetter.java
@@ -5,17 +5,17 @@
 
 package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
 
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
 public class CouchbaseNetworkAttributesGetter
-    implements ServerAttributesGetter<CouchbaseRequestInfo, Void> {
+    implements NetworkAttributesGetter<CouchbaseRequestInfo, Void> {
 
   @Nullable
   @Override
-  public InetSocketAddress getServerInetSocketAddress(
+  public InetSocketAddress getNetworkPeerInetSocketAddress(
       CouchbaseRequestInfo couchbaseRequest, @Nullable Void unused) {
     SocketAddress peerAddress = couchbaseRequest.getPeerAddress();
     if (peerAddress instanceof InetSocketAddress) {

diff --git a/...n/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSingletons.java b/...n/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSingletons.java
@@ -12,9 +12,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
-import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
 
 public final class CouchbaseSingletons {
@@ -33,10 +31,7 @@ public final class CouchbaseSingletons {
         Instrumenter.<CouchbaseRequestInfo, Void>builder(
                 GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanNameExtractor)
             .addAttributesExtractor(DbClientAttributesExtractor.create(couchbaseAttributesGetter))
-            .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter))
-            .addAttributesExtractor(
-                PeerServiceAttributesExtractor.create(
-                    netAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
+            .addAttributesExtractor(NetworkAttributesExtractor.create(netAttributesGetter))
             .addContextCustomizer(
                 (context, couchbaseRequest, startAttributes) ->
                     CouchbaseRequestInfo.init(context, couchbaseRequest));

diff --git a/...agent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java b/...agent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportNetworkAttributesGetter;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportInstrumenterFactory;
@@ -18,7 +18,7 @@ public final class Elasticsearch5TransportSingletons {
       ElasticsearchTransportInstrumenterFactory.create(
           "io.opentelemetry.elasticsearch-transport-5.0",
           new Elasticsearch5TransportExperimentalAttributesExtractor(),
-          ServerAttributesExtractor.create(new ElasticTransportNetworkAttributesGetter()));
+          NetworkAttributesExtractor.create(new ElasticTransportNetworkAttributesGetter()));
 
   public static Instrumenter<ElasticTransportRequest, ActionResponse> instrumenter() {
     return INSTRUMENTER;

diff --git a/...gent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportSingletons.java b/...gent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_3;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportNetworkAttributesGetter;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportInstrumenterFactory;
@@ -18,7 +18,7 @@ public final class Elasticsearch53TransportSingletons {
       ElasticsearchTransportInstrumenterFactory.create(
           "io.opentelemetry.elasticsearch-transport-5.3",
           new Elasticsearch53TransportExperimentalAttributesExtractor(),
-          ServerAttributesExtractor.create(new ElasticTransportNetworkAttributesGetter()));
+          NetworkAttributesExtractor.create(new ElasticTransportNetworkAttributesGetter()));
 
   public static Instrumenter<ElasticTransportRequest, ActionResponse> instrumenter() {
     return INSTRUMENTER;

diff --git a/...entation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetworkAttributesGetter.java b/...entation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetworkAttributesGetter.java
@@ -5,18 +5,18 @@
 
 package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v6_0;
 
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest;
 import java.net.InetSocketAddress;
 import javax.annotation.Nullable;
 import org.elasticsearch.action.ActionResponse;
 
 public class Elasticsearch6TransportNetworkAttributesGetter
-    implements ServerAttributesGetter<ElasticTransportRequest, ActionResponse> {
+    implements NetworkAttributesGetter<ElasticTransportRequest, ActionResponse> {
 
   @Override
   @Nullable
-  public InetSocketAddress getServerInetSocketAddress(
+  public InetSocketAddress getNetworkPeerInetSocketAddress(
       ElasticTransportRequest request, @Nullable ActionResponse response) {
     if (response != null && response.remoteAddress() != null) {
       return response.remoteAddress().address();

diff --git a/...agent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportSingletons.java b/...agent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v6_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest;
 import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportInstrumenterFactory;
 import org.elasticsearch.action.ActionResponse;
@@ -17,7 +17,7 @@ public final class Elasticsearch6TransportSingletons {
       ElasticsearchTransportInstrumenterFactory.create(
           "io.opentelemetry.elasticsearch-transport-6.0",
           new Elasticsearch6TransportExperimentalAttributesExtractor(),
-          ServerAttributesExtractor.create(new Elasticsearch6TransportNetworkAttributesGetter()));
+          NetworkAttributesExtractor.create(new Elasticsearch6TransportNetworkAttributesGetter()));
 
   public static Instrumenter<ElasticTransportRequest, ActionResponse> instrumenter() {
     return INSTRUMENTER;

diff --git a/...gent/instrumentation/elasticsearch/transport/ElasticTransportNetworkAttributesGetter.java b/...gent/instrumentation/elasticsearch/transport/ElasticTransportNetworkAttributesGetter.java
@@ -5,28 +5,16 @@
 
 package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport;
 
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
 import javax.annotation.Nullable;
 import org.elasticsearch.action.ActionResponse;
 
 public class ElasticTransportNetworkAttributesGetter
-    implements ServerAttributesGetter<ElasticTransportRequest, ActionResponse> {
+    implements NetworkAttributesGetter<ElasticTransportRequest, ActionResponse> {
 
   @Override
   @Nullable
-  public String getServerAddress(ElasticTransportRequest request) {
-    return null;
-  }
-
-  @Override
-  @Nullable
-  public Integer getServerPort(ElasticTransportRequest request) {
-    return null;
-  }
-
-  @Override
-  @Nullable
-  public String getServerSocketAddress(
+  public String getNetworkPeerAddress(
       ElasticTransportRequest request, @Nullable ActionResponse response) {
     if (response != null && response.remoteAddress() != null) {
       return response.remoteAddress().getAddress();
@@ -36,17 +24,7 @@ public String getServerSocketAddress(
 
   @Nullable
   @Override
-  public String getServerSocketDomain(
-      ElasticTransportRequest request, @Nullable ActionResponse response) {
-    if (response != null && response.remoteAddress() != null) {
-      return response.remoteAddress().getHost();
-    }
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public Integer getServerSocketPort(
+  public Integer getNetworkPeerPort(
       ElasticTransportRequest request, @Nullable ActionResponse response) {
     if (response != null && response.remoteAddress() != null) {
       return response.remoteAddress().getPort();