Merge branch 'main' into add-msi-tests

.github/workflows/base-ci-goreleaser.yaml

@@ -12,10 +12,15 @@ on:
       goarch:
         required: true
         type: string
+      nightly:
+        required: false
+        type: boolean
+        default: false
+        description: "Set to true to fetch latest otelcol-contrib main branch version instead of building the version in this repo"
 
 env:
   # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.4.1
+  GORELEASER_PRO_VERSION: v2.4.8
 
 jobs:
   check-goreleaser:
@@ -64,9 +69,75 @@ jobs:
           go-version: '1.23'
           check-latest: true
 
-      - name: Generate the sources
+      - name: Create artifacts directory to store build artifacts
+        if: inputs.distribution == 'otelcol-contrib'
+        run: mkdir -p distributions/otelcol-contrib/artifacts
+
+      - name: "[Nightly] Get latest finished run ID from contrib repo build-and-test"
+        id: get-run-id
+        if: inputs.distribution == 'otelcol-contrib' && inputs.nightly == true && matrix.GOARCH == 'amd64' && matrix.GOOS == 'linux'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          run_id=$(gh run list \
+            --branch main \
+            --workflow build-and-test \
+            --repo open-telemetry/opentelemetry-collector-contrib \
+            --limit 1 \
+            --status success \
+            --json databaseId \
+            --jq '.[0].databaseId' \
+          )
+          echo "Found run ID: $run_id"
+          echo "run_id=$run_id" >> "$GITHUB_OUTPUT"
+
+      - name: "[Nightly] Create sub-directory for otelcol-contrib nightly build"
+        if: inputs.distribution == 'otelcol-contrib' && inputs.nightly == true && matrix.GOARCH == 'amd64' && matrix.GOOS == 'linux'
+        run: mkdir -p distributions/otelcol-contrib/artifacts/otelcol-contrib_linux_amd64_v1
+
+      - name: "[Nightly] Download built otelcol-contrib artifact from contrib repo"
+        if: inputs.distribution == 'otelcol-contrib' && inputs.nightly == true && matrix.GOARCH == 'amd64' && matrix.GOOS == 'linux'
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: collector-binaries-linux-amd64
+          repository: open-telemetry/opentelemetry-collector-contrib
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ steps.get-run-id.outputs.run_id }}
+
+      - name: "[Nightly] Move downloaded artifact"
+        if: inputs.distribution == 'otelcol-contrib' && inputs.nightly == true && matrix.GOARCH == 'amd64' && matrix.GOOS == 'linux'
+        run: mv otelcontribcol_linux_amd64 distributions/otelcol-contrib/artifacts/otelcol-contrib_linux_amd64_v1/otelcol-contrib
+
+      - name: Generate the sources for ${{ inputs.distribution }}
+        if: inputs.nightly != true
+        env:
+          DISTRIBUTIONS: ${{ inputs.distribution }}
         run: make generate-sources
 
+        # otelcol-contrib is built in a separate stage
+      - name: Build ${{ inputs.distribution }}
+        if: inputs.distribution == 'otelcol-contrib' && inputs.nightly != true
+        uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
+        with:
+          distribution: goreleaser-pro
+          version: ${{ env.GORELEASER_PRO_VERSION }}
+          workdir: distributions/otelcol-contrib
+          args: --snapshot --clean --timeout 2h --split --config .goreleaser-build.yaml
+        env:
+          GOOS: ${{ matrix.GOOS }}
+          GOARCH: ${{ matrix.GOARCH }}
+          GOARM: 7 # Default is 6
+          GOAMD64: v1
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+
+      - name: Move built artifacts
+        if: inputs.distribution == 'otelcol-contrib' && inputs.nightly != true
+        run: mv distributions/otelcol-contrib/dist/**/* distributions/otelcol-contrib/artifacts/
+
+      - name: Show built or downloaded content
+        if: inputs.distribution == 'otelcol-contrib'
+        run: ls -laR distributions/otelcol-contrib/artifacts
+
       - name: Run GoReleaser for ${{ inputs.distribution }}
         uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
         with:

.github/workflows/base-release.yaml

@@ -15,7 +15,7 @@ on:
 
 env:
   # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.4.1
+  GORELEASER_PRO_VERSION: v2.4.8
 
 jobs:
   prepare:
@@ -45,7 +45,7 @@ jobs:
 
       - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
 
-      - uses: anchore/sbom-action/download-syft@fc46e51fd3cb168ffb36c6d1915723c47db58abb # v0.17.7
+      - uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
 
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
         with:
@@ -121,7 +121,7 @@ jobs:
 
       - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
 
-      - uses: anchore/sbom-action/download-syft@fc46e51fd3cb168ffb36c6d1915723c47db58abb # v0.17.7
+      - uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
 
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
         with:

.github/workflows/builder-release.yaml

@@ -6,7 +6,7 @@ on:
 
 env:
   # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.4.1
+  GORELEASER_PRO_VERSION: v2.4.8
 
 jobs:
   goreleaser:
@@ -40,7 +40,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@fc46e51fd3cb168ffb36c6d1915723c47db58abb # v0.17.7
+      - uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
         with:
           platforms: amd64, arm64,ppc64le

.github/workflows/builder-testbuild.yaml

@@ -1,6 +1,7 @@
 name: Builder - Check and Test Build
 
 on:
+  merge_group: 
   push:
     branches: [main]
     paths:
@@ -24,7 +25,7 @@ on:
 
 env:
   # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.4.1
+  GORELEASER_PRO_VERSION: v2.4.8
 
 jobs:
   check-goreleaser:
@@ -43,7 +44,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@fc46e51fd3cb168ffb36c6d1915723c47db58abb # v0.17.7
+      - uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
         with:
           platforms: amd64, arm64,ppc64le

.github/workflows/ci-goreleaser-contrib.yaml

@@ -1,6 +1,7 @@
 name: Continuous Integration - Contrib - GoReleaser
 
 on:
+  merge_group: 
   push:
     branches: [main]
     paths:
@@ -35,7 +36,7 @@ jobs:
   package-tests:
      name: Package tests
      needs: check-goreleaser
-     uses: ./.github/workflows/package-tests.yaml
+     uses: ./.github/workflows/base-package-tests.yaml
      with:
        distribution: otelcol-contrib
        type: '[ "deb", "rpm" ]'

.github/workflows/ci-goreleaser-core.yaml

@@ -1,6 +1,7 @@
 name: Continuous Integration - Core - GoReleaser
 
 on:
+  merge_group: 
   push:
     branches: [main]
     paths:
@@ -35,7 +36,7 @@ jobs:
   package-tests:
      name: Package tests
      needs: check-goreleaser
-     uses: ./.github/workflows/package-tests.yaml
+     uses: ./.github/workflows/base-package-tests.yaml
      with:
        distribution: otelcol
        type: '[ "deb", "rpm" ]'

.github/workflows/ci-goreleaser-k8s.yaml

@@ -1,6 +1,7 @@
 name: Continuous Integration - k8s - GoReleaser
 
 on:
+  merge_group: 
   push:
     branches: [main]
     paths:

.github/workflows/ci-goreleaser-otlp.yaml

@@ -1,6 +1,7 @@
 name: Continuous Integration - OTLP - GoReleaser
 
 on:
+  merge_group: 
   push:
     branches: [main]
     paths:

.github/workflows/ci.yaml

@@ -1,6 +1,7 @@
 name: Continuous Integration
 
 on:
+  merge_group: 
   push:
     branches: [main]
   pull_request:

.github/workflows/package-test.yaml

@@ -0,0 +1,24 @@
+name: Package Tests - Contrib
+
+on:
+  schedule:
+    - cron: "0 2 * * *" # every day at 2am UTC
+
+jobs:
+  check-goreleaser:
+    name: Build - Contrib - GoReleaser
+    uses: ./.github/workflows/base-ci-goreleaser.yaml
+    with:
+      distribution: otelcol-contrib
+      goos: '[ "linux" ]'
+      goarch: '[ "amd64" ]'
+      nightly: true
+    secrets: inherit
+
+  package-tests:
+    name: Linux Package tests
+    needs: check-goreleaser
+    uses: ./.github/workflows/base-package-tests.yaml
+    with:
+      distribution: otelcol-contrib
+      type: '[ "deb", "rpm" ]'

.github/workflows/shellcheck.yml

@@ -1,5 +1,6 @@
 name: Shellcheck lint
 on:
+  merge_group: 
   push:
     branches: [ main ]
   pull_request:

Makefile

@@ -92,4 +92,4 @@ delete-tags:
 # Used for debug only
 REMOTE?[email protected]:open-telemetry/opentelemetry-collector-releases.git
 .PHONY: repeat-tags
-repeat-tags: delete-tags push-tags
+repeat-tags: delete-tags push-tags