Rename AppSignals configs with backward compatibility #744

srprash · 2024-02-09T00:22:22Z

Description of changes:
SMP is just a component of Application Signals, so it makes sense that we appropriately name the config that controls the Application Signals.

Also, http://cloudwatch-agent.amazon-cloudwatch:4317 as default exporter endpoint doesn't really work since it points to CW pod in EKS environment. Plus 4317 is also wrong as we have switched to 4315 for AppSignals.

Testing
Tested without and with updating the environment variables in contract tests to ensure the change is backward compatible.

Test run with SMP config: https://github.com/srprash/aws-otel-java-instrumentation/actions/runs/7836933969/job/21386408375?pr=1
Test run with AppSignal config: https://github.com/srprash/aws-otel-java-instrumentation/actions/runs/7837485201/job/21387233082?pr=1

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

codecov-commenter · 2024-02-09T00:56:58Z

Codecov Report

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

Comparison is base (09e6487) 85.71% compared to head (254f823) 50.72%.
Report is 235 commits behind head on main.

Files	Patch %	Lines
...ent/providers/AwsAppSignalsCustomizerProvider.java	25.00%	36 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     #744       +/-   ##
=============================================
- Coverage     85.71%   50.72%   -34.99%     
- Complexity       19      264      +245     
=============================================
  Files             3       39       +36     
  Lines            49     1303     +1254     
  Branches          5      141      +136     
=============================================
+ Hits             42      661      +619     
- Misses            3      610      +607     
- Partials          4       32       +28

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

thpierce

You missed ~~a few occurrences~~ fixed link.

Discussed offline - we will change the E2E tests once operator is updated.

thpierce · 2024-02-09T16:47:34Z

.../java/software/amazon/opentelemetry/javaagent/providers/AwsAppSignalsCustomizerProvider.java

@@ -63,7 +63,8 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
  }

  private boolean isSmpEnabled(ConfigProperties configProps) {
-    return configProps.getBoolean("otel.smp.enabled", false);
+    return configProps.getBoolean(
+        "otel.aws.app.signals.enabled", configProps.getBoolean("otel.smp.enabled", false));


Lets update the comment above AwsAppSignalsCustomizerProvider, too:

* <p>You can control when these customizations are applied using the property otel.smp.enabled or * the environment variable OTEL_SMP_ENABLED. This flag is enabled by default.

to

* <p>You can control when these customizations are applied using the property aws.app.signals,enabled or * the environment variable OTEL_AWS_APP_SIGNALS_ENABLED. This flag is enabled by default.

thpierce · 2024-02-09T16:55:34Z

.../java/software/amazon/opentelemetry/javaagent/providers/AwsAppSignalsCustomizerProvider.java

+              "otel.aws.app.signals.exporter.endpoint",
+              configProps.getString("otel.aws.smp.exporter.endpoint", "http://localhost:4315"));


Also, http://cloudwatch-agent.amazon-cloudwatch:4317 as default exporter endpoint doesn't really work since it points to CW pod in EKS environment.

I recall "cloudwatch-agent.amazon-cloudwatch" being an intentional decision. Can you elaborate more on why we want to switch to localhost? You say it doesn't work because "it points to CW pod in EKS environment." I'm not following the argument.

Plus 4317 is also wrong as we have switched to 4315 for AppSignals.

Can you provide a reference for this claim? Public docs/etc? Also this seems to be somewhat tied to HTTP/gRPC changes discussed in #728

IMO, it would be better to untangle these somewhat controversial changes from the (hopefully) not controversial change to property names.

Let me try to explain this in 2 parts:

The cloudwatch-agent.amazon-cloudwatch resolves to the CWAgent's K8s pod which is created by the CWOperator, which will also set the "OTEL_AWS_SMP_EXPORTER_ENDPOINT" environment variable. In this case, the default value will never be utilized. So, IMO the default value should be set as per the environments where the above environment needs to be set by users such as EC2, therefore using localhost makes more sense to me.

Since ports 4317 and 4318 are used by OTel, for AppSignals we use 4315 (grpc) and 4316 (http).

So the default address http://localhost:4315 is for users running CWAgent for AppSignals but maybe forgot to manually set the OTEL_AWS_SMP_EXPORTER_ENDPOINT config on their application.

Hm I see the argument. This aligns with public documentation which tells customers to manually set OTEL_AWS_SMP_EXPORTER_ENDPOINT to http://localhost:4315 (ECS instructions set to 127.0.0.1, which should resolve to the same thing?) while EKS instructions [1][2] does not reference this variable. Seems reasonable to me.

thpierce · 2024-02-09T18:51:38Z

.../java/software/amazon/opentelemetry/javaagent/providers/AwsAppSignalsCustomizerProvider.java

- * <p>You can control when these customizations are applied using the property otel.smp.enabled or
- * the environment variable OTEL_SMP_ENABLED. This flag is enabled by default.
+ * <p>You can control when these customizations are applied using the property otel.aws.app.signals.enabled or
+ * the environment variable OTEL_AWS_APP_SIGNALS_ENABLED. This flag is disabled by default.


Oh man I thought we fixed the "disabled by default" comment a long time ago... Good catch.

srprash · 2024-02-09T20:59:29Z

Contract test failed due to a timeout. https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/7848701629/job/21420410781?pr=744

@aws-observability/adot-sdk-maintainers Can you help re-run the workflow and also review the PR? TY!

We are renaming the SMP configs: `OTEL_SMP_ENABLED` -> `OTEL_AWS_APP_SIGNALS_ENABLED` `OTEL_AWS_SMP_EXPORTER_ENDPOINT` -> `OTEL_AWS_APP_SIGNALS_EXPORTER_ENDPOINT` Related PRs: aws-observability/aws-otel-java-instrumentation#744 aws/amazon-cloudwatch-agent-operator#84 By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

…ity#744) * Rename AppSignals configs with backwards compatibility * update config name in contract tests * fixing related javadoc

* 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>

srprash added 2 commits February 8, 2024 14:42

Rename AppSignals configs with backwards compatibility

74ecaf9

update config name in contract tests

dc8ac3e

srprash requested a review from a team as a code owner February 9, 2024 00:22

thpierce reviewed Feb 9, 2024

View reviewed changes

thpierce approved these changes Feb 9, 2024

View reviewed changes

fixing related javadoc

254f823

srprash force-pushed the rename-config branch from 85202a9 to 254f823 Compare February 9, 2024 19:27

srprash mentioned this pull request Feb 9, 2024

Update SMP config names to AppSignals with backward compatibility aws/amazon-cloudwatch-agent-operator#84

Merged

bryan-aguilar approved these changes Feb 13, 2024

View reviewed changes

bryan-aguilar merged commit 61460af into aws-observability:main Feb 13, 2024
4 checks passed

srprash mentioned this pull request Feb 15, 2024

Rename SMP config to AppSignals aws-observability/aws-otel-python-instrumentation#59

Merged

srprash deleted the rename-config branch October 23, 2024 00:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename AppSignals configs with backward compatibility #744

Rename AppSignals configs with backward compatibility #744

srprash commented Feb 9, 2024

codecov-commenter commented Feb 9, 2024 •

edited

Loading

thpierce left a comment •

edited

Loading

thpierce Feb 9, 2024

srprash Feb 9, 2024

thpierce Feb 9, 2024

srprash Feb 9, 2024

thpierce Feb 9, 2024 •

edited

Loading

thpierce Feb 9, 2024

srprash commented Feb 9, 2024

		"otel.aws.app.signals.exporter.endpoint",
		configProps.getString("otel.aws.smp.exporter.endpoint", "http://localhost:4315"));

Rename AppSignals configs with backward compatibility #744

Rename AppSignals configs with backward compatibility #744

Conversation

srprash commented Feb 9, 2024

codecov-commenter commented Feb 9, 2024 • edited Loading

Codecov Report

thpierce left a comment • edited Loading

Choose a reason for hiding this comment

thpierce Feb 9, 2024

Choose a reason for hiding this comment

srprash Feb 9, 2024

Choose a reason for hiding this comment

thpierce Feb 9, 2024

Choose a reason for hiding this comment

srprash Feb 9, 2024

Choose a reason for hiding this comment

thpierce Feb 9, 2024 • edited Loading

Choose a reason for hiding this comment

thpierce Feb 9, 2024

Choose a reason for hiding this comment

srprash commented Feb 9, 2024

codecov-commenter commented Feb 9, 2024 •

edited

Loading

thpierce left a comment •

edited

Loading

thpierce Feb 9, 2024 •

edited

Loading