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

fix(deps): update errorproneversion to v2.41.0 (minor) (#14331) 

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
renovate[bot] 2025-07-28 10:38:51 -07:00 committed by GitHub
parent 4efd3d263b
commit c965b09dd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
62 changed files with 175 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
custom-checks/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/CanIgnoreReturnValueSuggesterFactory.java
View File

@ -6,13 +6,14 @@
package com.google.errorprone.bugpatterns.checkreturnvalue;
import com.google.errorprone.ErrorProneFlags;
import com.google.errorprone.bugpatterns.WellKnownKeep;
public final class CanIgnoreReturnValueSuggesterFactory {
// calls package private constructor of CanIgnoreReturnValueSuggester
public static CanIgnoreReturnValueSuggester createCanIgnoreReturnValueSuggester(
ErrorProneFlags errorProneFlags) {
return new CanIgnoreReturnValueSuggester(errorProneFlags);
ErrorProneFlags errorProneFlags, WellKnownKeep wellKnownKeep) {
return new CanIgnoreReturnValueSuggester(errorProneFlags, wellKnownKeep);
}
private CanIgnoreReturnValueSuggesterFactory() {}

6
custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java
View File

@ -12,6 +12,7 @@ import com.google.errorprone.BugPattern;
import com.google.errorprone.ErrorProneFlags;
import com.google.errorprone.VisitorState;
import com.google.errorprone.bugpatterns.BugChecker;
import com.google.errorprone.bugpatterns.WellKnownKeep;
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester;
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory;
import com.google.errorprone.matchers.Description;
@ -33,9 +34,10 @@ public class OtelCanIgnoreReturnValueSuggester extends BugChecker
private final CanIgnoreReturnValueSuggester delegate;
@Inject
OtelCanIgnoreReturnValueSuggester(ErrorProneFlags errorProneFlags) {
OtelCanIgnoreReturnValueSuggester(ErrorProneFlags errorProneFlags, WellKnownKeep wellKnownKeep) {
delegate =
CanIgnoreReturnValueSuggesterFactory.createCanIgnoreReturnValueSuggester(errorProneFlags);
CanIgnoreReturnValueSuggesterFactory.createCanIgnoreReturnValueSuggester(
errorProneFlags, wellKnownKeep);
}
public OtelCanIgnoreReturnValueSuggester() {

2
dependencyManagement/build.gradle.kts
View File

@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
val autoServiceVersion = "1.1.1"
val autoValueVersion = "1.11.0"
val errorProneVersion = "2.40.0"
val errorProneVersion = "2.41.0"
val byteBuddyVersion = "1.17.6"
val asmVersion = "9.8"
val jmhVersion = "1.37"

6
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java
View File

@ -139,10 +139,10 @@ public final class ContextPropagationDebug {
}
private static class Propagation {
public final String carrierClassName;
public final StackTraceElement[] location;
final String carrierClassName;
final StackTraceElement[] location;
public Propagation(String carrierClassName, StackTraceElement[] location) {
Propagation(String carrierClassName, StackTraceElement[] location) {
this.carrierClassName = carrierClassName;
this.location = location;
}

2
instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaFlowWrapper.java
View File

@ -73,7 +73,7 @@ public class AkkaFlowWrapper
private class TracingLogic extends GraphStageLogic {
private final Deque<TracingRequest> requests = new ArrayDeque<>();
public TracingLogic() {
TracingLogic() {
super(shape);
// server pulls response, pass response from user code to server

2
instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTest.java
View File

@ -211,7 +211,7 @@ public class ApacheHttpClientTest {
private static class HttpResponseHandler implements ResponseHandler<Void> {
private final HttpClientResult requestResult;
public HttpResponseHandler(HttpClientResult requestResult) {
HttpResponseHandler(HttpClientResult requestResult) {
this.requestResult = requestResult;
}

2
instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java
View File

@ -127,7 +127,7 @@ class ApacheHttpAsyncClientTest {
private static class ResponseCallback implements FutureCallback<SimpleHttpResponse> {
private final HttpClientResult httpClientResult;
public ResponseCallback(HttpClientResult httpClientResult) {
ResponseCallback(HttpClientResult httpClientResult) {
this.httpClientResult = httpClientResult;
}

2
instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTest.java
View File

@ -234,7 +234,7 @@ public class ApacheHttpClientTest {
private static class ResponseHandler implements HttpClientResponseHandler<Void> {
private final HttpClientResult httpClientResult;
public ResponseHandler(HttpClientResult httpClientResult) {
ResponseHandler(HttpClientResult httpClientResult) {
this.httpClientResult = httpClientResult;
}

3
instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java
View File

@ -177,8 +177,7 @@ public class AwsLambdaWrapperTest {
}
}
@SuppressWarnings("UnusedMethod")
private static class CustomType {
static class CustomType {
String key;
String value;

2
instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingList.java
View File

@ -85,7 +85,7 @@ class TracingList extends SdkInternalList<Message> {
}
private static class CallerClass extends SecurityManager {
public static final CallerClass INSTANCE = new CallerClass();
static final CallerClass INSTANCE = new CallerClass();
@Override
public Class<?>[] getClassContext() {

9
instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java
View File

@ -83,25 +83,24 @@ class ActiveContextManager {
private final CamelRequest request;
@Nullable private final Scope scope;
public ContextWithScope(
ContextWithScope parent, Context context, CamelRequest request, Scope scope) {
ContextWithScope(ContextWithScope parent, Context context, CamelRequest request, Scope scope) {
this.parent = parent;
this.context = context;
this.request = request;
this.scope = scope;
}
public static ContextWithScope activate(
static ContextWithScope activate(
ContextWithScope parent, Context context, CamelRequest request) {
Scope scope = context != null ? context.makeCurrent() : null;
return new ContextWithScope(parent, context, request, scope);
}
public ContextWithScope getParent() {
ContextWithScope getParent() {
return parent;
}
public void deactivate(Exception exception) {
void deactivate(Exception exception) {
if (scope == null) {
return;
}

2
instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.java
View File

@ -174,7 +174,7 @@ class SnsCamelTest {
private final String queueUrl;
private final String topicArn;
public SnsMetadata(String queueUrl, String topicArn) {
SnsMetadata(String queueUrl, String topicArn) {
this.queueUrl = queueUrl;
this.topicArn = topicArn;
}

14
instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java
View File

@ -340,14 +340,14 @@ class CassandraClientTest {
}
private static class Parameter {
public final String keyspace;
public final String statement;
public final String expectedStatement;
public final String spanName;
public final String operation;
public final String table;
final String keyspace;
final String statement;
final String expectedStatement;
final String spanName;
final String operation;
final String table;
public Parameter(
Parameter(
String keyspace,
String statement,
String expectedStatement,

6
instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java
View File

@ -72,10 +72,10 @@ class CouchbaseQuerySanitizerTest {
}
private static class Parameter {
public final Object query;
public final String expected;
final Object query;
final String expected;
public Parameter(Object query, String expected) {
Parameter(Object query, String expected) {
this.query = query;
this.expected = expected;
}

10
instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java
View File

@ -212,19 +212,19 @@ class ElasticsearchClientTest {
}
private static class AsyncRequest {
volatile InfoResponse response = null;
private volatile InfoResponse response = null;
public InfoResponse getResponse() {
InfoResponse getResponse() {
return response;
}
public void setResponse(InfoResponse response) {
void setResponse(InfoResponse response) {
this.response = response;
}
}
private static class Person {
public final String name;
static class Person {
private final String name;
Person(String name) {
this.name = name;

12
instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
View File

@ -183,22 +183,22 @@ class ElasticsearchRest7Test {
}
private static class AsyncRequest {
volatile Response requestResponse = null;
volatile Exception exception = null;
private volatile Response requestResponse = null;
private volatile Exception exception = null;
public Response getRequestResponse() {
Response getRequestResponse() {
return requestResponse;
}
public void setRequestResponse(Response requestResponse) {
void setRequestResponse(Response requestResponse) {
this.requestResponse = requestResponse;
}
public Exception getException() {
Exception getException() {
return exception;
}
public void setException(Exception exception) {
void setException(Exception exception) {
this.exception = exception;
}
}

12
instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
View File

@ -159,22 +159,22 @@ class ElasticsearchRest7Test {
}
private static class AsyncRequest {
volatile Response requestResponse = null;
volatile Exception exception = null;
private volatile Response requestResponse = null;
private volatile Exception exception = null;
public Response getRequestResponse() {
Response getRequestResponse() {
return requestResponse;
}
public void setRequestResponse(Response requestResponse) {
void setRequestResponse(Response requestResponse) {
this.requestResponse = requestResponse;
}
public Exception getException() {
Exception getException() {
return exception;
}
public void setException(Exception exception) {
void setException(Exception exception) {
this.exception = exception;
}
}

2
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/elasticsearch6Test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6NodeFactory.java
View File

@ -18,7 +18,7 @@ class Elasticsearch6NodeFactory implements NodeFactory {
InternalSettingsPreparer.prepareEnvironment(settings, null),
Collections.singleton(Netty4Plugin.class)) {
@SuppressWarnings({"UnusedMethod", "UnusedVariable"})
@SuppressWarnings({"UnusedMethod", "UnusedVariable", "EffectivelyPrivate"})
protected void registerDerivedNodeNameWithLogger(String s) {}
};
}

2
instrumentation/grpc-1.6/library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTest.java
View File

@ -176,7 +176,7 @@ class GrpcTest extends AbstractGrpcTest {
private final String valueOfKey2;
public CustomAttributesExtractorV2(String valueOfKey2) {
CustomAttributesExtractorV2(String valueOfKey2) {
this.valueOfKey2 = valueOfKey2;
}

8
instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/QueryTest.java
View File

@ -140,11 +140,11 @@ class QueryTest extends AbstractHibernateTest {
}
private static class Parameter {
public final String expectedSpanName;
public final boolean requiresTransaction;
public final Consumer<Session> queryInteraction;
final String expectedSpanName;
final boolean requiresTransaction;
final Consumer<Session> queryInteraction;
public Parameter(
Parameter(
String expectedSpanName, boolean requiresTransaction, Consumer<Session> queryInteraction) {
this.expectedSpanName = expectedSpanName;
this.requiresTransaction = requiresTransaction;

12
instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java
View File

@ -576,13 +576,13 @@ class SessionTest extends AbstractHibernateTest {
}
private static class Parameter {
public final String methodName;
public final String resource;
public final BiConsumer<Session, Value> sessionMethodTest;
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
public final Function<Session, Query> queryBuildMethod;
final String methodName;
final String resource;
final BiConsumer<Session, Value> sessionMethodTest;
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
final Function<Session, Query> queryBuildMethod;
public Parameter(
Parameter(
String methodName,
String resource,
BiConsumer<Session, Value> sessionMethodTest,

10
instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java
View File

@ -371,12 +371,12 @@ class EntityManagerTest extends AbstractHibernateTest {
}
private static class Parameter {
public final String methodName;
public final boolean attach;
public final boolean flushOnCommit;
public final BiConsumer<EntityManager, Value> sessionMethodTest;
final String methodName;
final boolean attach;
final boolean flushOnCommit;
final BiConsumer<EntityManager, Value> sessionMethodTest;
public Parameter(
Parameter(
String methodName,
boolean attach,
boolean flushOnCommit,

6
instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java
View File

@ -225,10 +225,10 @@ class QueryTest extends AbstractHibernateTest {
}
private static class Parameter {
public final String expectedSpanName;
public final Consumer<Session> queryInteraction;
final String expectedSpanName;
final Consumer<Session> queryInteraction;
public Parameter(String expectedSpanName, Consumer<Session> queryInteraction) {
Parameter(String expectedSpanName, Consumer<Session> queryInteraction) {
this.expectedSpanName = expectedSpanName;
this.queryInteraction = queryInteraction;
}

8
instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java
View File

@ -851,11 +851,11 @@ class SessionTest extends AbstractHibernateTest {
}
private static class Parameter {
public final String methodName;
public final BiConsumer<Session, Value> sessionMethodTest;
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
final String methodName;
final BiConsumer<Session, Value> sessionMethodTest;
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
public Parameter(
Parameter(
String methodName,
BiConsumer<Session, Value> sessionMethodTest,
BiConsumer<StatelessSession, Value> statelessSessionMethodTest) {

12
instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate6Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java
View File

@ -773,6 +773,12 @@ class SessionTest extends AbstractHibernateTest {
}
private static class Parameter {
final String methodName;
final String resource;
final Function<Session, SelectionQuery<?>> queryBuildMethod;
final BiConsumer<Session, Value> sessionMethodTest;
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
Parameter(
String methodName,
String resource,
@ -785,12 +791,6 @@ class SessionTest extends AbstractHibernateTest {
this.queryBuildMethod = queryBuildMethod;
this.statelessSessionMethodTest = statelessSessionMethodTest;
}
public final String methodName;
public final String resource;
public final Function<Session, SelectionQuery<?>> queryBuildMethod;
public final BiConsumer<Session, Value> sessionMethodTest;
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
}
private static SpanDataAssert assertSessionSpan(

12
instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java
View File

@ -683,6 +683,12 @@ class SessionTest extends AbstractHibernateTest {
}
private static class Parameter {
final String methodName;
final String resource;
final Function<Session, SelectionQuery<?>> queryBuildMethod;
final BiConsumer<Session, Value> sessionMethodTest;
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
Parameter(
String methodName,
String resource,
@ -695,12 +701,6 @@ class SessionTest extends AbstractHibernateTest {
this.queryBuildMethod = queryBuildMethod;
this.statelessSessionMethodTest = statelessSessionMethodTest;
}
public final String methodName;
public final String resource;
public final Function<Session, SelectionQuery<?>> queryBuildMethod;
public final BiConsumer<Session, Value> sessionMethodTest;
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
}
private static SpanDataAssert assertSessionSpan(

13
instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java
View File

@ -294,6 +294,12 @@ class EntityManagerTest extends AbstractHibernateTest {
}
private static class Parameter {
final String methodName;
final String resource;
final boolean attach;
final boolean flushOnCommit;
final BiConsumer<EntityManager, Value> sessionMethodTest;
final Function<EntityManager, Query> queryBuildMethod;
Parameter(String methodName, String resource, Function<EntityManager, Query> queryBuildMethod) {
this.methodName = methodName;
@ -317,13 +323,6 @@ class EntityManagerTest extends AbstractHibernateTest {
this.sessionMethodTest = sessionMethodTest;
this.queryBuildMethod = null;
}
public final String methodName;
public final String resource;
public final boolean attach;
public final boolean flushOnCommit;
public final BiConsumer<EntityManager, Value> sessionMethodTest;
public final Function<EntityManager, Query> queryBuildMethod;
}
@SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation

4
instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableChainTest.java
View File

@ -31,7 +31,7 @@ class HystrixObservableChainTest {
void testCommand() {
class TestCommand extends HystrixObservableCommand<String> {
protected TestCommand(Setter setter) {
TestCommand(Setter setter) {
super(setter);
}
@ -50,7 +50,7 @@ class HystrixObservableChainTest {
class AnotherTestCommand extends HystrixObservableCommand<String> {
private final String str;
protected AnotherTestCommand(Setter setter, String str) {
AnotherTestCommand(Setter setter, String str) {
super(setter);
this.str = str;
}

14
instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableTest.java
View File

@ -43,7 +43,7 @@ class HystrixObservableTest {
void testCommands(Parameter parameter) {
class TestCommand extends HystrixObservableCommand<String> {
protected TestCommand(Setter setter) {
TestCommand(Setter setter) {
super(setter);
}
@ -246,7 +246,7 @@ class HystrixObservableTest {
void testCommandFallbacks(Parameter parameter) {
class TestCommand extends HystrixObservableCommand<String> {
protected TestCommand(Setter setter) {
TestCommand(Setter setter) {
super(setter);
}
@ -335,7 +335,7 @@ class HystrixObservableTest {
void testNoFallbackResultsInErrorForAction(Parameter parameter) {
class TestCommand extends HystrixObservableCommand<String> {
protected TestCommand(Setter setter) {
TestCommand(Setter setter) {
super(setter);
}
@ -450,11 +450,11 @@ class HystrixObservableTest {
}
private static class Parameter {
public final Scheduler observeOn;
public final Scheduler subscribeOn;
public final Function<HystrixObservableCommand<String>, String> operation;
final Scheduler observeOn;
final Scheduler subscribeOn;
final Function<HystrixObservableCommand<String>, String> operation;
public Parameter(
Parameter(
Scheduler observeOn,
Scheduler subscribeOn,
Function<HystrixObservableCommand<String>, String> operation) {

4
instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTest.java
View File

@ -37,7 +37,7 @@ class HystrixTest {
@MethodSource("provideCommandActionArguments")
void testCommands(Function<HystrixCommand<String>, String> operation) {
class TestCommand extends HystrixCommand<String> {
protected TestCommand(Setter setter) {
TestCommand(Setter setter) {
super(setter);
}
@ -78,7 +78,7 @@ class HystrixTest {
@MethodSource("provideCommandActionArguments")
void testCommandFallbacks(Function<HystrixCommand<String>, String> operation) {
class TestCommand extends HystrixCommand<String> {
protected TestCommand(Setter setter) {
TestCommand(Setter setter) {
super(setter);
}

6
instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroServerSpanNameUpdater.java
View File

@ -132,15 +132,15 @@ final class MetroServerSpanNameUpdater {
lookup.unreflect(httpServletRequestClass.getMethod("getPathInfo"));
}
public boolean canHandle(Object httpServletRequest) {
boolean canHandle(Object httpServletRequest) {
return httpServletRequestClass.isInstance(httpServletRequest);
}
public String getServletPath(Object httpServletRequest) {
String getServletPath(Object httpServletRequest) {
return invokeSafely(getServletPathMethodHandle, httpServletRequest);
}
public String getPathInfo(Object httpServletRequest) {
String getPathInfo(Object httpServletRequest) {
return invokeSafely(getPathInfoMethodHandle, httpServletRequest);
}

2
instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetry.java
View File

@ -298,7 +298,7 @@ public final class KafkaTelemetry {
private final Context context;
private final KafkaProducerRequest request;
public ProducerCallback(
ProducerCallback(
Callback callback, Context parentContext, Context context, KafkaProducerRequest request) {
this.callback = callback;
this.parentContext = parentContext;

4
instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
View File

@ -125,7 +125,7 @@ final class OpenTelemetryTracing implements Tracing {
this.context = Context.current();
}
public Context getSpanContext() {
Context getSpanContext() {
return context;
}
}
@ -259,7 +259,7 @@ final class OpenTelemetryTracing implements Tracing {
// Added and called in 6.0+
// @Override
@CanIgnoreReturnValue
@SuppressWarnings("UnusedMethod")
@SuppressWarnings({"UnusedMethod", "EffectivelyPrivate"})
public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
start();
long startNanos = System.nanoTime();

6
instrumentation/lettuce/lettuce-common/library/src/test/java/io/opentelemetry/instrumentation/lettuce/common/LettuceArgSplitterTest.java
View File

@ -46,10 +46,10 @@ class LettuceArgSplitterTest {
}
private static class Parameter {
public final String args;
public final List<String> result;
final String args;
final List<String> result;
public Parameter(String query, List<String> result) {
Parameter(String query, List<String> result) {
this.args = query;
this.result = result;
}

2
instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogEventToReplay.java
View File

@ -184,7 +184,7 @@ class LogEventToReplay implements LogEvent {
private final Object[] parameters;
private final Throwable throwable;
public MessageCopy(Message message) {
MessageCopy(Message message) {
this.formattedMessage = message.getFormattedMessage();
this.format = message.getFormat();
this.parameters = message.getParameters();

2
instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/TracingCallFactory.java
View File

@ -134,7 +134,7 @@ class TracingCallFactory implements Call.Factory {
private final Callback delegate;
private final Context callingContext;
public TracingCallback(Callback delegate, Context callingContext) {
TracingCallback(Callback delegate, Context callingContext) {
this.delegate = delegate;
this.callingContext = callingContext;
}

2
instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoFlowWrapper.java
View File

@ -63,7 +63,7 @@ public class PekkoFlowWrapper
private class TracingLogic extends GraphStageLogic {
private final Queue<PekkoTracingRequest> requests = new ArrayDeque<>();
public TracingLogic() {
TracingLogic() {
super(shape);
// server pulls response, pass response from user code to server

2
instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerTracer.java
View File

@ -57,7 +57,7 @@ public class PekkoHttpServerTracer
private class TracingLogic extends GraphStageLogic {
private final Queue<PekkoTracingRequest> requests = new ArrayDeque<>();
public TracingLogic() {
TracingLogic() {
super(shape);
// server pulls response, pass response from user code to server

2
instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsClientBaseTest.java
View File

@ -108,7 +108,7 @@ abstract class PlayWsClientBaseTest<REQUEST> extends AbstractHttpClientTest<REQU
private static class CustomNameResolver extends InetNameResolver {
public CustomNameResolver(EventExecutor executor) {
CustomNameResolver(EventExecutor executor) {
super(executor);
}

2
instrumentation/play/play-ws/play-ws-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientBaseTest.java
View File

@ -109,7 +109,7 @@ abstract class PlayWsClientBaseTest<REQUEST> extends AbstractHttpClientTest<REQU
private static class CustomNameResolver extends InetNameResolver {
public CustomNameResolver(EventExecutor executor) {
CustomNameResolver(EventExecutor executor) {
super(executor);
}

26
instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java
View File

@ -238,14 +238,14 @@ public abstract class AbstractR2dbcStatementTest {
private static class Parameter {
public final String system;
public final String statement;
public final String expectedStatement;
public final String spanName;
public final String table;
public final String operation;
final String system;
final String statement;
final String expectedStatement;
final String spanName;
final String table;
final String operation;
public Parameter(
Parameter(
String system,
String statement,
String expectedStatement,
@ -262,19 +262,19 @@ public abstract class AbstractR2dbcStatementTest {
}
private static class DbSystemProps {
public final String system;
public final String image;
public final int port;
public final Map<String, String> envVariables = new HashMap<>();
final String system;
final String image;
final int port;
final Map<String, String> envVariables = new HashMap<>();
public DbSystemProps(String system, String image, int port) {
DbSystemProps(String system, String image, int port) {
this.system = system;
this.image = image;
this.port = port;
}
@CanIgnoreReturnValue
public DbSystemProps envVariables(String... keyValues) {
DbSystemProps envVariables(String... keyValues) {
for (int i = 0; i < keyValues.length / 2; i++) {
envVariables.put(keyValues[2 * i], keyValues[2 * i + 1]);
}

2
instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ContextPropagationOperator.java
View File

@ -278,7 +278,7 @@ public final class ContextPropagationOperator {
@SuppressWarnings({"FieldCanBeLocal", "UnusedVariable"})
private final ReactorAsyncOperationEndStrategy asyncOperationEndStrategy;
public Lifter(ReactorAsyncOperationEndStrategy asyncOperationEndStrategy) {
Lifter(ReactorAsyncOperationEndStrategy asyncOperationEndStrategy) {
this.asyncOperationEndStrategy = asyncOperationEndStrategy;
}

8
instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorAsyncOperationEndStrategy.java
View File

@ -86,16 +86,16 @@ public final class ReactorAsyncOperationEndStrategy implements AsyncOperationEnd
private final Context context;
protected EndOnFirstNotificationConsumer(Context context) {
EndOnFirstNotificationConsumer(Context context) {
super(false);
this.context = context;
}
public <T> void onSuccess(T result) {
<T> void onSuccess(T result) {
accept(result, null);
}
public void onCancel() {
void onCancel() {
if (compareAndSet(false, true)) {
if (captureExperimentalSpanAttributes) {
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
@ -120,6 +120,6 @@ public final class ReactorAsyncOperationEndStrategy implements AsyncOperationEnd
}
}
protected abstract void end(Object result, Throwable error);
abstract void end(Object result, Throwable error);
}
}

4
instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java
View File

@ -29,7 +29,7 @@ public final class DecoratorFunctions {
private final BiConsumer<? super M, ? super Connection> delegate;
private final boolean forceParentContext;
protected OnMessageDecorator(
OnMessageDecorator(
BiConsumer<? super M, ? super Connection> delegate, boolean forceParentContext) {
this.delegate = delegate;
this.forceParentContext = forceParentContext;
@ -83,7 +83,7 @@ public final class DecoratorFunctions {
private abstract static class OnMessageErrorDecorator<M> implements BiConsumer<M, Throwable> {
private final BiConsumer<? super M, ? super Throwable> delegate;
protected OnMessageErrorDecorator(BiConsumer<? super M, ? super Throwable> delegate) {
OnMessageErrorDecorator(BiConsumer<? super M, ? super Throwable> delegate) {
this.delegate = delegate;
}

2
instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java
View File

@ -32,7 +32,7 @@ class ManifestResourceProviderTest {
private final InputStream input;
private final Resource existing;
public TestCase(
TestCase(
String name,
String expectedName,
String expectedVersion,

6
instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategy.java
View File

@ -143,7 +143,7 @@ public final class RxJava2AsyncOperationEndStrategy implements AsyncOperationEnd
private final Context context;
protected EndOnFirstNotificationConsumer(Context context) {
EndOnFirstNotificationConsumer(Context context) {
this.context = context;
}
@ -152,7 +152,7 @@ public final class RxJava2AsyncOperationEndStrategy implements AsyncOperationEnd
accept(null, null);
}
public void onCancelOrDispose() {
void onCancelOrDispose() {
if (compareAndSet(false, true)) {
if (captureExperimentalSpanAttributes) {
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
@ -173,6 +173,6 @@ public final class RxJava2AsyncOperationEndStrategy implements AsyncOperationEnd
}
}
protected abstract void end(Object response, Throwable error);
abstract void end(Object response, Throwable error);
}
}

8
instrumentation/rxjava/rxjava-2.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2ConcurrencyTestHelper.java
View File

@ -87,11 +87,11 @@ public class RxJava2ConcurrencyTestHelper {
}
private static class Iteration {
public final Scheduler scheduler;
public final CountDownLatch countDown;
public final int index;
final Scheduler scheduler;
final CountDownLatch countDown;
final int index;
private Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
this.scheduler = scheduler;
this.countDown = countDown;
this.index = index;

6
instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java
View File

@ -143,7 +143,7 @@ public final class RxJava3AsyncOperationEndStrategy implements AsyncOperationEnd
private final Context context;
protected EndOnFirstNotificationConsumer(Context context) {
EndOnFirstNotificationConsumer(Context context) {
this.context = context;
}
@ -152,7 +152,7 @@ public final class RxJava3AsyncOperationEndStrategy implements AsyncOperationEnd
accept(null, null);
}
public void onCancelOrDispose() {
void onCancelOrDispose() {
if (compareAndSet(false, true)) {
if (captureExperimentalSpanAttributes) {
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
@ -173,6 +173,6 @@ public final class RxJava3AsyncOperationEndStrategy implements AsyncOperationEnd
}
}
protected abstract void end(Object response, Throwable error);
abstract void end(Object response, Throwable error);
}
}

8
instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java
View File

@ -87,11 +87,11 @@ public class RxJava3ConcurrencyTestHelper {
}
private static class Iteration {
public final Scheduler scheduler;
public final CountDownLatch countDown;
public final int index;
final Scheduler scheduler;
final CountDownLatch countDown;
final int index;
private Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
this.scheduler = scheduler;
this.countDown = countDown;
this.index = index;

2
instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java
View File

@ -160,7 +160,7 @@ class SnippetServletOutputStreamTest {
baos.write(b);
}
public byte[] getBytes() {
byte[] getBytes() {
return baos.toByteArray();
}
}

4
instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java
View File

@ -158,7 +158,7 @@ class SnippetServletOutputStreamTest {
private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
public byte[] getBytes() {
byte[] getBytes() {
return baos.toByteArray();
}
@ -171,7 +171,7 @@ class SnippetServletOutputStreamTest {
public void setWriteListener(WriteListener writeListener) {}
@Override
public void write(int b) throws IOException {
public void write(int b) {
baos.write(b);
}
}

10
instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java
View File

@ -752,6 +752,11 @@ public class SpringWebfluxTest {
}
private static class Parameter {
final String urlPath;
final String urlPathWithVariables;
final String annotatedMethod;
final String expectedResponseBody;
Parameter(
String urlPath,
String urlPathWithVariables,
@ -762,10 +767,5 @@ public class SpringWebfluxTest {
this.annotatedMethod = annotatedMethod;
this.expectedResponseBody = expectedResponseBody;
}
public final String urlPath;
public final String urlPathWithVariables;
public final String annotatedMethod;
public final String expectedResponseBody;
}
}

2
javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java
View File

@ -505,7 +505,7 @@ public class AgentClassLoader extends URLClassLoader {
private final ClassLoader platformClassLoader = getPlatformLoader();
public PlatformDelegatingClassLoader() {
PlatformDelegatingClassLoader() {
super(null);
}

4
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceUninliningPoolStrategy.java
View File

@ -52,7 +52,7 @@ class AdviceUninliningPoolStrategy implements AgentBuilder.PoolStrategy {
private static class TypePoolWrapper implements TypePool {
private final TypePool typePool;
public TypePoolWrapper(TypePool typePool) {
TypePoolWrapper(TypePool typePool) {
this.typePool = typePool;
}
@ -158,7 +158,7 @@ class AdviceUninliningPoolStrategy implements AgentBuilder.PoolStrategy {
private static class DelegatingMethodDescription
extends MethodDescription.InDefinedShape.AbstractBase {
protected final MethodDescription.InDefinedShape method;
final MethodDescription.InDefinedShape method;
DelegatingMethodDescription(MethodDescription.InDefinedShape method) {
this.method = method;

3
javaagent-tooling/src/testMissingType/java/io/opentelemetry/javaagent/tooling/bytebuddy/MissingTypeTest.java
View File

@ -92,8 +92,7 @@ class MissingTypeTest {
}
// com.google.common.base.Joiner is missing from runtime class path
@SuppressWarnings({"UnusedMethod", "UnusedVariable", "MethodCanBeStatic"})
private static class SomeClass {
static class SomeClass {
public Joiner joiner;
public static boolean isInstrumented() {

2
muzzle/src/main/java/io/opentelemetry/javaagent/tooling/ByteArrayUrl.java
View File

@ -74,7 +74,7 @@ public class ByteArrayUrl {
private final InputStream inputStream;
protected ByteArrayUrlConnection(URL url) {
ByteArrayUrlConnection(URL url) {
super(url);
inputStream = new ByteArrayInputStream(binaryRepresentation);
}

6
muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java
View File

@ -318,7 +318,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
private final ThreadLocal<Boolean> loadingAnnotations = new ThreadLocal<>();
private final WeakReference<ClassLoader> classLoaderRef;
public AgentTypePool(
AgentTypePool(
TypePool.CacheProvider cacheProvider,
ClassFileLocator classFileLocator,
ClassLoader classLoader,
@ -344,7 +344,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
* @param name The name of the type to resolve.
* @return The resolution for the type of this name.
*/
protected TypePool.Resolution doResolve(String name) {
private TypePool.Resolution doResolve(String name) {
TypePool.Resolution resolution = cacheProvider.find(name);
if (resolution == null) {
// calling super.doDescribe that will locate the class bytes and parse them unlike
@ -691,7 +691,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
private static class DelegatingMethodDescription
extends MethodDescription.InDefinedShape.AbstractBase {
protected final MethodDescription.InDefinedShape method;
final MethodDescription.InDefinedShape method;
DelegatingMethodDescription(MethodDescription.InDefinedShape method) {
this.method = method;

2
muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectingClassVisitor.java
View File

@ -312,7 +312,7 @@ final class ReferenceCollectingClassVisitor extends ClassVisitor {
private class AdviceReferenceMethodVisitor extends MethodVisitor {
private int currentLineNumber = -1;
public AdviceReferenceMethodVisitor(MethodVisitor methodVisitor) {
AdviceReferenceMethodVisitor(MethodVisitor methodVisitor) {
super(AsmApi.VERSION, methodVisitor);
}

2
muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/MuzzleCodeGenerator.java
View File

@ -98,7 +98,7 @@ final class MuzzleCodeGenerator implements AsmVisitorWrapper {
private boolean generateHelperClassNamesMethod = true;
private boolean generateVirtualFieldsMethod = true;
public GenerateMuzzleMethodsAndFields(ClassVisitor classVisitor, URLClassLoader classLoader) {
GenerateMuzzleMethodsAndFields(ClassVisitor classVisitor, URLClassLoader classLoader) {
super(AsmApi.VERSION, classVisitor);
this.classLoader = classLoader;
}

6
smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java
View File

@ -317,9 +317,9 @@ public class WindowsTestContainerManager extends AbstractTestContainerManager {
}
private static class Container {
public final String imageName;
public final String containerId;
public final InspectContainerResponse inspectResponse;
final String imageName;
final String containerId;
final InspectContainerResponse inspectResponse;
private Container(
String imageName, String containerId, InspectContainerResponse inspectResponse) {

2
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java
View File

@ -195,7 +195,7 @@ final class YamlFileMappingsSource implements MappingsSource {
final String path;
final boolean multi;
public StubMappingFileMetadata(String path, boolean multi) {
StubMappingFileMetadata(String path, boolean multi) {
this.path = path;
this.multi = multi;
}

2
testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java
View File

@ -167,7 +167,7 @@ public class TestAgentListener implements AgentBuilder.Listener {
private static class AbortTransformationException extends RuntimeException {
private static final long serialVersionUID = 1L;
public AbortTransformationException(String message) {
AbortTransformationException(String message) {
super(message);
}
}