From b274c958824472e6071ff05c9206ed9429784012 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 19 Aug 2025 10:56:00 +0200 Subject: [PATCH] Move aws-java-sdk modules --- .../aws-java-common}/build.gradle | 0 .../aws-java-common}/gradle.lockfile | 0 .../aws/ExpectedQueryParams.java | 0 .../aws-java-dynamodb-2.0/build.gradle | 2 +- .../aws-java-dynamodb-2.0/gradle.lockfile | 0 .../DynamoDbClientInstrumentation.java | 0 .../aws/v2/dynamodb/DynamoDbInterceptor.java | 0 .../aws/v2/dynamodb/DynamoDbUtil.java | 0 .../src/test/groovy/DynamoDbClientTest.groovy | 0 .../src/test/groovy/DynamoDbUtilTest.groovy | 0 .../aws-java-eventbridge-2.0/build.gradle | 2 +- .../aws-java-eventbridge-2.0/gradle.lockfile | 0 .../EventBridgeClientInstrumentation.java | 0 .../eventbridge/EventBridgeInterceptor.java | 0 .../v2/eventbridge/TextMapInjectAdapter.java | 0 .../test/groovy/EventBridgeClientTest.groovy | 0 .../aws-java-lambda-handler-1.2}/build.gradle | 0 .../gradle.lockfile | 0 .../aws/v1/lambda/LambdaHandlerDecorator.java | 0 .../lambda/LambdaHandlerInstrumentation.java | 0 .../src/test/groovy/HandlerStreaming.java | 0 .../groovy/HandlerStreamingWithError.java | 0 .../LambdaHandlerInstrumentationTest.groovy | 0 .../aws-java-s3-2.0/build.gradle | 2 +- .../aws-java-s3-2.0/gradle.lockfile | 0 .../aws/v2/s3/S3ClientInstrumentation.java | 0 .../aws/v2/s3/S3Interceptor.java | 0 .../src/test/groovy/S3ClientTest.groovy | 0 .../aws-java-sdk-1.11}/build.gradle | 0 .../aws-java-sdk-1.11}/gradle.lockfile | 0 .../groovy/AWS1KinesisClientTest.groovy | 0 .../dsmTest/groovy/AWS1SnsClientTest.groovy | 0 .../aws/v0/AWSHttpClientInstrumentation.java | 0 .../instrumentation/aws/v0/AwsNameCache.java | 0 .../aws/v0/AwsSdkClientDecorator.java | 0 .../instrumentation/aws/v0/AwsSdkModule.java | 0 .../instrumentation/aws/v0/EmrSdkModule.java | 0 .../instrumentation/aws/v0/GetterAccess.java | 0 .../HandlerChainFactoryInstrumentation.java | 0 .../aws/v0/OnErrorDecorator.java | 0 .../v0/RequestExecutorInstrumentation.java | 0 .../aws/v0/TracingRequestHandler.java | 0 .../src/test/groovy/AWS1ClientTest.groovy | 0 .../groovy/LegacyAWS1ClientForkedTest.groovy | 0 .../groovy/AWS0ClientTest.groovy | 0 .../groovy/LegacyAWS0ClientForkedTest.groovy | 0 .../aws-java-sdk-2.2/build.gradle | 2 +- .../aws-java-sdk-2.2/gradle.lockfile | 0 .../groovy/Aws2KinesisDataStreamsTest.groovy | 0 .../groovy/Aws2SnsDataStreamsTest.groovy | 0 .../v2/AbstractAwsClientInstrumentation.java | 0 .../aws/v2/AwsClientInstrumentation.java | 0 .../aws/v2/AwsHttpClientInstrumentation.java | 0 .../aws/v2/AwsSdkClientDecorator.java | 0 .../aws/v2/TracingExecutionInterceptor.java | 0 .../groovy/PayloadTaggingTest.groovy | 0 .../src/test/groovy/Aws2ClientTest.groovy | 0 .../groovy/LegacyAws2ClientForkedTest.groovy | 0 .../aws-java-sfn-2.0/build.gradle | 2 +- .../aws-java-sfn-2.0/gradle.lockfile | 0 .../aws/v2/sfn/InputAttributeInjector.java | 0 .../aws/v2/sfn/SfnClientInstrumentation.java | 0 .../aws/v2/sfn/SfnInterceptor.java | 0 .../src/test/groovy/SfnClientTest.groovy | 0 .../aws-java-sns-1.0/build.gradle | 4 ++-- .../aws-java-sns-1.0/gradle.lockfile | 0 .../aws/v1/sns/SnsClientInstrumentation.java | 0 .../aws/v1/sns/SnsInterceptor.java | 0 .../aws/v1/sns/TextMapInjectAdapter.java | 0 .../src/test/groovy/SnsClientTest.groovy | 0 .../aws-java-sns-2.0/build.gradle | 4 ++-- .../aws-java-sns-2.0/gradle.lockfile | 0 .../aws/v2/sns/SnsClientInstrumentation.java | 0 .../aws/v2/sns/SnsInterceptor.java | 0 .../aws/v2/sns/TextMapInjectAdapter.java | 0 .../src/test/groovy/SnsClientTest.groovy | 0 .../aws-java-sqs-1.0/build.gradle | 2 +- .../aws-java-sqs-1.0/gradle.lockfile | 0 .../v1/sqs/AbstractSqsInstrumentation.java | 0 .../aws/v1/sqs/MessageAttributeInjector.java | 0 .../aws/v1/sqs/MessageExtractAdapter.java | 0 .../sqs/QueueBufferConfigInstrumentation.java | 0 .../aws/v1/sqs/SqsClientInstrumentation.java | 0 .../aws/v1/sqs/SqsDecorator.java | 0 .../aws/v1/sqs/SqsInterceptor.java | 0 .../v1/sqs/SqsJmsMessageInstrumentation.java | 0 .../sqs/SqsReceiveRequestInstrumentation.java | 0 .../sqs/SqsReceiveResultInstrumentation.java | 0 .../aws/v1/sqs/TracingIterator.java | 0 .../aws/v1/sqs/TracingList.java | 0 .../aws/v1/sqs/TracingListIterator.java | 0 .../groovy/LegacySqsClientForkedTest.groovy | 0 .../src/test/groovy/SqsClientTest.groovy | 0 .../test/groovy/TimeInQueueForkedTest.groovy | 0 .../aws-java-sqs-2.0/build.gradle | 4 ++-- .../aws-java-sqs-2.0/gradle.lockfile | 0 .../v2/sqs/AbstractSqsInstrumentation.java | 0 .../aws/v2/sqs/MessageAttributeInjector.java | 0 .../aws/v2/sqs/MessageExtractAdapter.java | 0 .../aws/v2/sqs/SqsClientInstrumentation.java | 0 .../aws/v2/sqs/SqsDecorator.java | 0 .../aws/v2/sqs/SqsInterceptor.java | 0 .../v2/sqs/SqsJmsMessageInstrumentation.java | 0 .../sqs/SqsReceiveRequestInstrumentation.java | 0 .../sqs/SqsReceiveResultInstrumentation.java | 0 .../aws/v2/sqs/TracingIterator.java | 0 .../aws/v2/sqs/TracingList.java | 0 .../aws/v2/sqs/TracingListIterator.java | 0 .../groovy/LegacySqsClientForkedTest.groovy | 0 .../src/test/groovy/SqsClientTest.groovy | 0 .../test/groovy/TimeInQueueForkedTest.groovy | 0 .../instrumentation/mule-4/build.gradle | 2 +- .../spring-messaging-4/build.gradle | 6 ++--- settings.gradle.kts | 24 +++++++++---------- 114 files changed, 28 insertions(+), 28 deletions(-) rename dd-java-agent/instrumentation/{aws-common => aws-java/aws-java-common}/build.gradle (100%) rename dd-java-agent/instrumentation/{aws-common => aws-java/aws-java-common}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{aws-common => aws-java/aws-java-common}/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-dynamodb-2.0/build.gradle (97%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-dynamodb-2.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbUtilTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-eventbridge-2.0/build.gradle (97%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-eventbridge-2.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy (100%) rename dd-java-agent/instrumentation/{aws-lambda-handler => aws-java/aws-java-lambda-handler-1.2}/build.gradle (100%) rename dd-java-agent/instrumentation/{aws-lambda-handler => aws-java/aws-java-lambda-handler-1.2}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{aws-lambda-handler => aws-java/aws-java-lambda-handler-1.2}/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java (100%) rename dd-java-agent/instrumentation/{aws-lambda-handler => aws-java/aws-java-lambda-handler-1.2}/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{aws-lambda-handler => aws-java/aws-java-lambda-handler-1.2}/src/test/groovy/HandlerStreaming.java (100%) rename dd-java-agent/instrumentation/{aws-lambda-handler => aws-java/aws-java-lambda-handler-1.2}/src/test/groovy/HandlerStreamingWithError.java (100%) rename dd-java-agent/instrumentation/{aws-lambda-handler => aws-java/aws-java-lambda-handler-1.2}/src/test/groovy/LambdaHandlerInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-s3-2.0/build.gradle (97%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-s3-2.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/build.gradle (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/dsmTest/groovy/AWS1KinesisClientTest.groovy (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/dsmTest/groovy/AWS1SnsClientTest.groovy (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/test/groovy/AWS1ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/test/groovy/LegacyAWS1ClientForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/test_before_1_11_106/groovy/AWS0ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{aws-java-sdk-1.11.0 => aws-java/aws-java-sdk-1.11}/src/test_before_1_11_106/groovy/LegacyAWS0ClientForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/build.gradle (99%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/test/groovy/Aws2ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sdk-2.2/src/test/groovy/LegacyAws2ClientForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sfn-2.0/build.gradle (97%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sfn-2.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-1.0/build.gradle (96%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-1.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-2.0/build.gradle (96%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-2.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/build.gradle (98%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-1.0/src/test/groovy/TimeInQueueForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/build.gradle (96%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/AbstractSqsInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => aws-java}/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy (100%) diff --git a/dd-java-agent/instrumentation/aws-common/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-common/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/aws-common/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-common/build.gradle diff --git a/dd-java-agent/instrumentation/aws-common/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-common/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-common/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java b/dd-java-agent/instrumentation/aws-java/aws-java-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java similarity index 100% rename from dd-java-agent/instrumentation/aws-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java rename to dd-java-agent/instrumentation/aws-java/aws-java-common/src/main/java/datadog/trace/instrumentation/aws/ExpectedQueryParams.java diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle similarity index 97% rename from dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle index d7e09e45765..1bd34a6a10d 100644 --- a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-dynamodb-2.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java rename to dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbUtil.java diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbUtilTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbUtilTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbUtilTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbUtilTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle similarity index 97% rename from dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle index 34e58e5f852..8a2014530ba 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java rename to dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/test/groovy/EventBridgeClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/aws-lambda-handler/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-lambda-handler/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerDecorator.java diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/src/test/groovy/HandlerStreaming.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/groovy/HandlerStreaming.java similarity index 100% rename from dd-java-agent/instrumentation/aws-lambda-handler/src/test/groovy/HandlerStreaming.java rename to dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/groovy/HandlerStreaming.java diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/src/test/groovy/HandlerStreamingWithError.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/groovy/HandlerStreamingWithError.java similarity index 100% rename from dd-java-agent/instrumentation/aws-lambda-handler/src/test/groovy/HandlerStreamingWithError.java rename to dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/groovy/HandlerStreamingWithError.java diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/src/test/groovy/LambdaHandlerInstrumentationTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/groovy/LambdaHandlerInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-lambda-handler/src/test/groovy/LambdaHandlerInstrumentationTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/groovy/LambdaHandlerInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle similarity index 97% rename from dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle index 71b0b92e8ae..c9f0516360a 100644 --- a/dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/aws-java-s3-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-s3-2.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3Interceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/test/groovy/S3ClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1KinesisClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/dsmTest/groovy/AWS1KinesisClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1KinesisClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/dsmTest/groovy/AWS1KinesisClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/dsmTest/groovy/AWS1SnsClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1SnsClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/dsmTest/groovy/AWS1SnsClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsNameCache.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/GetterAccess.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/OnErrorDecorator.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWS1ClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/AWS1ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWS1ClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/AWS1ClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/LegacyAWS1ClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/LegacyAWS1ClientForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/LegacyAWS1ClientForkedTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/LegacyAWS1ClientForkedTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/AWS0ClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/AWS0ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/AWS0ClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/AWS0ClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/LegacyAWS0ClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/LegacyAWS0ClientForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/LegacyAWS0ClientForkedTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/LegacyAWS0ClientForkedTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle similarity index 99% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle index 30395ff0917..0190dd77057 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle @@ -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') diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/Aws2ClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/test/groovy/Aws2ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/Aws2ClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/test/groovy/Aws2ClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/LegacyAws2ClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/test/groovy/LegacyAws2ClientForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/LegacyAws2ClientForkedTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/test/groovy/LegacyAws2ClientForkedTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/build.gradle similarity index 97% rename from dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/build.gradle index 089e6c83900..4562a433bdc 100644 --- a/dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/build.gradle @@ -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 diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sfn-2.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/InputAttributeInjector.java diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/test/groovy/SfnClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle similarity index 96% rename from dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle index 34d5f1d5cc1..f7783907e12 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle @@ -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 diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java 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/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle similarity index 96% rename from dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle index b9981c726ac..2f573019b57 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java 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/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle similarity index 98% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle index f1e21262a58..a50e5feda8f 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle @@ -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: diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/AbstractSqsInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageExtractAdapter.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/QueueBufferConfigInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsDecorator.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsJmsMessageInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveRequestInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingList.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingListIterator.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/TimeInQueueForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/TimeInQueueForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/TimeInQueueForkedTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/TimeInQueueForkedTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle similarity index 96% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle index e56ba82dccd..e8206f0927f 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle @@ -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: diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/gradle.lockfile rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/AbstractSqsInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/AbstractSqsInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/AbstractSqsInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/AbstractSqsInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageExtractAdapter.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsDecorator.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsJmsMessageInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveRequestInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsReceiveResultInstrumentation.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingList.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingListIterator.java diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy rename to dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy diff --git a/dd-java-agent/instrumentation/mule-4/build.gradle b/dd-java-agent/instrumentation/mule-4/build.gradle index bbe6edd8334..de423601040 100644 --- a/dd-java-agent/instrumentation/mule-4/build.gradle +++ b/dd-java-agent/instrumentation/mule-4/build.gradle @@ -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') diff --git a/dd-java-agent/instrumentation/spring-messaging-4/build.gradle b/dd-java-agent/instrumentation/spring-messaging-4/build.gradle index e7eb20526e4..9df4b5a091e 100644 --- a/dd-java-agent/instrumentation/spring-messaging-4/build.gradle +++ b/dd-java-agent/instrumentation/spring-messaging-4/build.gradle @@ -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', { diff --git a/settings.gradle.kts b/settings.gradle.kts index 70bbfb5679f..6ec03c40493 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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",