diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraDatabaseClientTracer.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraDatabaseClientTracer.java index 7c90a9e28f..b9fd71e426 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraDatabaseClientTracer.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraDatabaseClientTracer.java @@ -131,6 +131,11 @@ public class CassandraDatabaseClientTracer extends DatabaseClientTracer. + int i = table.indexOf('.'); + if (i > -1 && i + 1 < table.length()) { + table = table.substring(i + 1); + } span.setAttribute(SemanticAttributes.DB_CASSANDRA_TABLE, table); } } 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 cacdd9fe49..7cfe63c85a 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 @@ -119,8 +119,8 @@ class CassandraClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE.key" Boolean "$SemanticAttributes.DB_CASSANDRA_PAGE_SIZE.key" 5000 "$SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT.key" 0 - // the SqlStatementSanitizer can't handle CREATE statements or splitting out the keyspace - "$SemanticAttributes.DB_CASSANDRA_TABLE.key" { table -> (statement.contains("CREATE") || keyspace == null ? true : table.endsWith("users")) } + // the SqlStatementSanitizer can't handle CREATE statements yet + "$SemanticAttributes.DB_CASSANDRA_TABLE.key" { table -> (statement.contains("CREATE") || keyspace == null ? true : table == "users") } } } }