fix warnings

laurit · laurit · commit 77fa79000ab6 · 2025-06-25T16:45:47.000+03:00
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsConnector.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsConnector.java
@@ -99,33 +99,39 @@ String getQueueArn(String queueUrl) {
   }
 
   void setTopicPublishingPolicy(String topicArn) {
-    String snsPolicy =
-        "{"
-            + "  \"Statement\": ["
-            + "    {"
-            + "      \"Effect\": \"Allow\","
-            + "      \"Principal\": \"*\","
-            + "      \"Action\": \"sns:Publish\","
-            + "      \"Resource\": \"%s\""
-            + "    }]"
-            + "}";
     snsClient.setTopicAttributes(
-        new SetTopicAttributesRequest(topicArn, "Policy", String.format(snsPolicy, topicArn)));
+        new SetTopicAttributesRequest(
+            topicArn,
+            "Policy",
+            String.format(
+                "{"
+                    + "  \"Statement\": ["
+                    + "    {"
+                    + "      \"Effect\": \"Allow\","
+                    + "      \"Principal\": \"*\","
+                    + "      \"Action\": \"sns:Publish\","
+                    + "      \"Resource\": \"%s\""
+                    + "    }]"
+                    + "}",
+                topicArn)));
   }
 
   void setQueuePublishingPolicy(String queueUrl, String queueArn) {
-    String sqsPolicy =
-        "{"
-            + "  \"Statement\": ["
-            + "    {"
-            + "      \"Effect\": \"Allow\","
-            + "      \"Principal\": \"*\","
-            + "      \"Action\": \"sqs:SendMessage\","
-            + "      \"Resource\": \"%s\""
-            + "    }]"
-            + "}";
     sqsClient.setQueueAttributes(
-        queueUrl, Collections.singletonMap("Policy", String.format(sqsPolicy, queueArn)));
+        queueUrl,
+        Collections.singletonMap(
+            "Policy",
+            String.format(
+                "{"
+                    + "  \"Statement\": ["
+                    + "    {"
+                    + "      \"Effect\": \"Allow\","
+                    + "      \"Principal\": \"*\","
+                    + "      \"Action\": \"sqs:SendMessage\","
+                    + "      \"Resource\": \"%s\""
+                    + "    }]"
+                    + "}",
+                queueArn)));
   }
 
   void createBucket(String bucketName) {
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingRequestHandler.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingRequestHandler.java
@@ -81,7 +81,7 @@ public void beforeRequest(Request<?> request) {
       Context context = InstrumenterUtil.suppressSpan(instrumenter, parentContext, request);
       context = context.with(REQUEST_TIMER_KEY, Timer.start());
       context = context.with(PARENT_CONTEXT_KEY, parentContext);
-      context = context.with(REQUEST_SPAN_SUPPRESSED_KEY, Boolean.TRUE);
+      context = context.with(REQUEST_SPAN_SUPPRESSED_KEY, true);
       request.addHandlerContext(CONTEXT, context);
       return;
     }
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53NodeClientTest.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53NodeClientTest.java
@@ -74,7 +74,7 @@ static void setUp(@TempDir File esWorkingDir) {
                   new ClusterUpdateSettingsRequest()
                       .transientSettings(
                           Collections.singletonMap(
-                              "cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
+                              "cluster.routing.allocation.disk.threshold_enabled", false)));
         });
     testing.waitForTraces(1);
     testing.clearData();
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientTest.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientTest.java
@@ -87,7 +87,7 @@ static void setUp(@TempDir File esWorkingDir) {
                   new ClusterUpdateSettingsRequest()
                       .transientSettings(
                           Collections.singletonMap(
-                              "cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
+                              "cluster.routing.allocation.disk.threshold_enabled", false)));
         });
     testing.waitForTraces(1);
     testing.clearData();
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Config.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Config.java
@@ -71,7 +71,7 @@ Node elasticSearchNode() throws Exception {
             new ClusterUpdateSettingsRequest()
                 .transientSettings(
                     Collections.singletonMap(
-                        "cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
+                        "cluster.routing.allocation.disk.threshold_enabled", false)));
 
     return testNode;
   }
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java
@@ -140,7 +140,7 @@ static void setUp(@TempDir File esWorkingDir) {
                   new ClusterUpdateSettingsRequest()
                       .transientSettings(
                           Collections.singletonMap(
-                              "cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
+                              "cluster.routing.allocation.disk.threshold_enabled", false)));
         });
     testing.waitForTraces(1);
     testing.clearData();
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6NodeClientTest.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6NodeClientTest.java
@@ -68,7 +68,7 @@ void setUp(@TempDir File esWorkingDir) {
                   new ClusterUpdateSettingsRequest()
                       .transientSettings(
                           Collections.singletonMap(
-                              "cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
+                              "cluster.routing.allocation.disk.threshold_enabled", false)));
         });
     testing.waitForTraces(1);
     testing.clearData();
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6TransportClientTest.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6TransportClientTest.java
@@ -81,7 +81,7 @@ void setUp(@TempDir File esWorkingDir) {
                   new ClusterUpdateSettingsRequest()
                       .transientSettings(
                           Collections.singletonMap(
-                              "cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
+                              "cluster.routing.allocation.disk.threshold_enabled", false)));
         });
     testing.waitForTraces(1);
     testing.clearData();
diff --git a/instrumentation/executors/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/executors/ExecutorAdviceHelper.java b/instrumentation/executors/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/executors/ExecutorAdviceHelper.java
@@ -24,7 +24,7 @@ public final class ExecutorAdviceHelper {
    * to re-enable the propagation.
    */
   public static void disablePropagation() {
-    propagationDisabled.set(Boolean.TRUE);
+    propagationDisabled.set(true);
   }
 
   /**
diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerInstrumentation.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerInstrumentation.java
@@ -42,7 +42,7 @@ public void transform(TypeTransformer transformer) {
   public static class CallLogRawAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void methodEnter(
-        @Advice.This() Logger logger,
+        @Advice.This Logger logger,
         @Advice.Argument(0) ExtLogRecord record,
         @Advice.Local("otelCallDepth") CallDepth callDepth) {
       // need to track call depth across all loggers in order to avoid double capture when one
diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java
@@ -103,8 +103,8 @@ void testCaptureAttributeArray() {
 
     assertThat(builder.build())
         .containsOnly(
-            entry(AttributeKey.booleanArrayKey("booleanArray"), singletonList(Boolean.TRUE)),
-            entry(AttributeKey.booleanArrayKey("BooleanArray"), singletonList(Boolean.TRUE)),
+            entry(AttributeKey.booleanArrayKey("booleanArray"), singletonList(true)),
+            entry(AttributeKey.booleanArrayKey("BooleanArray"), singletonList(true)),
             entry(AttributeKey.longArrayKey("byteArray"), singletonList(2L)),
             entry(AttributeKey.longArrayKey("ByteArray"), singletonList(2L)),
             entry(AttributeKey.longArrayKey("shortArray"), singletonList(2L)),
diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageListenerContext.java b/instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageListenerContext.java
@@ -17,7 +17,7 @@ private MessageListenerContext() {}
 
   /** Call on entry to a method that will pass the received message to a message listener. */
   public static void startProcessing() {
-    processing.set(Boolean.TRUE);
+    processing.set(true);
   }
 
   public static void endProcessing() {
diff --git a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/mapping/TomcatServlet3FilterMappingTest.java b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/mapping/TomcatServlet3FilterMappingTest.java
@@ -56,7 +56,7 @@ public void doFilter(
         ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
         throws IOException, ServletException {
       if (servletRequest.getAttribute("firstFilterCalled") != null) {
-        servletRequest.setAttribute("testFilterCalled", Boolean.TRUE);
+        servletRequest.setAttribute("testFilterCalled", true);
         filterChain.doFilter(servletRequest, servletResponse);
       } else {
         throw new IllegalStateException("First filter should have been called.");
@@ -75,7 +75,7 @@ public void init(FilterConfig filterConfig) {}
     public void doFilter(
         ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
         throws IOException, ServletException {
-      servletRequest.setAttribute("firstFilterCalled", Boolean.TRUE);
+      servletRequest.setAttribute("firstFilterCalled", true);
       filterChain.doFilter(servletRequest, servletResponse);
     }
 
diff --git a/instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/mapping/TomcatServlet5FilterMappingTest.java b/instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/mapping/TomcatServlet5FilterMappingTest.java
@@ -56,7 +56,7 @@ public void doFilter(
         ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
         throws IOException, ServletException {
       if (servletRequest.getAttribute("firstFilterCalled") != null) {
-        servletRequest.setAttribute("testFilterCalled", Boolean.TRUE);
+        servletRequest.setAttribute("testFilterCalled", true);
         filterChain.doFilter(servletRequest, servletResponse);
       } else {
         throw new IllegalStateException("First filter should have been called.");
@@ -75,7 +75,7 @@ public void init(FilterConfig filterConfig) {}
     public void doFilter(
         ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
         throws IOException, ServletException {
-      servletRequest.setAttribute("firstFilterCalled", Boolean.TRUE);
+      servletRequest.setAttribute("firstFilterCalled", true);
       filterChain.doFilter(servletRequest, servletResponse);
     }
 
diff --git a/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioAsyncMarker.java b/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioAsyncMarker.java
@@ -18,7 +18,7 @@ public final class TwilioAsyncMarker {
       ContextKey.named("opentelemetry-instrumentation-twilio-async-marker");
 
   public static Context markAsync(Context context) {
-    return context.with(MARKER_KEY, Boolean.TRUE);
+    return context.with(MARKER_KEY, true);
   }
 
   public static boolean isMarkedAsync(Context context) {
diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinSingletons.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinSingletons.java
@@ -47,7 +47,7 @@ public class VaadinSingletons {
             // add context for tracking nested request handler calls
             .addContextCustomizer(
                 (context, vaadinHandlerRequest, startAttributes) ->
-                    context.with(REQUEST_HANDLER_CONTEXT_KEY, Boolean.TRUE))
+                    context.with(REQUEST_HANDLER_CONTEXT_KEY, true))
             .buildInstrumenter();
 
     RPC_INSTRUMENTER =
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceTransformer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceTransformer.java
@@ -848,7 +848,7 @@ public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
           @Override
           public void visit(String name, Object value) {
             if ("inline".equals(name)) {
-              value = Boolean.FALSE;
+              value = false;
               hasInline = true;
             } else if ("skipOn".equals(name) && value != void.class) {
               hasSkipOn = true;
@@ -859,7 +859,7 @@ public void visit(String name, Object value) {
           @Override
           public void visitEnd() {
             if (!hasInline) {
-              visit("inline", Boolean.FALSE);
+              visit("inline", false);
             }
             if (context.canChangeReturnType() && hasSkipOn) {
               visit("skipOnIndex", 0);
@@ -887,7 +887,7 @@ public AnnotationVisitor visitParameterAnnotation(
           @Override
           public void visit(String name, Object value) {
             if ("readOnly".equals(name)) {
-              value = Boolean.TRUE;
+              value = true;
             }
             super.visit(name, value);
           }
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
@@ -355,7 +355,7 @@ protected TypePool.Resolution doResolve(String name) {
     }
 
     void enterLoadAnnotations() {
-      loadingAnnotations.set(Boolean.TRUE);
+      loadingAnnotations.set(true);
     }
 
     void exitLoadAnnotations() {
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/TestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/TestContainerManager.java
@@ -19,6 +19,7 @@ public interface TestContainerManager {
 
   int getTargetMappedPort(int originalPort);
 
+  @SuppressWarnings("TooManyParameters")
   Consumer<OutputFrame> startTarget(
       String targetImageName,
       String agentPath,

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void beforeRequest(Request<?> request) {`
`81`	`81`	`Context context = InstrumenterUtil.suppressSpan(instrumenter, parentContext, request);`
`82`	`82`	`context = context.with(REQUEST_TIMER_KEY, Timer.start());`
`83`	`83`	`context = context.with(PARENT_CONTEXT_KEY, parentContext);`
`84`		`- context = context.with(REQUEST_SPAN_SUPPRESSED_KEY, Boolean.TRUE);`
	`84`	`+ context = context.with(REQUEST_SPAN_SUPPRESSED_KEY, true);`
`85`	`85`	`request.addHandlerContext(CONTEXT, context);`
`86`	`86`	`return;`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ Node elasticSearchNode() throws Exception {`
`71`	`71`	`new ClusterUpdateSettingsRequest()`
`72`	`72`	`.transientSettings(`
`73`	`73`	`Collections.singletonMap(`
`74`		`- "cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));`
	`74`	`+ "cluster.routing.allocation.disk.threshold_enabled", false)));`
`75`	`75`
`76`	`76`	`return testNode;`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public final class ExecutorAdviceHelper {`
`24`	`24`	`* to re-enable the propagation.`
`25`	`25`	`*/`
`26`	`26`	`public static void disablePropagation() {`
`27`		`- propagationDisabled.set(Boolean.TRUE);`
	`27`	`+ propagationDisabled.set(true);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`