Add E2E EC2 Release Testing for Main Build #713

harrryr · 2024-01-12T18:40:21Z

Issue #, if available:
EC2 artifacts are currently not covered with E2E testing

Description of changes:
Add E2E testing for EC2 artifacts

Note: Will need to merge at same time as aws/amazon-cloudwatch-agent#1002 due to terraform code change.

Test run:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

srprash · 2024-01-12T22:11:02Z

.github/workflows/main-build.yml

+  # AppSignals specific e2e tests for ec2
+  appsignals-e2e-ec2-test:
+    needs: build
+    uses: ./.github/workflows/appsignals-e2e-eks-test.yml


Suggested change

uses: ./.github/workflows/appsignals-e2e-eks-test.yml

uses: ./.github/workflows/appsignals-e2e-ec2-test.yml

srprash · 2024-01-12T22:13:37Z

.github/workflows/main-build.yml

+    uses: ./.github/workflows/appsignals-e2e-eks-test.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ needs.build.outputs.aws_default_region }}


Why don't we use this for consistency?

Suggested change

aws-region: ${{ needs.build.outputs.aws_default_region }}

aws-region: ${{ needs.default-region-output.outputs.aws_default_region }}

Will also need dependency on the default-region-output step.

srprash · 2024-01-12T22:16:52Z

.github/workflows/main-build.yml

+    with:
+      aws-region: ${{ needs.build.outputs.aws_default_region }}
+      caller-workflow-name: 'main-build'
+
  publish-build-status:


Curious as to why do we need to publish status metric for the main build? Are we monitoring this metric somewhere?

I'm not too sure. The e2e-eks testing is publishing the status so I did the same for ec2

The overall main build is owned by ADOT team, this metric is designed and owned by them.

srprash · 2024-01-12T22:21:10Z

.github/workflows/appsignals-e2e-ec2-test.yml

+
+      - name: Upload main-build adot.jar to s3
+        if: ${{ inputs.caller-workflow-name }} == 'main-build'
+        run: aws s3 cp ./aws-opentelemetry-agent.jar/aws-opentelemetry-agent-0.1.0-SNAPSHOT.jar s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar


Is this correct? The aws-opentelemetry-agent-0.1.0-SNAPSHOT.jar is within the aws-opentelemetry-agent.jar?

It was when I was downloading all the artifacts, but I changed it to only download the aws-opentelmetry-agent.jar, so not true anymore.

Updated the code and also made the 0.1.0 into *

srprash · 2024-01-12T22:22:34Z

.github/workflows/appsignals-e2e-ec2-test.yml

+        working-directory: testing/terraform/ec2
+        run: |
+          old_command='"wget -O adot.jar ${var.adot_jar}",'
+          new_command='"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",'


Suggested change

new_command='"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",'

new_command='"aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar",'

srprash · 2024-01-12T22:23:19Z

.github/workflows/appsignals-e2e-ec2-test.yml

+          new_command='"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",'
+          sed -i "s|$old_command|$new_command|" "main.tf"
+
+          if grep -Fq '"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",' main.tf; then


Suggested change

if grep -Fq '"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",' main.tf; then

if grep -Fq '"aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar",' main.tf; then

srprash · 2024-01-12T22:24:41Z

Can you also link to a sample test run with these changes?

bryan-aguilar · 2024-01-12T22:52:49Z

.github/workflows/appsignals-e2e-ec2-test.yml

          old_command='"wget -O adot.jar ${var.adot_jar}",'
-          new_command='"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",'
+          new_command='"aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar",'
          sed -i "s|$old_command|$new_command|" "main.tf"

-          if grep -Fq '"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",' main.tf; then
+          if grep -Fq '"aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar",' main.tf; then


Is just making changes within a terraform file? Can a terraform variable be used instead?

Do you mean input as a terraform variable for s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar?
I'm replacing the entire line because this piece of code is for only testing staging images. I could put s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar as a github env variable instead?

Use a variable here. Set the variable to be the command you want to run. I don't think you need to use command line here.

I think that could work

codecov-commenter · 2024-01-12T23:18:53Z

Codecov Report

Attention: 102 lines in your changes are missing coverage. Please review.

Comparison is base (09e6487) 85.71% compared to head (9439dec) 50.73%.
Report is 231 commits behind head on main.

Files	Patch %	Lines
...ent/providers/AwsAppSignalsCustomizerProvider.java	24.00%	35 Missing and 3 partials ⚠️
...gent/providers/AwsSpanMetricsProcessorBuilder.java	0.00%	20 Missing ⚠️
...ders/AttributePropagatingSpanProcessorBuilder.java	0.00%	16 Missing ⚠️
...viders/AwsMetricAttributesSpanExporterBuilder.java	0.00%	11 Missing ⚠️
...try/javaagent/providers/AwsSpanProcessingUtil.java	90.16%	1 Missing and 5 partials ⚠️
...vaagent/providers/AwsMetricAttributeGenerator.java	96.89%	2 Missing and 3 partials ⚠️
...y/javaagent/providers/AwsSpanMetricsProcessor.java	91.48%	0 Missing and 4 partials ⚠️
...t/providers/AttributePropagatingSpanProcessor.java	94.59%	2 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@              Coverage Diff              @@
##               main     #713       +/-   ##
=============================================
- Coverage     85.71%   50.73%   -34.99%     
- Complexity       19      264      +245     
=============================================
  Files             3       39       +36     
  Lines            49     1301     +1252     
  Branches          5      141      +136     
=============================================
+ Hits             42      660      +618     
- Misses            3      609      +606     
- Partials          4       32       +28

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bryan-aguilar · 2024-01-13T00:55:55Z

.github/workflows/appsignals-e2e-ec2-test.yml

+        working-directory: testing/terraform/ec2
+        run: |
+          if [ ${{ inputs.caller-workflow-name }} == 'main-build' ]; then
+            echo APP_SIGNALS_GET_ADOT_JAR="aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV


Suggested change

echo APP_SIGNALS_GET_ADOT_JAR="aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV

echo TF_VAR_get_adot_jar="aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV

You can simplify this code more by using env vars. Terraform will pick this up automatically and you will not need to pass it in directly. This is up to you though, because using env vars to set TF variables can make it a bit more difficult to understand when and where the var is being set.

majanjua-amzn

LGTM, just rename the variables for clarity.

majanjua-amzn · 2024-01-15T17:41:04Z

.github/workflows/main-build.yml

+    with:
+      aws-region: ${{ needs.build.outputs.aws_default_region }}
+      caller-workflow-name: 'main-build'
+
  publish-build-status:


The overall main build is owned by ADOT team, this metric is designed and owned by them.

majanjua-amzn · 2024-01-15T17:42:14Z

testing/terraform/ec2/variables.tf

@@ -33,10 +33,10 @@ variable "sample_remote_app_jar" {
  default = "s3://<bucket-name>/<jar>"
 }

-variable "cw_agent_rpm" {
-  default = "s3://<bucket-name>/<jar>"
+variable "get_cw_agent_rpm" {


Should clarify that this is a command in the variable name itself

Suggested change

variable "get_cw_agent_rpm" {

variable "get_cw_agent_rpm_command" {

majanjua-amzn · 2024-01-15T17:42:26Z

testing/terraform/ec2/variables.tf

 }

-variable "adot_jar" {
-  default = "s3://<bucket-name>/<jar>"
+variable "get_adot_jar" {


Same here

Suggested change

variable "get_adot_jar" {

variable "get_adot_jar_command" {

majanjua-amzn · 2024-01-15T18:14:26Z

.github/workflows/appsignals-e2e-ec2-test.yml

@@ -43,11 +42,10 @@ jobs:
      - name: Set CW Agent RPM environment variable
        run: |
          if [ ${{ env.AWS_DEFAULT_REGION }} == "us-east-1" ]; then
-            echo APP_SIGNALS_CW_AGENT_RPM="https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV
+            echo APP_SIGNALS_GET_CW_AGENT_RPM="wget -O cw-agent.rpm https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV


Suggested change

echo APP_SIGNALS_GET_CW_AGENT_RPM="wget -O cw-agent.rpm https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV

echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV

majanjua-amzn · 2024-01-15T18:14:40Z

.github/workflows/appsignals-e2e-ec2-test.yml

          else
-            echo APP_SIGNALS_CW_AGENT_RPM="https://amazoncloudwatch-agent-${{ env.AWS_DEFAULT_REGION }}.s3.${{ env.AWS_DEFAULT_REGION }}.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV
+            echo APP_SIGNALS_GET_CW_AGENT_RPM="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ env.AWS_DEFAULT_REGION }}.s3.${{ env.AWS_DEFAULT_REGION }}.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV


Suggested change

echo APP_SIGNALS_GET_CW_AGENT_RPM="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ env.AWS_DEFAULT_REGION }}.s3.${{ env.AWS_DEFAULT_REGION }}.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV

echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ env.AWS_DEFAULT_REGION }}.s3.${{ env.AWS_DEFAULT_REGION }}.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV

majanjua-amzn

LGTM, let's make sure we merge the CW Agent PR quickly after this so that the release test is not not functional for too long

* Add E2E EC2 Release Testing for Main Build * Fix changes based on PR * Change Terraform variable * Update variable name * Edit if statement for main build --------- Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com>

* E2E Testing: Add failure in waiting for pods to retry mechanism (#659) * Revert "E2E Testing: Add failure in waiting for pods to retry mechanism (#659)" (#661) This reverts commit a5f5565. * Bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Feat: add support to releasing to private ECR (#633) * Removing patch dependencies scope restriction to release branch only (#670) Removing patches scope restriction to release branch * Updating patch file path and Excluding windows-built for patch build * Add patch dependencies and publish to maven local (#677) Add patch dependencies and publish to maven local for appsignals tests for canaries * nightly-build workfow update (#627) nightly-build-update seprarte out contract tests and timestamp * Adding missing symbols (#679) * Fixing main build failure (#680) * Updating workflows * Do not sign patched artifacts at PR time (#691) * Do not sign patched artifacts at PR time * Fix dir structure * Just don't provide keys to the workflow * Set env vars conditionally * Double quote * Use truthy statement instead * Use env vars to avoid inject attacks * Delete unncessary workflow * Use doublequote for substitution * Bump rust from 1.74 to 1.75 Bumps rust from 1.74 to 1.75. --- updated-dependencies: - dependency-name: rust dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump tempfile from 3.8.1 to 3.9.0 in /tools/cp-utility Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.1 to 3.9.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](Stebalien/tempfile@v3.8.1...v3.9.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump org.apache.logging.log4j:log4j-core from 2.20.0 to 2.22.1 Bumps org.apache.logging.log4j:log4j-core from 2.20.0 to 2.22.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump com.linecorp.armeria:armeria-bom from 1.26.3 to 1.26.4 Bumps [com.linecorp.armeria:armeria-bom](https://github.com/line/armeria) from 1.26.3 to 1.26.4. - [Release notes](https://github.com/line/armeria/releases) - [Changelog](https://github.com/line/armeria/blob/main/.post-release-msg) - [Commits](line/armeria@armeria-1.26.3...armeria-1.26.4) --- updated-dependencies: - dependency-name: com.linecorp.armeria:armeria-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump org.mockito:mockito-junit-jupiter from 5.3.1 to 5.8.0 Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 5.3.1 to 5.8.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.3.1...v5.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Changing from workflow to action (#694) Change from workflow to action * Dry run validator before pull request (#690) * Create test_validator * Rename test_validator to test_validator.yml * Update appsignals-e2e-ec2-test.yml * Update appsignals-e2e-ec2-canary-test.yml * Update appsignals-e2e-eks-canary-test.yml * add option to allow validator dry run compile * allow test validator dry run * allow test validator dry run * allow test validator dry run * allow test validator dry run * allow test validator dry run * allow test validator dry run * Allow PR-build test to test validator success to build * Revert change in E2E Test * Revert unneeded change * Revert unneeded change * Use Gradle-Build-Action instead of run command * delete unneeded indent * delete unneeded indent * delete unneeded indent * Handle multi-line strings (#700) * Use input rather than secret (#702) * Fix usage of input variable in workflows (#703) * remove unncessary build output * Fix region in app signal e2e workflow * Fix incorrect usage of env var * fix nightly build wf also * Build patched artifacts in codeql workflow (#701) * Build patched artifacts in codeql workflow * Add cache check * Set default region as build output (#704) * Set output for default region * Update the rest of the workflows * reorder init (#705) * add outputs context (#706) * Reinsert aws default region env var (#708) * Reinsert aws default region env var * Use explicit job for setting env var output * Fix tab spacing * revert region changes to app signal wfs * revert 703 changes fully * Build before publishing in e2e operator tests (#710) * Build before publishing * Add sample app build as dependency * Bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.10.1 (#695) Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.2...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/stale from 8 to 9 (#638) Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.google.guava:guava-bom from 32.1.3-jre to 33.0.0-jre (#696) Bumps [com.google.guava:guava-bom](https://github.com/google/guava) from 32.1.3-jre to 33.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava-bom dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.kafka:kafka-clients from 3.6.0 to 3.6.1 (#698) Bumps org.apache.kafka:kafka-clients from 3.6.0 to 3.6.1. --- updated-dependencies: - dependency-name: org.apache.kafka:kafka-clients dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-java from 3 to 4 (#681) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Change terraform to use minimal ami (#712) * Change terraform to use minimal ami * Combine wget and java11 installation --------- Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> * Add Documentation for Testing E2E Resource Changes (#709) * Add documentation for testing E2E resource changes, download enablement script from public repo * Additional changes to the README.md * Change back whitespace * Remove secret and run test on the canary * Add extra note to EKS cluster setup * Remove Internal Reference --------- Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> * Add E2E EC2 Release Testing for Main Build (#713) * Add E2E EC2 Release Testing for Main Build * Fix changes based on PR * Change Terraform variable * Update variable name * Edit if statement for main build --------- Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> * Bump actions/setup-go from 4 to 5 (#639) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix typos (#730) A few small fixes, no functional changes. * Update README.md (#743) * Remote target (#745) * Setting SQS remote target to ARN * Adding remote target for the other services * Ran spotless * Adding more tests * Adding more tests * Addressing PR * Fixing contract tests * Fixing PR * Rename AppSignals configs with backward compatibility (#744) * Rename AppSignals configs with backwards compatibility * update config name in contract tests * fixing related javadoc * Updated generateRemoteService to parse HTTP_URL as last resort (#750) * Updated generateRemoteService to parse HTTP_URL as last resort * fixed violations * updated comments * applied comments * Support AppSignals metrics transport protocol configuration (#752) * Support AppSignals metrics transport protocol configuration * rename SMP to AppSignals * rename Span Metrics to AppSignals * run gradlew :awsagentprovider:spotlessApply * Parse db.statement attribute for database instrumentation (#755) * Parse db.statement attribute for database instrumentation * reverted file change * fixed tests * fixed formating * applied comments * fixed ordering * Bump gradle/gradle-build-action from 2 to 3 (#732) Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2 to 3. - [Release notes](https://github.com/gradle/gradle-build-action/releases) - [Commits](gradle/gradle-build-action@v2...v3) --- updated-dependencies: - dependency-name: gradle/gradle-build-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * prefix AWS.SDK to the RemoteService from v1 (#756) * Update RemoteTarget Value to ::s3:::e2e-test-bucket-name for aws-sdk-call on E2E EC2 Tests (#757) Co-authored-by: Harry Ryu <khryu999@gmail.com> * update the remote target for eks e2e validations (#758) * Add `RPC_SYSTEM` testing to AWS SDK contract tests (#760) Followup contract test improvement following from #756 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Mahad Janjua <134644284+majanjua-amzn@users.noreply.github.com> Co-authored-by: Mengyi Zhou (bjrara) <zmengyi@amazon.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com> Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com> Co-authored-by: Paurush Garg <paurushg@amazon.com> Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Co-authored-by: XinRan Zhang <xinranzh@amazon.com> Co-authored-by: Harry <harryryu@amazon.com> Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> Co-authored-by: Thomas Pierce <thp@amazon.com> Co-authored-by: atshaw43 <108552302+atshaw43@users.noreply.github.com> Co-authored-by: Prashant Srivastava <50466688+srprash@users.noreply.github.com> Co-authored-by: Mohamed Asaker <asakermohamad471@icloud.com> Co-authored-by: Lei Wang <66336933+wangzlei@users.noreply.github.com> Co-authored-by: Harry Ryu <khryu999@gmail.com>

* Update Dependency to 1.32.1 and remove patch (#749) * [release/v1.32.x] Add commits from main branch (#761) * E2E Testing: Add failure in waiting for pods to retry mechanism (#659) * Revert "E2E Testing: Add failure in waiting for pods to retry mechanism (#659)" (#661) This reverts commit a5f5565. * Bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Feat: add support to releasing to private ECR (#633) * Removing patch dependencies scope restriction to release branch only (#670) Removing patches scope restriction to release branch * Updating patch file path and Excluding windows-built for patch build * Add patch dependencies and publish to maven local (#677) Add patch dependencies and publish to maven local for appsignals tests for canaries * nightly-build workfow update (#627) nightly-build-update seprarte out contract tests and timestamp * Adding missing symbols (#679) * Fixing main build failure (#680) * Updating workflows * Do not sign patched artifacts at PR time (#691) * Do not sign patched artifacts at PR time * Fix dir structure * Just don't provide keys to the workflow * Set env vars conditionally * Double quote * Use truthy statement instead * Use env vars to avoid inject attacks * Delete unncessary workflow * Use doublequote for substitution * Bump rust from 1.74 to 1.75 Bumps rust from 1.74 to 1.75. --- updated-dependencies: - dependency-name: rust dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump tempfile from 3.8.1 to 3.9.0 in /tools/cp-utility Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.1 to 3.9.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](Stebalien/tempfile@v3.8.1...v3.9.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump org.apache.logging.log4j:log4j-core from 2.20.0 to 2.22.1 Bumps org.apache.logging.log4j:log4j-core from 2.20.0 to 2.22.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump com.linecorp.armeria:armeria-bom from 1.26.3 to 1.26.4 Bumps [com.linecorp.armeria:armeria-bom](https://github.com/line/armeria) from 1.26.3 to 1.26.4. - [Release notes](https://github.com/line/armeria/releases) - [Changelog](https://github.com/line/armeria/blob/main/.post-release-msg) - [Commits](line/armeria@armeria-1.26.3...armeria-1.26.4) --- updated-dependencies: - dependency-name: com.linecorp.armeria:armeria-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump org.mockito:mockito-junit-jupiter from 5.3.1 to 5.8.0 Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 5.3.1 to 5.8.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.3.1...v5.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Changing from workflow to action (#694) Change from workflow to action * Dry run validator before pull request (#690) * Create test_validator * Rename test_validator to test_validator.yml * Update appsignals-e2e-ec2-test.yml * Update appsignals-e2e-ec2-canary-test.yml * Update appsignals-e2e-eks-canary-test.yml * add option to allow validator dry run compile * allow test validator dry run * allow test validator dry run * allow test validator dry run * allow test validator dry run * allow test validator dry run * allow test validator dry run * Allow PR-build test to test validator success to build * Revert change in E2E Test * Revert unneeded change * Revert unneeded change * Use Gradle-Build-Action instead of run command * delete unneeded indent * delete unneeded indent * delete unneeded indent * Handle multi-line strings (#700) * Use input rather than secret (#702) * Fix usage of input variable in workflows (#703) * remove unncessary build output * Fix region in app signal e2e workflow * Fix incorrect usage of env var * fix nightly build wf also * Build patched artifacts in codeql workflow (#701) * Build patched artifacts in codeql workflow * Add cache check * Set default region as build output (#704) * Set output for default region * Update the rest of the workflows * reorder init (#705) * add outputs context (#706) * Reinsert aws default region env var (#708) * Reinsert aws default region env var * Use explicit job for setting env var output * Fix tab spacing * revert region changes to app signal wfs * revert 703 changes fully * Build before publishing in e2e operator tests (#710) * Build before publishing * Add sample app build as dependency * Bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.10.1 (#695) Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.2...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/stale from 8 to 9 (#638) Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.google.guava:guava-bom from 32.1.3-jre to 33.0.0-jre (#696) Bumps [com.google.guava:guava-bom](https://github.com/google/guava) from 32.1.3-jre to 33.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava-bom dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.kafka:kafka-clients from 3.6.0 to 3.6.1 (#698) Bumps org.apache.kafka:kafka-clients from 3.6.0 to 3.6.1. --- updated-dependencies: - dependency-name: org.apache.kafka:kafka-clients dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-java from 3 to 4 (#681) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Change terraform to use minimal ami (#712) * Change terraform to use minimal ami * Combine wget and java11 installation --------- Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> * Add Documentation for Testing E2E Resource Changes (#709) * Add documentation for testing E2E resource changes, download enablement script from public repo * Additional changes to the README.md * Change back whitespace * Remove secret and run test on the canary * Add extra note to EKS cluster setup * Remove Internal Reference --------- Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> * Add E2E EC2 Release Testing for Main Build (#713) * Add E2E EC2 Release Testing for Main Build * Fix changes based on PR * Change Terraform variable * Update variable name * Edit if statement for main build --------- Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> * Bump actions/setup-go from 4 to 5 (#639) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix typos (#730) A few small fixes, no functional changes. * Update README.md (#743) * Remote target (#745) * Setting SQS remote target to ARN * Adding remote target for the other services * Ran spotless * Adding more tests * Adding more tests * Addressing PR * Fixing contract tests * Fixing PR * Rename AppSignals configs with backward compatibility (#744) * Rename AppSignals configs with backwards compatibility * update config name in contract tests * fixing related javadoc * Updated generateRemoteService to parse HTTP_URL as last resort (#750) * Updated generateRemoteService to parse HTTP_URL as last resort * fixed violations * updated comments * applied comments * Support AppSignals metrics transport protocol configuration (#752) * Support AppSignals metrics transport protocol configuration * rename SMP to AppSignals * rename Span Metrics to AppSignals * run gradlew :awsagentprovider:spotlessApply * Parse db.statement attribute for database instrumentation (#755) * Parse db.statement attribute for database instrumentation * reverted file change * fixed tests * fixed formating * applied comments * fixed ordering * Bump gradle/gradle-build-action from 2 to 3 (#732) Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2 to 3. - [Release notes](https://github.com/gradle/gradle-build-action/releases) - [Commits](gradle/gradle-build-action@v2...v3) --- updated-dependencies: - dependency-name: gradle/gradle-build-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * prefix AWS.SDK to the RemoteService from v1 (#756) * Update RemoteTarget Value to ::s3:::e2e-test-bucket-name for aws-sdk-call on E2E EC2 Tests (#757) Co-authored-by: Harry Ryu <khryu999@gmail.com> * update the remote target for eks e2e validations (#758) * Add `RPC_SYSTEM` testing to AWS SDK contract tests (#760) Followup contract test improvement following from #756 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Mahad Janjua <134644284+majanjua-amzn@users.noreply.github.com> Co-authored-by: Mengyi Zhou (bjrara) <zmengyi@amazon.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com> Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com> Co-authored-by: Paurush Garg <paurushg@amazon.com> Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Co-authored-by: XinRan Zhang <xinranzh@amazon.com> Co-authored-by: Harry <harryryu@amazon.com> Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> Co-authored-by: Thomas Pierce <thp@amazon.com> Co-authored-by: atshaw43 <108552302+atshaw43@users.noreply.github.com> Co-authored-by: Prashant Srivastava <50466688+srprash@users.noreply.github.com> Co-authored-by: Mohamed Asaker <asakermohamad471@icloud.com> Co-authored-by: Lei Wang <66336933+wangzlei@users.noreply.github.com> Co-authored-by: Harry Ryu <khryu999@gmail.com> * Prepare for release 1.32.1 - Update licenses (#766) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Mahad Janjua <134644284+majanjua-amzn@users.noreply.github.com> Co-authored-by: Mengyi Zhou (bjrara) <zmengyi@amazon.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com> Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com> Co-authored-by: Paurush Garg <paurushg@amazon.com> Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Co-authored-by: XinRan Zhang <xinranzh@amazon.com> Co-authored-by: Harry <harryryu@amazon.com> Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com> Co-authored-by: Thomas Pierce <thp@amazon.com> Co-authored-by: atshaw43 <108552302+atshaw43@users.noreply.github.com> Co-authored-by: Prashant Srivastava <50466688+srprash@users.noreply.github.com> Co-authored-by: Mohamed Asaker <asakermohamad471@icloud.com> Co-authored-by: Lei Wang <66336933+wangzlei@users.noreply.github.com> Co-authored-by: Harry Ryu <khryu999@gmail.com>

harrryr requested a review from a team as a code owner January 12, 2024 18:40

harrryr force-pushed the add-release-testing-for-adot-e2e-ec2 branch from 013ee9e to 7d97db8 Compare January 12, 2024 21:29

srprash reviewed Jan 12, 2024

View reviewed changes

Add E2E EC2 Release Testing for Main Build

f63134e

harrryr force-pushed the add-release-testing-for-adot-e2e-ec2 branch from 7d97db8 to f63134e Compare January 12, 2024 22:45

Fix changes based on PR

99e907a

bryan-aguilar reviewed Jan 12, 2024

View reviewed changes

harrryr requested a review from srprash January 12, 2024 23:09

harrryr force-pushed the add-release-testing-for-adot-e2e-ec2 branch from 6c07f4c to 3a82681 Compare January 13, 2024 00:01

Change Terraform variable

5dba03a

harrryr force-pushed the add-release-testing-for-adot-e2e-ec2 branch from 3a82681 to 5dba03a Compare January 13, 2024 00:50

bryan-aguilar reviewed Jan 13, 2024

View reviewed changes

majanjua-amzn reviewed Jan 15, 2024

View reviewed changes

harrryr force-pushed the add-release-testing-for-adot-e2e-ec2 branch from 431585e to f89fcfc Compare January 15, 2024 23:19

Update variable name

207e4ca

harrryr force-pushed the add-release-testing-for-adot-e2e-ec2 branch from f89fcfc to 207e4ca Compare January 15, 2024 23:20

majanjua-amzn approved these changes Jan 15, 2024

View reviewed changes

harrryr and others added 2 commits January 17, 2024 10:45

Merge branch 'main' into add-release-testing-for-adot-e2e-ec2

1492045

Edit if statement for main build

9439dec

harrryr force-pushed the add-release-testing-for-adot-e2e-ec2 branch from 5ecf505 to 9439dec Compare January 17, 2024 19:36

bryan-aguilar approved these changes Jan 18, 2024

View reviewed changes

bryan-aguilar merged commit 4be6798 into aws-observability:main Jan 18, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add E2E EC2 Release Testing for Main Build #713

Add E2E EC2 Release Testing for Main Build #713

harrryr commented Jan 12, 2024 •

edited

Loading

srprash Jan 12, 2024

srprash Jan 12, 2024

srprash Jan 12, 2024

srprash Jan 12, 2024

harrryr Jan 12, 2024

majanjua-amzn Jan 15, 2024

srprash Jan 12, 2024

harrryr Jan 12, 2024

srprash Jan 12, 2024

srprash Jan 12, 2024

srprash commented Jan 12, 2024

bryan-aguilar Jan 12, 2024

harrryr Jan 12, 2024

bryan-aguilar Jan 12, 2024

bryan-aguilar Jan 12, 2024

harrryr Jan 13, 2024

codecov-commenter commented Jan 12, 2024 •

edited

Loading

bryan-aguilar Jan 13, 2024

majanjua-amzn left a comment

majanjua-amzn Jan 15, 2024

majanjua-amzn Jan 15, 2024

harrryr Jan 15, 2024

majanjua-amzn Jan 15, 2024

harrryr Jan 15, 2024

majanjua-amzn Jan 15, 2024

harrryr Jan 15, 2024

majanjua-amzn Jan 15, 2024

harrryr Jan 15, 2024

majanjua-amzn left a comment

	uses: ./.github/workflows/appsignals-e2e-eks-test.yml
	uses: ./.github/workflows/appsignals-e2e-ec2-test.yml

	aws-region: ${{ needs.build.outputs.aws_default_region }}
	aws-region: ${{ needs.default-region-output.outputs.aws_default_region }}

	new_command='"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",'
	new_command='"aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar",'

	if grep -Fq '"aws s3 cp s3://main-build-adot-jar/aws-opentelemetry-agent.jar ./adot.jar",' main.tf; then
	if grep -Fq '"aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar",' main.tf; then

	echo APP_SIGNALS_GET_ADOT_JAR="aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV
	echo TF_VAR_get_adot_jar="aws s3 cp s3://main-build-adot-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV

	variable "get_cw_agent_rpm" {
	variable "get_cw_agent_rpm_command" {

	echo APP_SIGNALS_GET_CW_AGENT_RPM="wget -O cw-agent.rpm https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV
	echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-us-east-1.s3.amazonaws.com/amazon_linux/amd64/1.300031.0b313/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV

Add E2E EC2 Release Testing for Main Build #713

Add E2E EC2 Release Testing for Main Build #713

Conversation

harrryr commented Jan 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

srprash commented Jan 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-commenter commented Jan 12, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

majanjua-amzn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

majanjua-amzn left a comment

Choose a reason for hiding this comment

harrryr commented Jan 12, 2024 •

edited

Loading

codecov-commenter commented Jan 12, 2024 •

edited

Loading