Skip to content

Commit 7ff3b23

Browse files
lauritlaurit
authored
Remove db.connection_string (#11089)
1 parent a1466ad commit 7ff3b23

File tree

54 files changed

+135
-484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+135
-484
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,11 @@ abstract class DbClientCommonAttributesExtractor<
2525
this.getter = getter;
2626
}
2727

28-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
2928
@Override
3029
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
3130
internalSet(attributes, DbIncubatingAttributes.DB_SYSTEM, getter.getSystem(request));
3231
internalSet(attributes, DbIncubatingAttributes.DB_USER, getter.getUser(request));
3332
internalSet(attributes, DbIncubatingAttributes.DB_NAME, getter.getName(request));
34-
internalSet(
35-
attributes,
36-
DbIncubatingAttributes.DB_CONNECTION_STRING,
37-
getter.getConnectionString(request));
3833
}
3934

4035
@Override

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public interface DbClientCommonAttributesGetter<REQUEST> {
1919
@Nullable
2020
String getName(REQUEST request);
2121

22+
// to be removed in 2.4.0, use `server.address` and `server.port` instead
2223
@Nullable
23-
String getConnectionString(REQUEST request);
24+
@Deprecated
25+
default String getConnectionString(REQUEST request) {
26+
return null;
27+
}
2428
}

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java

-8
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ public String getName(Map<String, String> map) {
3636
return map.get("db.name");
3737
}
3838

39-
@Override
40-
public String getConnectionString(Map<String, String> map) {
41-
return map.get("db.connection_string");
42-
}
43-
4439
@Override
4540
public String getStatement(Map<String, String> map) {
4641
return map.get("db.statement");
@@ -52,15 +47,13 @@ public String getOperation(Map<String, String> map) {
5247
}
5348
}
5449

55-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
5650
@Test
5751
void shouldExtractAllAvailableAttributes() {
5852
// given
5953
Map<String, String> request = new HashMap<>();
6054
request.put("db.system", "myDb");
6155
request.put("db.user", "username");
6256
request.put("db.name", "potatoes");
63-
request.put("db.connection_string", "mydb:///potatoes");
6457
request.put("db.statement", "SELECT * FROM potato");
6558
request.put("db.operation", "SELECT");
6659

@@ -82,7 +75,6 @@ void shouldExtractAllAvailableAttributes() {
8275
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
8376
entry(DbIncubatingAttributes.DB_USER, "username"),
8477
entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
85-
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
8678
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"),
8779
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"));
8880

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java

-8
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,15 @@ public String getUser(Map<String, String> map) {
4242
public String getName(Map<String, String> map) {
4343
return map.get("db.name");
4444
}
45-
46-
@Override
47-
public String getConnectionString(Map<String, String> map) {
48-
return map.get("db.connection_string");
49-
}
5045
}
5146

52-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
5347
@Test
5448
void shouldExtractAllAttributes() {
5549
// given
5650
Map<String, String> request = new HashMap<>();
5751
request.put("db.system", "myDb");
5852
request.put("db.user", "username");
5953
request.put("db.name", "potatoes");
60-
request.put("db.connection_string", "mydb:///potatoes");
6154
request.put("db.statement", "SELECT * FROM potato WHERE id=12345");
6255

6356
Context context = Context.root();
@@ -78,7 +71,6 @@ void shouldExtractAllAttributes() {
7871
entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
7972
entry(DbIncubatingAttributes.DB_USER, "username"),
8073
entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
81-
entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
8274
entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"),
8375
entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"),
8476
entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato"));

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

-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ public String getName(CassandraRequest request) {
2828
return request.getSession().getLoggedKeyspace();
2929
}
3030

31-
@Override
32-
@Nullable
33-
public String getConnectionString(CassandraRequest request) {
34-
return null;
35-
}
36-
3731
@Override
3832
@Nullable
3933
public String getRawStatement(CassandraRequest request) {

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

-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ public String getName(CassandraRequest request) {
2929
return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
3030
}
3131

32-
@Override
33-
@Nullable
34-
public String getConnectionString(CassandraRequest request) {
35-
return null;
36-
}
37-
3832
@Override
3933
@Nullable
4034
public String getRawStatement(CassandraRequest request) {

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

-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ public String getName(CassandraRequest request) {
2929
return request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null);
3030
}
3131

32-
@Override
33-
@Nullable
34-
public String getConnectionString(CassandraRequest request) {
35-
return null;
36-
}
37-
3832
@Override
3933
@Nullable
4034
public String getRawStatement(CassandraRequest request) {

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

-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ public String getName(CouchbaseRequestInfo couchbaseRequest) {
2828
return couchbaseRequest.bucket();
2929
}
3030

31-
@Override
32-
@Nullable
33-
public String getConnectionString(CouchbaseRequestInfo couchbaseRequest) {
34-
return null;
35-
}
36-
3731
@Override
3832
@Nullable
3933
public String getStatement(CouchbaseRequestInfo couchbaseRequest) {

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

-6
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ public String getName(ElasticsearchRestRequest request) {
5151
return null;
5252
}
5353

54-
@Override
55-
@Nullable
56-
public String getConnectionString(ElasticsearchRestRequest request) {
57-
return null;
58-
}
59-
6054
@Override
6155
@Nullable
6256
public String getStatement(ElasticsearchRestRequest request) {

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

-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ public String getName(ElasticTransportRequest s) {
2929
return null;
3030
}
3131

32-
@Override
33-
@Nullable
34-
public String getConnectionString(ElasticTransportRequest s) {
35-
return null;
36-
}
37-
3832
@Override
3933
@Nullable
4034
public String getStatement(ElasticTransportRequest s) {

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

-6
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ public String getName(GeodeRequest request) {
3232
return request.getRegion().getName();
3333
}
3434

35-
@Override
36-
@Nullable
37-
public String getConnectionString(GeodeRequest request) {
38-
return null;
39-
}
40-
4135
@Override
4236
@Nullable
4337
public String getStatement(GeodeRequest request) {

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java

-4
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,18 @@ static void cleanUp() {
5757
}
5858
}
5959

60-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
6160
static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) {
6261
return span.hasKind(SpanKind.CLIENT)
6362
.hasParent(parent)
6463
.hasAttributesSatisfyingExactly(
6564
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
6665
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
6766
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
68-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
6967
satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)),
7068
satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)),
7169
equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value"));
7270
}
7371

74-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
7572
static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent, String verb) {
7673
return span.hasName(verb.concat(" db1.Value"))
7774
.hasKind(SpanKind.CLIENT)
@@ -80,7 +77,6 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent, Str
8077
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
8178
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
8279
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
83-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
8480
satisfies(
8581
DbIncubatingAttributes.DB_STATEMENT,
8682
stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ void testCriteria(String methodName, Consumer<Criteria> interaction) {
6969
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
7070
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
7171
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
72-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
7372
satisfies(
7473
DbIncubatingAttributes.DB_STATEMENT,
7574
stringAssert -> stringAssert.startsWith("select")),

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java

-8
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class EntityManagerTest extends AbstractHibernateTest {
3434
static final EntityManagerFactory entityManagerFactory =
3535
Persistence.createEntityManagerFactory("test-pu");
3636

37-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
3837
@ParameterizedTest
3938
@MethodSource("provideArgumentsHibernateActionParameters")
4039
void testHibernateActions(Parameter parameter) {
@@ -103,7 +102,6 @@ void testHibernateActions(Parameter parameter) {
103102
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
104103
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
105104
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
106-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
107105
satisfies(
108106
DbIncubatingAttributes.DB_STATEMENT,
109107
val -> val.isInstanceOf(String.class)),
@@ -134,7 +132,6 @@ void testHibernateActions(Parameter parameter) {
134132
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
135133
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
136134
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
137-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
138135
satisfies(
139136
DbIncubatingAttributes.DB_STATEMENT,
140137
val -> val.isInstanceOf(String.class)),
@@ -184,7 +181,6 @@ private static Stream<Arguments> provideArgumentsHibernateActionParameters() {
184181
Arguments.of(named("remove", new Parameter("delete", true, true, EntityManager::remove))));
185182
}
186183

187-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
188184
@Test
189185
void testHibernatePersist() {
190186
EntityManager entityManager = entityManagerFactory.createEntityManager();
@@ -220,7 +216,6 @@ void testHibernatePersist() {
220216
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
221217
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
222218
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
223-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
224219
satisfies(
225220
DbIncubatingAttributes.DB_STATEMENT,
226221
val -> val.isInstanceOf(String.class)),
@@ -246,7 +241,6 @@ void testHibernatePersist() {
246241
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
247242
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
248243
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
249-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
250244
satisfies(
251245
DbIncubatingAttributes.DB_STATEMENT,
252246
val -> val.isInstanceOf(String.class)),
@@ -256,7 +250,6 @@ void testHibernatePersist() {
256250
equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value"))));
257251
}
258252

259-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
260253
@ParameterizedTest
261254
@MethodSource("provideArgumentsAttachesState")
262255
void testAttachesStateToQuery(Function<EntityManager, Query> queryBuildMethod) {
@@ -295,7 +288,6 @@ void testAttachesStateToQuery(Function<EntityManager, Query> queryBuildMethod) {
295288
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
296289
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
297290
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
298-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
299291
satisfies(
300292
DbIncubatingAttributes.DB_STATEMENT,
301293
val -> val.isInstanceOf(String.class)),

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java

-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
class QueryTest extends AbstractHibernateTest {
2727

28-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
2928
@Test
3029
void testHibernateQueryExecuteUpdateWithTransaction() {
3130
testing.runWithSpan(
@@ -64,7 +63,6 @@ void testHibernateQueryExecuteUpdateWithTransaction() {
6463
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
6564
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
6665
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
67-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
6866
satisfies(
6967
DbIncubatingAttributes.DB_STATEMENT,
7068
val -> val.isInstanceOf(String.class)),
@@ -85,7 +83,6 @@ void testHibernateQueryExecuteUpdateWithTransaction() {
8583
.get(stringKey("hibernate.session_id"))))));
8684
}
8785

88-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
8986
@ParameterizedTest
9087
@MethodSource("providesArgumentsSingleCall")
9188
void testHibernateQuerySingleCall(Parameter parameter) {
@@ -122,7 +119,6 @@ void testHibernateQuerySingleCall(Parameter parameter) {
122119
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
123120
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
124121
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
125-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
126122
satisfies(
127123
DbIncubatingAttributes.DB_STATEMENT,
128124
val -> val.startsWith("select ")),
@@ -155,7 +151,6 @@ private static Stream<Arguments> providesArgumentsSingleCall() {
155151
new Parameter("SELECT Value", sess -> sess.createQuery("from Value").scroll()))));
156152
}
157153

158-
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
159154
@Test
160155
void testHibernateQueryIterate() {
161156
testing.runWithSpan(
@@ -196,7 +191,6 @@ void testHibernateQueryIterate() {
196191
equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"),
197192
equalTo(DbIncubatingAttributes.DB_NAME, "db1"),
198193
equalTo(DbIncubatingAttributes.DB_USER, "sa"),
199-
equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"),
200194
satisfies(
201195
DbIncubatingAttributes.DB_STATEMENT,
202196
val -> val.startsWith("select ")),

0 commit comments

Comments
 (0)