diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraKeyspaceExtractor.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraKeyspaceExtractor.java deleted file mode 100644 index 8993431ed9..0000000000 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraKeyspaceExtractor.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; - -import com.datastax.driver.core.ExecutionInfo; -import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; -import javax.annotation.Nullable; - -final class CassandraKeyspaceExtractor - implements AttributesExtractor { - - @Override - public void onStart(AttributesBuilder attributes, CassandraRequest request) { - attributes.put( - SemanticAttributes.DB_CASSANDRA_KEYSPACE, request.getSession().getLoggedKeyspace()); - } - - @Override - public void onEnd( - AttributesBuilder attributes, - CassandraRequest request, - ExecutionInfo executionInfo, - @Nullable Throwable error) {} -} diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java index e38d252b5e..86fc2c5510 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java @@ -30,7 +30,6 @@ public final class CassandraSingletons { GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanName) .addAttributesExtractor(attributesExtractor) .addAttributesExtractor(new CassandraNetAttributesExtractor()) - .addAttributesExtractor(new CassandraKeyspaceExtractor()) .newInstrumenter(SpanKindExtractor.alwaysClient()); } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/groovy/CassandraClientTest.groovy b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/groovy/CassandraClientTest.groovy index e1fbca6470..a2066dfb94 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/groovy/CassandraClientTest.groovy +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/groovy/CassandraClientTest.groovy @@ -152,7 +152,6 @@ class CassandraClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.DB_NAME" keyspace "$SemanticAttributes.DB_STATEMENT" statement "$SemanticAttributes.DB_OPERATION" operation - "$SemanticAttributes.DB_CASSANDRA_KEYSPACE" keyspace "$SemanticAttributes.DB_CASSANDRA_TABLE" table } } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java index 9665a461f5..b353cbb0f7 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0; -import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.config.DefaultDriverOption; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; @@ -20,12 +19,7 @@ final class CassandraAttributesExtractor implements AttributesExtractor { @Override - public void onStart(AttributesBuilder attributes, CassandraRequest request) { - set( - attributes, - SemanticAttributes.DB_CASSANDRA_KEYSPACE, - request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null)); - } + public void onStart(AttributesBuilder attributes, CassandraRequest request) {} @Override public void onEnd( diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/groovy/CassandraClientTest.groovy b/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/groovy/CassandraClientTest.groovy index 1b4f5a857a..f216def008 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/groovy/CassandraClientTest.groovy +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/groovy/CassandraClientTest.groovy @@ -131,7 +131,6 @@ class CassandraClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE" Boolean "$SemanticAttributes.DB_CASSANDRA_PAGE_SIZE" 5000 "$SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT" 0 - "$SemanticAttributes.DB_CASSANDRA_KEYSPACE" keyspace // the SqlStatementSanitizer can't handle CREATE statements yet "$SemanticAttributes.DB_CASSANDRA_TABLE" table }