Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/v1.32.x to main #767

Merged
merged 4 commits into from
Feb 28, 2024

Conversation

vasireddy99
Copy link
Contributor

Description of changes:
Merge release branch to main branch

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

vasireddy99 and others added 4 commits February 15, 2024 12:46
* E2E Testing: Add failure in waiting for pods to retry mechanism (aws-observability#659)

* Revert "E2E Testing: Add failure in waiting for pods to retry mechanism (aws-observability#659)" (aws-observability#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 (aws-observability#633)

* Removing patch dependencies scope restriction to release branch only (aws-observability#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 (aws-observability#677)

Add patch dependencies and publish to maven local for appsignals tests for canaries

* nightly-build workfow update (aws-observability#627)

nightly-build-update seprarte out contract tests and timestamp

* Adding missing symbols (aws-observability#679)

* Fixing main build failure (aws-observability#680)

* Updating workflows

* Do not sign patched artifacts at PR time (aws-observability#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 (aws-observability#694)

Change from workflow to action

* Dry run validator before pull request (aws-observability#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 (aws-observability#700)

* Use input rather than secret (aws-observability#702)

* Fix usage of input variable in workflows (aws-observability#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 (aws-observability#701)

* Build patched artifacts in codeql workflow

* Add cache check

* Set default region as build output (aws-observability#704)

* Set output for default region

* Update the rest of the workflows

* reorder init (aws-observability#705)

* add outputs context (aws-observability#706)

* Reinsert aws default region env var (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#730)

A few small fixes, no functional changes.

* Update README.md (aws-observability#743)

* Remote target (aws-observability#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 (aws-observability#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 (aws-observability#750)

* Updated generateRemoteService to parse HTTP_URL as last resort

* fixed violations

* updated comments

* applied comments

* Support AppSignals metrics transport protocol configuration (aws-observability#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 (aws-observability#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 (aws-observability#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 (aws-observability#756)

* Update RemoteTarget Value to ::s3:::e2e-test-bucket-name for aws-sdk-call on E2E EC2 Tests (aws-observability#757)

Co-authored-by: Harry Ryu <khryu999@gmail.com>

* update the remote target for eks e2e validations (aws-observability#758)

* Add `RPC_SYSTEM` testing to AWS SDK contract tests (aws-observability#760)

Followup contract test improvement following from aws-observability#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>
@vasireddy99 vasireddy99 requested a review from a team as a code owner February 28, 2024 00:15
@vasireddy99 vasireddy99 merged commit 93870a5 into aws-observability:main Feb 28, 2024
4 checks passed
@vasireddy99 vasireddy99 deleted the mergeMain branch February 28, 2024 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants