Bump version.aws.sdk from 2.21.13 to 2.21.36 in /apm-agent-plugins (#…

…3450) Bumps `version.aws.sdk` from 2.21.13 to 2.21.36. Updates `software.amazon.awssdk:s3` from 2.21.13 to 2.21.36 Updates `software.amazon.awssdk:sqs` from 2.21.13 to 2.21.36 Updates `software.amazon.awssdk:dynamodb` from 2.21.13 to 2.21.36 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
elastic · Dec 4, 2023 · c3e273c · c3e273c
1 parent a4cfea1
commit c3e273c
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 9 deletions.
diff --git a/...m-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/AbstractAws1ClientIT.java b/...m-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/AbstractAws1ClientIT.java
@@ -0,0 +1,12 @@
+package co.elastic.apm.agent.awssdk.v1;
+
+import co.elastic.apm.agent.awssdk.common.AbstractAwsClientIT;
+
+public abstract class AbstractAws1ClientIT extends AbstractAwsClientIT {
+
+    public static final String LOCALSTACK_VERSION = "0.14.2";
+
+    public AbstractAws1ClientIT() {
+        super(LOCALSTACK_VERSION);
+    }
+}
diff --git a/...k/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/DynamoDbClientIT.java b/...k/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/DynamoDbClientIT.java
@@ -50,7 +50,7 @@
 import static co.elastic.apm.agent.testutils.assertions.Assertions.assertThat;
 
 
-public class DynamoDbClientIT extends AbstractAwsClientIT {
+public class DynamoDbClientIT extends AbstractAws1ClientIT {
 
     private AmazonDynamoDB dynamoDB;
     private AmazonDynamoDBAsync dynamoDBAsync;

diff --git a/...aws-sdk/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/S3ClientIT.java b/...aws-sdk/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/S3ClientIT.java
@@ -36,7 +36,7 @@
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3;
 
 
-public class S3ClientIT extends AbstractAwsClientIT {
+public class S3ClientIT extends AbstractAws1ClientIT {
 
     private AmazonS3 s3;
 

diff --git a/...ws-sdk/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/SQSClientIT.java b/...ws-sdk/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/SQSClientIT.java
@@ -57,6 +57,10 @@ public class SQSClientIT extends AbstractSQSClientIT {
     CoreConfiguration coreConfiguration;
     MessagingConfiguration messagingConfiguration;
 
+    public SQSClientIT() {
+        super(AbstractAws1ClientIT.LOCALSTACK_VERSION);
+    }
+
     @BeforeEach
     public void setupClient() {
         coreConfiguration = tracer.getConfig(CoreConfiguration.class);

diff --git a/...sdk/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/SQSJmsClientIT.java b/...sdk/apm-aws-sdk-1-plugin/src/test/java/co/elastic/apm/agent/awssdk/v1/SQSJmsClientIT.java
@@ -56,7 +56,7 @@
 import static co.elastic.apm.agent.testutils.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
 
-public class SQSJmsClientIT extends AbstractAwsClientIT {
+public class SQSJmsClientIT extends AbstractAws1ClientIT {
     AmazonSQSMessagingClientWrapper client;
     SQSConnection connection;
     SQSConnection receivingConnection;

diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/pom.xml b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <apm-agent-parent.base.dir>${project.basedir}/../../..</apm-agent-parent.base.dir>
-        <version.aws.sdk>2.21.13</version.aws.sdk>
+        <version.aws.sdk>2.21.36</version.aws.sdk>
         <version.aws.jms>2.0.0</version.aws.jms>
         <!-- AWS SDK v2 is compiled for Java 8 -->
         <maven.compiler.target>8</maven.compiler.target>

diff --git a/...m-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/AbstractAws2ClientIT.java b/...m-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/AbstractAws2ClientIT.java
@@ -0,0 +1,12 @@
+package co.elastic.apm.agent.awssdk.v2;
+
+import co.elastic.apm.agent.awssdk.common.AbstractAwsClientIT;
+
+public abstract class AbstractAws2ClientIT extends AbstractAwsClientIT {
+
+    public static final String LOCALSTACK_VERSION = "3.0.2";
+
+    public AbstractAws2ClientIT() {
+        super(LOCALSTACK_VERSION);
+    }
+}
diff --git a/...k/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/DynamoDbClientIT.java b/...k/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/DynamoDbClientIT.java
@@ -54,7 +54,7 @@
 import static co.elastic.apm.agent.testutils.assertions.Assertions.assertThat;
 
 
-public class DynamoDbClientIT extends AbstractAwsClientIT {
+public class DynamoDbClientIT extends AbstractAws2ClientIT {
 
     private DynamoDbClient dynamoDB;
     private DynamoDbAsyncClient dynamoDBAsync;

diff --git a/...aws-sdk/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/S3ClientIT.java b/...aws-sdk/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/S3ClientIT.java
@@ -44,7 +44,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class S3ClientIT extends AbstractAwsClientIT {
+public class S3ClientIT extends AbstractAws2ClientIT {
     private S3Client s3;
     private S3AsyncClient s3Async;
 

diff --git a/...ws-sdk/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/SQSClientIT.java b/...ws-sdk/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/SQSClientIT.java
@@ -60,6 +60,10 @@ public class SQSClientIT extends AbstractSQSClientIT {
     CoreConfiguration coreConfiguration;
     MessagingConfiguration messagingConfiguration;
 
+    public SQSClientIT() {
+        super(AbstractAws2ClientIT.LOCALSTACK_VERSION);
+    }
+
     @BeforeEach
     public void setupClient() {
         coreConfiguration = tracer.getConfig(CoreConfiguration.class);

diff --git a/...sdk/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/SQSJmsClientIT.java b/...sdk/apm-aws-sdk-2-plugin/src/test/java/co/elastic/apm/agent/awssdk/v2/SQSJmsClientIT.java
@@ -57,7 +57,7 @@
 import static org.mockito.Mockito.doReturn;
 import static co.elastic.apm.agent.testutils.assertions.Assertions.assertThat;
 
-public class SQSJmsClientIT extends AbstractAwsClientIT {
+public class SQSJmsClientIT extends AbstractAws2ClientIT {
     AmazonSQSMessagingClientWrapper client;
     SQSConnection connection;
     SQSConnection receivingConnection;

diff --git a/...-aws-sdk-common/src/test/java/co/elastic/apm/agent/awssdk/common/AbstractAwsClientIT.java b/...-aws-sdk-common/src/test/java/co/elastic/apm/agent/awssdk/common/AbstractAwsClientIT.java
@@ -40,7 +40,6 @@
 
 @Testcontainers
 public abstract class AbstractAwsClientIT extends AbstractInstrumentationTest {
-    private static final DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:0.14.2");
     protected static final String BUCKET_NAME = "some-test-bucket";
     protected static final String SQS_QUEUE_NAME = "some-test-sqs-queue";
     protected static final String SQS_IGNORED_QUEUE_NAME = "ignored-queue";
@@ -52,7 +51,12 @@ public abstract class AbstractAwsClientIT extends AbstractInstrumentationTest {
     protected static final String KEY_CONDITION_EXPRESSION = "attributeOne = :one";
 
     @Container
-    protected LocalStackContainer localstack = new LocalStackContainer(localstackImage).withServices(localstackService());
+    protected LocalStackContainer localstack;
+
+    public AbstractAwsClientIT(String localstackVersion) {
+        DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:" + localstackVersion);
+        localstack = new LocalStackContainer(localstackImage).withServices(localstackService());
+    }
 
     protected abstract String awsService();
 

diff --git a/...-aws-sdk-common/src/test/java/co/elastic/apm/agent/awssdk/common/AbstractSQSClientIT.java b/...-aws-sdk-common/src/test/java/co/elastic/apm/agent/awssdk/common/AbstractSQSClientIT.java
@@ -38,6 +38,10 @@ public abstract class AbstractSQSClientIT extends AbstractAwsClientIT {
     protected CoreConfiguration coreConfiguration;
     protected MessagingConfiguration messagingConfiguration;
 
+    public AbstractSQSClientIT(String localstackVersion) {
+        super(localstackVersion);
+    }
+
     @BeforeEach
     public void setupConfig() {
         coreConfiguration = tracer.getConfig(CoreConfiguration.class);