fixes

Author: laurit

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() {}

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

@@ -12,6 +12,7 @@
 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() {

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

@@ -139,10 +139,10 @@ private static void debugContextPropagation(Context context) {
   }
 
   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;
     }

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

@@ -73,7 +73,7 @@ public GraphStageLogic createLogic(Attributes attributes) {
   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

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

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

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

@@ -83,25 +83,24 @@ private static class ContextWithScope {
     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;
       }

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

@@ -132,15 +132,15 @@ private HttpServletRequestAdapter(Class<?> httpServletRequestClass)
           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);
     }
 

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

@@ -298,7 +298,7 @@ private class ProducerCallback implements Callback {
     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;

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

@@ -125,7 +125,7 @@ private static class OpenTelemetryTraceContext implements TraceContext {
       this.context = Context.current();
     }
 
-    public Context getSpanContext() {
+    Context getSpanContext() {
       return context;
     }
   }
@@ -259,7 +259,7 @@ private void fillEndpoint(OpenTelemetryEndpoint endpoint) {
     // 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();

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

@@ -184,7 +184,7 @@ private static class MessageCopy implements Message {
     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();