From 24c11af290c7dca9c370630c493938f812a2a53a Mon Sep 17 00:00:00 2001 From: "John L. Peterson (Jack)" Date: Fri, 27 Sep 2024 13:12:13 -0400 Subject: [PATCH 1/4] add appropriate version tag in cmd/builder goreleaser config (#665) Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- cmd/builder/.goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml index 346da3b9..d666306c 100644 --- a/cmd/builder/.goreleaser.yml +++ b/cmd/builder/.goreleaser.yml @@ -8,7 +8,7 @@ builds: - flags: - -trimpath ldflags: - - -s -w + - -s -w -X go.opentelemetry.io/collector/cmd/builder/internal.version={{ .Version }} env: - CGO_ENABLED=0 goos: From f7542605648b630d502a4c4c3a69433ce1346cf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 06:57:15 -0700 Subject: [PATCH 2/4] Bump actions/checkout from 4.1.7 to 4.2.0 (#680) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [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/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout 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/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 f9cdf24e..d954083b 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 22320381..1a8e0786 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 @@ -110,7 +110,7 @@ jobs: contents: write steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 66b3773a..e9195b38 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Releases Repo - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 - name: Push cmd/builder Tag @@ -21,7 +21,7 @@ jobs: git tag -a "${tag}" -m "${message}" git push origin "${tag}" - name: Checkout Core Repo - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 repository: "open-telemetry/opentelemetry-collector" diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml index c9b49f3a..4d081252 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 - name: Checkout Core Repo - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 repository: "open-telemetry/opentelemetry-collector" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 492abfd2..befd39bc 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 diff --git a/.github/workflows/package-tests.yaml b/.github/workflows/package-tests.yaml index 90429064..d6f227d7 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - 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 65794f52..5fdd569a 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Run ShellCheck uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0 env: From 545bd7c1dd76f950f0f3dfcc04218732afdbdb5e Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:53:24 -0600 Subject: [PATCH 3/4] Remove the deprecated logging exporter (#682) * Remove the deprecated logging exporter * revert accidentally removed file --------- Co-authored-by: Bogdan Drutu --- distributions/otelcol-contrib/manifest.yaml | 1 - distributions/otelcol/manifest.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 5fae67ba..be452c82 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -38,7 +38,6 @@ extensions: exporters: - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.110.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.110.0 - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.110.0 - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0 - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0 diff --git a/distributions/otelcol/manifest.yaml b/distributions/otelcol/manifest.yaml index 34420ec1..8df01ad9 100644 --- a/distributions/otelcol/manifest.yaml +++ b/distributions/otelcol/manifest.yaml @@ -18,7 +18,6 @@ receivers: exporters: - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.110.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.110.0 - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.110.0 - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0 - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0 From edc8e9443074c736551ad82e6c35814a336d1d71 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Thu, 3 Oct 2024 00:31:50 +0200 Subject: [PATCH 4/4] [chore] refactor(contrib): remove unused replace directive for `go-connections` package (#677) The package `github.com/docker/go-connections` only exists in contrib's generated `go.mod` file in version `v0.5.0`, and does not exist in the replaced version `v0.4.1`. The distro also builds and runs fine without the replace directive. I believe the [reason](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/12322#issuecomment-1185029670) for the replace directive to have been added is out of date. To be sure, I have run the repro scenario described [here](https://github.com/docker/go-connections/issues/99#issuecomment-1782151119) and the behavior with go-connections v0.5.0 was correct - the Docker client tried to connect to the TCP port. Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- distributions/otelcol-contrib/manifest.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index be452c82..3a294019 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -224,8 +224,6 @@ providers: # When adding a replace, add a comment before it to document why it's needed and when it can be removed replaces: - # See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/12322#issuecomment-1185029670 - - github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 => github.com/docker/go-connections v0.4.0 # see https://github.com/mattn/go-ieproxy/issues/45 - github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1 # see https://github.com/openshift/api/pull/1515