Add defaults back to getProtocol*()

open-telemetry · Apr 6, 2023 · d63d44e · d63d44e
1 parent 9ef8b0a
commit d63d44e
Show file tree

Hide file tree

Showing 36 changed files with 6 additions and 436 deletions.
diff --git a/...java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java b/...java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java
@@ -26,15 +26,19 @@ public interface NetClientAttributesGetter<REQUEST, RESPONSE> {
    * <p>Examples: `amqp`, `http`, `mqtt`.
    */
   @Nullable
-  String getProtocolName(REQUEST request, @Nullable RESPONSE response);
+  default String getProtocolName(REQUEST request, @Nullable RESPONSE response) {
+    return null;
+  }
 
   /**
    * Returns the version of the application protocol used.
    *
    * <p>Examples: `3.1.1`.
    */
   @Nullable
-  String getProtocolVersion(REQUEST request, @Nullable RESPONSE response);
+  default String getProtocolVersion(REQUEST request, @Nullable RESPONSE response) {
+    return null;
+  }
 
   @Nullable
   String getPeerName(REQUEST request);

diff --git a/.../instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java b/.../instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java
@@ -15,7 +15,6 @@
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.Inet4Address;
 import java.net.InetSocketAddress;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -31,20 +30,6 @@ public String getTransport(InetSocketAddress request, InetSocketAddress response
               return SemanticAttributes.NetTransportValues.IP_TCP;
             }
 
-            @Nullable
-            @Override
-            public String getProtocolName(
-                InetSocketAddress address, @Nullable InetSocketAddress response) {
-              return null;
-            }
-
-            @Nullable
-            @Override
-            public String getProtocolVersion(
-                InetSocketAddress address, @Nullable InetSocketAddress response) {
-              return null;
-            }
-
             @Override
             public String getPeerName(InetSocketAddress request) {
               // net.peer.name and net.peer.port are tested in NetClientAttributesExtractorTest

diff --git a/...entelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java b/...entelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java
@@ -24,18 +24,6 @@ public String getTransport(DubboRequest request, @Nullable Result response) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(DubboRequest request, @Nullable Result result) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(DubboRequest request, @Nullable Result result) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(DubboRequest request) {

diff --git a/...src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkNetAttributesGetter.java b/...src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkNetAttributesGetter.java
@@ -20,19 +20,6 @@ public String getTransport(ExecutionAttributes request, @Nullable SdkHttpRespons
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(ExecutionAttributes request, @Nullable SdkHttpResponse response) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(
-      ExecutionAttributes request, @Nullable SdkHttpResponse response) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getPeerName(ExecutionAttributes request) {

diff --git a/.../opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java b/.../opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java
@@ -19,19 +19,6 @@ public String getTransport(CassandraRequest request, @Nullable ExecutionInfo exe
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(
-      CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(CassandraRequest request) {

diff --git a/.../opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java b/.../opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java
@@ -21,19 +21,6 @@ public String getTransport(CassandraRequest request, @Nullable ExecutionInfo exe
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(
-      CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(CassandraRequest request) {

diff --git a/...in/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetAttributesGetter.java b/...in/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetAttributesGetter.java
@@ -21,20 +21,6 @@ public String getTransport(CassandraRequest request, @Nullable ExecutionInfo exe
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(
-      CassandraRequest cassandraRequest, @Nullable ExecutionInfo executionInfo) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(
-      CassandraRequest cassandraRequest, @Nullable ExecutionInfo executionInfo) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(CassandraRequest request) {

diff --git a/.../opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java b/.../opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java
@@ -21,19 +21,6 @@ public String getTransport(CouchbaseRequestInfo couchbaseRequest, @Nullable Void
         : null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(CouchbaseRequestInfo couchbaseRequestInfo, @Nullable Void unused) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(
-      CouchbaseRequestInfo couchbaseRequestInfo, @Nullable Void unused) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(CouchbaseRequestInfo couchbaseRequest) {

diff --git a/...gent/instrumentation/elasticsearch/rest/ElasticsearchRestNetResponseAttributesGetter.java b/...gent/instrumentation/elasticsearch/rest/ElasticsearchRestNetResponseAttributesGetter.java
@@ -19,18 +19,6 @@ public String getTransport(ElasticsearchRestRequest request, Response response)
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(ElasticsearchRestRequest request, @Nullable Response response) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(ElasticsearchRestRequest request, @Nullable Response response) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getPeerName(ElasticsearchRestRequest request) {

diff --git a/...trumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java b/...trumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java
@@ -19,20 +19,6 @@ public String getTransport(ElasticTransportRequest request, @Nullable ActionResp
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(
-      ElasticTransportRequest request, @Nullable ActionResponse actionResponse) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(
-      ElasticTransportRequest request, @Nullable ActionResponse actionResponse) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(ElasticTransportRequest request) {

diff --git a/.../instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java b/.../instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java
@@ -18,20 +18,6 @@ public String getTransport(ElasticTransportRequest request, @Nullable ActionResp
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(
-      ElasticTransportRequest request, @Nullable ActionResponse actionResponse) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(
-      ElasticTransportRequest request, @Nullable ActionResponse actionResponse) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getPeerName(ElasticTransportRequest request) {

diff --git a/...metry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesGetter.java b/...metry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesGetter.java
@@ -19,18 +19,6 @@ public String getTransport(HttpRequest request, @Nullable HttpResponse response)
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(HttpRequest request, @Nullable HttpResponse response) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(HttpRequest request, @Nullable HttpResponse response) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getPeerName(HttpRequest request) {

diff --git a/...va/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java b/...va/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java
@@ -25,18 +25,6 @@ public String getTransport(GrpcRequest request, @Nullable Status response) {
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(GrpcRequest grpcRequest, @Nullable Status status) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(GrpcRequest grpcRequest, @Nullable Status status) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(GrpcRequest grpcRequest) {

diff --git a/...ntelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesGetter.java b/...ntelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesGetter.java
@@ -19,18 +19,6 @@ public String getTransport(ClientRequest request, @Nullable ClientResponse respo
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(ClientRequest request, @Nullable ClientResponse response) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(ClientRequest request, @Nullable ClientResponse response) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getPeerName(ClientRequest request) {

diff --git a/...src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetAttributesGetter.java b/...src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetAttributesGetter.java
@@ -20,18 +20,6 @@ public String getTransport(DbRequest request, @Nullable Void unused) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(DbRequest dbRequest, @Nullable Void unused) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(DbRequest dbRequest, @Nullable Void unused) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(DbRequest request) {

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetAttributesGetter.java b/.../java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetAttributesGetter.java
@@ -16,18 +16,6 @@ public String getTransport(JedisRequest request, @Nullable Void unused) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(JedisRequest jedisRequest, @Nullable Void unused) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(JedisRequest jedisRequest, @Nullable Void unused) {
-    return null;
-  }
-
   @Override
   public String getPeerName(JedisRequest request) {
     return request.getConnection().getHost();

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java b/.../java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java
@@ -19,18 +19,6 @@ public String getTransport(JedisRequest jedisRequest, @Nullable Void unused) {
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(JedisRequest jedisRequest, @Nullable Void unused) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(JedisRequest jedisRequest, @Nullable Void unused) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(JedisRequest jedisRequest) {

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java b/.../java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java
@@ -19,18 +19,6 @@ public String getTransport(JedisRequest jedisRequest, @Nullable Void unused) {
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(JedisRequest jedisRequest, @Nullable Void unused) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(JedisRequest jedisRequest, @Nullable Void unused) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getPeerName(JedisRequest jedisRequest) {

diff --git a/...entelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesGetter.java b/...entelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesGetter.java
@@ -18,18 +18,6 @@ public String getTransport(Request request, @Nullable ApiResponse<?> response) {
     return SemanticAttributes.NetTransportValues.IP_TCP;
   }
 
-  @Nullable
-  @Override
-  public String getProtocolName(Request request, @Nullable ApiResponse<?> response) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getProtocolVersion(Request request, @Nullable ApiResponse<?> response) {
-    return null;
-  }
-
   @Override
   public String getPeerName(Request request) {
     return request.url().host();