From 0e9d11e192b2256652540114b6d640b7979ed839 Mon Sep 17 00:00:00 2001 From: sramesh Date: Wed, 2 Jul 2025 11:23:16 +0530 Subject: [PATCH 1/5] update go version --- src/go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/go.mod b/src/go.mod index 0bf1266..07a0955 100644 --- a/src/go.mod +++ b/src/go.mod @@ -41,6 +41,4 @@ require ( module github.com/newrelic/aws-unified-lambda-logging -go 1.22.0 - -toolchain go1.23.0 +go 1.24.4 From 6179b000990fdcc41e2d10576e6b8dcba7ba6ec2 Mon Sep 17 00:00:00 2001 From: sramesh Date: Wed, 9 Jul 2025 11:21:56 +0530 Subject: [PATCH 2/5] update go version --- .github/workflows/pull_request.yaml | 2 +- .github/workflows/release-lambda-code.yaml | 2 +- .github/workflows/release-template-files.yaml | 2 +- .github/workflows/run-e2e-tests.yaml | 8 ++++---- e2e-tests/common-scripts/entity_synthesis_param.cfg | 2 +- integration-tests/go.mod | 2 +- src/common/version.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 0f9147b..1d1b9aa 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -115,7 +115,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24.4' #scripts to include the integration and end to end tests should be added here - name: Run Test Cases and Coverage run: | diff --git a/.github/workflows/release-lambda-code.yaml b/.github/workflows/release-lambda-code.yaml index 103ba1e..a213c3b 100644 --- a/.github/workflows/release-lambda-code.yaml +++ b/.github/workflows/release-lambda-code.yaml @@ -23,7 +23,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24.4' - name: Build and Package Go executable run: | diff --git a/.github/workflows/release-template-files.yaml b/.github/workflows/release-template-files.yaml index fdd62b5..0d98fe1 100644 --- a/.github/workflows/release-template-files.yaml +++ b/.github/workflows/release-template-files.yaml @@ -20,7 +20,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24.4' - name: Install AWS SAM CLI run: | diff --git a/.github/workflows/run-e2e-tests.yaml b/.github/workflows/run-e2e-tests.yaml index 64bc02c..3db9af9 100644 --- a/.github/workflows/run-e2e-tests.yaml +++ b/.github/workflows/run-e2e-tests.yaml @@ -24,7 +24,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24.4' - name: Install AWS SAM CLI run: | @@ -79,7 +79,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24.4' - name: Install AWS SAM CLI run: | @@ -129,7 +129,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24.4' - name: Install AWS SAM CLI run: | @@ -179,7 +179,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24.4' - name: Install AWS SAM CLI run: | diff --git a/e2e-tests/common-scripts/entity_synthesis_param.cfg b/e2e-tests/common-scripts/entity_synthesis_param.cfg index b116478..d52a878 100644 --- a/e2e-tests/common-scripts/entity_synthesis_param.cfg +++ b/e2e-tests/common-scripts/entity_synthesis_param.cfg @@ -1,4 +1,4 @@ # Entity synthesis Parameters , aws related params are dropped in pipeline. instrumentation_provider=aws instrumentation_name=lambda -instrumentation_version=1.1.0 +instrumentation_version=1.1.1 diff --git a/integration-tests/go.mod b/integration-tests/go.mod index bd86359..f7c5b7a 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -16,4 +16,4 @@ require ( module github.com/newrelic/aws-unified-lambda-logging -go 1.22 +go 1.24.4 diff --git a/src/common/version.go b/src/common/version.go index 441c987..c2d1f57 100644 --- a/src/common/version.go +++ b/src/common/version.go @@ -2,4 +2,4 @@ package common // InstrumentationVersion is a parameter necessary for Entity Synthesis at New Relic. -const InstrumentationVersion = "1.1.0" +const InstrumentationVersion = "1.1.1" From 65b5a8a41760833f3dee2cf33adf911b76934487 Mon Sep 17 00:00:00 2001 From: sramesh Date: Wed, 9 Jul 2025 15:11:33 +0530 Subject: [PATCH 3/5] make tests sequential --- .github/workflows/run-e2e-tests.yaml | 51 +++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-e2e-tests.yaml b/.github/workflows/run-e2e-tests.yaml index 3db9af9..8212f9f 100644 --- a/.github/workflows/run-e2e-tests.yaml +++ b/.github/workflows/run-e2e-tests.yaml @@ -164,9 +164,9 @@ jobs: permissions: id-token: write contents: write - strategy: - matrix: - test-case: [test_for_lambda_firehose_stack, test_for_firehose_metric_polling_stack, test_for_firehose_metric_streaming_stack, test_for_lambda_metrics_polling_stack, test_for_lambda_metrics_streaming_stack, test_for_lambda_firehose_metric_polling_stack, test_for_lambda_firehose_metric_streaming_stack] +# strategy: +# matrix: +# test-case: [test_for_lambda_firehose_stack, test_for_firehose_metric_polling_stack, test_for_firehose_metric_streaming_stack, test_for_lambda_metrics_polling_stack, test_for_lambda_metrics_streaming_stack, test_for_lambda_firehose_metric_polling_stack, test_for_lambda_firehose_metric_streaming_stack] steps: - name: Checkout code uses: actions/checkout@v4 @@ -191,13 +191,48 @@ jobs: role-to-assume: ${{ secrets.AWS_E2E_ROLE }} aws-region: us-east-1 - - name: Run e2e tests for lambda and metrics stack - env: - NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} +# - name: Run e2e tests for lambda and metrics stack +# env: +# NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} +# NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} +# run: | +# cd e2e-tests/ +# ./lambda-with-metrics-test.sh ${{ matrix.test-case }} + + - name: Run e2e test for lambda firehose stack + run: | + cd e2e-tests/ + ./lambda-with-metrics-test.sh test_for_lambda_firehose_stack + + - name: Run e2e test for firehose metric polling stack + run: | + cd e2e-tests/ + ./lambda-with-metrics-test.sh test_for_firehose_metric_polling_stack + + - name: Run e2e test for firehose metric streaming stack + run: | + cd e2e-tests/ + ./lambda-with-metrics-test.sh test_for_firehose_metric_streaming_stack + + - name: Run e2e test for lambda metrics polling stack + run: | + cd e2e-tests/ + ./lambda-with-metrics-test.sh test_for_lambda_metrics_polling_stack + + - name: Run e2e test for lambda metrics streaming stack + run: | + cd e2e-tests/ + ./lambda-with-metrics-test.sh test_for_lambda_metrics_streaming_stack + + - name: Run e2e test for lambda firehose metric polling stack + run: | + cd e2e-tests/ + ./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_polling_stack + + - name: Run e2e test for lambda firehose metric streaming stack run: | cd e2e-tests/ - ./lambda-with-metrics-test.sh ${{ matrix.test-case }} + ./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_streaming_stack - name: Send failure notification to Slack if: always() From e5ebf0cf603269784e2af3cf4ca16ab63ed1f9e1 Mon Sep 17 00:00:00 2001 From: sramesh Date: Wed, 9 Jul 2025 15:23:08 +0530 Subject: [PATCH 4/5] make tests sequential --- .github/workflows/run-e2e-tests.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/run-e2e-tests.yaml b/.github/workflows/run-e2e-tests.yaml index 8212f9f..25987e6 100644 --- a/.github/workflows/run-e2e-tests.yaml +++ b/.github/workflows/run-e2e-tests.yaml @@ -200,36 +200,57 @@ jobs: # ./lambda-with-metrics-test.sh ${{ matrix.test-case }} - name: Run e2e test for lambda firehose stack + env: + NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ ./lambda-with-metrics-test.sh test_for_lambda_firehose_stack - name: Run e2e test for firehose metric polling stack + env: + NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ ./lambda-with-metrics-test.sh test_for_firehose_metric_polling_stack - name: Run e2e test for firehose metric streaming stack + env: + NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ ./lambda-with-metrics-test.sh test_for_firehose_metric_streaming_stack - name: Run e2e test for lambda metrics polling stack + env: + NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ ./lambda-with-metrics-test.sh test_for_lambda_metrics_polling_stack - name: Run e2e test for lambda metrics streaming stack + env: + NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ ./lambda-with-metrics-test.sh test_for_lambda_metrics_streaming_stack - name: Run e2e test for lambda firehose metric polling stack + env: + NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ ./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_polling_stack - name: Run e2e test for lambda firehose metric streaming stack + env: + NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ ./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_streaming_stack From 357732e433f740909aa90bdacd0ce6f9e3f5c44f Mon Sep 17 00:00:00 2001 From: sramesh Date: Tue, 15 Jul 2025 14:32:30 +0530 Subject: [PATCH 5/5] reverse sequential tests --- .github/workflows/run-e2e-tests.yaml | 66 +++------------------------- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/.github/workflows/run-e2e-tests.yaml b/.github/workflows/run-e2e-tests.yaml index 25987e6..3db9af9 100644 --- a/.github/workflows/run-e2e-tests.yaml +++ b/.github/workflows/run-e2e-tests.yaml @@ -164,9 +164,9 @@ jobs: permissions: id-token: write contents: write -# strategy: -# matrix: -# test-case: [test_for_lambda_firehose_stack, test_for_firehose_metric_polling_stack, test_for_firehose_metric_streaming_stack, test_for_lambda_metrics_polling_stack, test_for_lambda_metrics_streaming_stack, test_for_lambda_firehose_metric_polling_stack, test_for_lambda_firehose_metric_streaming_stack] + strategy: + matrix: + test-case: [test_for_lambda_firehose_stack, test_for_firehose_metric_polling_stack, test_for_firehose_metric_streaming_stack, test_for_lambda_metrics_polling_stack, test_for_lambda_metrics_streaming_stack, test_for_lambda_firehose_metric_polling_stack, test_for_lambda_firehose_metric_streaming_stack] steps: - name: Checkout code uses: actions/checkout@v4 @@ -191,69 +191,13 @@ jobs: role-to-assume: ${{ secrets.AWS_E2E_ROLE }} aws-region: us-east-1 -# - name: Run e2e tests for lambda and metrics stack -# env: -# NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} -# NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} -# run: | -# cd e2e-tests/ -# ./lambda-with-metrics-test.sh ${{ matrix.test-case }} - - - name: Run e2e test for lambda firehose stack - env: - NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} - run: | - cd e2e-tests/ - ./lambda-with-metrics-test.sh test_for_lambda_firehose_stack - - - name: Run e2e test for firehose metric polling stack - env: - NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} - run: | - cd e2e-tests/ - ./lambda-with-metrics-test.sh test_for_firehose_metric_polling_stack - - - name: Run e2e test for firehose metric streaming stack - env: - NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} - run: | - cd e2e-tests/ - ./lambda-with-metrics-test.sh test_for_firehose_metric_streaming_stack - - - name: Run e2e test for lambda metrics polling stack - env: - NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} - run: | - cd e2e-tests/ - ./lambda-with-metrics-test.sh test_for_lambda_metrics_polling_stack - - - name: Run e2e test for lambda metrics streaming stack - env: - NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} - run: | - cd e2e-tests/ - ./lambda-with-metrics-test.sh test_for_lambda_metrics_streaming_stack - - - name: Run e2e test for lambda firehose metric polling stack - env: - NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} - run: | - cd e2e-tests/ - ./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_polling_stack - - - name: Run e2e test for lambda firehose metric streaming stack + - name: Run e2e tests for lambda and metrics stack env: NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} run: | cd e2e-tests/ - ./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_streaming_stack + ./lambda-with-metrics-test.sh ${{ matrix.test-case }} - name: Send failure notification to Slack if: always()