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.

Sign up for GitHub

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 main to release/v1.32.x #658

Merged
merged 21 commits into from
Dec 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9d3b384
E2E Test: Ensure the use of IMDSv2 in EC2 instances (#621)
majanjua-amzn Nov 29, 2023
9747047
Add e2e canary to public preview regions (#623)
harrryr Nov 30, 2023
b082f92
Fix trace validation error follow up fix (#626)
harrryr Dec 1, 2023
71ef73a
Fix Terrform Destroy Error on EKS Canary (#628)
harrryr Dec 6, 2023
704649f
Bump nebula.release from 17.2.2 to 18.0.6 (#631)
dependabot[bot] Dec 11, 2023
d8c0309
Bump actions/setup-java from 3 to 4 (#629)
dependabot[bot] Dec 11, 2023
0785750
Bump hashicorp/setup-terraform from 2 to 3 (#586)
dependabot[bot] Dec 11, 2023
5da2685
Bump rust from 1.73 to 1.74 (#611)
dependabot[bot] Dec 11, 2023
e54c318
Bump actions/setup-node from 3 to 4 (#574)
dependabot[bot] Dec 11, 2023
2beb66c
Bump tempfile from 3.8.0 to 3.8.1 in /tools/cp-utility (#585)
dependabot[bot] Dec 11, 2023
44b5b68
Provide aws-region for the e2e test in worklow (#643)
vasireddy99 Dec 12, 2023
82d921b
Revert "Provide aws-region for the e2e test in worklow (#643)" (#645)
vasireddy99 Dec 13, 2023
f0c9fe8
E2E Testing: Add concurrency tag to test in main build and nightly bu…
majanjua-amzn Dec 13, 2023
4f21215
Use aws-region in the workflow (#649)
vasireddy99 Dec 13, 2023
6a85d5f
Add Retry Mechanism to E2E EKS Terraform Deployment (#634)
harrryr Dec 13, 2023
efb16c6
Dynamic input RPM link by region setting (#647)
XinRanZhAWS Dec 13, 2023
5d7feed
Add Retry Mechanism to E2E EC2 Terraform Deployment (#635)
harrryr Dec 14, 2023
dd90422
Change App Signals Directory (#650)
harrryr Dec 14, 2023
d6289cc
change dep config to compileOnly to fix high cardinality metrics (#651)
bjrara Dec 14, 2023
f5fc3b3
E2E Testing: Fix EKS test candidate image override (#652)
majanjua-amzn Dec 15, 2023
d89c243
Merge branch main
PaurushGarg Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump actions/setup-java from 3 to 4 (#629) 
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>
  • Loading branch information
@dependabot
dependabot[bot] authored Dec 11, 2023
commit d8c0309785fe26a0e26a7bbeefdc8b93ecf00a22
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-smoke-tests-fake-backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
if: ${{ startsWith(github.ref_name, 'release/v') }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
path: aws-otel-java-instrumentation

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down Expand Up @@ -371,7 +371,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down Expand Up @@ -402,7 +402,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down Expand Up @@ -433,7 +433,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-upstream-snapshot-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/owasp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand All @@ -38,7 +38,7 @@ jobs:
with:
repository: "open-telemetry/opentelemetry-java-instrumentation"
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/patch-release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
with:
ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }}

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
Expand Down