Reduce the number of unnecessary diffs

trask · heyams · commit aba9d32e5735 · 2024-10-03T10:52:45.000-07:00
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java
@@ -25,8 +25,6 @@
 class DbClientAttributesExtractorTest {
 
   static final class TestAttributesGetter implements DbClientAttributesGetter<Map<String, String>> {
-
-    @Nullable
     @Override
     public String getDbSystem(Map<String, String> map) {
       return map.get("db.system");
@@ -39,7 +37,6 @@ public String getUser(Map<String, String> map) {
     }
 
     @Override
-    @Nullable
     public String getDbNamespace(Map<String, String> map) {
       return map.get(
           SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.name")).getKey());
@@ -52,14 +49,12 @@ public String getConnectionString(Map<String, String> map) {
     }
 
     @Override
-    @Nullable
     public String getDbQueryText(Map<String, String> map) {
       return map.get(
           SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.statement")).getKey());
     }
 
     @Override
-    @Nullable
     public String getDbOperationName(Map<String, String> map) {
       return map.get(
           SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.operation")).getKey());
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java
@@ -33,7 +33,6 @@ public String getRawQueryText(Map<String, String> map) {
           SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.statement")).getKey());
     }
 
-    @Nullable
     @Override
     public String getDbSystem(Map<String, String> map) {
       return map.get("db.system");
@@ -45,7 +44,6 @@ public String getUser(Map<String, String> map) {
       return map.get("db.user");
     }
 
-    @Nullable
     @Override
     public String getDbNamespace(Map<String, String> map) {
       return map.get(
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
@@ -25,6 +25,7 @@ public final class CassandraSingletons {
 
   static {
     CassandraSqlAttributesGetter attributesGetter = new CassandraSqlAttributesGetter();
+
     INSTRUMENTER =
         Instrumenter.<CassandraRequest, ExecutionInfo>builder(
                 GlobalOpenTelemetry.get(),
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
@@ -12,7 +12,7 @@
 final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest> {
 
   @Override
-  public String getDbSystem(CassandraRequest cassandraRequest) {
+  public String getSystem(CassandraRequest request) {
     return DbIncubatingAttributes.DbSystemValues.CASSANDRA;
   }
 
@@ -23,8 +23,8 @@ public String getUser(CassandraRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(CassandraRequest request) {
     return request.getSession().getLoggedKeyspace();
   }
@@ -37,6 +37,7 @@ public String getConnectionString(CassandraRequest request) {
   }
 
   @Override
+  @Nullable
   public String getRawQueryText(CassandraRequest request) {
     return request.getDbQueryText();
   }
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
@@ -11,8 +11,8 @@
 @AutoValue
 public abstract class CassandraRequest {
 
-  public static CassandraRequest create(Session session, String dbQueryText) {
-    return new AutoValue_CassandraRequest(session, dbQueryText);
+  public static CassandraRequest create(Session session, String queryText) {
+    return new AutoValue_CassandraRequest(session, queryText);
   }
 
   public abstract Session getSession();
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
@@ -24,6 +24,7 @@ public final class CassandraSingletons {
 
   static {
     CassandraSqlAttributesGetter attributesGetter = new CassandraSqlAttributesGetter();
+
     INSTRUMENTER =
         Instrumenter.<CassandraRequest, ExecutionInfo>builder(
                 GlobalOpenTelemetry.get(),
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
@@ -13,7 +13,7 @@
 final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest> {
 
   @Override
-  public String getDbSystem(CassandraRequest cassandraRequest) {
+  public String getSystem(CassandraRequest request) {
     return DbIncubatingAttributes.DbSystemValues.CASSANDRA;
   }
 
@@ -24,8 +24,8 @@ public String getUser(CassandraRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(CassandraRequest request) {
     return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
   }
@@ -38,6 +38,7 @@ public String getConnectionString(CassandraRequest request) {
   }
 
   @Override
+  @Nullable
   public String getRawQueryText(CassandraRequest request) {
     return request.getDbQueryText();
   }
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
@@ -11,8 +11,8 @@
 @AutoValue
 public abstract class CassandraRequest {
 
-  public static CassandraRequest create(Session session, String dbQueryText) {
-    return new AutoValue_CassandraRequest(session, dbQueryText);
+  public static CassandraRequest create(Session session, String queryText) {
+    return new AutoValue_CassandraRequest(session, queryText);
   }
 
   public abstract Session getSession();
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
@@ -25,8 +25,8 @@ public String getUser(CassandraRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(CassandraRequest request) {
     return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
   }
@@ -39,6 +39,7 @@ public String getConnectionString(CassandraRequest request) {
   }
 
   @Override
+  @Nullable
   public String getRawQueryText(CassandraRequest request) {
     return request.getDbQueryText();
   }
diff --git a/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java b/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java
@@ -29,6 +29,7 @@ public String getDbOperationName(ClickHouseDbRequest request) {
     return request.getSqlStatementInfo().getOperation();
   }
 
+  @Nullable
   @Override
   public String getDbSystem(ClickHouseDbRequest request) {
     return DbIncubatingAttributes.DbSystemValues.CLICKHOUSE;
diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java
@@ -23,8 +23,8 @@ public String getUser(CouchbaseRequestInfo couchbaseRequest) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(CouchbaseRequestInfo couchbaseRequest) {
     return couchbaseRequest.bucket();
   }
@@ -36,14 +36,14 @@ public String getConnectionString(CouchbaseRequestInfo couchbaseRequest) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbQueryText(CouchbaseRequestInfo couchbaseRequest) {
     return couchbaseRequest.statement();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbOperationName(CouchbaseRequestInfo couchbaseRequest) {
     return couchbaseRequest.operation();
   }
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java
@@ -37,7 +37,7 @@ final class ElasticsearchDbAttributesGetter
   }
 
   @Override
-  public String getDbSystem(ElasticsearchRestRequest elasticsearchRestRequest) {
+  public String getDbSystem(ElasticsearchRestRequest request) {
     return ELASTICSEARCH;
   }
 
@@ -48,8 +48,8 @@ public String getUser(ElasticsearchRestRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(ElasticsearchRestRequest request) {
     return null;
   }
@@ -61,8 +61,8 @@ public String getConnectionString(ElasticsearchRestRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbQueryText(ElasticsearchRestRequest request) {
     ElasticsearchEndpointDefinition epDefinition = request.getEndpointDefinition();
     HttpEntity httpEntity = request.getHttpEntity();
@@ -85,8 +85,8 @@ public String getDbQueryText(ElasticsearchRestRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbOperationName(ElasticsearchRestRequest request) {
     ElasticsearchEndpointDefinition endpointDefinition = request.getEndpointDefinition();
     return endpointDefinition != null ? endpointDefinition.getEndpointName() : null;
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
@@ -25,8 +25,8 @@ public String getUser(ElasticTransportRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(ElasticTransportRequest request) {
     return null;
   }
@@ -38,8 +38,8 @@ public String getConnectionString(ElasticTransportRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbQueryText(ElasticTransportRequest request) {
     return null;
   }
diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java
@@ -29,8 +29,8 @@ public String getUser(GeodeRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(GeodeRequest request) {
     return request.getRegion().getName();
   }
@@ -42,15 +42,15 @@ public String getConnectionString(GeodeRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbQueryText(GeodeRequest request) {
     // sanitized statement is cached
     return sanitizer.sanitize(request.getQuery()).getFullStatement();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbOperationName(GeodeRequest request) {
     return request.getOperation();
   }
diff --git a/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbAttributesGetter.java b/instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbAttributesGetter.java
@@ -26,7 +26,7 @@ public String getDbOperationName(InfluxDbRequest request) {
   }
 
   @Override
-  public String getDbSystem(InfluxDbRequest influxDbRequest) {
+  public String getDbSystem(InfluxDbRequest request) {
     return "influxdb";
   }
 
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
@@ -37,8 +37,8 @@ public static DbRequest create(Statement statement, String dbStatementString) {
     return create(extractDbInfo(connection), dbStatementString);
   }
 
-  public static DbRequest create(DbInfo dbInfo, String dbQueryText) {
-    return new AutoValue_DbRequest(dbInfo, dbQueryText);
+  public static DbRequest create(DbInfo dbInfo, String queryText) {
+    return new AutoValue_DbRequest(dbInfo, queryText);
   }
 
   public abstract DbInfo getDbInfo();
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
@@ -42,6 +42,7 @@ public String getConnectionString(DbRequest request) {
     return request.getDbInfo().getShortUrl();
   }
 
+  @Nullable
   @Override
   public String getRawQueryText(DbRequest request) {
     return request.getDbQueryText();
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
@@ -29,7 +29,6 @@ public String getUser(JedisRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
   public String getDbNamespace(JedisRequest request) {
     return null;
@@ -41,7 +40,6 @@ public String getConnectionString(JedisRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
   public String getDbQueryText(JedisRequest request) {
     return sanitizer.sanitize(request.getCommand().name(), request.getArgs());
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
@@ -24,7 +24,6 @@ public String getUser(JedisRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
   public String getDbNamespace(JedisRequest request) {
     return null;
@@ -36,13 +35,11 @@ public String getConnectionString(JedisRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
   public String getDbQueryText(JedisRequest request) {
     return request.getStatement();
   }
 
-  @Nullable
   @Override
   public String getDbOperationName(JedisRequest request) {
     return request.getOperation();
diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_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;
   }
 
@@ -24,7 +24,6 @@ public String getUser(JedisRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
   public String getDbNamespace(JedisRequest request) {
     return null;
@@ -36,13 +35,11 @@ public String getConnectionString(JedisRequest request) {
     return null;
   }
 
-  @Nullable
   @Override
   public String getDbQueryText(JedisRequest request) {
     return request.getStatement();
   }
 
-  @Nullable
   @Override
   public String getDbOperationName(JedisRequest request) {
     return request.getOperation();
diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java
diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java
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
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
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
diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java
diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java
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

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public String getRawQueryText(Map<String, String> map) {`
`33`	`33`	`SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.statement")).getKey());`
`34`	`34`	`}`
`35`	`35`
`36`		`- @Nullable`
`37`	`36`	`@Override`
`38`	`37`	`public String getDbSystem(Map<String, String> map) {`
`39`	`38`	`return map.get("db.system");`
`@@ -45,7 +44,6 @@ public String getUser(Map<String, String> map) {`
`45`	`44`	`return map.get("db.user");`
`46`	`45`	`}`
`47`	`46`
`48`		`- @Nullable`
`49`	`47`	`@Override`
`50`	`48`	`public String getDbNamespace(Map<String, String> map) {`
`51`	`49`	`return map.get(`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest> {`
`13`	`13`
`14`	`14`	`@Override`
`15`		`- public String getDbSystem(CassandraRequest cassandraRequest) {`
	`15`	`+ public String getSystem(CassandraRequest request) {`
`16`	`16`	`return DbIncubatingAttributes.DbSystemValues.CASSANDRA;`
`17`	`17`	`}`
`18`	`18`
`@@ -23,8 +23,8 @@ public String getUser(CassandraRequest request) {`
`23`	`23`	`return null;`
`24`	`24`	`}`
`25`	`25`
`26`		`- @Nullable`
`27`	`26`	`@Override`
	`27`	`+ @Nullable`
`28`	`28`	`public String getDbNamespace(CassandraRequest request) {`
`29`	`29`	`return request.getSession().getLoggedKeyspace();`
`30`	`30`	`}`
`@@ -37,6 +37,7 @@ public String getConnectionString(CassandraRequest request) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
	`40`	`+ @Nullable`
`40`	`41`	`public String getRawQueryText(CassandraRequest request) {`
`41`	`42`	`return request.getDbQueryText();`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`@AutoValue`
`12`	`12`	`public abstract class CassandraRequest {`
`13`	`13`
`14`		`- public static CassandraRequest create(Session session, String dbQueryText) {`
`15`		`- return new AutoValue_CassandraRequest(session, dbQueryText);`
	`14`	`+ public static CassandraRequest create(Session session, String queryText) {`
	`15`	`+ return new AutoValue_CassandraRequest(session, queryText);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public abstract Session getSession();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest> {`
`14`	`14`
`15`	`15`	`@Override`
`16`		`- public String getDbSystem(CassandraRequest cassandraRequest) {`
	`16`	`+ public String getSystem(CassandraRequest request) {`
`17`	`17`	`return DbIncubatingAttributes.DbSystemValues.CASSANDRA;`
`18`	`18`	`}`
`19`	`19`
`@@ -24,8 +24,8 @@ public String getUser(CassandraRequest request) {`
`24`	`24`	`return null;`
`25`	`25`	`}`
`26`	`26`
`27`		`- @Nullable`
`28`	`27`	`@Override`
	`28`	`+ @Nullable`
`29`	`29`	`public String getDbNamespace(CassandraRequest request) {`
`30`	`30`	`return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);`
`31`	`31`	`}`
`@@ -38,6 +38,7 @@ public String getConnectionString(CassandraRequest request) {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
	`41`	`+ @Nullable`
`41`	`42`	`public String getRawQueryText(CassandraRequest request) {`
`42`	`43`	`return request.getDbQueryText();`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ public String getUser(CassandraRequest request) {`
`25`	`25`	`return null;`
`26`	`26`	`}`
`27`	`27`
`28`		`- @Nullable`
`29`	`28`	`@Override`
	`29`	`+ @Nullable`
`30`	`30`	`public String getDbNamespace(CassandraRequest request) {`
`31`	`31`	`return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);`
`32`	`32`	`}`
`@@ -39,6 +39,7 @@ public String getConnectionString(CassandraRequest request) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
	`42`	`+ @Nullable`
`42`	`43`	`public String getRawQueryText(CassandraRequest request) {`
`43`	`44`	`return request.getDbQueryText();`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public String getDbOperationName(ClickHouseDbRequest request) {`
`29`	`29`	`return request.getSqlStatementInfo().getOperation();`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ @Nullable`
`32`	`33`	`@Override`
`33`	`34`	`public String getDbSystem(ClickHouseDbRequest request) {`
`34`	`35`	`return DbIncubatingAttributes.DbSystemValues.CLICKHOUSE;`