Comments

heyams · heyams · commit 5ea4be5dbb4f · 2024-10-03T10:37:09.000-07:00
diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraRequest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraRequest.java
@@ -17,5 +17,5 @@ public static CassandraRequest create(Session session, String dbQueryText) {
 
   public abstract Session getSession();
 
-  public abstract String getQueryText();
+  public abstract String getRawQueryText();
 }
diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java
@@ -39,6 +39,6 @@ public String getConnectionString(CassandraRequest request) {
   @Override
   @Nullable
   public String getRawQueryText(CassandraRequest request) {
-    return request.getQueryText();
+    return request.getRawQueryText();
   }
 }
diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java
@@ -108,6 +108,8 @@ void syncTest(Parameter parameter) {
                                         val.satisfiesAnyOf(
                                             v -> assertThat(v).isEqualTo("ipv4"),
                                             v -> assertThat(v).isEqualTo("ipv6"));
+                                      } else {
+                                        assertThat(val).isNull();
                                       }
                                     }),
                                 equalTo(SERVER_ADDRESS, cassandraHost),
@@ -173,6 +175,8 @@ void asyncTest(Parameter parameter) throws Exception {
                                         val.satisfiesAnyOf(
                                             v -> assertThat(v).isEqualTo("ipv4"),
                                             v -> assertThat(v).isEqualTo("ipv6"));
+                                      } else {
+                                        assertThat(val).isNull();
                                       }
                                     }),
                                 equalTo(SERVER_ADDRESS, cassandraHost),
diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraRequest.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraRequest.java
@@ -17,5 +17,5 @@ public static CassandraRequest create(Session session, String queryText) {
 
   public abstract Session getSession();
 
-  public abstract String getQueryText();
+  public abstract String getRawQueryText();
 }
diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java
@@ -40,6 +40,6 @@ public String getConnectionString(CassandraRequest request) {
   @Override
   @Nullable
   public String getRawQueryText(CassandraRequest request) {
-    return request.getQueryText();
+    return request.getRawQueryText();
   }
 }
diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraRequest.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraRequest.java
@@ -17,5 +17,5 @@ public static CassandraRequest create(Session session, String queryText) {
 
   public abstract Session getSession();
 
-  public abstract String getQueryText();
+  public abstract String getRawQueryText();
 }
diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java
@@ -41,6 +41,6 @@ public String getConnectionString(CassandraRequest request) {
   @Override
   @Nullable
   public String getRawQueryText(CassandraRequest request) {
-    return request.getQueryText();
+    return request.getRawQueryText();
   }
 }
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
@@ -20,6 +20,11 @@
 public class CassandraTelemetryBuilder {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-4.4";
+  // copied from DbIncubatingAttributes
+  private static final AttributeKey<String> DB_CASSANDRA_TABLE =
+      AttributeKey.stringKey("db.cassandra.table");
+  private static final AttributeKey<String> DB_COLLECTION_NAME =
+      AttributeKey.stringKey("db.collection.name");
 
   private final OpenTelemetry openTelemetry;
 
@@ -58,8 +63,8 @@ protected Instrumenter<CassandraRequest, ExecutionInfo> createInstrumenter(
             SqlClientAttributesExtractor.builder(attributesGetter)
                 .setTableAttribute(
                     SemconvStability.emitStableDatabaseSemconv()
-                        ? AttributeKey.stringKey("db.collection.name")
-                        : AttributeKey.stringKey("db.cassandra.table"))
+                        ? DB_COLLECTION_NAME
+                        : DB_CASSANDRA_TABLE)
                 .setStatementSanitizationEnabled(statementSanitizationEnabled)
                 .build())
         .addAttributesExtractor(
diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java
@@ -68,6 +68,8 @@ void reactiveTest(Parameter parameter) {
                                         val.satisfiesAnyOf(
                                             v -> assertThat(v).isEqualTo("ipv4"),
                                             v -> assertThat(v).isEqualTo("ipv6"));
+                                      } else {
+                                        assertThat(val).isNull();
                                       }
                                     }),
                                 equalTo(SERVER_ADDRESS, cassandraHost),
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java
@@ -14,7 +14,7 @@ final class ElasticsearchTransportAttributesGetter
     implements DbClientAttributesGetter<ElasticTransportRequest> {
 
   @Override
-  public String getDbSystem(ElasticTransportRequest elasticTransportRequest) {
+  public String getDbSystem(ElasticTransportRequest request) {
     return ELASTICSEARCH;
   }
 
diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DbRequest.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DbRequest.java
@@ -43,5 +43,5 @@ public static DbRequest create(DbInfo dbInfo, String queryText) {
 
   public abstract DbInfo getDbInfo();
 
-  public abstract String getQueryText();
+  public abstract String getRawQueryText();
 }
diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java
@@ -45,6 +45,6 @@ public String getConnectionString(DbRequest request) {
   @Nullable
   @Override
   public String getRawQueryText(DbRequest request) {
-    return request.getQueryText();
+    return request.getRawQueryText();
   }
 }
diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesGetter.java
@@ -18,7 +18,7 @@ final class JedisDbAttributesGetter implements DbClientAttributesGetter<JedisReq
       RedisCommandSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());
 
   @Override
-  public String getDbSystem(JedisRequest jedisRequest) {
+  public String getDbSystem(JedisRequest request) {
     return REDIS;
   }
 
diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisDbAttributesGetter.java
@@ -13,7 +13,7 @@
 final class JedisDbAttributesGetter implements DbClientAttributesGetter<JedisRequest> {
 
   @Override
-  public String getDbSystem(JedisRequest jedisRequest) {
+  public String getDbSystem(JedisRequest request) {
     return REDIS;
   }
 
diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java
@@ -50,7 +50,7 @@ class MongoDbAttributesGetter implements DbClientAttributesGetter<CommandStarted
   }
 
   @Override
-  public String getDbSystem(CommandStartedEvent commandStartedEvent) {
+  public String getDbSystem(CommandStartedEvent event) {
     return MONGODB;
   }
 
diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java
@@ -27,7 +27,7 @@ public String getUser(OpenSearchRestRequest request) {
 
   @Override
   @Nullable
-  public String getDbNamespace(OpenSearchRestRequest openSearchRestRequest) {
+  public String getDbNamespace(OpenSearchRestRequest request) {
     return null;
   }
 
diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/DbExecution.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/DbExecution.java
@@ -34,7 +34,7 @@ public final class DbExecution {
   private final String host;
   private final Integer port;
   private final String connectionString;
-  private final String rawStatement;
+  private final String rawQueryText;
 
   private Context context;
 
@@ -66,7 +66,7 @@ public DbExecution(QueryExecutionInfo queryInfo, ConnectionFactoryOptions factor
             protocol != null ? ":" + protocol : "",
             host != null ? "//" + host : "",
             port != null ? ":" + port : "");
-    this.rawStatement =
+    this.rawQueryText =
         queryInfo.getQueries().stream().map(QueryInfo::getQuery).collect(Collectors.joining(";\n"));
   }
 
@@ -94,8 +94,8 @@ public String getConnectionString() {
     return connectionString;
   }
 
-  public String getQueryText() {
-    return rawStatement;
+  public String getRawQueryText() {
+    return rawQueryText;
   }
 
   public Context getContext() {
@@ -127,7 +127,7 @@ public String toString() {
         + connectionString
         + '\''
         + ", rawStatement='"
-        + rawStatement
+        + rawQueryText
         + '\''
         + ", context="
         + context
diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java
@@ -43,6 +43,6 @@ public String getConnectionString(DbExecution request) {
   @Override
   @Nullable
   public String getRawQueryText(DbExecution request) {
-    return request.getQueryText();
+    return request.getRawQueryText();
   }
 }
diff --git a/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/DbExecutionTest.java b/instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/DbExecutionTest.java
@@ -45,6 +45,6 @@ void dbExecution() {
     assertEquals("localhost", dbExecution.getHost());
     assertEquals(3306, dbExecution.getPort());
     assertEquals("mariadb://localhost:3306", dbExecution.getConnectionString());
-    assertEquals("SELECT * from person where last_name = 'tom'", dbExecution.getQueryText());
+    assertEquals("SELECT * from person where last_name = 'tom'", dbExecution.getRawQueryText());
   }
 }
diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientAttributesGetter.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientAttributesGetter.java
@@ -40,6 +40,6 @@ public String getConnectionString(VertxSqlClientRequest request) {
   @Override
   @Nullable
   public String getRawQueryText(VertxSqlClientRequest request) {
-    return request.getQueryText();
+    return request.getRawQueryText();
   }
 }
diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientRequest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientRequest.java
@@ -8,16 +8,16 @@
 import io.vertx.sqlclient.SqlConnectOptions;
 
 public final class VertxSqlClientRequest {
-  private final String statement;
+  private final String rawQueryText;
   private final SqlConnectOptions sqlConnectOptions;
 
-  public VertxSqlClientRequest(String statement, SqlConnectOptions sqlConnectOptions) {
-    this.statement = statement;
+  public VertxSqlClientRequest(String rawQueryText, SqlConnectOptions sqlConnectOptions) {
+    this.rawQueryText = rawQueryText;
     this.sqlConnectOptions = sqlConnectOptions;
   }
 
-  public String getQueryText() {
-    return statement;
+  public String getRawQueryText() {
+    return rawQueryText;
   }
 
   public String getUser() {

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ public static CassandraRequest create(Session session, String dbQueryText) {`
`17`	`17`
`18`	`18`	`public abstract Session getSession();`
`19`	`19`
`20`		`- public abstract String getQueryText();`
	`20`	`+ public abstract String getRawQueryText();`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ public String getConnectionString(CassandraRequest request) {`
`39`	`39`	`@Override`
`40`	`40`	`@Nullable`
`41`	`41`	`public String getRawQueryText(CassandraRequest request) {`
`42`		`- return request.getQueryText();`
	`42`	`+ return request.getRawQueryText();`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ public String getConnectionString(CassandraRequest request) {`
`40`	`40`	`@Override`
`41`	`41`	`@Nullable`
`42`	`42`	`public String getRawQueryText(CassandraRequest request) {`
`43`		`- return request.getQueryText();`
	`43`	`+ return request.getRawQueryText();`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public String getConnectionString(CassandraRequest request) {`
`41`	`41`	`@Override`
`42`	`42`	`@Nullable`
`43`	`43`	`public String getRawQueryText(CassandraRequest request) {`
`44`		`- return request.getQueryText();`
	`44`	`+ return request.getRawQueryText();`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ void reactiveTest(Parameter parameter) {`
`68`	`68`	`val.satisfiesAnyOf(`
`69`	`69`	`v -> assertThat(v).isEqualTo("ipv4"),`
`70`	`70`	`v -> assertThat(v).isEqualTo("ipv6"));`
	`71`	`+ } else {`
	`72`	`+ assertThat(val).isNull();`
`71`	`73`	`}`
`72`	`74`	`}),`
`73`	`75`	`equalTo(SERVER_ADDRESS, cassandraHost),`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ final class ElasticsearchTransportAttributesGetter`
`14`	`14`	`implements DbClientAttributesGetter<ElasticTransportRequest> {`
`15`	`15`
`16`	`16`	`@Override`
`17`		`- public String getDbSystem(ElasticTransportRequest elasticTransportRequest) {`
	`17`	`+ public String getDbSystem(ElasticTransportRequest request) {`
`18`	`18`	`return ELASTICSEARCH;`
`19`	`19`	`}`
`20`	`20`