Merge remote-tracking branch 'origin/kafka-connect' into kafka-connect

Author: vasantteja

instrumentation/kafka/kafka-connect-2.6/testing/src/test/java/io/opentelemetry/instrumentation/kafkaconnect/v2_6/MongoKafkaConnectSinkTaskTest.java

@@ -104,7 +104,6 @@ class MongoKafkaConnectSinkTaskTest {
   private static MongoDBContainer mongoDB;
   private static int kafkaExposedPort;
 
-
   // Static methods
 
   private static String getKafkaConnectUrl() {
@@ -819,16 +818,14 @@ private static TracingData deserializeAndExtractSpans(String tracesJson, String
                 extractedSpanLink = new SpanLinkInfo(linkedTraceId, linkedSpanId);
               }
             } else if (scopeName.contains("mongo") && spanName.contains("testdb.person")) {
-              databaseSpan =
-                  new SpanInfo(spanName, traceId, spanId, parentSpanId, spanKind);
+              databaseSpan = new SpanInfo(spanName, traceId, spanId, parentSpanId, spanKind);
             }
           }
         }
       }
     }
 
-    return new TracingData(
-        kafkaConnectConsumerSpan, databaseSpan, extractedSpanLink);
+    return new TracingData(kafkaConnectConsumerSpan, databaseSpan, extractedSpanLink);
   }
 
   /** Deserialize traces JSON and extract span information for multi-topic scenarios */
@@ -909,8 +906,7 @@ private static MultiTopicTracingData deserializeAndExtractMultiTopicSpans(
                 }
               }
             } else if (scopeName.contains("mongo") && spanName.contains("testdb.person")) {
-              databaseSpan =
-                  new SpanInfo(spanName, traceId, spanId, parentSpanId, spanKind);
+              databaseSpan = new SpanInfo(spanName, traceId, spanId, parentSpanId, spanKind);
             }
           }
         }
@@ -941,9 +937,7 @@ private static class TracingData {
     final SpanLinkInfo extractedSpanLink;
 
     TracingData(
-        SpanInfo kafkaConnectConsumerSpan,
-        SpanInfo databaseSpan,
-        SpanLinkInfo extractedSpanLink) {
+        SpanInfo kafkaConnectConsumerSpan, SpanInfo databaseSpan, SpanLinkInfo extractedSpanLink) {
       this.kafkaConnectConsumerSpan = kafkaConnectConsumerSpan;
       this.databaseSpan = databaseSpan;
       this.extractedSpanLink = extractedSpanLink;
@@ -969,12 +963,7 @@ private static class SpanInfo {
     final String parentSpanId;
     final String kind;
 
-    SpanInfo(
-        String name,
-        String traceId,
-        String spanId,
-        String parentSpanId,
-        String kind) {
+    SpanInfo(String name, String traceId, String spanId, String parentSpanId, String kind) {
       this.name = name;
       this.traceId = traceId;
       this.spanId = spanId;

instrumentation/kafka/kafka-connect-2.6/testing/src/test/java/io/opentelemetry/instrumentation/kafkaconnect/v2_6/PostgresKafkaConnectSinkTaskTest.java

@@ -697,16 +697,14 @@ private static TracingData deserializeAndExtractSpans(String tracesJson, String
                     || spanName.contains("DELETE")
                     || spanName.contains("SELECT")
                     || spanName.contains(DB_TABLE_PERSON))) {
-              databaseSpan =
-                  new SpanInfo(traceId, spanId, parentSpanId, spanKind);
+              databaseSpan = new SpanInfo(spanName, traceId, spanId, parentSpanId, spanKind);
             }
           }
         }
       }
     }
 
-    return new TracingData(
-        kafkaConnectConsumerSpan, databaseSpan, extractedSpanLink);
+    return new TracingData(kafkaConnectConsumerSpan, databaseSpan, extractedSpanLink);
   }
 
   // Helper class to hold all tracing data
@@ -716,9 +714,7 @@ private static class TracingData {
     final SpanLinkInfo extractedSpanLink;
 
     TracingData(
-        SpanInfo kafkaConnectConsumerSpan,
-        SpanInfo databaseSpan,
-        SpanLinkInfo extractedSpanLink) {
+        SpanInfo kafkaConnectConsumerSpan, SpanInfo databaseSpan, SpanLinkInfo extractedSpanLink) {
       this.kafkaConnectConsumerSpan = kafkaConnectConsumerSpan;
       this.databaseSpan = databaseSpan;
       this.extractedSpanLink = extractedSpanLink;
@@ -732,11 +728,7 @@ private static class SpanInfo {
     final String parentSpanId;
     final String kind;
 
-    SpanInfo(
-        String traceId,
-        String spanId,
-        String parentSpanId,
-        String kind) {
+    SpanInfo(String name, String traceId, String spanId, String parentSpanId, String kind) {
       this.traceId = traceId;
       this.spanId = spanId;
       this.parentSpanId = parentSpanId;