NetAttributesExtractor optimization

benchmark/src/jmh/java/io/opentelemetry/benchmark/InstrumenterBenchmark.java

@@ -110,6 +110,10 @@ static class ConstantNetAttributesExtractor
     private static final InetSocketAddress ADDRESS =
         InetSocketAddress.createUnresolved("localhost", 8080);
 
+    protected ConstantNetAttributesExtractor() {
+      super(NetPeerAttributeExtraction.ON_START);
+    }
+
     @Override
     public @Nullable InetSocketAddress getAddress(Void unused, @Nullable Void unused2) {
       return ADDRESS;

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetAttributesExtractor.java

@@ -19,6 +19,15 @@
 public abstract class InetSocketAddressNetAttributesExtractor<REQUEST, RESPONSE>
     extends NetAttributesExtractor<REQUEST, RESPONSE> {
 
+  protected InetSocketAddressNetAttributesExtractor() {
+    this(NetPeerAttributeExtraction.ON_BOTH);
+  }
+
+  protected InetSocketAddressNetAttributesExtractor(
+      NetPeerAttributeExtraction netPeerAttributeExtraction) {
+    super(netPeerAttributeExtraction);
+  }
+
   /**
    * This method will be called twice: both when the request starts ({@code response} is always null
    * then) and when the response ends. This way it is possible to capture net attributes in both

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetAttributesExtractor.java

@@ -19,10 +19,24 @@
 public abstract class NetAttributesExtractor<REQUEST, RESPONSE>
     extends AttributesExtractor<REQUEST, RESPONSE> {
 
+  private final NetPeerAttributeExtraction netPeerAttributeExtraction;
+
+  protected NetAttributesExtractor() {
+    this(NetPeerAttributeExtraction.ON_BOTH);
+  }
+
+  protected NetAttributesExtractor(NetPeerAttributeExtraction netPeerAttributeExtraction) {
+    this.netPeerAttributeExtraction = netPeerAttributeExtraction;
+  }
+
   @Override
   protected final void onStart(AttributesBuilder attributes, REQUEST request) {
     set(attributes, SemanticAttributes.NET_TRANSPORT, transport(request));
 
+    if (netPeerAttributeExtraction == NetPeerAttributeExtraction.ON_END) {
+      return;
+    }
+
     String peerIp = peerIp(request, null);
     String peerName = peerName(request, null);
 
@@ -44,6 +58,10 @@ protected final void onEnd(
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
 
+    if (netPeerAttributeExtraction == NetPeerAttributeExtraction.ON_START) {
+      return;
+    }
+
     String peerIp = peerIp(request, response);
     String peerName = peerName(request, response);
 
@@ -84,4 +102,10 @@ protected final void onEnd(
    */
   @Nullable
   public abstract String peerIp(REQUEST request, @Nullable RESPONSE response);
+
+  public enum NetPeerAttributeExtraction {
+    ON_START,
+    ON_END,
+    ON_BOTH
+  }
 }

instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 public final class DubboNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<DubboRequest, Result> {
 
+  public DubboNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public @Nullable InetSocketAddress getAddress(DubboRequest request, @Nullable Result result) {
     return request.context().getRemoteAddress();

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientNetAttributesExtractor.java

@@ -13,6 +13,10 @@
 final class ApacheHttpAsyncClientNetAttributesExtractor
     extends NetAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {
 
+  ApacheHttpAsyncClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(ApacheHttpClientRequest request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class ApacheHttpClientNetAttributesExtractor
     extends NetAttributesExtractor<HttpMethod, HttpMethod> {
 
+  ApacheHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(HttpMethod request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientNetAttributesExtractor.java

@@ -13,6 +13,10 @@
 final class ApacheHttpClientNetAttributesExtractor
     extends NetAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {
 
+  ApacheHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(ApacheHttpClientRequest request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientNetAttributesExtractor.java

@@ -13,6 +13,10 @@
 final class ApacheHttpClientNetAttributesExtractor
     extends NetAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {
 
+  ApacheHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(ApacheHttpClientRequest request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientNetAttributesExtractor.java

@@ -19,6 +19,10 @@ final class ApacheHttpClientNetAttributesExtractor
   private static final Logger logger =
       LoggerFactory.getLogger(ApacheHttpClientNetAttributesExtractor.class);
 
+  ApacheHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(ClassicHttpRequest request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetAttributesExtractor.java

@@ -16,6 +16,10 @@
 public final class ArmeriaNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<RequestContext, RequestLog> {
 
+  public ArmeriaNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_END);
+  }
+
   @Override
   public String transport(RequestContext ctx) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class AsyncHttpClientNetAttributesExtractor
     extends NetAttributesExtractor<Request, Response> {
 
+  AsyncHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(Request request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class AsyncHttpClientNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<RequestContext, Response> {
 
+  AsyncHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_END);
+  }
+
   @Override
   public String transport(RequestContext requestContext) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesExtractor.java

@@ -13,6 +13,10 @@
 final class CassandraNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<CassandraRequest, ExecutionInfo> {
 
+  CassandraNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_END);
+  }
+
   @Override
   @Nullable
   public String transport(CassandraRequest request) {

instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesExtractor.java

@@ -15,6 +15,10 @@
 final class CassandraNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<CassandraRequest, ExecutionInfo> {
 
+  CassandraNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_END);
+  }
+
   @Override
   @Nullable
   public String transport(CassandraRequest request) {

instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestNetAttributesExtractor.java

@@ -12,6 +12,10 @@
 
 final class ElasticsearchRestNetAttributesExtractor
     extends NetAttributesExtractor<String, Response> {
+  ElasticsearchRestNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_END);
+  }
+
   @Override
   public String transport(String s) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesExtractor.java

@@ -13,6 +13,11 @@
 
 public class Elasticsearch6TransportNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<ElasticTransportRequest, ActionResponse> {
+
+  public Elasticsearch6TransportNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_END);
+  }
+
   @Override
   public @Nullable String transport(ElasticTransportRequest elasticTransportRequest) {
     return null;

instrumentation/elasticsearch/elasticsearch-transport-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetAttributesExtractor.java

@@ -11,6 +11,10 @@
 
 public class ElasticTransportNetAttributesExtractor
     extends NetAttributesExtractor<ElasticTransportRequest, ActionResponse> {
+  public ElasticTransportNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_END);
+  }
+
   @Override
   public @Nullable String transport(ElasticTransportRequest elasticTransportRequest) {
     return null;

instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class GoogleHttpClientNetAttributesExtractor
     extends NetAttributesExtractor<HttpRequest, HttpResponse> {
 
+  GoogleHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(HttpRequest request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetAttributesExtractor.java

@@ -15,6 +15,11 @@
 
 public final class GrpcNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<GrpcRequest, Status> {
+
+  public GrpcNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   @Nullable
   public InetSocketAddress getAddress(GrpcRequest request, @Nullable Status status) {

instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlNetAttributesExtractor.java

@@ -11,6 +11,10 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 class HttpUrlNetAttributesExtractor extends NetAttributesExtractor<HttpURLConnection, Integer> {
+  HttpUrlNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public @Nullable String transport(HttpURLConnection connection) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpNetAttributesExtractor.java

@@ -18,6 +18,10 @@ public class JdkHttpNetAttributesExtractor
 
   private static final Logger logger = LoggerFactory.getLogger(JdkHttpNetAttributesExtractor.class);
 
+  public JdkHttpNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(HttpRequest httpRequest) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class JaxRsClientNetAttributesExtractor
     extends NetAttributesExtractor<ClientRequest, ClientResponse> {
 
+  JaxRsClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(ClientRequest request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class JaxRsClientNetAttributesExtractor
     extends NetAttributesExtractor<ClientRequestContext, ClientResponseContext> {
 
+  JaxRsClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(ClientRequestContext request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class ResteasyClientNetAttributesExtractor
     extends NetAttributesExtractor<ClientInvocation, Response> {
 
+  ResteasyClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(ClientInvocation request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetAttributesExtractor.java

@@ -10,6 +10,10 @@
 
 public final class JdbcNetAttributesExtractor extends NetAttributesExtractor<DbRequest, Void> {
 
+  public JdbcNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Nullable
   @Override
   public String transport(DbRequest request) {

instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetAttributesExtractor.java

@@ -10,6 +10,10 @@
 
 final class JedisNetAttributesExtractor extends NetAttributesExtractor<JedisRequest, Void> {
 
+  JedisNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   @Nullable
   public String transport(JedisRequest request) {

instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 final class JedisNetAttributesExtractor
     extends InetSocketAddressNetAttributesExtractor<JedisRequest, Void> {
 
+  JedisNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public @Nullable InetSocketAddress getAddress(JedisRequest jedisRequest, @Nullable Void unused) {
     Socket socket = jedisRequest.getConnection().getSocket();

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientNetAttributesExtractor.java

@@ -14,6 +14,10 @@
 public class JettyHttpClientNetAttributesExtractor
     extends NetAttributesExtractor<Request, Response> {
 
+  public JettyHttpClientNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(Request request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesExtractor.java

@@ -12,6 +12,10 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 class KubernetesNetAttributesExtractor extends NetAttributesExtractor<Request, ApiResponse<?>> {
+  KubernetesNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   public String transport(Request request) {
     return SemanticAttributes.NetTransportValues.IP_TCP;

instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesExtractor.java

@@ -11,6 +11,10 @@
 
 final class LettuceConnectNetAttributesExtractor extends NetAttributesExtractor<RedisURI, Void> {
 
+  LettuceConnectNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   @Nullable
   public String transport(RedisURI redisUri) {

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesExtractor.java

@@ -11,6 +11,10 @@
 
 final class LettuceConnectNetAttributesExtractor extends NetAttributesExtractor<RedisURI, Void> {
 
+  LettuceConnectNetAttributesExtractor() {
+    super(NetPeerAttributeExtraction.ON_START);
+  }
+
   @Override
   @Nullable
   public String transport(RedisURI redisUri) {

instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherLinkInstrumentation.java

@@ -80,7 +80,6 @@ public static void stopSpan(
       scope.close();
 
       LibertyResponse response = new LibertyResponse(statusCode);
-      request.setCompleted();
 
       Throwable t = failure != null ? failure : throwable;
       instrumenter().end(context, request, response, t);