Skip to content

Move aws-java-sdk modules #9383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amarziali merged 1 commit into from
Aug 19, 2025
Merged

Move aws-java-sdk modules #9383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...t/instrumentation/aws-common/build.gradle → ...ion/aws-java/aws-java-common/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...nstrumentation/aws-common/gradle.lockfile → .../aws-java/aws-java-common/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...trumentation/aws/ExpectedQueryParams.java → ...trumentation/aws/ExpectedQueryParams.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tation/aws-java-dynamodb-2.0/build.gradle → ...s-java/aws-java-dynamodb-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
testImplementation 'software.amazon.awssdk:dynamodb:2.30.22'
testImplementation 'org.testcontainers:localstack:1.20.1'

Expand Down
0 ...ion/aws-java-dynamodb-2.0/gradle.lockfile → ...ava/aws-java-dynamodb-2.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...namodb/DynamoDbClientInstrumentation.java → ...namodb/DynamoDbClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../aws/v2/dynamodb/DynamoDbInterceptor.java → .../aws/v2/dynamodb/DynamoDbInterceptor.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/aws/v2/dynamodb/DynamoDbUtil.java → ...ntation/aws/v2/dynamodb/DynamoDbUtil.java
View file
Open in desktop
File renamed without changes.
0 ...src/test/groovy/DynamoDbClientTest.groovy → ...src/test/groovy/DynamoDbClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...0/src/test/groovy/DynamoDbUtilTest.groovy → ...0/src/test/groovy/DynamoDbUtilTest.groovy
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/aws-java-eventbridge-2.0/build.gradle → ...ava/aws-java-eventbridge-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
testImplementation 'software.amazon.awssdk:eventbridge:2.27.23'
// SQS and SNS are used to act as the "targets" of the EB bus.
testImplementation 'software.amazon.awssdk:sqs:2.27.23'
Expand Down
0 .../aws-java-eventbridge-2.0/gradle.lockfile → .../aws-java-eventbridge-2.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...dge/EventBridgeClientInstrumentation.java → ...dge/EventBridgeClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...2/eventbridge/EventBridgeInterceptor.java → ...2/eventbridge/EventBridgeInterceptor.java
View file
Open in desktop
File renamed without changes.
0 .../v2/eventbridge/TextMapInjectAdapter.java → .../v2/eventbridge/TextMapInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/EventBridgeClientTest.groovy → .../test/groovy/EventBridgeClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...mentation/aws-lambda-handler/build.gradle → .../aws-java-lambda-handler-1.2/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...tation/aws-lambda-handler/gradle.lockfile → ...s-java-lambda-handler-1.2/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...aws/v1/lambda/LambdaHandlerDecorator.java → ...aws/v1/lambda/LambdaHandlerDecorator.java
View file
Open in desktop
File renamed without changes.
0 .../lambda/LambdaHandlerInstrumentation.java → .../lambda/LambdaHandlerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ler/src/test/groovy/HandlerStreaming.java → ...1.2/src/test/groovy/HandlerStreaming.java
View file
Open in desktop
File renamed without changes.
0 ...est/groovy/HandlerStreamingWithError.java → ...est/groovy/HandlerStreamingWithError.java
View file
Open in desktop
File renamed without changes.
0 ...y/LambdaHandlerInstrumentationTest.groovy → ...y/LambdaHandlerInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...trumentation/aws-java-s3-2.0/build.gradle → ...ion/aws-java/aws-java-s3-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testRuntimeOnly project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:aws-java-sdk-2.2')
testRuntimeOnly project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
testImplementation 'software.amazon.awssdk:s3:2.29.26'
testImplementation 'org.testcontainers:localstack:1.20.1'

Expand Down
0 ...mentation/aws-java-s3-2.0/gradle.lockfile → .../aws-java/aws-java-s3-2.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...on/aws/v2/s3/S3ClientInstrumentation.java → ...on/aws/v2/s3/S3ClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...trumentation/aws/v2/s3/S3Interceptor.java → ...trumentation/aws/v2/s3/S3Interceptor.java
View file
Open in desktop
File renamed without changes.
0 ...3-2.0/src/test/groovy/S3ClientTest.groovy → ...3-2.0/src/test/groovy/S3ClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...entation/aws-java-sdk-1.11.0/build.gradle → ...n/aws-java/aws-java-sdk-1.11/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...ation/aws-java-sdk-1.11.0/gradle.lockfile → ...ws-java/aws-java-sdk-1.11/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...mTest/groovy/AWS1KinesisClientTest.groovy → ...mTest/groovy/AWS1KinesisClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...c/dsmTest/groovy/AWS1SnsClientTest.groovy → ...c/dsmTest/groovy/AWS1SnsClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../aws/v0/AWSHttpClientInstrumentation.java → .../aws/v0/AWSHttpClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../instrumentation/aws/v0/AwsNameCache.java → .../instrumentation/aws/v0/AwsNameCache.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/aws/v0/AwsSdkClientDecorator.java → ...ntation/aws/v0/AwsSdkClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 .../instrumentation/aws/v0/AwsSdkModule.java → .../instrumentation/aws/v0/AwsSdkModule.java
View file
Open in desktop
File renamed without changes.
0 .../instrumentation/aws/v0/EmrSdkModule.java → .../instrumentation/aws/v0/EmrSdkModule.java
View file
Open in desktop
File renamed without changes.
0 .../instrumentation/aws/v0/GetterAccess.java → .../instrumentation/aws/v0/GetterAccess.java
View file
Open in desktop
File renamed without changes.
0 ...0/HandlerChainFactoryInstrumentation.java → ...0/HandlerChainFactoryInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...trumentation/aws/v0/OnErrorDecorator.java → ...trumentation/aws/v0/OnErrorDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ws/v0/RequestExecutorInstrumentation.java → ...ws/v0/RequestExecutorInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/aws/v0/TracingRequestHandler.java → ...ntation/aws/v0/TracingRequestHandler.java
View file
Open in desktop
File renamed without changes.
0 ...1.0/src/test/groovy/AWS1ClientTest.groovy → ....11/src/test/groovy/AWS1ClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../groovy/LegacyAWS1ClientForkedTest.groovy → .../groovy/LegacyAWS1ClientForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...ore_1_11_106/groovy/AWS0ClientTest.groovy → ...ore_1_11_106/groovy/AWS0ClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../groovy/LegacyAWS0ClientForkedTest.groovy → .../groovy/LegacyAWS0ClientForkedTest.groovy
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rumentation/aws-java-sdk-2.2/build.gradle → ...on/aws-java/aws-java-sdk-2.2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def fixedSdkVersion = '2.20.33' // 2.20.34 is missing and breaks IDEA import

dependencies {
compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
testImplementation project(':dd-java-agent:instrumentation:aws-common')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-common')

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
Expand Down
0 ...entation/aws-java-sdk-2.2/gradle.lockfile → ...aws-java/aws-java-sdk-2.2/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 .../groovy/Aws2KinesisDataStreamsTest.groovy → .../groovy/Aws2KinesisDataStreamsTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...Test/groovy/Aws2SnsDataStreamsTest.groovy → ...Test/groovy/Aws2SnsDataStreamsTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../v2/AbstractAwsClientInstrumentation.java → .../v2/AbstractAwsClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...tion/aws/v2/AwsClientInstrumentation.java → ...tion/aws/v2/AwsClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../aws/v2/AwsHttpClientInstrumentation.java → .../aws/v2/AwsHttpClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/aws/v2/AwsSdkClientDecorator.java → ...ntation/aws/v2/AwsSdkClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...n/aws/v2/TracingExecutionInterceptor.java → ...n/aws/v2/TracingExecutionInterceptor.java
View file
Open in desktop
File renamed without changes.
0 ...gingTest/groovy/PayloadTaggingTest.groovy → ...gingTest/groovy/PayloadTaggingTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...2.2/src/test/groovy/Aws2ClientTest.groovy → ...2.2/src/test/groovy/Aws2ClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../groovy/LegacyAws2ClientForkedTest.groovy → .../groovy/LegacyAws2ClientForkedTest.groovy
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rumentation/aws-java-sfn-2.0/build.gradle → ...on/aws-java/aws-java-sfn-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
testImplementation 'software.amazon.awssdk:sfn:2.15.35'
testImplementation libs.testcontainers

Expand Down
0 ...entation/aws-java-sfn-2.0/gradle.lockfile → ...aws-java/aws-java-sfn-2.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...on/aws/v2/sfn/InputAttributeInjector.java → ...on/aws/v2/sfn/InputAttributeInjector.java
View file
Open in desktop
File renamed without changes.
0 .../aws/v2/sfn/SfnClientInstrumentation.java → .../aws/v2/sfn/SfnClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/aws/v2/sfn/SfnInterceptor.java → ...umentation/aws/v2/sfn/SfnInterceptor.java
View file
Open in desktop
File renamed without changes.
0 ...-2.0/src/test/groovy/SfnClientTest.groovy → ...-2.0/src/test/groovy/SfnClientTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rumentation/aws-java-sns-1.0/build.gradle → ...on/aws-java/aws-java-sns-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')

dependencies {
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '1.12.710'
testImplementation project(':dd-java-agent:instrumentation:aws-common')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-common')

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-1.11.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-1.11')
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '1.12.710'
// SQS is used to act as the "Subscriber" of the SNS topic.
// There's a problem with sqs sdk v1 with localstack+testcontainers testing. so use sdk v2 for sqs
Expand Down
0 ...entation/aws-java-sns-1.0/gradle.lockfile → ...aws-java/aws-java-sns-1.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 .../aws/v1/sns/SnsClientInstrumentation.java → .../aws/v1/sns/SnsClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/aws/v1/sns/SnsInterceptor.java → ...umentation/aws/v1/sns/SnsInterceptor.java
View file
Open in desktop
File renamed without changes.
0 ...tion/aws/v1/sns/TextMapInjectAdapter.java → ...tion/aws/v1/sns/TextMapInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...-1.0/src/test/groovy/SnsClientTest.groovy → ...-1.0/src/test/groovy/SnsClientTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rumentation/aws-java-sns-2.0/build.gradle → ...on/aws-java/aws-java-sns-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')

dependencies {
compileOnly group: 'software.amazon.awssdk', name: 'sns', version: '2.25.40'
testImplementation project(':dd-java-agent:instrumentation:aws-common')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-common')

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
testImplementation 'software.amazon.awssdk:sns:2.25.40'
// SQS is used to act as the "Subscriber" of the SNS topic.
testImplementation 'software.amazon.awssdk:sqs:2.25.40'
Expand Down
0 ...entation/aws-java-sns-2.0/gradle.lockfile → ...aws-java/aws-java-sns-2.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 .../aws/v2/sns/SnsClientInstrumentation.java → .../aws/v2/sns/SnsClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/aws/v2/sns/SnsInterceptor.java → ...umentation/aws/v2/sns/SnsInterceptor.java
View file
Open in desktop
File renamed without changes.
0 ...tion/aws/v2/sns/TextMapInjectAdapter.java → ...tion/aws/v2/sns/TextMapInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...-2.0/src/test/groovy/SnsClientTest.groovy → ...-2.0/src/test/groovy/SnsClientTest.groovy
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rumentation/aws-java-sqs-1.0/build.gradle → ...on/aws-java/aws-java-sqs-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-1.11.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-1.11')
testImplementation project(':dd-java-agent:instrumentation:jms')

// SQS<->JMS testing:
Expand Down
0 ...entation/aws-java-sqs-1.0/gradle.lockfile → ...aws-java/aws-java-sqs-1.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ws/v1/sqs/AbstractSqsInstrumentation.java → ...ws/v1/sqs/AbstractSqsInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../aws/v1/sqs/MessageAttributeInjector.java → .../aws/v1/sqs/MessageAttributeInjector.java
View file
Open in desktop
File renamed without changes.
0 ...ion/aws/v1/sqs/MessageExtractAdapter.java → ...ion/aws/v1/sqs/MessageExtractAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...sqs/QueueBufferConfigInstrumentation.java → ...sqs/QueueBufferConfigInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../aws/v1/sqs/SqsClientInstrumentation.java → .../aws/v1/sqs/SqsClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...trumentation/aws/v1/sqs/SqsDecorator.java → ...trumentation/aws/v1/sqs/SqsDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/aws/v1/sqs/SqsInterceptor.java → ...umentation/aws/v1/sqs/SqsInterceptor.java
View file
Open in desktop
File renamed without changes.
0 .../v1/sqs/SqsJmsMessageInstrumentation.java → .../v1/sqs/SqsJmsMessageInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...sqs/SqsReceiveRequestInstrumentation.java → ...sqs/SqsReceiveRequestInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../sqs/SqsReceiveResultInstrumentation.java → .../sqs/SqsReceiveResultInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/aws/v1/sqs/TracingIterator.java → ...mentation/aws/v1/sqs/TracingIterator.java
View file
Open in desktop
File renamed without changes.
0 ...strumentation/aws/v1/sqs/TracingList.java → ...strumentation/aws/v1/sqs/TracingList.java
View file
Open in desktop
File renamed without changes.
0 ...ation/aws/v1/sqs/TracingListIterator.java → ...ation/aws/v1/sqs/TracingListIterator.java
View file
Open in desktop
File renamed without changes.
0 ...t/groovy/LegacySqsClientForkedTest.groovy → ...t/groovy/LegacySqsClientForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...-1.0/src/test/groovy/SqsClientTest.groovy → ...-1.0/src/test/groovy/SqsClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/TimeInQueueForkedTest.groovy → .../test/groovy/TimeInQueueForkedTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rumentation/aws-java-sqs-2.0/build.gradle → ...on/aws-java/aws-java-sqs-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
dependencies {
compileOnly group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0'
compileOnly group: 'com.amazonaws', name: 'amazon-sqs-java-messaging-lib', version: '2.0.0'
testImplementation project(':dd-java-agent:instrumentation:aws-common')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-common')

// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:jms')

// SQS<->JMS testing:
Expand Down
0 ...entation/aws-java-sqs-2.0/gradle.lockfile → ...aws-java/aws-java-sqs-2.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ws/v2/sqs/AbstractSqsInstrumentation.java → ...ws/v2/sqs/AbstractSqsInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../aws/v2/sqs/MessageAttributeInjector.java → .../aws/v2/sqs/MessageAttributeInjector.java
View file
Open in desktop
File renamed without changes.
0 ...ion/aws/v2/sqs/MessageExtractAdapter.java → ...ion/aws/v2/sqs/MessageExtractAdapter.java
View file
Open in desktop
File renamed without changes.
0 .../aws/v2/sqs/SqsClientInstrumentation.java → .../aws/v2/sqs/SqsClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...trumentation/aws/v2/sqs/SqsDecorator.java → ...trumentation/aws/v2/sqs/SqsDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/aws/v2/sqs/SqsInterceptor.java → ...umentation/aws/v2/sqs/SqsInterceptor.java
View file
Open in desktop
File renamed without changes.
0 .../v2/sqs/SqsJmsMessageInstrumentation.java → .../v2/sqs/SqsJmsMessageInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...sqs/SqsReceiveRequestInstrumentation.java → ...sqs/SqsReceiveRequestInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../sqs/SqsReceiveResultInstrumentation.java → .../sqs/SqsReceiveResultInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/aws/v2/sqs/TracingIterator.java → ...mentation/aws/v2/sqs/TracingIterator.java
View file
Open in desktop
File renamed without changes.
0 ...strumentation/aws/v2/sqs/TracingList.java → ...strumentation/aws/v2/sqs/TracingList.java
View file
Open in desktop
File renamed without changes.
0 ...ation/aws/v2/sqs/TracingListIterator.java → ...ation/aws/v2/sqs/TracingListIterator.java
View file
Open in desktop
File renamed without changes.
0 ...t/groovy/LegacySqsClientForkedTest.groovy → ...t/groovy/LegacySqsClientForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...-2.0/src/test/groovy/SqsClientTest.groovy → ...-2.0/src/test/groovy/SqsClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/TimeInQueueForkedTest.groovy → .../test/groovy/TimeInQueueForkedTest.groovy
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/mule-4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ dependencies {
main_java11CompileOnly project(':dd-java-agent:agent-bootstrap')

testImplementation sourceSets.main_java11.output
testImplementation project(':dd-java-agent:instrumentation:aws-common')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-common')
testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
testImplementation project(':dd-java-agent:instrumentation:reactive-streams')
testImplementation project(':dd-java-agent:instrumentation:grizzly-2')
Expand Down
6 changes: 3 additions & 3 deletions dd-java-agent/instrumentation/spring-messaging-4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ addTestSuiteForDir('latestDepTest', 'test')

dependencies {
compileOnly group: 'org.springframework', name: 'spring-messaging', version: '4.0.0.RELEASE'
testImplementation project(':dd-java-agent:instrumentation:aws-common')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-common')

// capture SQS send and receive spans, propagate trace details in messages
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:aws-java-sqs-2.0')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sqs-2.0')

testImplementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '2.0.0'
testImplementation group: 'io.awspring.cloud', name: 'spring-cloud-aws-sqs', version: '3.0.1', {
Expand Down
24 changes: 12 additions & 12 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,18 +255,18 @@ include(
":dd-java-agent:instrumentation:armeria:armeria-grpc-0.84",
":dd-java-agent:instrumentation:armeria:armeria-jetty-1.24",
":dd-java-agent:instrumentation:avro",
":dd-java-agent:instrumentation:aws-common",
":dd-java-agent:instrumentation:aws-java-dynamodb-2.0",
":dd-java-agent:instrumentation:aws-java-eventbridge-2.0",
":dd-java-agent:instrumentation:aws-java-sdk-1.11.0",
":dd-java-agent:instrumentation:aws-java-sdk-2.2",
":dd-java-agent:instrumentation:aws-java-sfn-2.0",
":dd-java-agent:instrumentation:aws-java-sns-1.0",
":dd-java-agent:instrumentation:aws-java-sns-2.0",
":dd-java-agent:instrumentation:aws-java-sqs-1.0",
":dd-java-agent:instrumentation:aws-java-sqs-2.0",
":dd-java-agent:instrumentation:aws-java-s3-2.0",
":dd-java-agent:instrumentation:aws-lambda-handler",
":dd-java-agent:instrumentation:aws-java:aws-java-common",
":dd-java-agent:instrumentation:aws-java:aws-java-dynamodb-2.0",
":dd-java-agent:instrumentation:aws-java:aws-java-eventbridge-2.0",
":dd-java-agent:instrumentation:aws-java:aws-java-lambda-handler-1.2",
":dd-java-agent:instrumentation:aws-java:aws-java-sdk-1.11",
":dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2",
":dd-java-agent:instrumentation:aws-java:aws-java-sfn-2.0",
":dd-java-agent:instrumentation:aws-java:aws-java-sns-1.0",
":dd-java-agent:instrumentation:aws-java:aws-java-sns-2.0",
":dd-java-agent:instrumentation:aws-java:aws-java-sqs-1.0",
":dd-java-agent:instrumentation:aws-java:aws-java-sqs-2.0",
":dd-java-agent:instrumentation:aws-java:aws-java-s3-2.0",
":dd-java-agent:instrumentation:axis-2",
":dd-java-agent:instrumentation:axway-api",
":dd-java-agent:instrumentation:azure-functions",
Expand Down