Fix AWS Payload Tagging prefix generation related to SdkPojo.

Author: ygree

dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java

@@ -27,7 +27,6 @@
 import datadog.trace.payloadtags.PayloadTagsData;
 import java.net.URI;
 import java.time.Instant;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -461,7 +460,7 @@ protected String getResponseHeader(SdkHttpResponse response, String headerName)
 
   private void awsPojoToTags(AgentSpan span, String tagsPrefix, Object pojo) {
     Collection<PayloadTagsData.PathAndValue> payloadTagsData = new ArrayList<>();
-    ArrayDeque<Object> path = new ArrayDeque<>();
+    ArrayList<Object> path = new ArrayList<>();
     collectPayloadTagsData(payloadTagsData, path, pojo);
     span.setTag(
         tagsPrefix,
@@ -470,30 +469,30 @@ private void awsPojoToTags(AgentSpan span, String tagsPrefix, Object pojo) {
 
   private void collectPayloadTagsData(
       Collection<PayloadTagsData.PathAndValue> payloadTagsData,
-      ArrayDeque<Object> path,
+      ArrayList<Object> path,
       Object object) {
     if (object instanceof SdkPojo) {
       SdkPojo pojo = (SdkPojo) object;
       for (SdkField<?> field : pojo.sdkFields()) {
         Object val = field.getValueOrDefault(pojo);
-        path.push(field.locationName());
+        path.add(field.locationName());
         collectPayloadTagsData(payloadTagsData, path, val);
-        path.pop();
+        path.remove(path.size() - 1);
       }
     } else if (object instanceof Collection) {
       int index = 0;
       for (Object value : (Collection<?>) object) {
-        path.push(index);
+        path.add(index);
         collectPayloadTagsData(payloadTagsData, path, value);
-        path.pop();
+        path.remove(path.size() - 1);
         index++;
       }
     } else if (object instanceof Map) {
       Map<?, ?> map = (Map<?, ?>) object;
       for (Map.Entry<?, ?> entry : map.entrySet()) {
-        path.push(entry.getKey().toString());
+        path.add(entry.getKey().toString());
         collectPayloadTagsData(payloadTagsData, path, entry.getValue());
-        path.pop();
+        path.remove(path.size() - 1);
       }
     } else if (object instanceof SdkBytes) {
       SdkBytes bytes = (SdkBytes) object;

dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy

@@ -114,7 +114,7 @@ class PayloadTaggingRedactionForkedTest extends AbstractPayloadTaggingTest {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
-    def redactTopLevelTags = "\$.*,\$.DisplayName.Owner"
+    def redactTopLevelTags = "\$.*,\$.Owner.DisplayName"
     injectSysConfig(TracerConfig.TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING, redactTopLevelTags)
     injectSysConfig(TracerConfig.TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING, redactTopLevelTags)
   }
@@ -171,7 +171,7 @@ class PayloadTaggingRedactionForkedTest extends AbstractPayloadTaggingTest {
       }
     }
     "Kinesis"     | NA                            | "ShardLimit"         | { kinesisClient.describeLimits() }
-    "S3"          | NA                            | "DisplayName.Owner"  | { s3Client.listBuckets() }
+    "S3"          | NA                            | "Owner.DisplayName"  | { s3Client.listBuckets() }
   }
 }
 
@@ -215,7 +215,7 @@ class PayloadTaggingExpansionForkedTest extends AbstractPayloadTaggingTest {
           .message('{ "sms": "sms text", "default": "default text" }')
       }
     }
-    "Key.0.Tags"                                        | "foo"                  | {
+    "Tags.0.Key"                                        | "foo"                  | {
       snsClient.createTopic {
         it.name("testtopic")
           .tags(Tag.builder().key("foo").value("bar").build(), Tag.builder().key("t").value("1").build())
@@ -224,17 +224,17 @@ class PayloadTaggingExpansionForkedTest extends AbstractPayloadTaggingTest {
     "nextToken"                                         | null                   | {
       snsClient.listPhoneNumbersOptedOut()
     }
-    "DefaultSMSType.attributes"                         | "bar"                  | {
+    "attributes.DefaultSMSType"                         | "bar"                  | {
       snsClient.setSMSAttributes { it.attributes(["DefaultSenderID": "foo", "DefaultSMSType": "bar"]) }
     }
-    "BinaryValue.foo\\.bar.MessageAttributes.abc\\.def" | 42                     | {
+    "MessageAttributes.foo\\.bar.BinaryValue.abc\\.def" | 42                     | {
       snsClient.publish {
         it.phoneNumber("+15555555555").message("testmessage")
           .messageAttributes(["foo.bar": snsBinaryAttribute('{"abc.def": 42}')
           ])
       }
     }
-    "BinaryValue.foo\\.bar.MessageAttributes"           | "<binary>"             | {
+    "MessageAttributes.foo\\.bar.BinaryValue"           | "<binary>"             | {
       snsClient.publish {
         it.phoneNumber("+15555555555").message("testmessage").messageAttributes(["foo.bar": snsBinaryAttribute('{"invalid json: 42}')])
       }