diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractor.java index fc14fe34d861..c05e5957af31 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractor.java @@ -19,7 +19,8 @@ * methods, but implement as many as possible for best compliance with the OpenTelemetry * specification. */ -public abstract class DbAttributesExtractor extends AttributesExtractor { +public abstract class DbAttributesExtractor + extends AttributesExtractor { @Override protected void onStart(AttributesBuilder attributes, REQUEST request) { set(attributes, SemanticAttributes.DB_SYSTEM, system(request)); @@ -32,7 +33,7 @@ protected void onStart(AttributesBuilder attributes, REQUEST request) { @Override protected final void onEnd( - AttributesBuilder attributes, REQUEST request, @Nullable Void unused) {} + AttributesBuilder attributes, REQUEST request, @Nullable RESPONSE response) {} @Nullable protected abstract String system(REQUEST request); diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractor.java index 6636b4e581ef..0fa523e37e55 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractor.java @@ -18,15 +18,15 @@ public final class DbSpanNameExtractor implements SpanNameExtractor}. */ public static SpanNameExtractor create( - DbAttributesExtractor attributesExtractor) { + DbAttributesExtractor attributesExtractor) { return new DbSpanNameExtractor<>(attributesExtractor); } private static final String DEFAULT_SPAN_NAME = "DB Query"; - private final DbAttributesExtractor attributesExtractor; + private final DbAttributesExtractor attributesExtractor; - private DbSpanNameExtractor(DbAttributesExtractor attributesExtractor) { + private DbSpanNameExtractor(DbAttributesExtractor attributesExtractor) { this.attributesExtractor = attributesExtractor; } @@ -59,7 +59,7 @@ public String extract(REQUEST request) { @Nullable private String getTableName(REQUEST request) { if (attributesExtractor instanceof SqlAttributesExtractor) { - return ((SqlAttributesExtractor) attributesExtractor).table(request); + return ((SqlAttributesExtractor) attributesExtractor).table(request); } return null; } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractor.java index fe3b4536614a..a145faecb70b 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractor.java @@ -22,7 +22,8 @@ *
  • It enables adding the table name extracted by the sanitizer as a parameter. * */ -public abstract class SqlAttributesExtractor extends DbAttributesExtractor { +public abstract class SqlAttributesExtractor + extends DbAttributesExtractor { @Override protected final void onStart(AttributesBuilder attributes, REQUEST request) { diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java index 3ddd244a74bb..8eb364ceba47 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.Test; class DbAttributesExtractorTest { - DbAttributesExtractor> underTest = - new DbAttributesExtractor>() { + DbAttributesExtractor, Void> underTest = + new DbAttributesExtractor, Void>() { @Override protected String system(Map map) { return map.get("db.system"); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractorTest.java index 7daeeea92269..c289b92585a5 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractorTest.java @@ -16,8 +16,8 @@ @ExtendWith(MockitoExtension.class) class DbSpanNameExtractorTest { - @Mock DbAttributesExtractor dbAttributesExtractor; - @Mock SqlAttributesExtractor sqlAttributesExtractor; + @Mock DbAttributesExtractor dbAttributesExtractor; + @Mock SqlAttributesExtractor sqlAttributesExtractor; @Test void shouldExtractFullSpanName() { diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java index 2b8dbcd82403..d5913ea5dba9 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java @@ -19,8 +19,8 @@ class SqlAttributesExtractorTest { AttributeKey dbTableAttribute; - SqlAttributesExtractor> underTest = - new SqlAttributesExtractor>() { + SqlAttributesExtractor, Void> underTest = + new SqlAttributesExtractor, Void>() { @Override protected AttributeKey dbTableAttribute() { diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle b/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle index 31987bbfcda5..9fc0e032887a 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle @@ -29,6 +29,9 @@ muzzle { dependencies { library "com.datastax.cassandra:cassandra-driver-core:3.0.0" + compileOnly deps.autoValueAnnotations + annotationProcessor deps.autoValue + testLibrary "com.datastax.cassandra:cassandra-driver-core:3.2.0" testInstrumentation project(':instrumentation:guava-10.0:javaagent') diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumenters.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumenters.java index b0398e65227a..ac93ef4fc55f 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumenters.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraInstrumenters.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; +import com.datastax.driver.core.ResultSet; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; @@ -15,15 +16,15 @@ public final class CassandraInstrumenters { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.cassandra-3.0"; - private static final Instrumenter INSTRUMENTER; + private static final Instrumenter INSTRUMENTER; static { - DbAttributesExtractor attributesExtractor = + DbAttributesExtractor attributesExtractor = new CassandraSqlAttributesExtractor(); SpanNameExtractor spanName = DbSpanNameExtractor.create(attributesExtractor); INSTRUMENTER = - Instrumenter.newBuilder( + Instrumenter.newBuilder( GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, spanName) .addAttributesExtractor(attributesExtractor) .addAttributesExtractor(new CassandraNetAttributesExtractor()) @@ -31,7 +32,7 @@ public final class CassandraInstrumenters { .newInstrumenter(SpanKindExtractor.alwaysClient()); } - public static Instrumenter instrumenter() { + public static Instrumenter instrumenter() { return INSTRUMENTER; } 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 index 87ecc2845ab5..9e67577dc73e 100644 --- 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 @@ -5,11 +5,12 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; +import com.datastax.driver.core.ResultSet; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; -final class CassandraKeyspaceExtractor extends AttributesExtractor { +final class CassandraKeyspaceExtractor extends AttributesExtractor { @Override protected void onStart(AttributesBuilder attributes, CassandraRequest request) { @@ -18,5 +19,6 @@ protected void onStart(AttributesBuilder attributes, CassandraRequest request) { } @Override - protected void onEnd(AttributesBuilder attributes, CassandraRequest request, Void unused) {} + protected void onEnd( + AttributesBuilder attributes, CassandraRequest request, ResultSet response) {} } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesExtractor.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesExtractor.java index 46006c679856..dc089baf68d3 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesExtractor.java @@ -5,13 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; -import com.datastax.driver.core.ExecutionInfo; +import com.datastax.driver.core.ResultSet; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetAttributesExtractor; import java.net.InetSocketAddress; import org.checkerframework.checker.nullness.qual.Nullable; final class CassandraNetAttributesExtractor - extends InetSocketAddressNetAttributesExtractor { + extends InetSocketAddressNetAttributesExtractor { @Override @Nullable @@ -20,8 +20,10 @@ public String transport(CassandraRequest request) { } @Override - public @Nullable InetSocketAddress getAddress(CassandraRequest request, @Nullable Void response) { - ExecutionInfo executionInfo = request.getExecutionInfo(); - return executionInfo == null ? null : executionInfo.getQueriedHost().getSocketAddress(); + public @Nullable InetSocketAddress getAddress( + CassandraRequest request, @Nullable ResultSet response) { + return response == null + ? null + : response.getExecutionInfo().getQueriedHost().getSocketAddress(); } } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraRequest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraRequest.java index ca85bc14fbd9..c0f4056a364c 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraRequest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraRequest.java @@ -5,34 +5,17 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; -import com.datastax.driver.core.ExecutionInfo; import com.datastax.driver.core.Session; +import com.google.auto.value.AutoValue; -public final class CassandraRequest { +@AutoValue +public abstract class CassandraRequest { - private final Session session; - private final String statement; - // volatile is not needed here as this field is set and get from the same thread - private ExecutionInfo executionInfo; + public abstract Session getSession(); - public CassandraRequest(Session session, String statement) { - this.session = session; - this.statement = statement; - } - - public Session getSession() { - return session; - } - - public String getStatement() { - return statement; - } - - public void setExecutionInfo(ExecutionInfo executionInfo) { - this.executionInfo = executionInfo; - } + public abstract String getStatement(); - public ExecutionInfo getExecutionInfo() { - return executionInfo; + public static CassandraRequest create(Session session, String statement) { + return new AutoValue_CassandraRequest(session, statement); } } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesExtractor.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesExtractor.java index 494b59ca934c..7fbb0bd20a70 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesExtractor.java @@ -5,12 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; +import com.datastax.driver.core.ResultSet; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.instrumenter.db.SqlAttributesExtractor; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.checkerframework.checker.nullness.qual.Nullable; -final class CassandraSqlAttributesExtractor extends SqlAttributesExtractor { +final class CassandraSqlAttributesExtractor + extends SqlAttributesExtractor { @Override protected String system(CassandraRequest request) { diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/TracingSession.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/TracingSession.java index 760886fbec0c..10e85b0d18fe 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/TracingSession.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/TracingSession.java @@ -48,7 +48,7 @@ public ListenableFuture initAsync() { @Override public ResultSet execute(String query) { - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); ResultSet resultSet; try (Scope ignored = context.makeCurrent()) { @@ -57,14 +57,13 @@ public ResultSet execute(String query) { instrumenter().end(context, request, null, t); throw t; } - request.setExecutionInfo(resultSet.getExecutionInfo()); - instrumenter().end(context, request, null, null); + instrumenter().end(context, request, resultSet, null); return resultSet; } @Override public ResultSet execute(String query, Object... values) { - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); ResultSet resultSet; try (Scope ignored = context.makeCurrent()) { @@ -73,14 +72,13 @@ public ResultSet execute(String query, Object... values) { instrumenter().end(context, request, null, t); throw t; } - request.setExecutionInfo(resultSet.getExecutionInfo()); - instrumenter().end(context, request, null, null); + instrumenter().end(context, request, resultSet, null); return resultSet; } @Override public ResultSet execute(String query, Map values) { - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); ResultSet resultSet; try (Scope ignored = context.makeCurrent()) { @@ -89,15 +87,14 @@ public ResultSet execute(String query, Map values) { instrumenter().end(context, request, null, t); throw t; } - request.setExecutionInfo(resultSet.getExecutionInfo()); - instrumenter().end(context, request, null, null); + instrumenter().end(context, request, resultSet, null); return resultSet; } @Override public ResultSet execute(Statement statement) { String query = getQuery(statement); - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); ResultSet resultSet; try (Scope ignored = context.makeCurrent()) { @@ -106,14 +103,13 @@ public ResultSet execute(Statement statement) { instrumenter().end(context, request, null, t); throw t; } - request.setExecutionInfo(resultSet.getExecutionInfo()); - instrumenter().end(context, request, null, null); + instrumenter().end(context, request, resultSet, null); return resultSet; } @Override public ResultSetFuture executeAsync(String query) { - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); try (Scope ignored = context.makeCurrent()) { ResultSetFuture future = session.executeAsync(query); @@ -124,7 +120,7 @@ public ResultSetFuture executeAsync(String query) { @Override public ResultSetFuture executeAsync(String query, Object... values) { - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); try (Scope ignored = context.makeCurrent()) { ResultSetFuture future = session.executeAsync(query, values); @@ -135,7 +131,7 @@ public ResultSetFuture executeAsync(String query, Object... values) { @Override public ResultSetFuture executeAsync(String query, Map values) { - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); try (Scope ignored = context.makeCurrent()) { ResultSetFuture future = session.executeAsync(query, values); @@ -147,7 +143,7 @@ public ResultSetFuture executeAsync(String query, Map values) { @Override public ResultSetFuture executeAsync(Statement statement) { String query = getQuery(statement); - CassandraRequest request = new CassandraRequest(session, query); + CassandraRequest request = CassandraRequest.create(session, query); Context context = instrumenter().start(Context.current(), request); try (Scope ignored = context.makeCurrent()) { ResultSetFuture future = session.executeAsync(statement); @@ -219,8 +215,7 @@ private void addCallbackToEndSpan( new FutureCallback() { @Override public void onSuccess(ResultSet resultSet) { - request.setExecutionInfo(resultSet.getExecutionInfo()); - instrumenter().end(context, request, null, null); + instrumenter().end(context, request, resultSet, null); } @Override diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesExtractor.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesExtractor.java index cf907d635bd1..f2319aaf7f02 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesExtractor.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.checkerframework.checker.nullness.qual.Nullable; -final class GeodeDbAttributesExtractor extends DbAttributesExtractor { +final class GeodeDbAttributesExtractor extends DbAttributesExtractor { @Override protected String system(GeodeRequest request) { return SemanticAttributes.DbSystemValues.GEODE; diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumenters.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumenters.java index 614736372c14..20968052ac50 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumenters.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumenters.java @@ -18,7 +18,8 @@ public final class GeodeInstrumenters { private static final Instrumenter INSTRUMENTER; static { - DbAttributesExtractor attributesExtractor = new GeodeDbAttributesExtractor(); + DbAttributesExtractor attributesExtractor = + new GeodeDbAttributesExtractor(); SpanNameExtractor spanName = DbSpanNameExtractor.create(attributesExtractor); INSTRUMENTER = diff --git a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcAttributesExtractor.java b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcAttributesExtractor.java index 100008c97e74..6d8f6c7f4a88 100644 --- a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcAttributesExtractor.java +++ b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.checkerframework.checker.nullness.qual.Nullable; -final class JdbcAttributesExtractor extends SqlAttributesExtractor { +final class JdbcAttributesExtractor extends SqlAttributesExtractor { @Nullable @Override protected String system(DbRequest dbRequest) { diff --git a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumenters.java b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumenters.java index 54c3bd0a67b3..b6ab0445314d 100644 --- a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumenters.java +++ b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumenters.java @@ -19,7 +19,7 @@ public final class JdbcInstrumenters { private static final Instrumenter INSTRUMENTER; static { - DbAttributesExtractor dbAttributesExtractor = new JdbcAttributesExtractor(); + DbAttributesExtractor dbAttributesExtractor = new JdbcAttributesExtractor(); SpanNameExtractor spanName = DbSpanNameExtractor.create(dbAttributesExtractor); JdbcNetAttributesExtractor netAttributesExtractor = new JdbcNetAttributesExtractor(); diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesExtractor.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesExtractor.java index 8418dfd4fa40..cfa99512193a 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesExtractor.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.checkerframework.checker.nullness.qual.Nullable; -final class JedisDbAttributesExtractor extends DbAttributesExtractor { +final class JedisDbAttributesExtractor extends DbAttributesExtractor { @Override protected String system(JedisRequest request) { return SemanticAttributes.DbSystemValues.REDIS; diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumenters.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumenters.java index c70a24e7d6ab..e555316caf7d 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumenters.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumenters.java @@ -19,7 +19,8 @@ public final class JedisInstrumenters { private static final Instrumenter INSTRUMENTER; static { - DbAttributesExtractor attributesExtractor = new JedisDbAttributesExtractor(); + DbAttributesExtractor attributesExtractor = + new JedisDbAttributesExtractor(); SpanNameExtractor spanName = DbSpanNameExtractor.create(attributesExtractor); JedisNetAttributesExtractor netAttributesExtractor = new JedisNetAttributesExtractor(); diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesExtractor.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesExtractor.java index 6f1e2c6d2f6d..374cb65b3cc6 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesExtractor.java @@ -10,7 +10,8 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.checkerframework.checker.nullness.qual.Nullable; -final class LettuceDbAttributesExtractor extends DbAttributesExtractor> { +final class LettuceDbAttributesExtractor + extends DbAttributesExtractor, Void> { @Override protected String system(RedisCommand request) { return SemanticAttributes.DbSystemValues.REDIS; diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumenters.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumenters.java index fcb7d40e139e..494d9dadbc57 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumenters.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumenters.java @@ -23,7 +23,7 @@ public final class LettuceInstrumenters { private static final Instrumenter CONNECT_INSTRUMENTER; static { - DbAttributesExtractor> attributesExtractor = + DbAttributesExtractor, Void> attributesExtractor = new LettuceDbAttributesExtractor(); SpanNameExtractor> spanName = DbSpanNameExtractor.create(attributesExtractor); diff --git a/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesExtractor.java b/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesExtractor.java index a416c5b94aa6..94934ebec92a 100644 --- a/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesExtractor.java +++ b/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesExtractor.java @@ -20,7 +20,7 @@ import org.redisson.client.protocol.CommandData; import org.redisson.client.protocol.CommandsData; -final class RedissonDbAttributesExtractor extends DbAttributesExtractor { +final class RedissonDbAttributesExtractor extends DbAttributesExtractor { private static final String UNKNOWN_COMMAND = "Redis Command"; diff --git a/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenters.java b/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenters.java index 1eb6d6b42a47..de7b5234716b 100644 --- a/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenters.java +++ b/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumenters.java @@ -18,7 +18,7 @@ public final class RedissonInstrumenters { private static final Instrumenter INSTRUMENTER; static { - DbAttributesExtractor dbAttributesExtractor = + DbAttributesExtractor dbAttributesExtractor = new RedissonDbAttributesExtractor(); RedissonNetAttributesExtractor netAttributesExtractor = new RedissonNetAttributesExtractor(); SpanNameExtractor spanName = DbSpanNameExtractor.create(dbAttributesExtractor);