Merge branch 'terraform' into trace-id-value-xray-exporter-tests

.github/workflows/cdk-deploy.yml

@@ -25,7 +25,7 @@ jobs:
           role-to-assume: ${{ secrets.TEST_FW_ASSUMABLE_ROLE_ARN }}
           aws-region: us-west-2
           role-duration-seconds: 21600
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
       - name: Get npm cache directory

.github/workflows/pr-build.yml

@@ -54,7 +54,7 @@ jobs:
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: 16
     - name: Get npm cache directory

.github/workflows/update-test-images.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           arguments: build
       - name: Set up terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
       - name: run imagebuild
         working-directory: terraform/imagebuild
         run: |

adot-testbed/app/src/test/java/software/amazon/adot/testbed/LogsTests.java

@@ -49,7 +49,6 @@ class LogsTests extends CollectorSetup {
     void testSyslog() throws Exception {
         String logStreamName = "rfcsyslog-logstream-" + uniqueID;
         collector = createAndStartCollectorForLogs("/configurations/config-rfcsyslog.yaml", logStreamName);
-
         List<InputStream> inputStreams = new ArrayList<>();
         InputStream inputStream = getClass().getResourceAsStream("/logs/RFC5424.log");
         inputStreams.add(inputStream);
@@ -63,7 +62,6 @@ void testSyslog() throws Exception {
     void testLog4j() throws Exception {
         String logStreamName = "log4j-logstream-" + uniqueID;
         collector = createAndStartCollectorForLogs("/configurations/config-log4j.yaml", logStreamName);
-
         List<InputStream> inputStreams = new ArrayList<>();
         InputStream inputStream = getClass().getResourceAsStream("/logs/log4j.log");
         inputStreams.add(inputStream);
@@ -76,7 +74,6 @@ void testLog4j() throws Exception {
     void testJson() throws Exception {
         String logStreamName = "json-logstream-" + uniqueID;
         collector = createAndStartCollectorForLogs("/configurations/config-json.yaml", logStreamName);
-
         List<InputStream> inputStreams = new ArrayList<>();
         InputStream inputStream = getClass().getResourceAsStream("/logs/testingJSON.log");
         inputStreams.add(inputStream);

build.gradle

@@ -9,7 +9,7 @@
 plugins {
     // Apply the java plugin to add support for Java
     id 'java'
-    id 'com.github.ben-manes.versions' version '0.49.0'
+    id 'com.github.ben-manes.versions' version '0.50.0'
     id 'se.patrikerdes.use-latest-versions' version '0.2.18'
 
 }