From f1feb68ccad56647bb45aae0c2ab8453ef6382dc Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Wed, 9 Aug 2023 12:14:52 +0200 Subject: [PATCH] Deprecate NetClientAttribitesExtractor --- .../http/HttpClientAttributesExtractor.java | 9 +++-- .../HttpClientAttributesExtractorBuilder.java | 13 +++++-- .../http/HttpClientAttributesGetter.java | 7 +++- .../net/NetClientAttributesExtractor.java | 4 ++ .../net/NetClientAttributesGetter.java | 4 ++ .../net/internal/InetSocketAddressUtil.java | 8 +++- .../InternalNetClientAttributesExtractor.java | 10 +++-- ...tAddressNetClientAttributesGetterTest.java | 1 + .../net/NetClientAttributesExtractorTest.java | 1 + ...entAttributesExtractorBothSemconvTest.java | 1 + ...tAttributesExtractorStableSemconvTest.java | 1 + .../apachedubbo/v2_7/OpenTelemetryFilter.java | 4 +- .../v2_7/DubboTelemetryBuilder.java | 8 ++-- ...> DubboClientNetworkAttributesGetter.java} | 6 +-- ... => CassandraNetworkAttributesGetter.java} | 18 ++------- .../cassandra/v3_0/CassandraSingletons.java | 4 +- ... => CassandraNetworkAttributesGetter.java} | 18 ++------- .../cassandra/v4_0/CassandraSingletons.java | 4 +- ... => CassandraNetworkAttributesGetter.java} | 18 ++------- .../v4_4/CassandraTelemetryBuilder.java | 4 +- ... => CouchbaseNetworkAttributesGetter.java} | 18 ++------- .../couchbase/v2_0/CouchbaseSingletons.java | 6 +-- .../Elasticsearch5TransportSingletons.java | 6 +-- .../Elasticsearch53TransportSingletons.java | 6 +-- ...rch6TransportNetworkAttributesGetter.java} | 18 ++------- .../Elasticsearch6TransportSingletons.java | 4 +- ...sticTransportNetworkAttributesGetter.java} | 6 +-- .../grpc/v1_6/GrpcTelemetryBuilder.java | 8 ++-- ...=> GrpcClientNetworkAttributesGetter.java} | 6 +-- .../instrumentation/jdbc/JdbcSingletons.java | 8 ++-- .../internal/JdbcInstrumenterFactory.java | 7 ++-- ....java => JdbcNetworkAttributesGetter.java} | 4 +- ...java => JedisNetworkAttributesGetter.java} | 4 +- .../jedis/v1_4/JedisSingletons.java | 6 +-- ...java => JedisNetworkAttributesGetter.java} | 4 +- .../jedis/v3_0/JedisSingletons.java | 6 +-- ...java => JedisNetworkAttributesGetter.java} | 16 +------- .../jedis/v4_0/JedisSingletons.java | 6 +-- ...ettuceConnectNetworkAttributesGetter.java} | 5 ++- .../lettuce/v4_0/LettuceSingletons.java | 7 ++-- ...ettuceConnectNetworkAttributesGetter.java} | 5 ++- .../lettuce/v5_0/LettuceSingletons.java | 11 +++--- ...va => LettuceNetworkAttributesGetter.java} | 18 ++------- .../lettuce/v5_1/OpenTelemetryTracing.java | 8 ++-- .../mongo/v3_1/MongoInstrumenterFactory.java | 8 ++-- ...java => MongoNetworkAttributesGetter.java} | 4 +- .../NettyClientInstrumenterFactory.java | 6 ++- .../client/NettySslNetAttributesGetter.java | 5 ++- .../OpenSearchRestInstrumenterFactory.java | 6 ++- ...SearchRestNetResponseAttributesGetter.java | 38 ++++++++++++++----- .../PulsarNetClientAttributesGetter.java | 4 +- .../v2_8/telemetry/PulsarSingletons.java | 8 ++-- .../internal/R2dbcInstrumenterBuilder.java | 5 +-- .../internal/R2dbcNetAttributesGetter.java | 4 +- .../RabbitChannelNetAttributesGetter.java | 37 ++++++++++++------ .../RabbitReceiveNetAttributesGetter.java | 37 ++++++++++++------ .../rabbitmq/RabbitSingletons.java | 10 +++-- .../redisson/RedissonInstrumenterFactory.java | 4 +- .../redisson/RedissonNetAttributesGetter.java | 17 +-------- .../VertxSqlClientNetAttributesGetter.java | 4 +- .../v4_0/sql/VertxSqlClientSingletons.java | 4 +- 61 files changed, 267 insertions(+), 270 deletions(-) rename instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/{DubboNetClientAttributesGetter.java => DubboClientNetworkAttributesGetter.java} (80%) rename instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/{CassandraNetAttributesGetter.java => CassandraNetworkAttributesGetter.java} (55%) rename instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/{CassandraNetAttributesGetter.java => CassandraNetworkAttributesGetter.java} (70%) rename instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/{CassandraNetAttributesGetter.java => CassandraNetworkAttributesGetter.java} (70%) rename instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/{CouchbaseNetAttributesGetter.java => CouchbaseNetworkAttributesGetter.java} (57%) rename instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/{Elasticsearch6TransportNetAttributesGetter.java => Elasticsearch6TransportNetworkAttributesGetter.java} (60%) rename instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/{ElasticTransportNetResponseAttributesGetter.java => ElasticTransportNetworkAttributesGetter.java} (85%) rename instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/{GrpcNetClientAttributesGetter.java => GrpcClientNetworkAttributesGetter.java} (83%) rename instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/{JdbcNetAttributesGetter.java => JdbcNetworkAttributesGetter.java} (74%) rename instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/{JedisNetAttributesGetter.java => JedisNetworkAttributesGetter.java} (67%) rename instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/{JedisNetAttributesGetter.java => JedisNetworkAttributesGetter.java} (82%) rename instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/{JedisNetAttributesGetter.java => JedisNetworkAttributesGetter.java} (59%) rename instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/{LettuceConnectNetAttributesGetter.java => LettuceConnectNetworkAttributesGetter.java} (67%) rename instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/{LettuceConnectNetAttributesGetter.java => LettuceConnectNetworkAttributesGetter.java} (66%) rename instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/{LettuceNetAttributesGetter.java => LettuceNetworkAttributesGetter.java} (53%) rename instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/{MongoNetAttributesGetter.java => MongoNetworkAttributesGetter.java} (81%) diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java index cb3f681baeab..7aa22e5a15de 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java @@ -10,7 +10,6 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.internal.InternalNetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.InternalNetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.InternalServerAttributesExtractor; @@ -52,7 +51,9 @@ public static AttributesExtractor create( @Deprecated public static AttributesExtractor create( HttpClientAttributesGetter httpAttributesGetter, - NetClientAttributesGetter netAttributesGetter) { + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + REQUEST, RESPONSE> + netAttributesGetter) { return builder(httpAttributesGetter, netAttributesGetter).build(); } @@ -76,7 +77,9 @@ public static HttpClientAttributesExtractorBuilder HttpClientAttributesExtractorBuilder builder( HttpClientAttributesGetter httpAttributesGetter, - NetClientAttributesGetter netAttributesGetter) { + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + REQUEST, RESPONSE> + netAttributesGetter) { return new HttpClientAttributesExtractorBuilder<>(httpAttributesGetter, netAttributesGetter); } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBuilder.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBuilder.java index f7d7678d66a9..701ef28f8050 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBuilder.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBuilder.java @@ -10,7 +10,6 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.internal.InternalNetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.InternalNetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.InternalServerAttributesExtractor; @@ -26,7 +25,12 @@ public final class HttpClientAttributesExtractorBuilder { final HttpClientAttributesGetter httpAttributesGetter; - final NetClientAttributesGetter netAttributesGetter; + + @SuppressWarnings("deprecation") // using the net extractor for the old->stable semconv story + final io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + REQUEST, RESPONSE> + netAttributesGetter; + final HttpAddressPortExtractor addressPortExtractor; List capturedRequestHeaders = emptyList(); List capturedResponseHeaders = emptyList(); @@ -35,7 +39,10 @@ public final class HttpClientAttributesExtractorBuilder { HttpClientAttributesExtractorBuilder( HttpClientAttributesGetter httpAttributesGetter, - NetClientAttributesGetter netAttributesGetter) { + @SuppressWarnings("deprecation") // using the net extractor for the old->stable semconv story + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + REQUEST, RESPONSE> + netAttributesGetter) { this.httpAttributesGetter = httpAttributesGetter; this.netAttributesGetter = netAttributesGetter; addressPortExtractor = new HttpAddressPortExtractor<>(httpAttributesGetter); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java index 5948220d1755..c012a1123518 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java @@ -5,7 +5,6 @@ package io.opentelemetry.instrumentation.api.instrumenter.http; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import javax.annotation.Nullable; @@ -17,9 +16,13 @@ * library/framework. It will be used by the {@link HttpClientAttributesExtractor} to obtain the * various HTTP client attributes in a type-generic way. */ +@SuppressWarnings( + "deprecation") // implementing the NetClientAttributesGetter for the old->stable semconv story; +// will be removed in 2.0 public interface HttpClientAttributesGetter extends HttpCommonAttributesGetter, - NetClientAttributesGetter, + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + REQUEST, RESPONSE>, NetworkAttributesGetter, ServerAttributesGetter { diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractor.java index 5eb402986d59..b659f1d5c98e 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractor.java @@ -23,7 +23,11 @@ * *

This class delegates to a type-specific {@link NetClientAttributesGetter} for individual * attribute extraction from request/response objects. + * + * @deprecated Make sure that your instrumentation uses the extractors from the {@code ...network} + * package instead. This class will be removed in the 2.0 release. */ +@Deprecated public final class NetClientAttributesExtractor implements AttributesExtractor { 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 aa3ffbf8520b..e6384b158ed6 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java @@ -18,7 +18,11 @@ *

Instrumentation authors will create implementations of this interface for their specific * library/framework. It will be used by the NetClientAttributesExtractor to obtain the various * network attributes in a type-generic way. + * + * @deprecated Make sure that your instrumentation implements the getters from the {@code + * ...network} package instead. This class will be removed in the 2.0 release. */ +@Deprecated public interface NetClientAttributesGetter extends NetworkAttributesGetter, ServerAttributesGetter { diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InetSocketAddressUtil.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InetSocketAddressUtil.java index 575eed42ea93..f2ff06583d0c 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InetSocketAddressUtil.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InetSocketAddressUtil.java @@ -5,6 +5,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.net.internal; +import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -42,7 +43,12 @@ public static String getNetworkType( return null; } InetAddress remoteAddress = address.getAddress(); - return remoteAddress instanceof Inet6Address ? "ipv6" : "ipv4"; + if (remoteAddress instanceof Inet4Address) { + return "ipv6"; + } else if (remoteAddress instanceof Inet6Address) { + return "ipv6"; + } + return null; } @Nullable diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java index ee2d6fc462c7..d4cbd23a0968 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java @@ -8,7 +8,6 @@ import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.AddressAndPort; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.FallbackAddressPortExtractor; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; @@ -18,14 +17,19 @@ * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ +@SuppressWarnings("deprecation") // this class will be removed in the 2.0 version public final class InternalNetClientAttributesExtractor { - private final NetClientAttributesGetter getter; + private final io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + REQUEST, RESPONSE> + getter; private final FallbackAddressPortExtractor fallbackAddressPortExtractor; private final boolean emitOldHttpAttributes; public InternalNetClientAttributesExtractor( - NetClientAttributesGetter getter, + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + REQUEST, RESPONSE> + getter, FallbackAddressPortExtractor fallbackAddressPortExtractor, boolean emitOldHttpAttributes) { this.getter = getter; 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 25c804571c73..67d5f3e9face 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 @@ -19,6 +19,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; +@SuppressWarnings("deprecation") // testing deprecated class @ExtendWith(MockitoExtension.class) class InetSocketAddressNetClientAttributesGetterTest { 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 d05d7bf22228..98e6f84f24f0 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 @@ -21,6 +21,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +@SuppressWarnings("deprecation") // testing deprecated class class NetClientAttributesExtractorTest { static class TestNetClientAttributesGetter 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 1993da0c92d6..e1bc5518649b 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 @@ -20,6 +20,7 @@ import javax.annotation.Nullable; import org.junit.jupiter.api.Test; +@SuppressWarnings("deprecation") // testing deprecated class class NetClientAttributesExtractorBothSemconvTest { static class TestNetClientAttributesGetter 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 c3637ecb24a1..781a411e6caf 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 @@ -19,6 +19,7 @@ import javax.annotation.Nullable; import org.junit.jupiter.api.Test; +@SuppressWarnings("deprecation") // testing deprecated class class NetClientAttributesExtractorStableSemconvTest { static class TestNetClientAttributesGetter diff --git a/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java b/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java index a3010a6cfc8d..fa37cc29fa0c 100644 --- a/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java +++ b/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.apachedubbo.v2_7.DubboTelemetry; -import io.opentelemetry.instrumentation.apachedubbo.v2_7.internal.DubboNetClientAttributesGetter; +import io.opentelemetry.instrumentation.apachedubbo.v2_7.internal.DubboClientNetworkAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import org.apache.dubbo.common.extension.Activate; @@ -26,7 +26,7 @@ public OpenTelemetryFilter() { DubboTelemetry.builder(GlobalOpenTelemetry.get()) .addAttributesExtractor( PeerServiceAttributesExtractor.create( - new DubboNetClientAttributesGetter(), + new DubboClientNetworkAttributesGetter(), CommonConfig.get().getPeerServiceMapping())) .build() .newFilter(); diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java index f9d99301aba1..eef737614252 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java @@ -7,12 +7,11 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.apachedubbo.v2_7.internal.DubboNetClientAttributesGetter; +import io.opentelemetry.instrumentation.apachedubbo.v2_7.internal.DubboClientNetworkAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; 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.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.ClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcClientAttributesExtractor; @@ -62,7 +61,8 @@ public DubboTelemetry build() { DubboRpcAttributesGetter rpcAttributesGetter = DubboRpcAttributesGetter.INSTANCE; SpanNameExtractor spanNameExtractor = RpcSpanNameExtractor.create(rpcAttributesGetter); - DubboNetClientAttributesGetter netClientAttributesGetter = new DubboNetClientAttributesGetter(); + DubboClientNetworkAttributesGetter netClientAttributesGetter = + new DubboClientNetworkAttributesGetter(); DubboNetworkServerAttributesGetter netServerAttributesGetter = new DubboNetworkServerAttributesGetter(); @@ -79,7 +79,7 @@ public DubboTelemetry build() { Instrumenter.builder( openTelemetry, INSTRUMENTATION_NAME, spanNameExtractor) .addAttributesExtractor(RpcClientAttributesExtractor.create(rpcAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netClientAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netClientAttributesGetter)) .addAttributesExtractors(attributesExtractors); if (peerService != null) { diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboClientNetworkAttributesGetter.java similarity index 80% rename from instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboClientNetworkAttributesGetter.java index a4d9470f728c..659e4ca27166 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboClientNetworkAttributesGetter.java @@ -6,7 +6,7 @@ package io.opentelemetry.instrumentation.apachedubbo.v2_7.internal; import io.opentelemetry.instrumentation.apachedubbo.v2_7.DubboRequest; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import javax.annotation.Nullable; import org.apache.dubbo.rpc.Result; @@ -15,8 +15,8 @@ * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -public final class DubboNetClientAttributesGetter - implements NetClientAttributesGetter { +public final class DubboClientNetworkAttributesGetter + implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetworkAttributesGetter.java similarity index 55% rename from instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java rename to instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetworkAttributesGetter.java index bc5ace7cb0a5..0a8207d6963e 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetworkAttributesGetter.java @@ -6,24 +6,12 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; import com.datastax.driver.core.ExecutionInfo; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import javax.annotation.Nullable; -final class CassandraNetAttributesGetter - implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(CassandraRequest request) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(CassandraRequest request) { - return null; - } +final class CassandraNetworkAttributesGetter + implements ServerAttributesGetter { @Override @Nullable diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java index 9b61b45e186a..c4114412e730 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/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.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; @@ -37,7 +37,7 @@ public final class CassandraSingletons { CommonConfig.get().isStatementSanitizationEnabled()) .build()) .addAttributesExtractor( - NetClientAttributesExtractor.create(new CassandraNetAttributesGetter())) + ServerAttributesExtractor.create(new CassandraNetworkAttributesGetter())) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetworkAttributesGetter.java similarity index 70% rename from instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java rename to instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetworkAttributesGetter.java index b68a52ea7a51..2bf26ec44bcf 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetworkAttributesGetter.java @@ -7,25 +7,13 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import java.net.SocketAddress; import javax.annotation.Nullable; -final class CassandraNetAttributesGetter - implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(CassandraRequest request) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(CassandraRequest request) { - return null; - } +final class CassandraNetworkAttributesGetter + implements ServerAttributesGetter { @Override @Nullable diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java index b84df6935485..c502391a5d16 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/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.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; @@ -36,7 +36,7 @@ public final class CassandraSingletons { CommonConfig.get().isStatementSanitizationEnabled()) .build()) .addAttributesExtractor( - NetClientAttributesExtractor.create(new CassandraNetAttributesGetter())) + ServerAttributesExtractor.create(new CassandraNetworkAttributesGetter())) .addAttributesExtractor(new CassandraAttributesExtractor()) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetAttributesGetter.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetworkAttributesGetter.java similarity index 70% rename from instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetAttributesGetter.java rename to instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetworkAttributesGetter.java index d1e26aa71489..ca7e93a2b804 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetworkAttributesGetter.java @@ -7,25 +7,13 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import java.net.SocketAddress; import javax.annotation.Nullable; -final class CassandraNetAttributesGetter - implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(CassandraRequest request) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(CassandraRequest request) { - return null; - } +final class CassandraNetworkAttributesGetter + implements ServerAttributesGetter { @Override @Nullable diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java index bf8657a09550..6bbd5b9a06da 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/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.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; /** A builder of {@link CassandraTelemetry}. */ @@ -59,7 +59,7 @@ protected Instrumenter createInstrumenter( .setStatementSanitizationEnabled(statementSanitizationEnabled) .build()) .addAttributesExtractor( - NetClientAttributesExtractor.create(new CassandraNetAttributesGetter())) + ServerAttributesExtractor.create(new CassandraNetworkAttributesGetter())) .addAttributesExtractor(new CassandraAttributesExtractor()) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetworkAttributesGetter.java similarity index 57% rename from instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java rename to instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetworkAttributesGetter.java index b0557b9ccde2..35b19adadf24 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetworkAttributesGetter.java @@ -5,25 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import java.net.SocketAddress; import javax.annotation.Nullable; -public class CouchbaseNetAttributesGetter - implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(CouchbaseRequestInfo couchbaseRequest) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(CouchbaseRequestInfo couchbaseRequest) { - return null; - } +public class CouchbaseNetworkAttributesGetter + implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSingletons.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSingletons.java index 15b9ebddf3ad..6050f79d0a9e 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSingletons.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSingletons.java @@ -12,8 +12,8 @@ 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.NetClientAttributesExtractor; 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.javaagent.bootstrap.internal.InstrumentationConfig; @@ -27,13 +27,13 @@ public final class CouchbaseSingletons { CouchbaseAttributesGetter couchbaseAttributesGetter = new CouchbaseAttributesGetter(); SpanNameExtractor spanNameExtractor = new CouchbaseSpanNameExtractor(DbClientSpanNameExtractor.create(couchbaseAttributesGetter)); - CouchbaseNetAttributesGetter netAttributesGetter = new CouchbaseNetAttributesGetter(); + CouchbaseNetworkAttributesGetter netAttributesGetter = new CouchbaseNetworkAttributesGetter(); InstrumenterBuilder builder = Instrumenter.builder( GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanNameExtractor) .addAttributesExtractor(DbClientAttributesExtractor.create(couchbaseAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( netAttributesGetter, CommonConfig.get().getPeerServiceMapping())) diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java index 7980678389ef..60308996e2aa 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_0; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; -import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportNetResponseAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; +import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportNetworkAttributesGetter; import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest; import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportInstrumenterFactory; import org.elasticsearch.action.ActionResponse; @@ -18,7 +18,7 @@ public final class Elasticsearch5TransportSingletons { ElasticsearchTransportInstrumenterFactory.create( "io.opentelemetry.elasticsearch-transport-5.0", new Elasticsearch5TransportExperimentalAttributesExtractor(), - NetClientAttributesExtractor.create(new ElasticTransportNetResponseAttributesGetter())); + ServerAttributesExtractor.create(new ElasticTransportNetworkAttributesGetter())); public static Instrumenter instrumenter() { return INSTRUMENTER; diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportSingletons.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportSingletons.java index 215ef95e029f..f29a445de1a9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportSingletons.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportSingletons.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_3; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; -import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportNetResponseAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; +import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportNetworkAttributesGetter; import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest; import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportInstrumenterFactory; import org.elasticsearch.action.ActionResponse; @@ -18,7 +18,7 @@ public final class Elasticsearch53TransportSingletons { ElasticsearchTransportInstrumenterFactory.create( "io.opentelemetry.elasticsearch-transport-5.3", new Elasticsearch53TransportExperimentalAttributesExtractor(), - NetClientAttributesExtractor.create(new ElasticTransportNetResponseAttributesGetter())); + ServerAttributesExtractor.create(new ElasticTransportNetworkAttributesGetter())); public static Instrumenter instrumenter() { return INSTRUMENTER; diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetworkAttributesGetter.java similarity index 60% rename from instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java rename to instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetworkAttributesGetter.java index da846f89803e..51351b57bf90 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetworkAttributesGetter.java @@ -5,26 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v6_0; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest; import java.net.InetSocketAddress; import javax.annotation.Nullable; import org.elasticsearch.action.ActionResponse; -public class Elasticsearch6TransportNetAttributesGetter - implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(ElasticTransportRequest request) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(ElasticTransportRequest request) { - return null; - } +public class Elasticsearch6TransportNetworkAttributesGetter + implements ServerAttributesGetter { @Override @Nullable diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportSingletons.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportSingletons.java index 5e72056bb4f8..e8123e7207bb 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportSingletons.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/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.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; 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(), - NetClientAttributesExtractor.create(new Elasticsearch6TransportNetAttributesGetter())); + ServerAttributesExtractor.create(new Elasticsearch6TransportNetworkAttributesGetter())); public static Instrumenter instrumenter() { return INSTRUMENTER; diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetworkAttributesGetter.java similarity index 85% rename from instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java rename to instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetworkAttributesGetter.java index 05a9c7b2bfe6..939bba50e482 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetworkAttributesGetter.java @@ -5,12 +5,12 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import javax.annotation.Nullable; import org.elasticsearch.action.ActionResponse; -public class ElasticTransportNetResponseAttributesGetter - implements NetClientAttributesGetter { +public class ElasticTransportNetworkAttributesGetter + implements ServerAttributesGetter { @Override @Nullable diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java index 309bb4fd48bc..a0bc0fb6779d 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java @@ -13,14 +13,13 @@ import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.ClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcClientMetrics; import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcServerAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcServerMetrics; -import io.opentelemetry.instrumentation.grpc.v1_6.internal.GrpcNetClientAttributesGetter; +import io.opentelemetry.instrumentation.grpc.v1_6.internal.GrpcClientNetworkAttributesGetter; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.ArrayList; import java.util.Collections; @@ -175,14 +174,15 @@ public GrpcTelemetry build() { .setSpanStatusExtractor(new GrpcSpanStatusExtractor()) .addAttributesExtractors(additionalExtractors)); - GrpcNetClientAttributesGetter netClientAttributesGetter = new GrpcNetClientAttributesGetter(); + GrpcClientNetworkAttributesGetter netClientAttributesGetter = + new GrpcClientNetworkAttributesGetter(); GrpcNetworkServerAttributesGetter netServerAttributesGetter = new GrpcNetworkServerAttributesGetter(); GrpcRpcAttributesGetter rpcAttributesGetter = GrpcRpcAttributesGetter.INSTANCE; clientInstrumenterBuilder .addAttributesExtractor(RpcClientAttributesExtractor.create(rpcAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netClientAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netClientAttributesGetter)) .addAttributesExtractors(additionalClientExtractors) .addAttributesExtractor( new GrpcAttributesExtractor( diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcClientNetworkAttributesGetter.java similarity index 83% rename from instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java rename to instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcClientNetworkAttributesGetter.java index a7a72cc8db35..c2d342da7946 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcClientNetworkAttributesGetter.java @@ -6,7 +6,7 @@ package io.opentelemetry.instrumentation.grpc.v1_6.internal; import io.grpc.Status; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import io.opentelemetry.instrumentation.grpc.v1_6.GrpcRequest; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -16,8 +16,8 @@ * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -public final class GrpcNetClientAttributesGetter - implements NetClientAttributesGetter { +public final class GrpcClientNetworkAttributesGetter + implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java index afb3132327c5..282f0249a7d1 100644 --- a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java +++ b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java @@ -12,11 +12,11 @@ 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.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.instrumentation.jdbc.internal.DbRequest; import io.opentelemetry.instrumentation.jdbc.internal.JdbcAttributesGetter; -import io.opentelemetry.instrumentation.jdbc.internal.JdbcNetAttributesGetter; +import io.opentelemetry.instrumentation.jdbc.internal.JdbcNetworkAttributesGetter; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; import io.opentelemetry.javaagent.bootstrap.jdbc.DbInfo; @@ -31,7 +31,7 @@ public final class JdbcSingletons { static { JdbcAttributesGetter dbAttributesGetter = new JdbcAttributesGetter(); - JdbcNetAttributesGetter netAttributesGetter = new JdbcNetAttributesGetter(); + JdbcNetworkAttributesGetter netAttributesGetter = new JdbcNetworkAttributesGetter(); STATEMENT_INSTRUMENTER = Instrumenter.builder( @@ -46,7 +46,7 @@ public final class JdbcSingletons { "otel.instrumentation.jdbc.statement-sanitizer.enabled", CommonConfig.get().isStatementSanitizationEnabled())) .build()) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( netAttributesGetter, CommonConfig.get().getPeerServiceMapping())) diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.java index 6399476743fd..2bb92dbf1030 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.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.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; /** @@ -21,7 +21,8 @@ public final class JdbcInstrumenterFactory { public static final String INSTRUMENTATION_NAME = "io.opentelemetry.jdbc"; private static final JdbcAttributesGetter dbAttributesGetter = new JdbcAttributesGetter(); - private static final JdbcNetAttributesGetter netAttributesGetter = new JdbcNetAttributesGetter(); + private static final JdbcNetworkAttributesGetter netAttributesGetter = + new JdbcNetworkAttributesGetter(); public static Instrumenter createStatementInstrumenter() { return createStatementInstrumenter(GlobalOpenTelemetry.get()); @@ -39,7 +40,7 @@ public static Instrumenter createStatementInstrumenter( ConfigPropertiesUtil.getBoolean( "otel.instrumentation.common.db-statement-sanitizer.enabled", true)) .build()) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetAttributesGetter.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetworkAttributesGetter.java similarity index 74% rename from instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetAttributesGetter.java rename to instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetworkAttributesGetter.java index 168e4d7cbd04..bd4faba06132 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetAttributesGetter.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetworkAttributesGetter.java @@ -5,14 +5,14 @@ package io.opentelemetry.instrumentation.jdbc.internal; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import javax.annotation.Nullable; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -public final class JdbcNetAttributesGetter implements NetClientAttributesGetter { +public final class JdbcNetworkAttributesGetter implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetAttributesGetter.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetworkAttributesGetter.java similarity index 67% rename from instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetAttributesGetter.java rename to instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetworkAttributesGetter.java index acac62885b27..130bd8b8cbd0 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetAttributesGetter.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetworkAttributesGetter.java @@ -5,9 +5,9 @@ package io.opentelemetry.javaagent.instrumentation.jedis.v1_4; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; -final class JedisNetAttributesGetter implements NetClientAttributesGetter { +final class JedisNetworkAttributesGetter implements ServerAttributesGetter { @Override public String getServerAddress(JedisRequest request) { diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java index 4ed9529b7b3a..02dbf4aecf32 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java @@ -10,8 +10,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; public final class JedisSingletons { @@ -21,7 +21,7 @@ public final class JedisSingletons { static { JedisDbAttributesGetter dbAttributesGetter = new JedisDbAttributesGetter(); - JedisNetAttributesGetter netAttributesGetter = new JedisNetAttributesGetter(); + JedisNetworkAttributesGetter netAttributesGetter = new JedisNetworkAttributesGetter(); INSTRUMENTER = Instrumenter.builder( @@ -29,7 +29,7 @@ public final class JedisSingletons { INSTRUMENTATION_NAME, DbClientSpanNameExtractor.create(dbAttributesGetter)) .addAttributesExtractor(DbClientAttributesExtractor.create(dbAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( netAttributesGetter, CommonConfig.get().getPeerServiceMapping())) diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetworkAttributesGetter.java similarity index 82% rename from instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java rename to instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetworkAttributesGetter.java index 53bb9df01aaf..6fdf8ae2660c 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetworkAttributesGetter.java @@ -5,12 +5,12 @@ package io.opentelemetry.javaagent.instrumentation.jedis.v3_0; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import java.net.Socket; import javax.annotation.Nullable; -final class JedisNetAttributesGetter implements NetClientAttributesGetter { +final class JedisNetworkAttributesGetter implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java index 7e4d8483b000..079395c9f5a3 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java @@ -10,8 +10,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; public final class JedisSingletons { @@ -21,7 +21,7 @@ public final class JedisSingletons { static { JedisDbAttributesGetter dbAttributesGetter = new JedisDbAttributesGetter(); - JedisNetAttributesGetter netAttributesGetter = new JedisNetAttributesGetter(); + JedisNetworkAttributesGetter netAttributesGetter = new JedisNetworkAttributesGetter(); INSTRUMENTER = Instrumenter.builder( @@ -29,7 +29,7 @@ public final class JedisSingletons { INSTRUMENTATION_NAME, DbClientSpanNameExtractor.create(dbAttributesGetter)) .addAttributesExtractor(DbClientAttributesExtractor.create(dbAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( netAttributesGetter, CommonConfig.get().getPeerServiceMapping())) diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetworkAttributesGetter.java similarity index 59% rename from instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java rename to instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetworkAttributesGetter.java index 8e5c4ffa72f1..b72554bdaafa 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetworkAttributesGetter.java @@ -5,24 +5,12 @@ package io.opentelemetry.javaagent.instrumentation.jedis.v4_0; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import java.net.SocketAddress; import javax.annotation.Nullable; -final class JedisNetAttributesGetter implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(JedisRequest jedisRequest) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(JedisRequest jedisRequest) { - return null; - } +final class JedisNetworkAttributesGetter implements ServerAttributesGetter { @Override @Nullable diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisSingletons.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisSingletons.java index 0e9c43c5f1ea..fcd59f8716d8 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisSingletons.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisSingletons.java @@ -10,8 +10,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; public final class JedisSingletons { @@ -21,7 +21,7 @@ public final class JedisSingletons { static { JedisDbAttributesGetter dbAttributesGetter = new JedisDbAttributesGetter(); - JedisNetAttributesGetter netAttributesGetter = new JedisNetAttributesGetter(); + JedisNetworkAttributesGetter netAttributesGetter = new JedisNetworkAttributesGetter(); INSTRUMENTER = Instrumenter.builder( @@ -29,7 +29,7 @@ public final class JedisSingletons { INSTRUMENTATION_NAME, DbClientSpanNameExtractor.create(dbAttributesGetter)) .addAttributesExtractor(DbClientAttributesExtractor.create(dbAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( netAttributesGetter, CommonConfig.get().getPeerServiceMapping())) diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetworkAttributesGetter.java similarity index 67% rename from instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java rename to instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetworkAttributesGetter.java index 9ff6a9526f4f..5aa7b6f23f95 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetworkAttributesGetter.java @@ -6,9 +6,10 @@ package io.opentelemetry.javaagent.instrumentation.lettuce.v4_0; import com.lambdaworks.redis.RedisURI; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; -final class LettuceConnectNetAttributesGetter implements NetClientAttributesGetter { +final class LettuceConnectNetworkAttributesGetter + implements ServerAttributesGetter { @Override public String getServerAddress(RedisURI redisUri) { diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java index 3e88ae511399..a8db8f6fd74c 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java @@ -14,8 +14,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; public final class LettuceSingletons { @@ -38,12 +38,13 @@ public final class LettuceSingletons { .addAttributesExtractor(DbClientAttributesExtractor.create(dbAttributesGetter)) .buildInstrumenter(SpanKindExtractor.alwaysClient()); - LettuceConnectNetAttributesGetter netAttributesGetter = new LettuceConnectNetAttributesGetter(); + LettuceConnectNetworkAttributesGetter netAttributesGetter = + new LettuceConnectNetworkAttributesGetter(); CONNECT_INSTRUMENTER = Instrumenter.builder( GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, redisUri -> "CONNECT") - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( netAttributesGetter, CommonConfig.get().getPeerServiceMapping())) diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetworkAttributesGetter.java similarity index 66% rename from instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java rename to instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetworkAttributesGetter.java index 872d813e6287..e6ae6c4cb0c5 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetworkAttributesGetter.java @@ -6,9 +6,10 @@ package io.opentelemetry.javaagent.instrumentation.lettuce.v5_0; import io.lettuce.core.RedisURI; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; -final class LettuceConnectNetAttributesGetter implements NetClientAttributesGetter { +final class LettuceConnectNetworkAttributesGetter + implements ServerAttributesGetter { @Override public String getServerAddress(RedisURI redisUri) { diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java index c0727677f34b..e72819b512fb 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java @@ -14,8 +14,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; public final class LettuceSingletons { @@ -38,16 +38,17 @@ public final class LettuceSingletons { .addAttributesExtractor(DbClientAttributesExtractor.create(dbAttributesGetter)) .buildInstrumenter(SpanKindExtractor.alwaysClient()); - LettuceConnectNetAttributesGetter connectNetAttributesGetter = - new LettuceConnectNetAttributesGetter(); + LettuceConnectNetworkAttributesGetter connectNetworkAttributesGetter = + new LettuceConnectNetworkAttributesGetter(); CONNECT_INSTRUMENTER = Instrumenter.builder( GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, redisUri -> "CONNECT") - .addAttributesExtractor(NetClientAttributesExtractor.create(connectNetAttributesGetter)) + .addAttributesExtractor( + ServerAttributesExtractor.create(connectNetworkAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( - connectNetAttributesGetter, CommonConfig.get().getPeerServiceMapping())) + connectNetworkAttributesGetter, CommonConfig.get().getPeerServiceMapping())) .addAttributesExtractor(new LettuceConnectAttributesExtractor()) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetworkAttributesGetter.java similarity index 53% rename from instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java rename to instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetworkAttributesGetter.java index b779ac08fe4b..9c7d823466c0 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetworkAttributesGetter.java @@ -5,25 +5,13 @@ package io.opentelemetry.instrumentation.lettuce.v5_1; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import io.opentelemetry.instrumentation.lettuce.v5_1.OpenTelemetryTracing.OpenTelemetryEndpoint; import java.net.InetSocketAddress; import javax.annotation.Nullable; -final class LettuceNetAttributesGetter - implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(OpenTelemetryEndpoint openTelemetryEndpoint) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(OpenTelemetryEndpoint openTelemetryEndpoint) { - return null; - } +final class LettuceNetworkAttributesGetter + implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java index b504bd51727e..365fdf8b940c 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java @@ -26,7 +26,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.db.RedisCommandSanitizer; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DbSystemValues; import java.net.InetSocketAddress; @@ -38,8 +38,8 @@ final class OpenTelemetryTracing implements Tracing { - private static final AttributesExtractor netAttributesExtractor = - NetClientAttributesExtractor.create(new LettuceNetAttributesGetter()); + private static final AttributesExtractor serverAttributesExtractor = + ServerAttributesExtractor.create(new LettuceNetworkAttributesGetter()); private final TracerProvider tracerProvider; OpenTelemetryTracing(io.opentelemetry.api.trace.Tracer tracer, RedisCommandSanitizer sanitizer) { @@ -204,7 +204,7 @@ public synchronized Tracer.Span remoteEndpoint(Endpoint endpoint) { private void fillEndpoint(OpenTelemetryEndpoint endpoint) { AttributesBuilder attributesBuilder = Attributes.builder(); Context currentContext = span == null ? context : context.with(span); - netAttributesExtractor.onEnd(attributesBuilder, currentContext, endpoint, null, null); + serverAttributesExtractor.onEnd(attributesBuilder, currentContext, endpoint, null, null); if (span != null) { span.setAllAttributes(attributesBuilder.build()); } else { diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoInstrumenterFactory.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoInstrumenterFactory.java index eb5a0d919ad1..a420992e0bf8 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoInstrumenterFactory.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoInstrumenterFactory.java @@ -7,19 +7,16 @@ import com.mongodb.event.CommandStartedEvent; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; class MongoInstrumenterFactory { private static final MongoAttributesExtractor attributesExtractor = new MongoAttributesExtractor(); - private static final AttributesExtractor netAttributesExtractor = - NetClientAttributesExtractor.create(new MongoNetAttributesGetter()); static Instrumenter createInstrumenter( OpenTelemetry openTelemetry, @@ -34,7 +31,8 @@ static Instrumenter createInstrumenter( return Instrumenter.builder( openTelemetry, "io.opentelemetry.mongo-3.1", spanNameExtractor) .addAttributesExtractor(DbClientAttributesExtractor.create(dbAttributesGetter)) - .addAttributesExtractor(netAttributesExtractor) + .addAttributesExtractor( + ServerAttributesExtractor.create(new MongoNetworkAttributesGetter())) .addAttributesExtractor(attributesExtractor) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetAttributesGetter.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetworkAttributesGetter.java similarity index 81% rename from instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetAttributesGetter.java rename to instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetworkAttributesGetter.java index 65e6cab8751a..7c8aee565e2f 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetAttributesGetter.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetworkAttributesGetter.java @@ -6,10 +6,10 @@ package io.opentelemetry.instrumentation.mongo.v3_1; import com.mongodb.event.CommandStartedEvent; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import javax.annotation.Nullable; -class MongoNetAttributesGetter implements NetClientAttributesGetter { +class MongoNetworkAttributesGetter implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java index 1420d63c0d33..f219c99bb665 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java @@ -18,7 +18,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientMetrics; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; import io.opentelemetry.instrumentation.netty.common.internal.NettyConnectionRequest; import io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel; @@ -108,6 +107,7 @@ public NettyConnectionInstrumenter createConnectionInstrumenter() { : new NettyErrorOnlyConnectionInstrumenter(instrumenter); } + @SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesExtractor for now public NettySslInstrumenter createSslInstrumenter() { if (sslTelemetryState == NettyConnectionInstrumentationFlag.DISABLED) { return NoopSslInstrumenter.INSTANCE; @@ -119,7 +119,9 @@ public NettySslInstrumenter createSslInstrumenter() { Instrumenter instrumenter = Instrumenter.builder( openTelemetry, instrumentationName, NettySslRequest::spanName) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor( + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor + .create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create(netAttributesGetter, peerServiceMapping)) .buildInstrumenter( 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 97fdca556bde..56cd6d65d580 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 @@ -9,13 +9,14 @@ import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_UDP; import io.netty.channel.socket.DatagramChannel; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.netty.v4.common.internal.ChannelUtil; import java.net.InetSocketAddress; import javax.annotation.Nullable; +@SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesGetter for now final class NettySslNetAttributesGetter - implements NetClientAttributesGetter { + implements io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + NettySslRequest, Void> { @Override public String getTransport(NettySslRequest request, @Nullable Void unused) { diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestInstrumenterFactory.java b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestInstrumenterFactory.java index 2d05930701b0..bbb8d0c499b2 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestInstrumenterFactory.java +++ b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestInstrumenterFactory.java @@ -10,13 +10,13 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import org.opensearch.client.Response; public final class OpenSearchRestInstrumenterFactory { + @SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesExtractor for now public static Instrumenter create(String instrumentationName) { OpenSearchRestAttributesGetter dbClientAttributesGetter = new OpenSearchRestAttributesGetter(); OpenSearchRestNetResponseAttributesGetter netAttributesGetter = @@ -27,7 +27,9 @@ public static Instrumenter create(String instru instrumentationName, DbClientSpanNameExtractor.create(dbClientAttributesGetter)) .addAttributesExtractor(DbClientAttributesExtractor.create(dbClientAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor( + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor + .create(netAttributesGetter)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( netAttributesGetter, CommonConfig.get().getPeerServiceMapping())) 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 a7539c1afb45..66af50f54d02 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 @@ -5,33 +5,51 @@ package io.opentelemetry.javaagent.instrumentation.opensearch.rest; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import java.net.Inet4Address; import java.net.Inet6Address; +import java.net.InetAddress; import javax.annotation.Nullable; import org.opensearch.client.Response; +@SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesGetter for now final class OpenSearchRestNetResponseAttributesGetter - implements NetClientAttributesGetter { + implements io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + OpenSearchRestRequest, Response> { + @Nullable @Override + public String getSockFamily( + OpenSearchRestRequest elasticsearchRestRequest, @Nullable Response response) { + if (response != null && response.getHost().getAddress() instanceof Inet6Address) { + return "inet6"; + } + return null; + } + @Nullable - public String getServerAddress(OpenSearchRestRequest request) { + @Override + public String getNetworkType(OpenSearchRestRequest request, @Nullable Response response) { + if (response == null) { + return null; + } + InetAddress address = response.getHost().getAddress(); + if (address instanceof Inet4Address) { + return "ipv4"; + } else if (address instanceof Inet6Address) { + return "ipv6"; + } return null; } @Override @Nullable - public Integer getServerPort(OpenSearchRestRequest request) { + public String getServerAddress(OpenSearchRestRequest request) { return null; } - @Nullable @Override - public String getSockFamily( - OpenSearchRestRequest elasticsearchRestRequest, @Nullable Response response) { - if (response != null && response.getHost().getAddress() instanceof Inet6Address) { - return "inet6"; - } + @Nullable + public Integer getServerPort(OpenSearchRestRequest request) { return null; } diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java b/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java index 3ad7a927b1a7..db40b42b1e69 100644 --- a/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java +++ b/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java @@ -5,11 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.pulsar.v2_8.telemetry; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import javax.annotation.Nullable; public final class PulsarNetClientAttributesGetter - implements NetClientAttributesGetter { + implements ServerAttributesGetter { @Nullable @Override diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java b/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java index 25a3499557c0..5fdef73e782c 100644 --- a/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java +++ b/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java @@ -18,7 +18,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil; import io.opentelemetry.instrumentation.api.internal.Timer; import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig; @@ -71,7 +71,7 @@ private static Instrumenter createConsumerReceiveInstrument .addAttributesExtractor( createMessagingAttributesExtractor(getter, MessageOperation.RECEIVE)) .addAttributesExtractor( - NetClientAttributesExtractor.create(new PulsarNetClientAttributesGetter())) + ServerAttributesExtractor.create(new PulsarNetClientAttributesGetter())) .buildConsumerInstrumenter(MessageTextMapGetter.INSTANCE); } @@ -86,7 +86,7 @@ private static Instrumenter createConsumerBatchReceive .addAttributesExtractor( createMessagingAttributesExtractor(getter, MessageOperation.RECEIVE)) .addAttributesExtractor( - NetClientAttributesExtractor.create(new PulsarNetClientAttributesGetter())) + ServerAttributesExtractor.create(new PulsarNetClientAttributesGetter())) .setEnabled(ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()) .addSpanLinksExtractor( new PulsarBatchRequestSpanLinksExtractor( @@ -119,7 +119,7 @@ private static Instrumenter createProducerInstrumenter() { .addAttributesExtractor( createMessagingAttributesExtractor(getter, MessageOperation.PUBLISH)) .addAttributesExtractor( - NetClientAttributesExtractor.create(new PulsarNetClientAttributesGetter())); + ServerAttributesExtractor.create(new PulsarNetClientAttributesGetter())); if (InstrumentationConfig.get() .getBoolean("otel.instrumentation.pulsar.experimental-span-attributes", false)) { diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java index 77de2bca2d46..ab809b16ba41 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.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.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; import java.util.ArrayList; import java.util.List; @@ -50,8 +50,7 @@ public Instrumenter build(boolean statementSanitizationEnable SqlClientAttributesExtractor.builder(R2dbcSqlAttributesGetter.INSTANCE) .setStatementSanitizationEnabled(statementSanitizationEnabled) .build()) - .addAttributesExtractor( - NetClientAttributesExtractor.create(R2dbcNetAttributesGetter.INSTANCE)) + .addAttributesExtractor(ServerAttributesExtractor.create(R2dbcNetAttributesGetter.INSTANCE)) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } } diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java index 09425ca69792..08f137003ecd 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java @@ -5,14 +5,14 @@ package io.opentelemetry.instrumentation.r2dbc.v1_0.internal; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import javax.annotation.Nullable; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -public enum R2dbcNetAttributesGetter implements NetClientAttributesGetter { +public enum R2dbcNetAttributesGetter implements ServerAttributesGetter { INSTANCE; @Nullable 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 6c099279fb22..9cd04a538eb4 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 @@ -5,12 +5,36 @@ package io.opentelemetry.javaagent.instrumentation.rabbitmq; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import java.net.Inet4Address; import java.net.Inet6Address; +import java.net.InetAddress; import javax.annotation.Nullable; +@SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesGetter for now public class RabbitChannelNetAttributesGetter - implements NetClientAttributesGetter { + implements io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + ChannelAndMethod, Void> { + + @Nullable + @Override + public String getSockFamily(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + if (channelAndMethod.getChannel().getConnection().getAddress() instanceof Inet6Address) { + return "inet6"; + } + return null; + } + + @Nullable + @Override + public String getNetworkType(ChannelAndMethod channelAndMethod, @Nullable Void unused) { + InetAddress address = channelAndMethod.getChannel().getConnection().getAddress(); + if (address instanceof Inet4Address) { + return "ipv6"; + } else if (address instanceof Inet6Address) { + return "ipv6"; + } + return null; + } @Nullable @Override @@ -34,13 +58,4 @@ public String getServerSocketAddress(ChannelAndMethod channelAndMethod, @Nullabl public Integer getServerSocketPort(ChannelAndMethod channelAndMethod, @Nullable Void unused) { return channelAndMethod.getChannel().getConnection().getPort(); } - - @Nullable - @Override - public String getSockFamily(ChannelAndMethod channelAndMethod, @Nullable Void unused) { - if (channelAndMethod.getChannel().getConnection().getAddress() instanceof Inet6Address) { - return "inet6"; - } - return null; - } } 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 1b7adbf3e529..28f10b3fd249 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 @@ -6,12 +6,36 @@ package io.opentelemetry.javaagent.instrumentation.rabbitmq; import com.rabbitmq.client.GetResponse; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import java.net.Inet4Address; import java.net.Inet6Address; +import java.net.InetAddress; import javax.annotation.Nullable; +@SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesGetter for now public class RabbitReceiveNetAttributesGetter - implements NetClientAttributesGetter { + implements io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter< + ReceiveRequest, GetResponse> { + + @Nullable + @Override + public String getSockFamily(ReceiveRequest request, @Nullable GetResponse response) { + if (request.getConnection().getAddress() instanceof Inet6Address) { + return "inet6"; + } + return null; + } + + @Nullable + @Override + public String getNetworkType(ReceiveRequest request, @Nullable GetResponse response) { + InetAddress address = request.getConnection().getAddress(); + if (address instanceof Inet4Address) { + return "ipv6"; + } else if (address instanceof Inet6Address) { + return "ipv6"; + } + return null; + } @Nullable @Override @@ -36,13 +60,4 @@ public String getServerSocketAddress(ReceiveRequest request, @Nullable GetRespon public Integer getServerSocketPort(ReceiveRequest request, @Nullable GetResponse response) { return request.getConnection().getPort(); } - - @Nullable - @Override - public String getSockFamily(ReceiveRequest request, @Nullable GetResponse response) { - if (request.getConnection().getAddress() instanceof Inet6Address) { - return "inet6"; - } - return null; - } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitSingletons.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitSingletons.java index b770d8dbad51..e80b226cf887 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitSingletons.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitSingletons.java @@ -17,7 +17,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessageOperation; import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessagingAttributesGetter; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor; import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; @@ -51,6 +50,7 @@ static Instrumenter deliverInstrumenter() { return deliverInstrumenter; } + @SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesExtractor for now private static Instrumenter createChannelInstrumenter() { return Instrumenter.builder( GlobalOpenTelemetry.get(), instrumentationName, ChannelAndMethod::getMethod) @@ -58,7 +58,8 @@ private static Instrumenter createChannelInstrumenter() buildMessagingAttributesExtractor( RabbitChannelAttributesGetter.INSTANCE, MessageOperation.PUBLISH)) .addAttributesExtractor( - NetClientAttributesExtractor.create(new RabbitChannelNetAttributesGetter())) + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor + .create(new RabbitChannelNetAttributesGetter())) .addContextCustomizer( (context, request, startAttributes) -> context.with(CHANNEL_AND_METHOD_CONTEXT_KEY, new RabbitChannelAndMethodHolder())) @@ -67,12 +68,15 @@ private static Instrumenter createChannelInstrumenter() channelAndMethod.getMethod().equals("Channel.basicPublish") ? PRODUCER : CLIENT); } + @SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesExtractor for now private static Instrumenter createReceiveInstrumenter() { List> extractors = new ArrayList<>(); extractors.add( buildMessagingAttributesExtractor( RabbitReceiveAttributesGetter.INSTANCE, MessageOperation.RECEIVE)); - extractors.add(NetClientAttributesExtractor.create(new RabbitReceiveNetAttributesGetter())); + extractors.add( + io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor.create( + new RabbitReceiveNetAttributesGetter())); if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) { extractors.add(new RabbitReceiveExperimentalAttributesExtractor()); } diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenterFactory.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenterFactory.java index 745d55e72659..ebe4a626f283 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenterFactory.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenterFactory.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor; public final class RedissonInstrumenterFactory { @@ -23,7 +23,7 @@ public static Instrumenter createInstrumenter(String inst instrumentationName, DbClientSpanNameExtractor.create(dbAttributesGetter)) .addAttributesExtractor(DbClientAttributesExtractor.create(dbAttributesGetter)) - .addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter)) + .addAttributesExtractor(ServerAttributesExtractor.create(netAttributesGetter)) .buildInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java index d06e68b52654..79ad404fc305 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java @@ -5,24 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.redisson; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import java.net.InetSocketAddress; import javax.annotation.Nullable; -final class RedissonNetAttributesGetter - implements NetClientAttributesGetter { - - @Nullable - @Override - public String getServerAddress(RedissonRequest redissonRequest) { - return null; - } - - @Nullable - @Override - public Integer getServerPort(RedissonRequest redissonRequest) { - return null; - } +final class RedissonNetAttributesGetter implements ServerAttributesGetter { @Override public InetSocketAddress getServerInetSocketAddress( diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientNetAttributesGetter.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientNetAttributesGetter.java index c2ad69d277cb..7ec329350738 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientNetAttributesGetter.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientNetAttributesGetter.java @@ -5,11 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.vertx.v4_0.sql; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; +import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter; import javax.annotation.Nullable; public enum VertxSqlClientNetAttributesGetter - implements NetClientAttributesGetter { + implements ServerAttributesGetter { INSTANCE; @Nullable diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientSingletons.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientSingletons.java index bfbc953fbdb2..2861962e21e9 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientSingletons.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientSingletons.java @@ -14,8 +14,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.DbClientSpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor; 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.vertx.sqlclient.SqlConnectOptions; import java.util.Map; @@ -41,7 +41,7 @@ public final class VertxSqlClientSingletons { CommonConfig.get().isStatementSanitizationEnabled()) .build()) .addAttributesExtractor( - NetClientAttributesExtractor.create(VertxSqlClientNetAttributesGetter.INSTANCE)) + ServerAttributesExtractor.create(VertxSqlClientNetAttributesGetter.INSTANCE)) .addAttributesExtractor( PeerServiceAttributesExtractor.create( VertxSqlClientNetAttributesGetter.INSTANCE,