fix

Author: trask

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesGetter.java

@@ -37,7 +37,9 @@ default String getDbSystem(REQUEST request) {
 
   @Deprecated
   @Nullable
-  String getUser(REQUEST request);
+  default String getUser(REQUEST request) {
+    return null;
+  }
 
   /**
    * @deprecated Use {@link #getDbNamespace(Object)} instead.

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

@@ -22,26 +22,12 @@ public String getDbSystem(CassandraRequest request) {
     return DbIncubatingAttributes.DbSystemIncubatingValues.CASSANDRA;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getUser(CassandraRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbNamespace(CassandraRequest request) {
     return request.getSession().getLoggedKeyspace();
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(CassandraRequest request) {
-    return null;
-  }
-
   @Override
   public Collection<String> getRawQueryTexts(CassandraRequest request) {
     return singleton(request.getQueryText());

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

@@ -23,26 +23,12 @@ public String getDbSystem(CassandraRequest request) {
     return DbIncubatingAttributes.DbSystemIncubatingValues.CASSANDRA;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getUser(CassandraRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbNamespace(CassandraRequest request) {
     return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(CassandraRequest request) {
-    return null;
-  }
-
   @Override
   public Collection<String> getRawQueryTexts(CassandraRequest request) {
     return singleton(request.getQueryText());

instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java

@@ -23,26 +23,12 @@ public String getDbSystem(CassandraRequest request) {
     return CASSANDRA;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getUser(CassandraRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbNamespace(CassandraRequest request) {
     return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(CassandraRequest request) {
-    return null;
-  }
-
   @Override
   public Collection<String> getRawQueryTexts(CassandraRequest request) {
     return singleton(request.getQueryText());

instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseAttributesGetter.java

@@ -43,13 +43,6 @@ public String getDbSystem(ClickHouseDbRequest request) {
     return DbIncubatingAttributes.DbSystemIncubatingValues.CLICKHOUSE;
   }
 
-  @Deprecated
-  @Nullable
-  @Override
-  public String getUser(ClickHouseDbRequest request) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getDbNamespace(ClickHouseDbRequest request) {
@@ -60,13 +53,6 @@ public String getDbNamespace(ClickHouseDbRequest request) {
     return dbName;
   }
 
-  @Deprecated
-  @Nullable
-  @Override
-  public String getConnectionString(ClickHouseDbRequest request) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java

@@ -20,26 +20,12 @@ public String getDbSystem(CouchbaseRequestInfo couchbaseRequest) {
     return DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getUser(CouchbaseRequestInfo couchbaseRequest) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbNamespace(CouchbaseRequestInfo couchbaseRequest) {
     return couchbaseRequest.bucket();
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(CouchbaseRequestInfo couchbaseRequest) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbQueryText(CouchbaseRequestInfo couchbaseRequest) {

instrumentation/elasticsearch/elasticsearch-rest-common-5.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/common/v5_0/internal/ElasticsearchDbAttributesGetter.java

@@ -43,26 +43,12 @@ public String getDbSystem(ElasticsearchRestRequest request) {
     return ELASTICSEARCH;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getUser(ElasticsearchRestRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbNamespace(ElasticsearchRestRequest request) {
     return null;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(ElasticsearchRestRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbQueryText(ElasticsearchRestRequest request) {

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

@@ -19,26 +19,12 @@ public String getDbSystem(ElasticTransportRequest request) {
     return DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getUser(ElasticTransportRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbNamespace(ElasticTransportRequest request) {
     return null;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(ElasticTransportRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbQueryText(ElasticTransportRequest request) {

instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java

@@ -22,26 +22,12 @@ public String getDbSystem(GeodeRequest request) {
     return DbIncubatingAttributes.DbSystemIncubatingValues.GEODE;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getUser(GeodeRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbNamespace(GeodeRequest request) {
     return request.getRegion().getName();
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(GeodeRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getDbQueryText(GeodeRequest request) {

instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbAttributesGetter.java

@@ -30,24 +30,10 @@ public String getDbSystem(InfluxDbRequest request) {
     return "influxdb";
   }
 
-  @Deprecated
-  @Nullable
-  @Override
-  public String getUser(InfluxDbRequest request) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getDbNamespace(InfluxDbRequest request) {
     String dbName = request.getDbName();
     return "".equals(dbName) ? null : dbName;
   }
-
-  @Deprecated
-  @Nullable
-  @Override
-  public String getConnectionString(InfluxDbRequest influxDbRequest) {
-    return null;
-  }
 }