Skip to content

Commit 7fd551e

Browse files
trasktrask
authored
Remove network.type from stable Cassandra db spans (#18920)
1 parent f330e4c commit 7fd551e

5 files changed

Lines changed: 24 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public static <REQUEST, RESPONSE> SqlClientAttributesExtractorBuilder<REQUEST, R
7272
// capturing query parameters disables query sanitization
7373
this.querySanitizationEnabled = !captureQueryParameters && querySanitizationEnabled;
7474
this.captureQueryParameters = captureQueryParameters;
75-
internalNetworkExtractor = new InternalNetworkAttributesExtractor<>(getter, true, false);
75+
internalNetworkExtractor =
76+
new InternalNetworkAttributesExtractor<>(getter, emitOldDatabaseSemconv(), false);
7677
serverAttributesExtractor = ServerAttributesExtractor.create(getter);
7778
}
7879

‎instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/camel/v2_20/decorators/CassandraTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void testCassandra() {
137137
.hasKind(SpanKind.CLIENT)
138138
.hasParent(trace.getSpan(0))
139139
.hasAttributesSatisfyingExactly(
140-
satisfies(NETWORK_TYPE, val -> val.isInstanceOf(String.class)),
140+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
141141
equalTo(SERVER_ADDRESS, host),
142142
equalTo(SERVER_PORT, cassandraPort),
143143
satisfies(

‎instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraClientTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void syncTest(Parameter parameter) {
111111
.hasKind(SpanKind.CLIENT)
112112
.hasNoParent()
113113
.hasAttributesSatisfyingExactly(
114-
equalTo(NETWORK_TYPE, "ipv4"),
114+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
115115
equalTo(SERVER_ADDRESS, cassandraHost),
116116
equalTo(SERVER_PORT, cassandraPort),
117117
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -130,7 +130,7 @@ void syncTest(Parameter parameter) {
130130
.hasKind(SpanKind.CLIENT)
131131
.hasNoParent()
132132
.hasAttributesSatisfyingExactly(
133-
equalTo(NETWORK_TYPE, "ipv4"),
133+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
134134
equalTo(SERVER_ADDRESS, cassandraHost),
135135
equalTo(SERVER_PORT, cassandraPort),
136136
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -156,7 +156,7 @@ void syncTest(Parameter parameter) {
156156
.hasKind(SpanKind.CLIENT)
157157
.hasNoParent()
158158
.hasAttributesSatisfyingExactly(
159-
equalTo(NETWORK_TYPE, "ipv4"),
159+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
160160
equalTo(SERVER_ADDRESS, cassandraHost),
161161
equalTo(SERVER_PORT, cassandraPort),
162162
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -200,7 +200,7 @@ void asyncTest(Parameter parameter) {
200200
.hasKind(SpanKind.CLIENT)
201201
.hasNoParent()
202202
.hasAttributesSatisfyingExactly(
203-
equalTo(NETWORK_TYPE, "ipv4"),
203+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
204204
equalTo(SERVER_ADDRESS, cassandraHost),
205205
equalTo(SERVER_PORT, cassandraPort),
206206
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -220,7 +220,7 @@ void asyncTest(Parameter parameter) {
220220
.hasKind(SpanKind.CLIENT)
221221
.hasParent(trace.getSpan(0))
222222
.hasAttributesSatisfyingExactly(
223-
equalTo(NETWORK_TYPE, "ipv4"),
223+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
224224
equalTo(SERVER_ADDRESS, cassandraHost),
225225
equalTo(SERVER_PORT, cassandraPort),
226226
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -251,7 +251,7 @@ void asyncTest(Parameter parameter) {
251251
.hasKind(SpanKind.CLIENT)
252252
.hasParent(trace.getSpan(0))
253253
.hasAttributesSatisfyingExactly(
254-
equalTo(NETWORK_TYPE, "ipv4"),
254+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
255255
equalTo(SERVER_ADDRESS, cassandraHost),
256256
equalTo(SERVER_PORT, cassandraPort),
257257
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

‎instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ void reactiveTest(Parameter parameter) {
6565
.hasKind(SpanKind.CLIENT)
6666
.hasParent(trace.getSpan(0))
6767
.hasAttributesSatisfyingExactly(
68-
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", "ipv6")),
68+
satisfies(
69+
NETWORK_TYPE,
70+
emitStableDatabaseSemconv()
71+
? val -> val.isNull()
72+
: val -> val.isIn("ipv4", "ipv6")),
6973
equalTo(SERVER_ADDRESS, cassandraHost),
7074
equalTo(SERVER_PORT, cassandraPort),
7175
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

‎instrumentation/cassandra/cassandra-common-4.0/testing/src/main/java/io/opentelemetry/cassandra/common/v4_0/AbstractCassandraTest.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ void syncTest(Parameter parameter) {
130130
.hasKind(SpanKind.CLIENT)
131131
.hasNoParent()
132132
.hasAttributesSatisfyingExactly(
133-
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", "ipv6")),
133+
satisfies(
134+
NETWORK_TYPE,
135+
emitStableDatabaseSemconv()
136+
? val -> val.isNull()
137+
: val -> val.isIn("ipv4", "ipv6")),
134138
equalTo(SERVER_ADDRESS, cassandraHost),
135139
equalTo(SERVER_PORT, cassandraPort),
136140
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -185,7 +189,11 @@ void asyncTest(Parameter parameter) {
185189
.hasKind(SpanKind.CLIENT)
186190
.hasParent(trace.getSpan(0))
187191
.hasAttributesSatisfyingExactly(
188-
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", "ipv6")),
192+
satisfies(
193+
NETWORK_TYPE,
194+
emitStableDatabaseSemconv()
195+
? val -> val.isNull()
196+
: val -> val.isIn("ipv4", "ipv6")),
189197
equalTo(SERVER_ADDRESS, cassandraHost),
190198
equalTo(SERVER_PORT, cassandraPort),
191199
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

0 commit comments

Comments
 (0)