Update dev branch to be in sync with main

.github/config/testcases.json

@@ -4,14 +4,43 @@
 			"type": "EKS",
 			"targets": [
 				{
+<<<<<<< HEAD
 					"name": "dev-collector-ci-amd64-1-23",
+=======
+					"name": "collector-ci-amd64-1-22",
+>>>>>>> main
 					"region": "us-west-2",
 					"excluded_tests": [
 						"containerinsights_eks_containerd"
 					]
 				},
 				{
+<<<<<<< HEAD
 					"name": "dev-collector-ci-amd64-1-26",
+=======
+					"name": "collector-ci-amd64-1-23",
+					"region": "us-west-2",
+					"excluded_tests": [
+						"containerinsights_eks_containerd"
+					]
+				},
+				{
+					"name": "collector-ci-amd64-1-24",
+					"region": "us-west-2",
+					"excluded_tests": [
+						"containerinsight_eks"
+					]
+				},
+				{
+					"name": "collector-ci-amd64-1-25",
+					"region": "us-west-2",
+					"excluded_tests": [
+						"containerinsight_eks"
+					]
+				},
+				{
+					"name": "collector-ci-amd64-1-26",
+>>>>>>> main
 					"region": "us-west-2",
 					"excluded_tests": [
 						"containerinsight_eks"
@@ -23,18 +52,89 @@
 			"type": "EKS_ARM64",
 			"targets": [
 				{
+<<<<<<< HEAD
 					"name": "dev-collector-ci-arm64-1-23",
+=======
+					"name": "collector-ci-arm64-1-22",
+>>>>>>> main
 					"region": "us-west-2",
 					"excluded_tests": [
 						"containerinsights_eks_containerd"
 					]
 				},
 				{
+<<<<<<< HEAD
 					"name": "dev-collector-ci-arm64-1-26",
+=======
+					"name": "collector-ci-arm64-1-23",
+					"region": "us-west-2",
+					"excluded_tests": [
+						"containerinsights_eks_containerd"
+					]
+				},
+				{
+					"name": "collector-ci-arm64-1-24",
+>>>>>>> main
+					"region": "us-west-2",
+					"excluded_tests": [
+						"containerinsight_eks"
+					]
+<<<<<<< HEAD
+=======
+				},
+				{
+					"name": "collector-ci-arm64-1-25",
 					"region": "us-west-2",
 					"excluded_tests": [
 						"containerinsight_eks"
 					]
+				},
+				{
+					"name": "collector-ci-arm64-1-26",
+					"region": "us-west-2",
+					"excluded_tests": [
+						"containerinsight_eks"
+					]
+				}
+			]
+		},
+		{
+			"type": "EKS_ADOT_OPERATOR",
+			"targets": [
+				{
+					"name": "operator-ci-amd64-1-22",
+					"region": "us-west-2"
+				},
+				{
+					"name": "operator-ci-amd64-1-23",
+					"region": "us-west-2"
+				}
+			]
+		},
+		{
+			"type": "EKS_ADOT_OPERATOR_ARM64",
+			"targets": [
+				{
+					"name": "operator-ci-arm64-1-22",
+					"region": "us-west-2"
+				},
+				{
+					"name": "operator-ci-arm64-1-23",
+					"region": "us-west-2"
+				}
+			]
+		},
+		{
+			"type": "EKS_FARGATE",
+			"targets": [
+				{
+					"name": "collector-ci-fargate-1-22",
+					"region": "us-west-2"
+				},
+				{
+					"name": "collector-ci-fargate-1-23",
+					"region": "us-west-2"
+>>>>>>> main
 				}
 			]
 		}
@@ -436,6 +536,23 @@
 			]
 		},
 		{
+<<<<<<< HEAD
+=======
+			"case_name": "statsd_nootellib_instScopeEnabled",
+			"platforms": [
+				"EKS",
+				"EKS_ARM64"
+			]
+		},
+		{
+			"case_name": "statsd_otellib_instScopeEnabled",
+			"platforms": [
+				"EKS",
+				"EKS_ARM64"
+			]
+		},
+		{
+>>>>>>> main
 			"case_name": "logzio_exporter_trace_mock",
 			"platforms": [
 				"LOCAL",
@@ -478,6 +595,15 @@
 			]
 		},
 		{
+<<<<<<< HEAD
+=======
+			"case_name": "containerinsight_ecs_prometheus",
+			"platforms": [
+				"ECS"
+			]
+		},
+		{
+>>>>>>> main
 			"case_name": "otlp_metric_k8sattr",
 			"platforms": [
 				"EKS",
@@ -515,6 +641,7 @@
 			]
 		},
 		{
+<<<<<<< HEAD
 			"case_name": "statsd_nootellib_instScopeEnabled",
 			"platforms": [
 				"EKS",
@@ -523,10 +650,17 @@
 		},
 		{
 			"case_name": "statsd_otellib_instScopeEnabled",
+=======
+			"case_name": "statsd_instscopedisabled",
+>>>>>>> main
 			"platforms": [
 				"EKS",
 				"EKS_ARM64"
 			]
 		}
 	]
+<<<<<<< HEAD
+}
+=======
 }
+>>>>>>> main

.github/scripts/test-collector-ctl.sh

@@ -0,0 +1,74 @@
+#!/bin/bash -x
+
+set -e
+
+# This script is supposed to run during the CI to validate that the control
+# script is working as expected
+# Important: this script requires root permission.
+
+COLLECTOR_DEB=$1
+COLLECTOR_CONFIG=$2
+
+ADOT_CTL=/opt/aws/aws-otel-collector/bin/aws-otel-collector-ctl
+ENV_FILE="/opt/aws/aws-otel-collector/etc/.env"
+CONFIG_FILE="/opt/aws/aws-otel-collector/etc/config.yaml"
+
+setup() {
+    dpkg -i "$COLLECTOR_DEB"
+}
+
+test_collector_ctl_does_not_overwrite_env() {
+    $ADOT_CTL -a start
+    if [ ! -e $CONFIG_FILE ]; then
+        echo "Config file does not exist"
+        exit 1
+    fi
+
+    echo "EXTRA_ENV=\"some value\"" | tee -a $ENV_FILE > /dev/null
+
+    # We don't need the collector to succeed, just that the control script is execised
+    $ADOT_CTL -a start -c "http://example.com"
+
+    if ! grep -q EXTRA_ENV "$ENV_FILE"; then
+        echo "Env file was overwritten"
+        exit 1
+    fi
+
+    $ADOT_CTL -a start -c "$COLLECTOR_CONFIG"
+    if ! grep -q EXTRA_ENV "$ENV_FILE"; then
+        ehco "Env file was overwritten"
+        exit 1
+    fi
+    echo "${FUNCNAME[0]} ... OK"
+}
+
+test_collector_ctl_with_sed_special_chars() {
+    # ampersand is a special character in sed
+    cfg="https://example.com?test=1&test=2"
+    $ADOT_CTL -a start -c "$cfg"
+
+    expected_string="^config=\"--config '${cfg}'\"$"
+
+    if ! grep -q "${expected_string}" "$ENV_FILE";  then
+        echo "Configuration is incorrect"
+        exit 1
+    fi
+
+    cfg="./config.yaml"
+    $ADOT_CTL -a start -c "$cfg"
+
+    expected_string="^config=\"--config /opt/aws/aws-otel-collector/etc/config.yaml\"$"
+    if ! grep -q "${expected_string}" "$ENV_FILE";  then
+        echo "Configuration is incorrect"
+        exit 1
+    fi
+
+    echo "${FUNCNAME[0]} ... OK"
+}
+
+
+setup
+
+## Tests
+test_collector_ctl_does_not_overwrite_env
+test_collector_ctl_with_sed_special_chars

.github/workflows/CD.yml

@@ -50,7 +50,7 @@ jobs:
       latest-or-newer: ${{ steps.version.outputs.latest-or-newer }}
       sha: ${{ steps.set-input-vars.outputs.sha }}
     steps: 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set Input Variables
         id: set-input-vars
         run: |
@@ -62,7 +62,7 @@ jobs:
             echo "sha=${{ github.sha }}" >> $GITHUB_OUTPUT
           fi
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           role-to-assume: ${{ secrets.COLLECTOR_ASSUMABLE_ROLE_ARN }}
           aws-region: us-west-2
@@ -113,7 +113,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [release-checking]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache if success
         id: release-to-s3
@@ -131,7 +131,7 @@ jobs:
 
       - name: Configure AWS Credentials
         if: steps.release-to-s3.outputs.cache-hit != 'true'
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           role-to-assume: ${{ secrets.COLLECTOR_PROD_RELEASE_ROLE_ARN }}
           aws-region: us-west-2
@@ -148,7 +148,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [release-checking]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache if success
         id: release-version-image
@@ -159,7 +159,7 @@ jobs:
 
       - name: Configure AWS Credentials
         if: steps.release-version-image.outputs.cache-hit != 'true'
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           role-to-assume: ${{ secrets.COLLECTOR_PROD_RELEASE_ROLE_ARN }}
           aws-region: us-east-1
@@ -222,7 +222,7 @@ jobs:
     needs: [ release-ssm, release-to-s3, release-version-image, release-checking]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.release-checking.outputs.sha }}