Minor cleanup.

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit eedf11e7921a · 2025-08-26T12:21:37.000-04:00
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy
@@ -81,7 +81,7 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
     if (server != null) {
       try {
         server.stopAndWait()
-      } catch (InterruptedException ignored) {
+      } catch (InterruptedException _) {
         Thread.currentThread().interrupt()
       }
     }
diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy b/dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy
@@ -241,7 +241,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner {
         MyMessage.parseFrom(new byte[]{
           1, 2, 3, 4, 5
         })
-      } catch (InvalidProtocolBufferException ignored) {
+      } catch (InvalidProtocolBufferException _) {
       }
     }
     TEST_WRITER.waitForTraces(1)
diff --git a/dd-java-agent/instrumentation/tomcat-5.5/src/latestDepTest/groovy/TomcatServer.groovy b/dd-java-agent/instrumentation/tomcat-5.5/src/latestDepTest/groovy/TomcatServer.groovy
@@ -136,7 +136,7 @@ class TomcatServer implements WebsocketServer {
         while (WsEndpoint.activeSession == null) {
           WsEndpoint.wait()
         }
-      } catch (InterruptedException ignored) {
+      } catch (InterruptedException _) {
         Thread.currentThread().interrupt()
       }
     }
diff --git a/dd-java-agent/instrumentation/tomcat-5.5/src/tomcat9Test/groovy/TomcatServer.groovy b/dd-java-agent/instrumentation/tomcat-5.5/src/tomcat9Test/groovy/TomcatServer.groovy
@@ -92,7 +92,7 @@ class TomcatServer implements WebsocketServer {
         while (WsEndpoint.activeSession == null) {
           WsEndpoint.wait()
         }
-      } catch (InterruptedException ignored) {
+      } catch (InterruptedException _) {
         Thread.currentThread().interrupt()
       }
     }
diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/src/test/groovy/EndpointWrapper.groovy b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/src/test/groovy/EndpointWrapper.groovy
@@ -14,7 +14,7 @@ class EndpointWrapper extends Endpoint {
     def endpoint = endpointConfig.getUserProperties().get(Endpoint.name) as Endpoint
     assert endpoint != null
     session.getUserProperties().put(Endpoint.name, endpoint)
-    try (def ignored = span != null ? activateSpan(span) : null) {
+    try (def _ = span != null ? activateSpan(span) : null) {
       endpoint.onOpen(session, endpointConfig)
     }
   }
diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/EndpointWrapper.groovy b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/EndpointWrapper.groovy
@@ -14,7 +14,7 @@ class EndpointWrapper extends Endpoint {
     def endpoint = endpointConfig.getUserProperties().get(Endpoint.name) as Endpoint
     assert endpoint != null
     session.getUserProperties().put(Endpoint.name, endpoint)
-    try (def ignored = span != null ? activateSpan(span) : null) {
+    try (def _ = span != null ? activateSpan(span) : null) {
       endpoint.onOpen(session, endpointConfig)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ abstract class SqsClientTest extends VersionedNamingTestBase {`
`81`	`81`	`if (server != null) {`
`82`	`82`	`try {`
`83`	`83`	`server.stopAndWait()`
`84`		`- } catch (InterruptedException ignored) {`
	`84`	`+ } catch (InterruptedException _) {`
`85`	`85`	`Thread.currentThread().interrupt()`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner {`
`241`	`241`	`MyMessage.parseFrom(new byte[]{`
`242`	`242`	`1, 2, 3, 4, 5`
`243`	`243`	`})`
`244`		`- } catch (InvalidProtocolBufferException ignored) {`
	`244`	`+ } catch (InvalidProtocolBufferException _) {`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`	`TEST_WRITER.waitForTraces(1)`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ class TomcatServer implements WebsocketServer {`
`136`	`136`	`while (WsEndpoint.activeSession == null) {`
`137`	`137`	`WsEndpoint.wait()`
`138`	`138`	`}`
`139`		`- } catch (InterruptedException ignored) {`
	`139`	`+ } catch (InterruptedException _) {`
`140`	`140`	`Thread.currentThread().interrupt()`
`141`	`141`	`}`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class TomcatServer implements WebsocketServer {`
`92`	`92`	`while (WsEndpoint.activeSession == null) {`
`93`	`93`	`WsEndpoint.wait()`
`94`	`94`	`}`
`95`		`- } catch (InterruptedException ignored) {`
	`95`	`+ } catch (InterruptedException _) {`
`96`	`96`	`Thread.currentThread().interrupt()`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class EndpointWrapper extends Endpoint {`
`14`	`14`	`def endpoint = endpointConfig.getUserProperties().get(Endpoint.name) as Endpoint`
`15`	`15`	`assert endpoint != null`
`16`	`16`	`session.getUserProperties().put(Endpoint.name, endpoint)`
`17`		`- try (def ignored = span != null ? activateSpan(span) : null) {`
	`17`	`+ try (def _ = span != null ? activateSpan(span) : null) {`
`18`	`18`	`endpoint.onOpen(session, endpointConfig)`
`19`	`19`	`}`
`20`	`20`	`}`