Module cleanup (run 25329827818) (open-telemetry#18567)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaClientDefaultTest.java

@@ -156,14 +156,14 @@ void testPassThroughTombstone() throws Exception {
   @ValueSource(booleans = {true, false})
   void testRecordsWithTopicPartitionKafkaConsume(boolean testListIterator) throws Exception {
     String greeting = "Hello from MockConsumer!";
-    producer.send(new ProducerRecord<>(SHARED_TOPIC, partition, null, greeting)).get(5, SECONDS);
+    producer.send(new ProducerRecord<>(SHARED_TOPIC, PARTITION, null, greeting)).get(5, SECONDS);
 
     testing.waitForTraces(1);
 
     awaitUntilConsumerIsReady();
     ConsumerRecords<?, ?> consumerRecords = poll(Duration.ofSeconds(5));
     List<? extends ConsumerRecord<?, ?>> recordsInPartition =
-        consumerRecords.records(KafkaClientBaseTest.topicPartition);
+        consumerRecords.records(KafkaClientBaseTest.TOPIC_PARTITION);
     assertThat(recordsInPartition).hasSize(1);
 
     // iterate over records to generate spans

instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaClientSuppressReceiveSpansTest.java

@@ -119,14 +119,14 @@ void testPassThroughTombstone() throws Exception {
   @Test
   void testRecordsWithTopicPartitionKafkaConsume() throws Exception {
     String greeting = "Hello from MockConsumer!";
-    producer.send(new ProducerRecord<>(SHARED_TOPIC, partition, null, greeting)).get(5, SECONDS);
+    producer.send(new ProducerRecord<>(SHARED_TOPIC, PARTITION, null, greeting)).get(5, SECONDS);
 
     testing.waitForTraces(1);
 
     awaitUntilConsumerIsReady();
     ConsumerRecords<?, ?> consumerRecords = poll(Duration.ofSeconds(5));
     List<? extends ConsumerRecord<?, ?>> recordsInPartition =
-        consumerRecords.records(KafkaClientBaseTest.topicPartition);
+        consumerRecords.records(KafkaClientBaseTest.TOPIC_PARTITION);
     assertThat(recordsInPartition).hasSize(1);
 
     // iterate over records to generate spans

instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaClientBaseTest.java

@@ -85,8 +85,8 @@ public abstract class KafkaClientBaseTest {
   private static final boolean EXPERIMENTAL_ATTRIBUTES =
       Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes");
 
-  public static final int partition = 0;
-  public static final TopicPartition topicPartition = new TopicPartition(SHARED_TOPIC, partition);
+  public static final int PARTITION = 0;
+  public static final TopicPartition TOPIC_PARTITION = new TopicPartition(SHARED_TOPIC, PARTITION);
 
   @BeforeAll
   void setupClass() throws ExecutionException, InterruptedException, TimeoutException {

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
 }
 
 tasks {
-  withType<Test>().configureEach {
+  test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
     systemProperty("testLatestDeps", otelProps.testLatestDeps)
     systemProperty("collectMetadata", otelProps.collectMetadata)

instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaMetricRegistry.java

@@ -52,7 +52,7 @@ final class KafkaMetricRegistry {
     for (Map.Entry<String, String> entry : classNameToType.entrySet()) {
       try {
         measurableToInstrumentType.put(Class.forName(entry.getKey()), entry.getValue());
-      } catch (ClassNotFoundException e) {
+      } catch (ClassNotFoundException ignored) {
         // Class doesn't exist in this version of kafka client - skip
       }
     }
@@ -92,7 +92,7 @@ static RegisteredObservable getRegisteredObservable(Meter meter, KafkaMetric kaf
   private static Class<? extends Measurable> getMeasurable(KafkaMetric kafkaMetric) {
     try {
       return kafkaMetric.measurable().getClass();
-    } catch (IllegalStateException e) {
+    } catch (IllegalStateException ignored) {
       return null;
     }
   }

instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaPropagation.java

@@ -20,7 +20,7 @@
 public final class KafkaPropagation {
 
   private static final KafkaHeadersSetter SETTER = KafkaHeadersSetter.INSTANCE;
-  private static final boolean hasMaxUsableProduceMagic = hasMaxUsableProduceMagic();
+  private static final boolean HAS_MAX_USABLE_PRODUCE_MAGIC = hasMaxUsableProduceMagic();
 
   // Do not inject headers for batch versions below 2
   // This is how similar check is being done in Kafka client itself:
@@ -30,7 +30,7 @@ public final class KafkaPropagation {
   // headers attempt to read messages that were produced by clients > 0.11 and the magic
   // value of the broker(s) is >= 2
   public static boolean shouldPropagate(ApiVersions apiVersions) {
-    return !hasMaxUsableProduceMagic
+    return !HAS_MAX_USABLE_PRODUCE_MAGIC
         || maxUsableProduceMagic(apiVersions) >= RecordBatch.MAGIC_VALUE_V2;
   }
 
@@ -44,7 +44,7 @@ private static boolean hasMaxUsableProduceMagic() {
       // missing in kafka 4.x
       ApiVersions.class.getMethod("maxUsableProduceMagic");
       return true;
-    } catch (NoSuchMethodException e) {
+    } catch (NoSuchMethodException ignored) {
       return false;
     }
   }
@@ -59,7 +59,7 @@ public static <K, V> ProducerRecord<K, V> propagateContext(
       TextMapPropagator propagator, Context context, ProducerRecord<K, V> record) {
     try {
       inject(propagator, context, record);
-    } catch (IllegalStateException e) {
+    } catch (IllegalStateException ignored) {
       // headers must be read-only from reused record. try again with new one.
       record =
           new ProducerRecord<>(

instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaUtil.java

@@ -105,7 +105,7 @@ private static String extractConsumerGroup(Consumer<?, ?> consumer) {
     try {
       Object metadata = GET_GROUP_METADATA.invoke(consumer);
       return (String) GET_GROUP_ID.invoke(metadata);
-    } catch (Throwable t) {
+    } catch (Throwable ignored) {
       return null;
     }
   }

instrumentation/kafka/kafka-connect-2.6/testing/build.gradle.kts

@@ -23,10 +23,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers-mongodb") // For MongoDBContainer
   testImplementation("org.mongodb:mongodb-driver-sync:4.11.0") // MongoDB Java driver
 
-  // Testcontainers dependencies for integration testing
-  testImplementation("org.testcontainers:testcontainers-junit-jupiter")
   testImplementation("org.testcontainers:testcontainers")
-  testImplementation("org.testcontainers:testcontainers-kafka")
   testImplementation("io.rest-assured:rest-assured:5.5.5")
   testImplementation("com.fasterxml.jackson.core:jackson-databind")
 }

instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/v0_11/KafkaStreamsDefaultTest.java

@@ -72,6 +72,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
             });
 
     KafkaStreams streams = streamBuilder.createStreams(values, config, STREAM_PROCESSED);
+    cleanup.deferCleanup(() -> streams.close());
     streams.start();
 
     String greeting = "TESTING TESTING 123!";

instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/v0_11/KafkaStreamsSuppressReceiveSpansTest.java

@@ -69,6 +69,7 @@ void testKafkaProduceAndConsumeWithStreamsInBetween() throws Exception {
             });
 
     KafkaStreams streams = streamBuilder.createStreams(values, config, STREAM_PROCESSED);
+    cleanup.deferCleanup(() -> streams.close());
     streams.start();
 
     String greeting = "TESTING TESTING 123!";