Merge pull request #2217 from newrelic/sqs-v1-dt-undo

undo adding DT for SQS sdk v1
newrelic · Jan 23, 2025 · e8715f2 · e8715f2
2 parents e5bc12c + 250eeed
commit e8715f2
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 195 deletions.
diff --git a/...a-sdk-sqs-1.10.44/src/main/java/com/amazonaws/services/sqs/AmazonSQS_Instrumentation.java b/...a-sdk-sqs-1.10.44/src/main/java/com/amazonaws/services/sqs/AmazonSQS_Instrumentation.java
@@ -10,7 +10,6 @@
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
 import com.amazonaws.services.sqs.model.SendMessageBatchRequest;
-import com.amazonaws.services.sqs.model.SendMessageBatchRequestEntry;
 import com.amazonaws.services.sqs.model.SendMessageBatchResult;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
 import com.amazonaws.services.sqs.model.SendMessageResult;
@@ -21,45 +20,27 @@
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.newrelic.utils.SQSBatchRequestHeaders;
-import com.newrelic.utils.SQSRequestHeaders;
 import com.newrelic.utils.SqsV1Util;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 @Weave(type = MatchType.Interface, originalName = "com.amazonaws.services.sqs.AmazonSQS")
 public class AmazonSQS_Instrumentation {
 
     @Trace
     public SendMessageBatchResult sendMessageBatch(SendMessageBatchRequest sendMessageBatchRequest) {
-        for (SendMessageBatchRequestEntry request : sendMessageBatchRequest.getEntries()) {
-            SQSBatchRequestHeaders headers = new SQSBatchRequestHeaders(request);
-            NewRelic.getAgent().getTransaction().insertDistributedTraceHeaders(headers);
-        }
-
         MessageProduceParameters messageProduceParameters = SqsV1Util.generateExternalProduceMetrics(sendMessageBatchRequest.getQueueUrl());
         NewRelic.getAgent().getTracedMethod().reportAsExternal(messageProduceParameters);
         return Weaver.callOriginal();
     }
 
     @Trace
     public SendMessageResult sendMessage(SendMessageRequest sendMessageRequest) {
-        SQSRequestHeaders headers = new SQSRequestHeaders(sendMessageRequest);
-        NewRelic.getAgent().getTransaction().insertDistributedTraceHeaders(headers);
-
         MessageProduceParameters messageProduceParameters = SqsV1Util.generateExternalProduceMetrics(sendMessageRequest.getQueueUrl());
         NewRelic.getAgent().getTracedMethod().reportAsExternal(messageProduceParameters);
         return Weaver.callOriginal();
     }
 
     @Trace
     public ReceiveMessageResult receiveMessage(ReceiveMessageRequest receiveMessageRequest) {
-        List<String> updatedMessageAttrNames = new ArrayList<>(receiveMessageRequest.getMessageAttributeNames());
-        Collections.addAll(updatedMessageAttrNames, SqsV1Util.DT_HEADERS);
-        receiveMessageRequest.setMessageAttributeNames(updatedMessageAttrNames);
-
         MessageConsumeParameters messageConsumeParameters = SqsV1Util.generateExternalConsumeMetrics(receiveMessageRequest.getQueueUrl());
         NewRelic.getAgent().getTracedMethod().reportAsExternal(messageConsumeParameters);
         return Weaver.callOriginal();

diff --git a/...ion/aws-java-sdk-sqs-1.10.44/src/main/java/com/newrelic/utils/SQSBatchRequestHeaders.java b/...ion/aws-java-sdk-sqs-1.10.44/src/main/java/com/newrelic/utils/SQSBatchRequestHeaders.java
diff --git a/...entation/aws-java-sdk-sqs-1.10.44/src/main/java/com/newrelic/utils/SQSRequestHeaders.java b/...entation/aws-java-sdk-sqs-1.10.44/src/main/java/com/newrelic/utils/SQSRequestHeaders.java
diff --git a/instrumentation/aws-java-sdk-sqs-1.10.44/src/main/java/com/newrelic/utils/SqsV1Util.java b/instrumentation/aws-java-sdk-sqs-1.10.44/src/main/java/com/newrelic/utils/SqsV1Util.java
@@ -18,7 +18,6 @@ public class SqsV1Util {
 
     public static final String LIBRARY = "SQS";
     public static final String OTEL_LIBRARY = "aws_sqs";
-    public static final String[] DT_HEADERS = new String[] {"newrelic","NEWRELIC","NewRelic","tracestate","TraceState","TRACESTATE"};
 
     public static MessageProduceParameters generateExternalProduceMetrics(String queueUrl) {
         DestinationData destinationData = DestinationData.parse(queueUrl);

diff --git a/...tion/aws-java-sdk-sqs-1.10.44/src/test/java/com/amazonaws/services/sqs/SqsClientTest.java b/...tion/aws-java-sdk-sqs-1.10.44/src/test/java/com/amazonaws/services/sqs/SqsClientTest.java
@@ -77,11 +77,6 @@ public void testSendMessage() {
         Introspector introspector = InstrumentationTestRunner.getIntrospector();
         SendMessageRequest request = sendMessageRequest();
 
-        Set<String> dtHeaders = new HashSet<>(Arrays.asList(SqsV1Util.DT_HEADERS));
-        boolean containsDtHeaders = request.getMessageAttributes().entrySet().stream().anyMatch(e ->
-                dtHeaders.contains(e.getKey()) && e.getValue() != null && !e.getValue().getStringValue().isEmpty());
-        assertTrue("Message request must contain headers", containsDtHeaders);
-
         assertEquals(1, introspector.getFinishedTransactionCount(10000));
 
         String txName = introspector.getTransactionNames().iterator().next();
@@ -94,14 +89,6 @@ public void testSendMessageBatch() {
         SendMessageBatchRequest request = sendMessageBatch();
         assertEquals(1, introspector.getFinishedTransactionCount(10000));
 
-        Set<String> dtHeaders = new HashSet<>(Arrays.asList(SqsV1Util.DT_HEADERS));
-        assertFalse("Batch request must contain at least one entry", request.getEntries().isEmpty());
-        for (SendMessageBatchRequestEntry entry: request.getEntries()) {
-            boolean containsDtHeaders = entry.getMessageAttributes().entrySet().stream().anyMatch(e ->
-                    dtHeaders.contains(e.getKey()) && e.getValue() != null && !e.getValue().getStringValue().isEmpty());
-            assertTrue("Message entry must contain headers", containsDtHeaders);
-        }
-
         String txName = introspector.getTransactionNames().iterator().next();
         checkScopedMetricCount(txName, "MessageBroker/SQS/Queue/Produce/Named/" + QUEUE_NAME, 1);
     }