Skip to content

Commit 7efa297

Browse files
committed
Update all implementations to use new method names
- Changed all getDbSystem() implementations to getDbSystemName() - Changed all getResponseStatus() implementations to getResponseStatusCode() - Updated implementations across all database instrumentations: - JDBC, Cassandra, ClickHouse, Couchbase - Elasticsearch (REST and Transport) - Geode, InfluxDB - Jedis (1.4, 3.0, 4.0) - Lettuce (4.0, 5.0) - MongoDB - OpenSearch (Java 3.0 and REST) - R2DBC - Redis clients (Rediscala, Redisson) - Spymemcached - Vertx (Redis and SQL clients)
1 parent d222397 commit 7efa297

File tree

24 files changed

+32
-32
lines changed

24 files changed

+32
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class CassandraSqlAttributesGetter
1919

2020
@SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
2121
@Override
22-
public String getDbSystem(CassandraRequest request) {
22+
public String getDbSystemName(CassandraRequest request) {
2323
return DbIncubatingAttributes.DbSystemIncubatingValues.CASSANDRA;
2424
}
2525

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class CassandraSqlAttributesGetter
2222

2323
@SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
2424
@Override
25-
public String getDbSystem(CassandraRequest request) {
25+
public String getDbSystemName(CassandraRequest request) {
2626
return DbIncubatingAttributes.DbSystemIncubatingValues.CASSANDRA;
2727
}
2828

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
final class CassandraSqlAttributesGetter
2121
implements SqlClientAttributesGetter<CassandraRequest, ExecutionInfo> {
2222
// copied from DbIncubatingAttributes.DbSystemIncubatingValues
23-
private static final String CASSANDRA = "cassandra";
23+
private static final String CASSANDRA = \"cassandra\";
2424

2525
@Override
26-
public String getDbSystem(CassandraRequest request) {
26+
public String getDbSystemName(CassandraRequest request) {
2727
return CASSANDRA;
2828
}
2929

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public String getDbOperationName(ClickHouseDbRequest request) {
3939

4040
@SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
4141
@Override
42-
public String getDbSystem(ClickHouseDbRequest request) {
42+
public String getDbSystemName(ClickHouseDbRequest request) {
4343
return DbIncubatingAttributes.DbSystemIncubatingValues.CLICKHOUSE;
4444
}
4545

@@ -55,7 +55,7 @@ public String getDbNamespace(ClickHouseDbRequest request) {
5555

5656
@Nullable
5757
@Override
58-
public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
58+
public String getResponseStatusCode(@Nullable Void response, @Nullable Throwable error) {
5959
return errorCodeExtractor.apply(error);
6060
}
6161
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class CouchbaseAttributesGetter
1616

1717
@SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
1818
@Override
19-
public String getDbSystem(CouchbaseRequestInfo couchbaseRequest) {
19+
public String getDbSystemName(CouchbaseRequestInfo couchbaseRequest) {
2020
return DbIncubatingAttributes.DbSystemIncubatingValues.COUCHBASE;
2121
}
2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ final class ElasticsearchDbAttributesGetter
3939
}
4040

4141
@Override
42-
public String getDbSystem(ElasticsearchRestRequest request) {
42+
public String getDbSystemName(ElasticsearchRestRequest request) {
4343
return ELASTICSEARCH;
4444
}
4545

@@ -82,7 +82,7 @@ public String getDbOperationName(ElasticsearchRestRequest request) {
8282

8383
@Nullable
8484
@Override
85-
public String getResponseStatus(@Nullable Response response, @Nullable Throwable error) {
85+
public String getResponseStatusCode(@Nullable Response response, @Nullable Throwable error) {
8686
return response != null ? dbResponseStatusCode(response.getStatusLine().getStatusCode()) : null;
8787
}
8888
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ final class ElasticsearchTransportAttributesGetter
1515

1616
@SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
1717
@Override
18-
public String getDbSystem(ElasticTransportRequest request) {
18+
public String getDbSystemName(ElasticTransportRequest request) {
1919
return DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH;
2020
}
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class GeodeDbAttributesGetter implements DbClientAttributesGetter<GeodeReq
1818

1919
@SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
2020
@Override
21-
public String getDbSystem(GeodeRequest request) {
21+
public String getDbSystemName(GeodeRequest request) {
2222
return DbIncubatingAttributes.DbSystemIncubatingValues.GEODE;
2323
}
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public String getDbOperationName(InfluxDbRequest request) {
2626
}
2727

2828
@Override
29-
public String getDbSystem(InfluxDbRequest request) {
29+
public String getDbSystemName(InfluxDbRequest request) {
3030
return "influxdb";
3131
}
3232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public Long getBatchSize(DbRequest request) {
5959

6060
@Nullable
6161
@Override
62-
public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
62+
public String getResponseStatusCode(@Nullable Void response, @Nullable Throwable error) {
6363
if (error instanceof SQLException) {
6464
return Integer.toString(((SQLException) error).getErrorCode());
6565
}

0 commit comments

Comments
 (0)