Skip to content

Commit 5a7a862

Browse files
ahegdeNRahegdeNR
authored
merge two commits from develop to main (#44)
Go version Upgrade Test Cases Update
1 parent b43d7eb commit 5a7a862

16 files changed

+98
-51
lines changed

‎.github/workflows/pull_request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- name: Setup Go
116116
uses: actions/setup-go@v5
117117
with:
118-
go-version: '1.22'
118+
go-version: '1.24.4'
119119
#scripts to include the integration and end to end tests should be added here
120120
- name: Run Test Cases and Coverage
121121
run: |

‎.github/workflows/release-lambda-code.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup Go
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: '1.22'
26+
go-version: '1.24.4'
2727

2828
- name: Build and Package Go executable
2929
run: |

‎.github/workflows/release-template-files.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version: '1.22'
23+
go-version: '1.24.4'
2424

2525
- name: Install AWS SAM CLI
2626
run: |

‎.github/workflows/run-e2e-tests.yaml‎

Lines changed: 58 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Go
2525
uses: actions/setup-go@v5
2626
with:
27-
go-version: '1.22'
27+
go-version: '1.24.4'
2828

2929
- name: Install AWS SAM CLI
3030
run: |
@@ -79,7 +79,7 @@ jobs:
7979
- name: Setup Go
8080
uses: actions/setup-go@v5
8181
with:
82-
go-version: '1.22'
82+
go-version: '1.24.4'
8383

8484
- name: Install AWS SAM CLI
8585
run: |
@@ -129,7 +129,7 @@ jobs:
129129
- name: Setup Go
130130
uses: actions/setup-go@v5
131131
with:
132-
go-version: '1.22'
132+
go-version: '1.24.4'
133133

134134
- name: Install AWS SAM CLI
135135
run: |
@@ -158,15 +158,59 @@ jobs:
158158
env:
159159
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
160160

161+
run-e2e-tests-lambda-firehose:
162+
needs: [build-templates]
163+
runs-on: ubuntu-latest
164+
permissions:
165+
id-token: write
166+
contents: write
167+
steps:
168+
- name: Checkout code
169+
uses: actions/checkout@v4
170+
171+
- name: Download Artifact
172+
uses: actions/download-artifact@v4
173+
with:
174+
path: build-artifacts
175+
176+
- name: Setup Go
177+
uses: actions/setup-go@v5
178+
with:
179+
go-version: '1.24.4'
180+
181+
- name: Install AWS SAM CLI
182+
run: |
183+
pip install aws-sam-cli
184+
185+
- name: Configure AWS Credentials
186+
uses: aws-actions/configure-aws-credentials@v3
187+
with:
188+
role-to-assume: ${{ secrets.AWS_E2E_ROLE }}
189+
aws-region: us-east-1
190+
191+
- name: Run e2e tests for lambda and firehose stack
192+
env:
193+
NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }}
194+
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
195+
run: |
196+
cd e2e-tests/
197+
./lambda-with-metrics-test.sh test_for_lambda_firehose_stack
198+
199+
- name: Send failure notification to Slack
200+
if: always()
201+
uses: ravsamhq/notify-slack-action@v1
202+
with:
203+
status: ${{ job.status }}
204+
notify_when: 'failure'
205+
env:
206+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
207+
161208
run-e2e-tests-lambda-firehose-metrics:
162209
needs: [build-templates]
163210
runs-on: ubuntu-latest
164211
permissions:
165212
id-token: write
166213
contents: write
167-
strategy:
168-
matrix:
169-
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]
170214
steps:
171215
- name: Checkout code
172216
uses: actions/checkout@v4
@@ -191,13 +235,18 @@ jobs:
191235
role-to-assume: ${{ secrets.AWS_E2E_ROLE }}
192236
aws-region: us-east-1
193237

194-
- name: Run e2e tests for lambda and metrics stack
238+
- name: Run e2e tests for lambda, firehose and metrics stacks
195239
env:
196240
NEW_RELIC_USER_KEY: ${{ secrets.NEW_RELIC_USER_KEY }}
197241
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
198242
run: |
199243
cd e2e-tests/
200-
./lambda-with-metrics-test.sh ${{ matrix.test-case }}
244+
./lambda-with-metrics-test.sh test_for_lambda_metrics_polling_stack
245+
./lambda-with-metrics-test.sh test_for_lambda_metrics_streaming_stack
246+
./lambda-with-metrics-test.sh test_for_firehose_metric_polling_stack
247+
./lambda-with-metrics-test.sh test_for_firehose_metric_streaming_stack
248+
./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_polling_stack
249+
./lambda-with-metrics-test.sh test_for_lambda_firehose_metric_streaming_stack
201250
202251
- name: Send failure notification to Slack
203252
if: always()
@@ -209,7 +258,7 @@ jobs:
209258
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
210259

211260
clean-up:
212-
needs: [run-e2e-tests-cloudwatch, run-e2e-tests-s3, run-e2e-tests-lambda-firehose-metrics]
261+
needs: [run-e2e-tests-cloudwatch, run-e2e-tests-s3, run-e2e-tests-lambda-firehose, run-e2e-tests-lambda-firehose-metrics]
213262
runs-on: ubuntu-latest
214263
permissions:
215264
id-token: write

‎e2e-tests/common-scripts/entity_synthesis_param.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Entity synthesis Parameters , aws related params are dropped in pipeline.
22
instrumentation_provider=aws
33
instrumentation_name=lambda
4-
instrumentation_version=1.1.0
4+
instrumentation_version=1.1.1

‎integration-tests/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ require (
1616

1717
module github.com/newrelic/aws-unified-lambda-logging
1818

19-
go 1.22
19+
go 1.24.4

‎lambda-template.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Description: New Relic Template to forward logs using S3 bucket and/or cloudwatc
44

55
Metadata:
66
AWS::ServerlessRepo::Application:
7-
Name: NewRelic-log-forwarding
7+
Name: NewRelic-Log-Forwarder-Lambda
88
Description: Send log data from AWS to New Relic.
99
Author: New Relic
1010
SpdxLicenseId: Apache-2.0
1111
LicenseUrl: LICENSE.txt
1212
ReadmeUrl: README.md
13-
HomePageUrl: https://github.com/newrelic/aws-unified-logging #TODO change this url once the repo is public
14-
SemanticVersion: 0.0.17
15-
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging #TODO change this url once the repo is public
13+
HomePageUrl: https://github.com/newrelic/aws-unified-logging
14+
SemanticVersion: 1.1.1
15+
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging
1616

1717
AWS::CloudFormation::Interface:
1818
ParameterLabels:

‎logging-firehose-metric-polling.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ Transform: AWS::Serverless-2016-10-31
33
Description: New Relic Template to forward logs using firehose and metrics using polling from AWS to New Relic
44
Metadata:
55
AWS::ServerlessRepo::Application:
6-
Name: NewRelic-Firehose-Log-Forwarding
6+
Name: NewRelic-Log-Forwarder-Firehose-Metric-Polling
77
Description: Send log data from AWS to New Relic.
88
Author: New Relic
99
SpdxLicenseId: Apache-2.0
1010
LicenseUrl: LICENSE.txt
1111
ReadmeUrl: README.md
12-
HomePageUrl: https://github.com/newrelic/aws-unified-firehose-logging # TODO update this when the repo is public.
13-
SemanticVersion: 0.0.17
14-
SourceCodeUrl: https://github.com/newrelic/aws-unified-firehose-logging # TODO update this when the repo is public.
15-
12+
HomePageUrl: https://github.com/newrelic/aws-unified-logging
13+
SemanticVersion: 1.1.1
14+
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging
15+
1616
AWS::CloudFormation::Interface:
1717
ParameterGroups:
1818
-

‎logging-firehose-metric-stream.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Description: New Relic Template to forward logs using firehose and metrics using
44

55
Metadata:
66
AWS::ServerlessRepo::Application:
7-
Name: NewRelic-Firehose-Log-Forwarding
7+
Name: NewRelic-Log-Forwarder-Firehose-Metric-Streaming
88
Description: Send log data from AWS to New Relic.
99
Author: New Relic
1010
SpdxLicenseId: Apache-2.0
1111
LicenseUrl: LICENSE.txt
1212
ReadmeUrl: README.md
13-
HomePageUrl: https://github.com/newrelic/aws-unified-firehose-logging # TODO update this when the repo is public.
14-
SemanticVersion: 0.0.17
15-
SourceCodeUrl: https://github.com/newrelic/aws-unified-firehose-logging # TODO update this when the repo is public.
13+
HomePageUrl: https://github.com/newrelic/aws-unified-logging
14+
SemanticVersion: 1.1.1
15+
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging
1616
AWS::CloudFormation::Interface:
1717
ParameterGroups:
1818
-

‎logging-lambda-firehose-metric-polling.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Description: New Relic Template to forward logs using firehose/S3 bucket and met
44

55
Metadata:
66
AWS::ServerlessRepo::Application:
7-
Name: NewRelic-log-forwarding
7+
Name: NewRelic-Log-Forwarder-Lambda-Firehose-Metric-Polling
88
Description: Send log data from AWS to New Relic.
99
Author: New Relic
1010
SpdxLicenseId: Apache-2.0
1111
LicenseUrl: LICENSE.txt
1212
ReadmeUrl: README.md
13-
HomePageUrl: https://github.com/newrelic/aws-unified-logging #TODO change this url once the repo is public
14-
SemanticVersion: 0.0.17
15-
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging #TODO change this url once the repo is public
13+
HomePageUrl: https://github.com/newrelic/aws-unified-logging
14+
SemanticVersion: 1.1.1
15+
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging
1616
AWS::CloudFormation::Interface:
1717
ParameterGroups:
1818
-

0 commit comments

Comments
 (0)