open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't extract deprecated cassandra keyspace attribute (#5041)

This commit is contained in:
Nikita Salnikov-Tarnovski 2022-01-08 01:19:59 +02:00 committed by GitHub
parent 25550e0a63
commit daeda5dcfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraKeyspaceExtractor.java
View File

@ -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<CassandraRequest, ExecutionInfo> {
@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) {}
}

1
instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java
View File

@ -30,7 +30,6 @@ public final class CassandraSingletons {
GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanName) GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanName)
.addAttributesExtractor(attributesExtractor) .addAttributesExtractor(attributesExtractor)
.addAttributesExtractor(new CassandraNetAttributesExtractor()) .addAttributesExtractor(new CassandraNetAttributesExtractor())
.addAttributesExtractor(new CassandraKeyspaceExtractor())
.newInstrumenter(SpanKindExtractor.alwaysClient()); .newInstrumenter(SpanKindExtractor.alwaysClient());
} }

1
instrumentation/cassandra/cassandra-3.0/javaagent/src/test/groovy/CassandraClientTest.groovy
View File

@ -152,7 +152,6 @@ class CassandraClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_NAME" keyspace "$SemanticAttributes.DB_NAME" keyspace
"$SemanticAttributes.DB_STATEMENT" statement "$SemanticAttributes.DB_STATEMENT" statement
"$SemanticAttributes.DB_OPERATION" operation "$SemanticAttributes.DB_OPERATION" operation
"$SemanticAttributes.DB_CASSANDRA_KEYSPACE" keyspace
"$SemanticAttributes.DB_CASSANDRA_TABLE" table "$SemanticAttributes.DB_CASSANDRA_TABLE" table
} }
} }

8
instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java
View File

@ -5,7 +5,6 @@
package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0; 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.DefaultDriverOption;
import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
@ -20,12 +19,7 @@ final class CassandraAttributesExtractor
implements AttributesExtractor<CassandraRequest, ExecutionInfo> { implements AttributesExtractor<CassandraRequest, ExecutionInfo> {
@Override @Override
public void onStart(AttributesBuilder attributes, CassandraRequest request) { public void onStart(AttributesBuilder attributes, CassandraRequest request) {}
set(
attributes,
SemanticAttributes.DB_CASSANDRA_KEYSPACE,
request.getSession().getKeyspace().map(CqlIdentifier::toString).orElse(null));
}
@Override @Override
public void onEnd( public void onEnd(

1
instrumentation/cassandra/cassandra-4.0/javaagent/src/test/groovy/CassandraClientTest.groovy
View File

@ -131,7 +131,6 @@ class CassandraClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE" Boolean "$SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE" Boolean
"$SemanticAttributes.DB_CASSANDRA_PAGE_SIZE" 5000 "$SemanticAttributes.DB_CASSANDRA_PAGE_SIZE" 5000
"$SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT" 0 "$SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT" 0
"$SemanticAttributes.DB_CASSANDRA_KEYSPACE" keyspace
// the SqlStatementSanitizer can't handle CREATE statements yet // the SqlStatementSanitizer can't handle CREATE statements yet
"$SemanticAttributes.DB_CASSANDRA_TABLE" table "$SemanticAttributes.DB_CASSANDRA_TABLE" table
} }