Skip to content

Commit 9e34fe1

Browse files
trasktrask
committed
revert a bit, will implement differently later
1 parent d580bba commit 9e34fe1

File tree

11 files changed

+38
-254
lines changed

11 files changed

+38
-254
lines changed

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

Lines changed: 0 additions & 71 deletions
This file was deleted.

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

Lines changed: 0 additions & 90 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0;
77

88
import com.datastax.driver.core.ExecutionInfo;
9-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbNetworkAttributesGetter;
9+
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
1010
import java.net.InetSocketAddress;
1111
import javax.annotation.Nullable;
1212

1313
final class CassandraNetworkAttributesGetter
14-
implements DbNetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
14+
implements NetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
1515

1616
@Override
1717
@Nullable

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import com.datastax.driver.core.ExecutionInfo;
99
import io.opentelemetry.api.GlobalOpenTelemetry;
1010
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
11-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbNetworkAttributesExtractor;
1211
import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesExtractor;
1312
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1413
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
14+
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
1515
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
1616
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1717

@@ -38,7 +38,7 @@ public final class CassandraSingletons {
3838
AgentCommonConfig.get().isStatementSanitizationEnabled())
3939
.build())
4040
.addAttributesExtractor(
41-
DbNetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
41+
NetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
4242
.addAttributesExtractor(new CassandraAttributesExtractor())
4343
.buildInstrumenter(SpanKindExtractor.alwaysClient());
4444
}

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

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.datastax.driver.core.ResultSetFuture;
1111
import com.datastax.driver.core.Session;
1212
import io.opentelemetry.api.trace.SpanKind;
13-
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1413
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1514
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1615
import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil;
@@ -95,9 +94,7 @@ void syncTest(Parameter parameter) {
9594
.hasKind(SpanKind.CLIENT)
9695
.hasNoParent()
9796
.hasAttributesSatisfyingExactly(
98-
equalTo(
99-
NetworkAttributes.NETWORK_TYPE,
100-
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
97+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
10198
equalTo(ServerAttributes.SERVER_ADDRESS, cassandraHost),
10299
equalTo(ServerAttributes.SERVER_PORT, cassandraPort),
103100
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),
@@ -114,9 +111,7 @@ void syncTest(Parameter parameter) {
114111
.hasKind(SpanKind.CLIENT)
115112
.hasNoParent()
116113
.hasAttributesSatisfyingExactly(
117-
equalTo(
118-
NetworkAttributes.NETWORK_TYPE,
119-
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
114+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
120115
equalTo(ServerAttributes.SERVER_ADDRESS, cassandraHost),
121116
equalTo(ServerAttributes.SERVER_PORT, cassandraPort),
122117
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),
@@ -147,9 +142,7 @@ void syncTest(Parameter parameter) {
147142
.hasKind(SpanKind.CLIENT)
148143
.hasNoParent()
149144
.hasAttributesSatisfyingExactly(
150-
equalTo(
151-
NetworkAttributes.NETWORK_TYPE,
152-
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
145+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
153146
equalTo(ServerAttributes.SERVER_ADDRESS, cassandraHost),
154147
equalTo(ServerAttributes.SERVER_PORT, cassandraPort),
155148
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),
@@ -197,9 +190,7 @@ void asyncTest(Parameter parameter) {
197190
.hasKind(SpanKind.CLIENT)
198191
.hasNoParent()
199192
.hasAttributesSatisfyingExactly(
200-
equalTo(
201-
NetworkAttributes.NETWORK_TYPE,
202-
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
193+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
203194
equalTo(ServerAttributes.SERVER_ADDRESS, cassandraHost),
204195
equalTo(ServerAttributes.SERVER_PORT, cassandraPort),
205196
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),
@@ -217,9 +208,7 @@ void asyncTest(Parameter parameter) {
217208
.hasKind(SpanKind.CLIENT)
218209
.hasParent(trace.getSpan(0))
219210
.hasAttributesSatisfyingExactly(
220-
equalTo(
221-
NetworkAttributes.NETWORK_TYPE,
222-
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
211+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
223212
equalTo(ServerAttributes.SERVER_ADDRESS, cassandraHost),
224213
equalTo(ServerAttributes.SERVER_PORT, cassandraPort),
225214
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),
@@ -255,9 +244,7 @@ void asyncTest(Parameter parameter) {
255244
.hasKind(SpanKind.CLIENT)
256245
.hasParent(trace.getSpan(0))
257246
.hasAttributesSatisfyingExactly(
258-
equalTo(
259-
NetworkAttributes.NETWORK_TYPE,
260-
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
247+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
261248
equalTo(ServerAttributes.SERVER_ADDRESS, cassandraHost),
262249
equalTo(ServerAttributes.SERVER_PORT, cassandraPort),
263250
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
99
import com.datastax.oss.driver.api.core.metadata.Node;
10-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbNetworkAttributesGetter;
10+
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
1111
import java.net.InetSocketAddress;
1212
import java.net.SocketAddress;
1313
import javax.annotation.Nullable;
1414

1515
final class CassandraNetworkAttributesGetter
16-
implements DbNetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
16+
implements NetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
1717

1818
@Override
1919
@Nullable

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
99
import io.opentelemetry.api.GlobalOpenTelemetry;
1010
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
11-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbNetworkAttributesExtractor;
1211
import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesExtractor;
1312
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1413
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
14+
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
1515
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
1616
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1717

@@ -37,7 +37,7 @@ public final class CassandraSingletons {
3737
AgentCommonConfig.get().isStatementSanitizationEnabled())
3838
.build())
3939
.addAttributesExtractor(
40-
DbNetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
40+
NetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
4141
.addAttributesExtractor(new CassandraAttributesExtractor())
4242
.buildInstrumenter(SpanKindExtractor.alwaysClient());
4343
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import com.datastax.oss.driver.api.core.metadata.EndPoint;
1010
import com.datastax.oss.driver.api.core.metadata.Node;
1111
import com.datastax.oss.driver.internal.core.metadata.DefaultEndPoint;
12-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbNetworkAttributesGetter;
12+
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
1313
import java.net.InetSocketAddress;
1414
import javax.annotation.Nullable;
1515

1616
final class CassandraNetworkAttributesGetter
17-
implements DbNetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
17+
implements NetworkAttributesGetter<CassandraRequest, ExecutionInfo> {
1818

1919
@Override
2020
@Nullable

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import io.opentelemetry.api.OpenTelemetry;
1111
import io.opentelemetry.api.common.AttributeKey;
1212
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
13-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbNetworkAttributesExtractor;
1413
import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesExtractor;
1514
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1615
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
16+
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
1717

1818
/** A builder of {@link CassandraTelemetry}. */
1919
public class CassandraTelemetryBuilder {
@@ -63,7 +63,7 @@ protected Instrumenter<CassandraRequest, ExecutionInfo> createInstrumenter(
6363
.setStatementSanitizationEnabled(statementSanitizationEnabled)
6464
.build())
6565
.addAttributesExtractor(
66-
DbNetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
66+
NetworkAttributesExtractor.create(new CassandraNetworkAttributesGetter()))
6767
.addAttributesExtractor(new CassandraAttributesExtractor())
6868
.buildInstrumenter(SpanKindExtractor.alwaysClient());
6969
}

0 commit comments

Comments
 (0)