Both topicArn and targetArn are optional for SNS publish requests; avoid NPE when only a phone number is provided

mcculls · mcculls · commit 562b65d7bc7c · 2024-08-15T19:37:18.000+01:00
diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java
@@ -58,8 +58,14 @@ public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request
       // the limit still applies here
       if (messageAttributes.size() < 10) {
         // Extract the topic name from the ARN for DSM
-        String topicName =
-            pRequest.getTopicArn() == null ? pRequest.getTargetArn() : pRequest.getTopicArn();
+        String topicName = pRequest.getTopicArn();
+        if (null == topicName) {
+          topicName = pRequest.getTargetArn();
+          if (null == topicName) {
+            return request; // request is to phone number, ignore for DSM
+          }
+        }
+
         topicName = topicName.substring(topicName.lastIndexOf(':') + 1);
 
         HashMap<String, MessageAttributeValue> modifiedMessageAttributes =
diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java
@@ -59,7 +59,14 @@ public SdkRequest modifyRequest(
       // the limit still applies here
       if (request.messageAttributes().size() < 10) {
         // Get topic name for DSM
-        String snsTopicArn = request.topicArn() == null ? request.targetArn() : request.topicArn();
+        String snsTopicArn = request.topicArn();
+        if (null == snsTopicArn) {
+          snsTopicArn = request.targetArn();
+          if (null == snsTopicArn) {
+            return request; // request is to phone number, ignore for DSM
+          }
+        }
+
         String snsTopicName = snsTopicArn.substring(snsTopicArn.lastIndexOf(':') + 1);
         Map<String, MessageAttributeValue> modifiedMessageAttributes =
             new HashMap<>(request.messageAttributes());
