[release/v1.32.x] Implement forEach support for aws sqs tracing list (#…

…10195) Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
open-telemetry · Jan 9, 2024 · c7ceea6 · c7ceea6
1 parent a36175c
commit c7ceea6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/...1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingList.java b/...1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingList.java
@@ -13,6 +13,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Consumer;
 
 class TracingList extends SdkInternalList<Message> {
   private static final long serialVersionUID = 1L;
@@ -57,6 +58,13 @@ public Iterator<Message> iterator() {
     return it;
   }
 
+  @Override
+  public void forEach(Consumer<? super Message> action) {
+    for (Message message : this) {
+      action.accept(message);
+    }
+  }
+
   private static boolean inAwsClient() {
     for (Class<?> caller : CallerClass.INSTANCE.getClassContext()) {
       if (AmazonSQSClient.class == caller) {

diff --git a/...c/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.groovy b/...c/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.groovy
@@ -67,8 +67,15 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification {
       receiveMessageRequest.withMessageAttributeNames("test-message-header")
     }
     def receiveMessageResult = client.receiveMessage(receiveMessageRequest)
-    receiveMessageResult.messages.each {message ->
-      runWithSpan("process child") {}
+    // test different ways of iterating the messages list
+    if (testCaptureHeaders) {
+      receiveMessageResult.messages.each { message ->
+        runWithSpan("process child") {}
+      }
+    } else {
+      receiveMessageResult.messages.forEach { message ->
+        runWithSpan("process child") {}
+      }
     }
 
     then:

diff --git a/...k-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingList.java b/...k-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingList.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Consumer;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.services.sqs.model.Message;
 
@@ -59,4 +60,11 @@ public Iterator<Message> iterator() {
 
     return it;
   }
+
+  @Override
+  public void forEach(Consumer<? super Message> action) {
+    for (Message message : this) {
+      action.accept(message);
+    }
+  }
 }
diff --git a/...ain/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy b/...ain/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy
@@ -307,7 +307,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
 
     then:
     resp.messages.size() == 1
-    resp.messages.each {message -> runWithSpan("process child") {}}
+    // using forEach instead of each here to test different ways of iterating messages list
+    resp.messages.forEach {message -> runWithSpan("process child") {}}
     assertSqsTraces(false, true)
   }