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

Remove incorrect lettuce db.statement attribute (#4160)

This commit is contained in:
Trask Stalnaker 2021-09-21 20:02:26 -07:00 committed by GitHub
parent 8c8eb3ddea
commit f24dd6160a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesExtractor.java
View File

@ -37,7 +37,7 @@ final class LettuceDbAttributesExtractor
@Override @Override
protected String statement(RedisCommand<?, ?, ?> request) { protected String statement(RedisCommand<?, ?, ?> request) {
return request.getType().name(); return null;
} }
@Override @Override

10
instrumentation/lettuce/lettuce-4.0/javaagent/src/test/groovy/LettuceAsyncClientTest.groovy
View File

@ -169,7 +169,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "SET" "${SemanticAttributes.DB_OPERATION.key}" "SET"
"${SemanticAttributes.DB_STATEMENT.key}" "SET"
} }
} }
} }
@ -212,7 +211,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "GET" "${SemanticAttributes.DB_OPERATION.key}" "GET"
"${SemanticAttributes.DB_STATEMENT.key}" "GET"
} }
} }
span(2) { span(2) {
@ -276,7 +274,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "GET" "${SemanticAttributes.DB_OPERATION.key}" "GET"
"${SemanticAttributes.DB_STATEMENT.key}" "GET"
} }
} }
span(2) { span(2) {
@ -329,7 +326,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "RANDOMKEY" "${SemanticAttributes.DB_OPERATION.key}" "RANDOMKEY"
"${SemanticAttributes.DB_STATEMENT.key}" "RANDOMKEY"
} }
} }
span(2) { span(2) {
@ -386,7 +382,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "HMSET" "${SemanticAttributes.DB_OPERATION.key}" "HMSET"
"${SemanticAttributes.DB_STATEMENT.key}" "HMSET"
} }
} }
} }
@ -397,7 +392,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "HGETALL" "${SemanticAttributes.DB_OPERATION.key}" "HGETALL"
"${SemanticAttributes.DB_STATEMENT.key}" "HGETALL"
} }
} }
} }
@ -440,7 +434,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "DEL" "${SemanticAttributes.DB_OPERATION.key}" "DEL"
"${SemanticAttributes.DB_STATEMENT.key}" "DEL"
} }
} }
} }
@ -485,7 +478,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "SADD" "${SemanticAttributes.DB_OPERATION.key}" "SADD"
"${SemanticAttributes.DB_STATEMENT.key}" "SADD"
"lettuce.command.cancelled" true "lettuce.command.cancelled" true
} }
} }
@ -511,7 +503,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "DEBUG" "${SemanticAttributes.DB_OPERATION.key}" "DEBUG"
"${SemanticAttributes.DB_STATEMENT.key}" "DEBUG"
} }
} }
} }
@ -532,7 +523,6 @@ class LettuceAsyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "SHUTDOWN" "${SemanticAttributes.DB_OPERATION.key}" "SHUTDOWN"
"${SemanticAttributes.DB_STATEMENT.key}" "SHUTDOWN"
} }
} }
} }

9
instrumentation/lettuce/lettuce-4.0/javaagent/src/test/groovy/LettuceSyncClientTest.groovy
View File

@ -149,7 +149,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "SET" "${SemanticAttributes.DB_OPERATION.key}" "SET"
"${SemanticAttributes.DB_STATEMENT.key}" "SET"
} }
} }
} }
@ -170,7 +169,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "GET" "${SemanticAttributes.DB_OPERATION.key}" "GET"
"${SemanticAttributes.DB_STATEMENT.key}" "GET"
} }
} }
} }
@ -191,7 +189,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "GET" "${SemanticAttributes.DB_OPERATION.key}" "GET"
"${SemanticAttributes.DB_STATEMENT.key}" "GET"
} }
} }
} }
@ -212,7 +209,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "RANDOMKEY" "${SemanticAttributes.DB_OPERATION.key}" "RANDOMKEY"
"${SemanticAttributes.DB_STATEMENT.key}" "RANDOMKEY"
} }
} }
} }
@ -233,7 +229,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "LPUSH" "${SemanticAttributes.DB_OPERATION.key}" "LPUSH"
"${SemanticAttributes.DB_STATEMENT.key}" "LPUSH"
} }
} }
} }
@ -254,7 +249,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "HMSET" "${SemanticAttributes.DB_OPERATION.key}" "HMSET"
"${SemanticAttributes.DB_STATEMENT.key}" "HMSET"
} }
} }
} }
@ -275,7 +269,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "HGETALL" "${SemanticAttributes.DB_OPERATION.key}" "HGETALL"
"${SemanticAttributes.DB_STATEMENT.key}" "HGETALL"
} }
} }
} }
@ -295,7 +288,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "DEBUG" "${SemanticAttributes.DB_OPERATION.key}" "DEBUG"
"${SemanticAttributes.DB_STATEMENT.key}" "DEBUG"
} }
} }
} }
@ -315,7 +307,6 @@ class LettuceSyncClientTest extends AgentInstrumentationSpecification {
attributes { attributes {
"${SemanticAttributes.DB_SYSTEM.key}" "redis" "${SemanticAttributes.DB_SYSTEM.key}" "redis"
"${SemanticAttributes.DB_OPERATION.key}" "SHUTDOWN" "${SemanticAttributes.DB_OPERATION.key}" "SHUTDOWN"
"${SemanticAttributes.DB_STATEMENT.key}" "SHUTDOWN"
} }
} }
} }