From d69f1bf9df6fb01bea4c4770a3cb96781b8d5dc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:41:43 -0700 Subject: [PATCH 01/11] Bump sigstore/cosign-installer from 3.6.0 to 3.7.0 (#714) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/v3.6.0...dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/builder-release.yaml | 2 +- .github/workflows/builder-testbuild.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index b783ea8b..546a9f26 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -35,7 +35,7 @@ jobs: path: ".core" - name: Copy Dockerfile to Core Repo directory run: cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile - - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0 + - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4 - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index 2e04b15d..5b5d1e4f 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -38,7 +38,7 @@ jobs: path: ".core" - name: Copy Dockerfile to Core Repo directory run: cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile - - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0 + - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4 - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: From e2e1ec2797e86c7af755ad35004aae2ec1941c3b Mon Sep 17 00:00:00 2001 From: Adam Charrett <73886859+adcharre@users.noreply.github.com> Date: Tue, 29 Oct 2024 11:08:27 +0000 Subject: [PATCH 02/11] Add AWS S3 Receiver to contrib distribution (#698) Co-authored-by: Pablo Baeyens --- distributions/otelcol-contrib/manifest.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 19b61d09..178315aa 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -121,6 +121,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.112.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.112.0 From c106f40f892a11c55444ddcd95321a86f003abae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 12:04:00 +0100 Subject: [PATCH 03/11] Bump docker/setup-buildx-action from 3.6.1 to 3.7.1 (#713) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.6.1 to 3.7.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.6.1...c47758b77c9736f4b2ef4073d4d51994fabfe349) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- .github/workflows/builder-release.yaml | 2 +- .github/workflows/builder-testbuild.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 546a9f26..53b613c4 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -40,7 +40,7 @@ jobs: - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: platforms: amd64, arm64,ppc64le - - uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 + - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index 5b5d1e4f..1941d120 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -43,7 +43,7 @@ jobs: - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: platforms: amd64, arm64,ppc64le - - uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 + - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: From 385356345698fa2fb23ad9db4512cee41ff06b20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 12:12:13 +0100 Subject: [PATCH 04/11] Bump actions/setup-go from 5.0.2 to 5.1.0 (#712) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.2 to 5.1.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32...41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- .github/workflows/base-ci-goreleaser.yaml | 2 +- .github/workflows/base-release.yaml | 4 ++-- .github/workflows/builder-release.yaml | 2 +- .github/workflows/builder-testbuild.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index a0fad440..25165860 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -55,7 +55,7 @@ jobs: uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - name: Setup Go - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.23' check-latest: true diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index a558ebd9..69e38866 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -49,7 +49,7 @@ jobs: - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.23' check-latest: true @@ -125,7 +125,7 @@ jobs: - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.23' check-latest: true diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 53b613c4..e81aeecd 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -42,7 +42,7 @@ jobs: platforms: amd64, arm64,ppc64le - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - name: Setup Go - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: ~1.23 - name: Log into Docker.io diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index 1941d120..3d9e2deb 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -45,7 +45,7 @@ jobs: platforms: amd64, arm64,ppc64le - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - name: Setup Go - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: ~1.23 - name: Check GoReleaser diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 85877c06..4d24c701 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.23' check-latest: true From d60d8cc7795104a381af4dcb1cb4bfd449f171e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 12:21:01 +0100 Subject: [PATCH 05/11] Bump anchore/sbom-action from 0.17.4 to 0.17.6 (#717) Bumps [anchore/sbom-action](https://github.com/anchore/sbom-action) from 0.17.4 to 0.17.6. - [Release notes](https://github.com/anchore/sbom-action/releases) - [Changelog](https://github.com/anchore/sbom-action/blob/main/RELEASE.md) - [Commits](https://github.com/anchore/sbom-action/compare/8d0a6505bf28ced3e85154d13dc6af83299e13f1...251a468eed47e5082b105c3ba6ee500c0e65a764) --- updated-dependencies: - dependency-name: anchore/sbom-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- .github/workflows/base-release.yaml | 4 ++-- .github/workflows/builder-release.yaml | 2 +- .github/workflows/builder-testbuild.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 69e38866..14ef2860 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -41,7 +41,7 @@ jobs: - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - - uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4 + - uses: anchore/sbom-action/download-syft@251a468eed47e5082b105c3ba6ee500c0e65a764 # v0.17.6 - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: @@ -117,7 +117,7 @@ jobs: - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - - uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4 + - uses: anchore/sbom-action/download-syft@251a468eed47e5082b105c3ba6ee500c0e65a764 # v0.17.6 - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index e81aeecd..7a571f84 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -36,7 +36,7 @@ jobs: - name: Copy Dockerfile to Core Repo directory run: cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - - uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4 + - uses: anchore/sbom-action/download-syft@251a468eed47e5082b105c3ba6ee500c0e65a764 # v0.17.6 - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: platforms: amd64, arm64,ppc64le diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index 3d9e2deb..211b8979 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -39,7 +39,7 @@ jobs: - name: Copy Dockerfile to Core Repo directory run: cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - - uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4 + - uses: anchore/sbom-action/download-syft@251a468eed47e5082b105c3ba6ee500c0e65a764 # v0.17.6 - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 with: platforms: amd64, arm64,ppc64le From 6ebf4c259bfb27fec00d1ee8e1a8eec985bc536e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 12:28:49 +0100 Subject: [PATCH 06/11] Bump actions/checkout from 4.2.1 to 4.2.2 (#711) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- .github/workflows/base-ci-goreleaser.yaml | 2 +- .github/workflows/base-release.yaml | 4 ++-- .github/workflows/builder-release.yaml | 4 ++-- .github/workflows/builder-testbuild.yaml | 4 ++-- .github/workflows/ci.yaml | 2 +- .github/workflows/package-tests.yaml | 2 +- .github/workflows/shellcheck.yml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index 25165860..43c867b7 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 14ef2860..b416f01b 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 @@ -111,7 +111,7 @@ jobs: contents: write steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 7a571f84..4f4b9724 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout Releases Repo - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - name: Push cmd/builder Tag @@ -27,7 +27,7 @@ jobs: git tag -a "${tag}" -m "${message}" git push origin "${tag}" - name: Checkout Core Repo - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 repository: "open-telemetry/opentelemetry-collector" diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index 211b8979..73598eaf 100644 --- a/.github/workflows/builder-testbuild.yaml +++ b/.github/workflows/builder-testbuild.yaml @@ -27,11 +27,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Releases Repo - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - name: Checkout Core Repo - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 repository: "open-telemetry/opentelemetry-collector" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4d24c701..21093f82 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 diff --git a/.github/workflows/package-tests.yaml b/.github/workflows/package-tests.yaml index 9f7ca3fe..57d10102 100644 --- a/.github/workflows/package-tests.yaml +++ b/.github/workflows/package-tests.yaml @@ -19,7 +19,7 @@ jobs: type: ${{ fromJSON(inputs.type) }} steps: - name: Checkout - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Download built artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 3299b41c..8cc62a64 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -10,7 +10,7 @@ jobs: name: Shellcheck runs-on: ubuntu-latest steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Run ShellCheck uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0 env: From 787127289378d9dfb9a686af17457bd7064a5c05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 12:56:00 +0100 Subject: [PATCH 07/11] chore: Configure Renovate (#709) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..5db72dd6 --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ] +} From 9a506cec55cfa4468412a239ed2300e1868172b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:37:22 +0100 Subject: [PATCH 08/11] chore(deps): update alpine docker tag to v3.20 (#718) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- distributions/otelcol-contrib/Dockerfile | 2 +- distributions/otelcol-k8s/Dockerfile | 2 +- distributions/otelcol-otlp/Dockerfile | 2 +- distributions/otelcol/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distributions/otelcol-contrib/Dockerfile b/distributions/otelcol-contrib/Dockerfile index 4bc1346a..5d6043a4 100644 --- a/distributions/otelcol-contrib/Dockerfile +++ b/distributions/otelcol-contrib/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 as certs +FROM alpine:3.20 as certs RUN apk --update add ca-certificates FROM scratch diff --git a/distributions/otelcol-k8s/Dockerfile b/distributions/otelcol-k8s/Dockerfile index 9e022de8..9a1fcfff 100644 --- a/distributions/otelcol-k8s/Dockerfile +++ b/distributions/otelcol-k8s/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 as certs +FROM alpine:3.20 as certs RUN apk --update add ca-certificates FROM scratch diff --git a/distributions/otelcol-otlp/Dockerfile b/distributions/otelcol-otlp/Dockerfile index 2e7521c4..ab8545f4 100644 --- a/distributions/otelcol-otlp/Dockerfile +++ b/distributions/otelcol-otlp/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 as certs +FROM alpine:3.20 as certs RUN apk --update add ca-certificates FROM scratch diff --git a/distributions/otelcol/Dockerfile b/distributions/otelcol/Dockerfile index 834c4a82..09f62b28 100644 --- a/distributions/otelcol/Dockerfile +++ b/distributions/otelcol/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 as certs +FROM alpine:3.20 as certs RUN apk --update add ca-certificates FROM scratch From 3ba7931410d1696d9df7bef424b634a5d64cffbd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:30:16 +0100 Subject: [PATCH 09/11] chore(deps): update dependency ubuntu to v24 (#719) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/base-ci-goreleaser.yaml | 2 +- .github/workflows/base-release.yaml | 4 ++-- .github/workflows/ci.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index 43c867b7..12772029 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -32,7 +32,7 @@ jobs: GOARCH: arm - GOOS: windows GOARCH: s390x - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index b416f01b..05bc88fc 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -32,7 +32,7 @@ jobs: GOARCH: arm - GOOS: windows GOARCH: s390x - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -102,7 +102,7 @@ jobs: release: name: ${{ inputs.distribution }} Release - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: prepare permissions: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 21093f82..d04cba26 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ on: jobs: build: name: Build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 From 4201470db503a8294ebce058c9ad46350957aadd Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Sat, 2 Nov 2024 11:48:36 -0400 Subject: [PATCH 10/11] revert removal of googlecloudspanner receiver (#721) --- distributions/otelcol-contrib/manifest.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 178315aa..5d600d3e 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -144,6 +144,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudmonitoringreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.112.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.112.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.112.0 From 11530fd416496525d0a026be319feb442e0add3b Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 5 Nov 2024 05:00:29 -0800 Subject: [PATCH 11/11] Remove otel-version usage, removed from builder (#722) Signed-off-by: Bogdan Drutu Co-authored-by: Andrzej Stencel --- distributions/otelcol-contrib/manifest.yaml | 1 - distributions/otelcol-k8s/manifest.yaml | 1 - distributions/otelcol-otlp/manifest.yaml | 1 - distributions/otelcol/manifest.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 5d600d3e..d5aefad8 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -4,7 +4,6 @@ dist: description: OpenTelemetry Collector Contrib version: 0.112.0 output_path: ./_build - otelcol_version: 0.112.0 extensions: - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.112.0 diff --git a/distributions/otelcol-k8s/manifest.yaml b/distributions/otelcol-k8s/manifest.yaml index 50950816..bae1f8d1 100644 --- a/distributions/otelcol-k8s/manifest.yaml +++ b/distributions/otelcol-k8s/manifest.yaml @@ -4,7 +4,6 @@ dist: description: OpenTelemetry Collector for Kubernetes version: 0.112.0 output_path: ./_build - otelcol_version: 0.112.0 extensions: - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.112.0 diff --git a/distributions/otelcol-otlp/manifest.yaml b/distributions/otelcol-otlp/manifest.yaml index 6a5c7b5e..657334b2 100644 --- a/distributions/otelcol-otlp/manifest.yaml +++ b/distributions/otelcol-otlp/manifest.yaml @@ -4,7 +4,6 @@ dist: description: OpenTelemetry Collector OTLP version: 0.112.0 output_path: ./_build - otelcol_version: 0.112.0 exporters: - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.112.0 diff --git a/distributions/otelcol/manifest.yaml b/distributions/otelcol/manifest.yaml index 2ef7238f..43a762fd 100644 --- a/distributions/otelcol/manifest.yaml +++ b/distributions/otelcol/manifest.yaml @@ -4,7 +4,6 @@ dist: description: OpenTelemetry Collector version: 0.112.0 output_path: ./_build - otelcol_version: 0.112.0 receivers: - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.112.0