diff --git a/custom-checks/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/CanIgnoreReturnValueSuggesterFactory.java b/custom-checks/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/CanIgnoreReturnValueSuggesterFactory.java
index d157d5fe92..4ef3d204ab 100644
--- a/custom-checks/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/CanIgnoreReturnValueSuggesterFactory.java
+++ b/custom-checks/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/CanIgnoreReturnValueSuggesterFactory.java
@@ -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() {}
diff --git a/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java
index 55e1d0bfce..5274fadeb2 100644
--- a/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java
+++ b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelCanIgnoreReturnValueSuggester.java
@@ -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() {
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 11013f7f90..8498912f93 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -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"
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java
index fac5726af8..963554c1ef 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java
@@ -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;
     }
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaFlowWrapper.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaFlowWrapper.java
index 1880275cea..d39e3df815 100644
--- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaFlowWrapper.java
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaFlowWrapper.java
@@ -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
diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTest.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTest.java
index cb8a8e17b4..305efe6173 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTest.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTest.java
@@ -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;
     }
 
diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java
index 6ec2ae3817..3aca7a793f 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java
@@ -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;
     }
 
diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTest.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTest.java
index e76b1ae758..681457a1eb 100644
--- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTest.java
+++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTest.java
@@ -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;
     }
 
diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java
index 12bef1d950..2c00f5fa20 100644
--- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java
+++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java
@@ -177,8 +177,7 @@ public class AwsLambdaWrapperTest {
     }
   }
 
-  @SuppressWarnings("UnusedMethod")
-  private static class CustomType {
+  static class CustomType {
     String key;
     String value;
 
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingList.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingList.java
index f003d23a29..cf3ec366d1 100644
--- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingList.java
+++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingList.java
@@ -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() {
diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java
index 9816cf15c1..c678ad6760 100644
--- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java
+++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java
@@ -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;
       }
diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.java
index d74d03011d..0ab3bee480 100644
--- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.java
+++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.java
@@ -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;
     }
diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java
index d45c8ff034..9d9a14a5c0 100644
--- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java
+++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java
@@ -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,
diff --git a/instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java b/instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java
index b67f857a2e..4c0d9e32cf 100644
--- a/instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java
+++ b/instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java
@@ -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;
     }
diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java
index 538c3a0393..f883419aa4 100644
--- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java
+++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java
@@ -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;
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
index 44d9f5bff5..bde1b70f7d 100644
--- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
+++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
@@ -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;
     }
   }
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
index 7242f65fdd..cbf4442778 100644
--- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
+++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
@@ -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;
     }
   }
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/elasticsearch6Test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6NodeFactory.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/elasticsearch6Test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6NodeFactory.java
index 0e9b929b86..262c07a76e 100644
--- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/elasticsearch6Test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6NodeFactory.java
+++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/elasticsearch6Test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6NodeFactory.java
@@ -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) {}
     };
   }
diff --git a/instrumentation/grpc-1.6/library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTest.java b/instrumentation/grpc-1.6/library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTest.java
index 36b27c83fb..93ba8b129a 100644
--- a/instrumentation/grpc-1.6/library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTest.java
+++ b/instrumentation/grpc-1.6/library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTest.java
@@ -176,7 +176,7 @@ class GrpcTest extends AbstractGrpcTest {
 
     private final String valueOfKey2;
 
-    public CustomAttributesExtractorV2(String valueOfKey2) {
+    CustomAttributesExtractorV2(String valueOfKey2) {
       this.valueOfKey2 = valueOfKey2;
     }
 
diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/QueryTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/QueryTest.java
index e8da2d58f3..2dbb864f2b 100644
--- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/QueryTest.java
+++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/QueryTest.java
@@ -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;
diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java
index 9a246eb107..21228dd7fe 100644
--- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java
+++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java
@@ -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,
diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java
index 545fc29385..b94fbccd4f 100644
--- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java
+++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java
@@ -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,
diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java
index 5680bfefc1..4e997d19ec 100644
--- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java
+++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java
@@ -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;
     }
diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java
index 0ef67c94a8..b524440a4f 100644
--- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java
+++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java
@@ -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) {
diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate6Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate6Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java
index 0aadd99ca8..c19bd2baf0 100644
--- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate6Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java
+++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate6Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java
@@ -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(
diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java
index 55912b70f7..68038d564f 100644
--- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java
+++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java
@@ -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(
diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java
index 7cfaa7aecb..1adc805987 100644
--- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java
+++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java
@@ -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
diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableChainTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableChainTest.java
index 89eef213fb..852d24ddba 100644
--- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableChainTest.java
+++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableChainTest.java
@@ -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;
       }
diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableTest.java
index fdac6e9b09..bc1aa3a5e0 100644
--- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableTest.java
+++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixObservableTest.java
@@ -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) {
diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTest.java
index bd8adba9f0..675a53b51f 100644
--- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTest.java
+++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTest.java
@@ -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);
       }
 
diff --git a/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroServerSpanNameUpdater.java b/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroServerSpanNameUpdater.java
index 2d9ee053da..a26c793b55 100644
--- a/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroServerSpanNameUpdater.java
+++ b/instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroServerSpanNameUpdater.java
@@ -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);
     }
 
diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetry.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetry.java
index 4f938a545e..d66003f660 100644
--- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetry.java
+++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetry.java
@@ -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;
diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
index 115d096c1d..58a67d6dc0 100644
--- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
+++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
@@ -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();
diff --git a/instrumentation/lettuce/lettuce-common/library/src/test/java/io/opentelemetry/instrumentation/lettuce/common/LettuceArgSplitterTest.java b/instrumentation/lettuce/lettuce-common/library/src/test/java/io/opentelemetry/instrumentation/lettuce/common/LettuceArgSplitterTest.java
index 5761b3f7c5..63999140f6 100644
--- a/instrumentation/lettuce/lettuce-common/library/src/test/java/io/opentelemetry/instrumentation/lettuce/common/LettuceArgSplitterTest.java
+++ b/instrumentation/lettuce/lettuce-common/library/src/test/java/io/opentelemetry/instrumentation/lettuce/common/LettuceArgSplitterTest.java
@@ -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;
     }
diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogEventToReplay.java b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogEventToReplay.java
index a165d0edab..7b7134a344 100644
--- a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogEventToReplay.java
+++ b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogEventToReplay.java
@@ -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();
diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/TracingCallFactory.java b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/TracingCallFactory.java
index fcc473ccf4..479e107c51 100644
--- a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/TracingCallFactory.java
+++ b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/TracingCallFactory.java
@@ -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;
       }
diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoFlowWrapper.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoFlowWrapper.java
index 516c797f63..7b09a0d405 100644
--- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoFlowWrapper.java
+++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoFlowWrapper.java
@@ -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
diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerTracer.java b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerTracer.java
index 971235e3f9..fd1350feeb 100644
--- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerTracer.java
+++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerTracer.java
@@ -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
diff --git a/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsClientBaseTest.java b/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsClientBaseTest.java
index 3b028e10be..d080c04b62 100644
--- a/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsClientBaseTest.java
+++ b/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsClientBaseTest.java
@@ -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);
     }
 
diff --git a/instrumentation/play/play-ws/play-ws-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientBaseTest.java b/instrumentation/play/play-ws/play-ws-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientBaseTest.java
index 58e0b81dd4..7591b650f9 100644
--- a/instrumentation/play/play-ws/play-ws-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientBaseTest.java
+++ b/instrumentation/play/play-ws/play-ws-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientBaseTest.java
@@ -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);
     }
 
diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java
index dcef6bcdc5..6c8e5477e4 100644
--- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java
+++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java
@@ -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]);
       }
diff --git a/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ContextPropagationOperator.java b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ContextPropagationOperator.java
index 3d554240c2..ba2afc3297 100644
--- a/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ContextPropagationOperator.java
+++ b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ContextPropagationOperator.java
@@ -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;
     }
 
diff --git a/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorAsyncOperationEndStrategy.java b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorAsyncOperationEndStrategy.java
index 49f85ad0ae..5e77ffffd9 100644
--- a/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorAsyncOperationEndStrategy.java
+++ b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorAsyncOperationEndStrategy.java
@@ -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);
   }
 }
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java
index 53e8eb5405..03ac29f725 100644
--- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java
+++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java
@@ -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;
     }
 
diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java
index e34768d344..2986337d89 100644
--- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java
+++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java
@@ -32,7 +32,7 @@ class ManifestResourceProviderTest {
     private final InputStream input;
     private final Resource existing;
 
-    public TestCase(
+    TestCase(
         String name,
         String expectedName,
         String expectedVersion,
diff --git a/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategy.java b/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategy.java
index a66bda6174..caf78662f7 100644
--- a/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategy.java
+++ b/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategy.java
@@ -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);
   }
 }
diff --git a/instrumentation/rxjava/rxjava-2.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2ConcurrencyTestHelper.java b/instrumentation/rxjava/rxjava-2.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2ConcurrencyTestHelper.java
index 9c95ba400a..355e20984a 100644
--- a/instrumentation/rxjava/rxjava-2.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2ConcurrencyTestHelper.java
+++ b/instrumentation/rxjava/rxjava-2.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2ConcurrencyTestHelper.java
@@ -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;
diff --git a/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java b/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java
index 2814a15f42..a6dc8fa69f 100644
--- a/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java
+++ b/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java
@@ -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);
   }
 }
diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java b/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java
index 9d1ddb055d..ed3dd21116 100644
--- a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java
+++ b/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java
@@ -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;
diff --git a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java
index d16c4c521f..7a33bf4736 100644
--- a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java
+++ b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java
@@ -160,7 +160,7 @@ class SnippetServletOutputStreamTest {
       baos.write(b);
     }
 
-    public byte[] getBytes() {
+    byte[] getBytes() {
       return baos.toByteArray();
     }
   }
diff --git a/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java b/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java
index aed84df63c..da6ce0589c 100644
--- a/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java
+++ b/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java
@@ -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);
     }
   }
diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java
index 9d315d37b2..0fcc0698c0 100644
--- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java
+++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java
@@ -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;
   }
 }
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java
index 4a940e5dc7..340809bc90 100644
--- a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java
+++ b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java
@@ -505,7 +505,7 @@ public class AgentClassLoader extends URLClassLoader {
 
     private final ClassLoader platformClassLoader = getPlatformLoader();
 
-    public PlatformDelegatingClassLoader() {
+    PlatformDelegatingClassLoader() {
       super(null);
     }
 
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceUninliningPoolStrategy.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceUninliningPoolStrategy.java
index 0fde158141..b258f552a4 100644
--- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceUninliningPoolStrategy.java
+++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceUninliningPoolStrategy.java
@@ -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;
diff --git a/javaagent-tooling/src/testMissingType/java/io/opentelemetry/javaagent/tooling/bytebuddy/MissingTypeTest.java b/javaagent-tooling/src/testMissingType/java/io/opentelemetry/javaagent/tooling/bytebuddy/MissingTypeTest.java
index 057b62acf0..d86733e56c 100644
--- a/javaagent-tooling/src/testMissingType/java/io/opentelemetry/javaagent/tooling/bytebuddy/MissingTypeTest.java
+++ b/javaagent-tooling/src/testMissingType/java/io/opentelemetry/javaagent/tooling/bytebuddy/MissingTypeTest.java
@@ -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() {
diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/ByteArrayUrl.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/ByteArrayUrl.java
index ccbce0f16a..f77d71b4e3 100644
--- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/ByteArrayUrl.java
+++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/ByteArrayUrl.java
@@ -74,7 +74,7 @@ public class ByteArrayUrl {
 
       private final InputStream inputStream;
 
-      protected ByteArrayUrlConnection(URL url) {
+      ByteArrayUrlConnection(URL url) {
         super(url);
         inputStream = new ByteArrayInputStream(binaryRepresentation);
       }
diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java
index 49c1d4dfc6..e931af800f 100644
--- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java
+++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java
@@ -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;
diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectingClassVisitor.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectingClassVisitor.java
index 7ac429efa6..9eccb683c2 100644
--- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectingClassVisitor.java
+++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectingClassVisitor.java
@@ -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);
     }
 
diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/MuzzleCodeGenerator.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/MuzzleCodeGenerator.java
index 0fdccccb9a..d55e410099 100644
--- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/MuzzleCodeGenerator.java
+++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/MuzzleCodeGenerator.java
@@ -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;
     }
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java
index cdb4f41f26..6281e76268 100644
--- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java
+++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java
@@ -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) {
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java
index 9aafad162a..4090ff8a76 100644
--- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java
+++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java
@@ -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;
     }
diff --git a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java
index 5ca308930d..12a799a1d0 100644
--- a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java
+++ b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java
@@ -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);
     }
   }