Merge branch 'main' into renovate-collector-integration

mowies · web-flow · commit a0a8cfbc7a37 · 2025-08-21T11:17:18.000+02:00
diff --git a/.chloggen/ebpf-profiler-distro-release-artifacts.yaml b/.chloggen/ebpf-profiler-distro-release-artifacts.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: ebpf-profiler
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Start producing release artifacts for the eBPF profiler distribution.
+
+# One or more tracking issues or pull requests related to the change
+issues: [984]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]
diff --git a/.github/workflows/base-binary-release.yaml b/.github/workflows/base-binary-release.yaml
@@ -23,7 +23,7 @@ env:
 
 jobs:
   goreleaser:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     permissions:
       id-token: write
diff --git a/.github/workflows/base-ci-binary.yaml b/.github/workflows/base-ci-binary.yaml
@@ -18,14 +18,13 @@ on:
         default: ""
         description: "The collector dependency will be put into this folder"
 
-
 env:
   # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
   GORELEASER_PRO_VERSION: v2.11.2
 
 jobs:
   check-goreleaser:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Releases Repo
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml
@@ -12,6 +12,10 @@ on:
       goarch:
         required: true
         type: string
+      runner_os:
+        required: false
+        type: string
+        default: ubuntu-24.04
       nightly:
         required: false
         type: boolean
@@ -62,7 +66,7 @@ jobs:
             GOARCH: riscv64
           - GOOS: windows
             GOARCH: riscv64
-    runs-on: ubuntu-24.04
+    runs-on: ${{ inputs.runner_os }}
     outputs:
       version: ${{ steps.prep.outputs.version }}
 
@@ -267,7 +271,7 @@ jobs:
         exclude:
           - GOOS: darwin
           - GOOS: windows
-    runs-on: ubuntu-24.04
+    runs-on: ${{ inputs.runner_os }}
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
diff --git a/.github/workflows/ci-goreleaser-ebpf-profiler.yaml b/.github/workflows/ci-goreleaser-ebpf-profiler.yaml
@@ -28,14 +28,26 @@ on:
       - "go.sum"
 
 jobs:
-  check-goreleaser:
+  check-goreleaser-amd64:
     name: CI - eBPF Profiler - GoReleaser
     uses: ./.github/workflows/base-ci-goreleaser.yaml
     with:
       distribution: otelcol-ebpf-profiler
       config_file: ebpf-profiler-config.yaml
-      docker_run_options: '--privileged --pid=host -v /sys/kernel/debug/:/sys/kernel/debug/:ro'
-      otelcol_run_options: '--feature-gates=service.profilesSupport'
+      docker_run_options: "--privileged --pid=host -v /sys/kernel/debug/:/sys/kernel/debug/:ro"
+      otelcol_run_options: "--feature-gates=service.profilesSupport"
       goos: '[ "linux" ]'
       goarch: '[ "amd64" ]'
     secrets: inherit
+  check-goreleaser-arm64:
+    name: CI - eBPF Profiler - GoReleaser
+    uses: ./.github/workflows/base-ci-goreleaser.yaml
+    with:
+      distribution: otelcol-ebpf-profiler
+      config_file: ebpf-profiler-config.yaml
+      docker_run_options: "--privileged --pid=host -v /sys/kernel/debug/:/sys/kernel/debug/:ro"
+      otelcol_run_options: "--feature-gates=service.profilesSupport"
+      goos: '[ "linux" ]'
+      goarch: '[ "arm64" ]'
+      runner_os: ubuntu-24.04-arm
+    secrets: inherit
diff --git a/.github/workflows/release-ebpf-profiler.yaml b/.github/workflows/release-ebpf-profiler.yaml
@@ -0,0 +1,17 @@
+name: Release eBPF Profiler
+
+on:
+  push:
+    tags: ["v*"]
+
+jobs:
+  release:
+    name: Release eBPF Profiler
+    uses: ./.github/workflows/base-release.yaml
+    with:
+      distribution: otelcol-ebpf-profiler
+      goos: '[ "linux" ]'
+      goarch: '[ "amd64", "arm64" ]'
+      nightly: ${{ contains(github.ref, '-nightly') }}
+    secrets: inherit
+    permissions: write-all
diff --git a/.github/workflows/update-version.yaml b/.github/workflows/update-version.yaml
@@ -23,8 +23,6 @@ jobs:
       contents: write # required for pushing changes
       pull-requests: write # required for creating PR
 
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         id: otelbot-token
@@ -47,7 +45,7 @@ jobs:
         run: |
           .github/workflows/scripts/bump-versions.sh --commit --pull-request
         env:
-          GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           next_beta_core: ${{ github.event.inputs.next_beta_core }}
           next_beta_contrib: ${{ github.event.inputs.next_beta_contrib }}
           next_stable_core: ${{ github.event.inputs.next_stable_core }}
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -54,7 +54,7 @@ var (
 	winContainerArchs = []string{"amd64"}
 	darwinArchs       = []string{"amd64", "arm64"}
 	k8sArchs          = []string{"amd64", "arm64", "ppc64le", "riscv64", "s390x"}
-	ebpfProfilerArchs = []string{"amd64"}
+	ebpfProfilerArchs = []string{"amd64", "arm64"}
 	ocbArchs          = []string{"amd64", "arm64", "ppc64le", "riscv64"}
 	opAmpArchs        = []string{"amd64", "arm64", "ppc64le"}
 
@@ -181,7 +181,7 @@ var (
 		d.containerImageManifests = slices.Concat(
 			newContainerImageManifests(d.name, "linux", ebpfProfilerArchs, containerImageOptions{}),
 		)
-		d.enableCgo = true
+		d.env = append(d.env, "TARGET_ARCH={{ .Runtime.Goarch }}")
 		d.ldFlags = "-extldflags=-static"
 		d.goTags = "osusergo,netgo"
 	}).WithDefaultArchives().
@@ -193,6 +193,7 @@ var (
 		WithDefaultEnv().
 		WithDefaultPartial().
 		WithDefaultRelease().
+		WithNightlyConfig().
 		Build()
 
 	// OCB binary
@@ -499,8 +500,7 @@ func (b *distributionBuilder) WithDefaultEnv() *distributionBuilder {
 		if !b.dist.enableCgo {
 			env = append(env, "CGO_ENABLED=0")
 		}
-
-		b.dist.env = env
+		b.dist.env = append(b.dist.env, env...)
 	})
 	return b
 }
diff --git a/distributions/otelcol-ebpf-profiler/.goreleaser.yaml b/distributions/otelcol-ebpf-profiler/.goreleaser.yaml
@@ -1,12 +1,14 @@
 version: 2
 project_name: opentelemetry-collector-releases
 env:
+  - TARGET_ARCH={{ .Runtime.Goarch }}
   - COSIGN_YES=true
   - LD_FLAGS=-extldflags=-static
   - BUILD_FLAGS=-trimpath
   - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }}
   - GOPROXY=https://proxy.golang.org,direct
   - GO_TAGS=osusergo,netgo
+  - CGO_ENABLED=0
 release:
   replace_existing_artifacts: true
 builds:
@@ -15,6 +17,7 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     dir: _build
     binary: otelcol-ebpf-profiler
     ldflags:
@@ -47,19 +50,41 @@ dockers:
       - --label=org.opencontainers.image.source={{.GitURL}}
       - --label=org.opencontainers.image.licenses=Apache-2.0
     use: buildx
+  - goos: linux
+    goarch: arm64
+    dockerfile: Dockerfile
+    image_templates:
+      - otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-arm64
+      - otel/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
+    build_flag_templates:
+      - --pull
+      - --platform=linux/arm64
+      - --label=org.opencontainers.image.created={{.Date}}
+      - --label=org.opencontainers.image.name={{.ProjectName}}
+      - --label=org.opencontainers.image.revision={{.FullCommit}}
+      - --label=org.opencontainers.image.version={{.Version}}
+      - --label=org.opencontainers.image.source={{.GitURL}}
+      - --label=org.opencontainers.image.licenses=Apache-2.0
+    use: buildx
 docker_manifests:
   - name_template: otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}
     image_templates:
       - otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64
+      - otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-arm64
   - name_template: otel/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
     image_templates:
       - otel/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
+      - otel/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
   - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}
     image_templates:
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-arm64
   - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
     image_templates:
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
 signs:
   - cmd: cosign
     args:
@@ -86,3 +111,7 @@ monorepo:
   tag_prefix: v
 partial:
   by: target
+nightly:
+  version_template: '{{ incpatch .Version}}-nightly.{{ .ShortCommit }}'
+  tag_name: nightly-otelcol-ebpf-profiler
+  keep_single_release: true
diff --git a/distributions/otelcol-ebpf-profiler/Dockerfile b/distributions/otelcol-ebpf-profiler/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6
+FROM golang:1.25.0@sha256:91e2cd436f7adbfad0a0cbb7bf8502fa863ed8461414ceebe36c6304731e0fd9
 
 COPY --chmod=755 otelcol-ebpf-profiler /otelcol-ebpf-profiler
 ENTRYPOINT ["/otelcol-ebpf-profiler"]
diff --git a/distributions/otelcol-ebpf-profiler/manifest.yaml b/distributions/otelcol-ebpf-profiler/manifest.yaml
@@ -21,7 +21,7 @@ processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.132.0
 
 receivers:
-  - gomod: go.opentelemetry.io/ebpf-profiler v0.0.202529
+  - gomod: go.opentelemetry.io/ebpf-profiler v0.0.202531
     import: go.opentelemetry.io/ebpf-profiler/collector
 
 providers:
@@ -35,4 +35,4 @@ providers:
 replaces:
   # see https://github.com/openshift/api/pull/1515
   - github.com/openshift/api => github.com/openshift/api v0.0.0-20230726162818-81f778f3b3ec
-  - go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.58.0
+  - go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.58.0
diff --git a/scripts/package-tests/Dockerfile.test.deb b/scripts/package-tests/Dockerfile.test.deb
@@ -1,6 +1,6 @@
 # A debian image with systemd enabled.  Must be run with:
 # `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags
-FROM debian:12@sha256:b6507e340c43553136f5078284c8c68d86ec8262b1724dde73c325e8d3dcdeba
+FROM debian:13@sha256:6d87375016340817ac2391e670971725a9981cfc24e221c47734681ed0f6c0f5
 
 ENV container docker
 ENV DEBIAN_FRONTEND noninteractive
