Skip to content

Commit 6414eba

Browse files
trasktrask
committed
Conditionally check network.type
1 parent 65c3696 commit 6414eba

File tree

13 files changed

+154
-79
lines changed

13 files changed

+154
-79
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
67
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
78
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
89
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
@@ -102,7 +103,7 @@ void syncTest(Parameter parameter) {
102103
.hasKind(SpanKind.CLIENT)
103104
.hasNoParent()
104105
.hasAttributesSatisfyingExactly(
105-
equalTo(NETWORK_TYPE, "ipv4"),
106+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
106107
equalTo(SERVER_ADDRESS, cassandraHost),
107108
equalTo(SERVER_PORT, cassandraPort),
108109
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -116,7 +117,7 @@ void syncTest(Parameter parameter) {
116117
.hasKind(SpanKind.CLIENT)
117118
.hasNoParent()
118119
.hasAttributesSatisfyingExactly(
119-
equalTo(NETWORK_TYPE, "ipv4"),
120+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
120121
equalTo(SERVER_ADDRESS, cassandraHost),
121122
equalTo(SERVER_PORT, cassandraPort),
122123
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -135,7 +136,7 @@ void syncTest(Parameter parameter) {
135136
.hasKind(SpanKind.CLIENT)
136137
.hasNoParent()
137138
.hasAttributesSatisfyingExactly(
138-
equalTo(NETWORK_TYPE, "ipv4"),
139+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
139140
equalTo(SERVER_ADDRESS, cassandraHost),
140141
equalTo(SERVER_PORT, cassandraPort),
141142
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -174,7 +175,7 @@ void asyncTest(Parameter parameter) {
174175
.hasKind(SpanKind.CLIENT)
175176
.hasNoParent()
176177
.hasAttributesSatisfyingExactly(
177-
equalTo(NETWORK_TYPE, "ipv4"),
178+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
178179
equalTo(SERVER_ADDRESS, cassandraHost),
179180
equalTo(SERVER_PORT, cassandraPort),
180181
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -189,7 +190,7 @@ void asyncTest(Parameter parameter) {
189190
.hasKind(SpanKind.CLIENT)
190191
.hasParent(trace.getSpan(0))
191192
.hasAttributesSatisfyingExactly(
192-
equalTo(NETWORK_TYPE, "ipv4"),
193+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
193194
equalTo(SERVER_ADDRESS, cassandraHost),
194195
equalTo(SERVER_PORT, cassandraPort),
195196
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -213,7 +214,7 @@ void asyncTest(Parameter parameter) {
213214
.hasKind(SpanKind.CLIENT)
214215
.hasParent(trace.getSpan(0))
215216
.hasAttributesSatisfyingExactly(
216-
equalTo(NETWORK_TYPE, "ipv4"),
217+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
217218
equalTo(SERVER_ADDRESS, cassandraHost),
218219
equalTo(SERVER_PORT, cassandraPort),
219220
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

‎instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.cassandra.v4.common;
77

8+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
89
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
@@ -104,10 +105,15 @@ void syncTest(Parameter parameter) {
104105
.hasAttributesSatisfyingExactly(
105106
satisfies(
106107
NETWORK_TYPE,
107-
val ->
108+
val -> {
109+
if (emitStableDatabaseSemconv()) {
110+
val.isNull();
111+
} else {
108112
val.satisfiesAnyOf(
109113
v -> assertThat(v).isEqualTo("ipv4"),
110-
v -> assertThat(v).isEqualTo("ipv6"))),
114+
v -> assertThat(v).isEqualTo("ipv6"));
115+
}
116+
}),
111117
equalTo(SERVER_ADDRESS, cassandraHost),
112118
equalTo(SERVER_PORT, cassandraPort),
113119
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -158,10 +164,15 @@ void asyncTest(Parameter parameter) throws Exception {
158164
.hasAttributesSatisfyingExactly(
159165
satisfies(
160166
NETWORK_TYPE,
161-
val ->
167+
val -> {
168+
if (emitStableDatabaseSemconv()) {
169+
val.isNull();
170+
} else {
162171
val.satisfiesAnyOf(
163172
v -> assertThat(v).isEqualTo("ipv4"),
164-
v -> assertThat(v).isEqualTo("ipv6"))),
173+
v -> assertThat(v).isEqualTo("ipv6"));
174+
}
175+
}),
165176
equalTo(SERVER_ADDRESS, cassandraHost),
166177
equalTo(SERVER_PORT, cassandraPort),
167178
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.testing.cassandra.v4_4;
77

8+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
89
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
@@ -64,10 +65,15 @@ void reactiveTest(Parameter parameter) {
6465
.hasAttributesSatisfyingExactly(
6566
satisfies(
6667
NETWORK_TYPE,
67-
val ->
68+
val -> {
69+
if (emitStableDatabaseSemconv()) {
70+
val.isNull();
71+
} else {
6872
val.satisfiesAnyOf(
6973
v -> assertThat(v).isEqualTo("ipv4"),
70-
v -> assertThat(v).isEqualTo("ipv6"))),
74+
v -> assertThat(v).isEqualTo("ipv6"));
75+
}
76+
}),
7177
equalTo(SERVER_ADDRESS, cassandraHost),
7278
equalTo(SERVER_PORT, cassandraPort),
7379
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

‎instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6TransportClientTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING;
99

10+
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1011
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.AbstractElasticsearchTransportClientTest;
1112
import java.io.File;
1213
import java.util.Collections;
@@ -111,6 +112,6 @@ protected int getPort() {
111112

112113
@Override
113114
protected boolean hasNetworkType() {
114-
return true;
115+
return SemconvStability.emitOldDatabaseSemconv();
115116
}
116117
}

‎instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jedis.v3_0;
77

8+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
89
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
@@ -85,7 +86,7 @@ void setCommand() {
8586
equalTo(maybeStable(DB_OPERATION), "SET"),
8687
equalTo(SERVER_ADDRESS, host),
8788
equalTo(SERVER_PORT, port),
88-
equalTo(NETWORK_TYPE, "ipv4"),
89+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
8990
equalTo(NETWORK_PEER_ADDRESS, ip),
9091
satisfies(NETWORK_PEER_PORT, AbstractLongAssert::isNotNegative))));
9192
}
@@ -109,7 +110,7 @@ void getCommand() {
109110
equalTo(maybeStable(DB_OPERATION), "SET"),
110111
equalTo(SERVER_ADDRESS, host),
111112
equalTo(SERVER_PORT, port),
112-
equalTo(NETWORK_TYPE, "ipv4"),
113+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
113114
equalTo(NETWORK_PEER_ADDRESS, ip),
114115
satisfies(NETWORK_PEER_PORT, AbstractLongAssert::isNotNegative))),
115116
trace ->
@@ -123,7 +124,7 @@ void getCommand() {
123124
equalTo(maybeStable(DB_OPERATION), "GET"),
124125
equalTo(SERVER_ADDRESS, host),
125126
equalTo(SERVER_PORT, port),
126-
equalTo(NETWORK_TYPE, "ipv4"),
127+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
127128
equalTo(NETWORK_PEER_ADDRESS, ip),
128129
satisfies(NETWORK_PEER_PORT, AbstractLongAssert::isNotNegative))));
129130
}
@@ -147,7 +148,7 @@ void commandWithNoArguments() {
147148
equalTo(maybeStable(DB_OPERATION), "SET"),
148149
equalTo(SERVER_ADDRESS, host),
149150
equalTo(SERVER_PORT, port),
150-
equalTo(NETWORK_TYPE, "ipv4"),
151+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
151152
equalTo(NETWORK_PEER_ADDRESS, ip),
152153
satisfies(NETWORK_PEER_PORT, AbstractLongAssert::isNotNegative))),
153154
trace ->
@@ -161,7 +162,7 @@ void commandWithNoArguments() {
161162
equalTo(maybeStable(DB_OPERATION), "RANDOMKEY"),
162163
equalTo(SERVER_ADDRESS, host),
163164
equalTo(SERVER_PORT, port),
164-
equalTo(NETWORK_TYPE, "ipv4"),
165+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
165166
equalTo(NETWORK_PEER_ADDRESS, ip),
166167
satisfies(NETWORK_PEER_PORT, AbstractLongAssert::isNotNegative))));
167168
}

‎instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jedis.v4_0;
77

8+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
89
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
@@ -76,7 +77,7 @@ void setCommand() {
7677
equalTo(DB_SYSTEM, "redis"),
7778
equalTo(maybeStable(DB_STATEMENT), "SET foo ?"),
7879
equalTo(maybeStable(DB_OPERATION), "SET"),
79-
equalTo(NETWORK_TYPE, "ipv4"),
80+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
8081
equalTo(NETWORK_PEER_PORT, port),
8182
equalTo(NETWORK_PEER_ADDRESS, ip))));
8283
}
@@ -98,7 +99,7 @@ void getCommand() {
9899
equalTo(DB_SYSTEM, "redis"),
99100
equalTo(maybeStable(DB_STATEMENT), "SET foo ?"),
100101
equalTo(maybeStable(DB_OPERATION), "SET"),
101-
equalTo(NETWORK_TYPE, "ipv4"),
102+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
102103
equalTo(NETWORK_PEER_PORT, port),
103104
equalTo(NETWORK_PEER_ADDRESS, ip))),
104105
trace ->
@@ -110,7 +111,7 @@ void getCommand() {
110111
equalTo(DB_SYSTEM, "redis"),
111112
equalTo(maybeStable(DB_STATEMENT), "GET foo"),
112113
equalTo(maybeStable(DB_OPERATION), "GET"),
113-
equalTo(NETWORK_TYPE, "ipv4"),
114+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
114115
equalTo(NETWORK_PEER_PORT, port),
115116
equalTo(NETWORK_PEER_ADDRESS, ip))));
116117
}
@@ -132,7 +133,7 @@ void commandWithNoArguments() {
132133
equalTo(DB_SYSTEM, "redis"),
133134
equalTo(maybeStable(DB_STATEMENT), "SET foo ?"),
134135
equalTo(maybeStable(DB_OPERATION), "SET"),
135-
equalTo(NETWORK_TYPE, "ipv4"),
136+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
136137
equalTo(NETWORK_PEER_PORT, port),
137138
equalTo(NETWORK_PEER_ADDRESS, ip))),
138139
trace ->
@@ -144,7 +145,7 @@ void commandWithNoArguments() {
144145
equalTo(DB_SYSTEM, "redis"),
145146
equalTo(maybeStable(DB_STATEMENT), "RANDOMKEY"),
146147
equalTo(maybeStable(DB_OPERATION), "RANDOMKEY"),
147-
equalTo(NETWORK_TYPE, "ipv4"),
148+
equalTo(NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
148149
equalTo(NETWORK_PEER_PORT, port),
149150
equalTo(NETWORK_PEER_ADDRESS, ip))));
150151
}

‎instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.lettuce.v5_1;
77

8+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
89
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
910
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1011
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
@@ -59,7 +60,8 @@ void testAsyncSubscriberWithSpecificThreadPool() {
5960
.hasParent(trace.getSpan(0))
6061
.hasAttributesSatisfyingExactly(
6162
addExtraAttributes(
62-
equalTo(NETWORK_TYPE, "ipv4"),
63+
equalTo(
64+
NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
6365
equalTo(NETWORK_PEER_ADDRESS, ip),
6466
equalTo(NETWORK_PEER_PORT, port),
6567
equalTo(SERVER_ADDRESS, host),
@@ -75,7 +77,8 @@ void testAsyncSubscriberWithSpecificThreadPool() {
7577
.hasParent(trace.getSpan(0))
7678
.hasAttributesSatisfyingExactly(
7779
addExtraAttributes(
78-
equalTo(NETWORK_TYPE, "ipv4"),
80+
equalTo(
81+
NETWORK_TYPE, emitStableDatabaseSemconv() ? null : "ipv4"),
7982
equalTo(NETWORK_PEER_ADDRESS, ip),
8083
equalTo(NETWORK_PEER_PORT, port),
8184
equalTo(SERVER_ADDRESS, host),

0 commit comments

Comments
 (0)