fix(pyroscope.ebpf): Update opentelemetry-ebpf-profiler

[korniltsev-grafanista]

Update go.opentelemetry.io/ebpf-profiler replacement to latest pyroscope_alloy branch commit from github.com/grafana/opentelemetry-ebpf-profiler.

Old: v0.0.202602-0.20260216144214-241376220646
New: v0.0.202602-0.20260326091923-bd31a19190b9

This is to include this fix for customer escalation grafana/opentelemetry-ebpf-profiler#53

[github-actions]

🔍 Dependency Review

Below are the reviews for dependencies changed in the provided go.mod diffs. Each section includes an assessment and concrete migration notes (with diffs) when applicable.

Key finding: The only dependency that requires code changes in this PR is the Grafana fork of the OpenTelemetry eBPF profiler. All other updates are patch/minor bumps and appear safe.

go.opentelemetry.io/ebpf-profiler (replaced) v0.0.202602-0.20260216144214-241376220646 -> github.com/grafana/opentelemetry-ebpf-profiler v0.0.20260326091923-bd31a19190b9 — ❌ Changes Needed

Impact

• This upgrade introduces a breaking internal data model change in the ebpf-profiler samples package.
• Specifically, grouping keys and event maps were refactored:
  • Resource-level identity moved to a new samples.ResourceKey (replacing containerID + parts of the old TraceAndMetaKey).
  • Sample-level identity moved to a new samples.SampleKey (replacing the old TraceAndMetaKey for sample uniqueness).
  • The events mapping types were renamed/restructured:
    • samples.KeyToEventMapping -> samples.SampleToEvents
    • samples.TraceAndMetaKey -> samples.SampleKey
    • A new container type samples.ResourceToProfiles now carries EnvVars at the resource level and splits Events by origin.

Evidence (source change in this PR that matches the new API)

• In internal/component/pyroscope/ebpf/reporter/pprof.go and corresponding tests, the code was adapted to:
  • Use samples.ResourceKey and samples.SampleKey.
  • Store EnvVars at the resource level (ResourceToProfiles) rather than inside TraceEvents.
  • Update createProfile to accept a ResourceKey and map[SampleKey]*TraceEvents.
• The following diffs demonstrate the minimum required changes to migrate from the old API to the new API:

Migration snippets (apply these patterns wherever similar code exists)

1. Replace old keying with ResourceKey + SampleKey, and new event container:

- containerID := meta.ContainerID
- key := samples.TraceAndMetaKey{
-   Hash:           trace.Hash,
-   Comm:           meta.Comm,
-   ProcessName:    meta.ProcessName,
-   ExecutablePath: meta.ExecutablePath,
-   ApmServiceName: meta.APMServiceName,
-   Pid:            int64(meta.PID),
-   Tid:            int64(meta.TID),
- }

- if _, exists := (*eventsTree)[containerID]; !exists {
-   (*eventsTree)[containerID] = make(map[libpf.Origin]samples.KeyToEventMapping)
- }

- if _, exists := (*eventsTree)[containerID][meta.Origin]; !exists {
-   (*eventsTree)[containerID][meta.Origin] = make(samples.KeyToEventMapping)
- }

- if events, exists := (*eventsTree)[containerID][meta.Origin][key]; exists {
-   events.Timestamps = append(events.Timestamps, uint64(meta.Timestamp))
-   events.OffTimes = append(events.OffTimes, meta.OffTime)
-   (*eventsTree)[containerID][meta.Origin][key] = events
-   return nil
- }
- (*eventsTree)[containerID][meta.Origin][key] = &samples.TraceEvents{
-   Frames:     trace.Frames,
-   Timestamps: []uint64{uint64(meta.Timestamp)},
-   OffTimes:   []int64{meta.OffTime},
-   EnvVars:    meta.EnvVars,
-   Labels:     trace.CustomLabels,
- }

+ key := samples.ResourceKey{
+   APMServiceName: meta.APMServiceName,
+   ContainerID:    meta.ContainerID,
+   PID:            int64(meta.PID),
+   ExecutablePath: meta.ExecutablePath,
+ }

+ if _, exists := (*eventsTree)[key]; !exists {
+   (*eventsTree)[key] = samples.ResourceToProfiles{
+     EnvVars: meta.EnvVars,
+     Events:  make(map[libpf.Origin]samples.SampleToEvents),
+   }
+ }

+ rtp := (*eventsTree)[key]
+ if _, exists := rtp.Events[meta.Origin]; !exists {
+   rtp.Events[meta.Origin] = make(samples.SampleToEvents)
+ }

+ sampleKey := samples.SampleKey{
+   Hash: trace.Hash,
+   Comm: meta.Comm,
+   TID:  int64(meta.TID),
+   CPU:  int64(meta.CPU),
+ }
+ if events, exists := rtp.Events[meta.Origin][sampleKey]; exists {
+   events.Timestamps = append(events.Timestamps, uint64(meta.Timestamp))
+   events.OffTimes = append(events.OffTimes, meta.OffTime)
+   return nil
+ }
+ rtp.Events[meta.Origin][sampleKey] = &samples.TraceEvents{
+   Frames:     trace.Frames,
+   Timestamps: []uint64{uint64(meta.Timestamp)},
+   OffTimes:   []int64{meta.OffTime},
+   Labels:     trace.CustomLabels,
+ }

2. Update the reportProfile loop and createProfile signature to match new types:

- for containerID, ts := range reportedEvents {
-   for origin, events := range ts {
-     pp := p.createProfile(containerID, origin, events)
+ for resourceKey, rtp := range reportedEvents {
+   for origin, events := range rtp.Events {
+     pp := p.createProfile(resourceKey, origin, events)
      profiles = append(profiles, pp...)
   }
 }

-func (p *PPROFReporter) createProfile(containerID samples.ContainerID, origin libpf.Origin, events map[samples.TraceAndMetaKey]*samples.TraceEvents) []PPROF {
+func (p *PPROFReporter) createProfile(resourceKey samples.ResourceKey, origin libpf.Origin, events map[samples.SampleKey]*samples.TraceEvents) []PPROF {

3. Use resourceKey instead of the old TraceAndMetaKey inside createProfile:

- for traceKey, traceInfo := range events {
-   target := p.sd.FindTarget(uint32(traceKey.Pid), containerID.String())
+ for sampleKey, traceInfo := range events {
+   target := p.sd.FindTarget(uint32(resourceKey.PID), resourceKey.ContainerID.String())
    if target == nil {
      continue
    }
-   b := bs.BuilderForSample(target, uint32(traceKey.Pid))
+   b := bs.BuilderForSample(target, uint32(resourceKey.PID))

-   comm := traceKey.Comm.String()
+   comm := sampleKey.Comm.String()
    if p.cfg.PIDLabel {
-     sampleLabels["pid"] = []string{strconv.FormatInt(traceKey.Pid, 10)}
+     sampleLabels["pid"] = []string{strconv.FormatInt(resourceKey.PID, 10)}
    }

4. Remove EnvVars from TraceEvents usage; they are now attached at the resource level (samples.ResourceToProfiles.EnvVars). If you need EnvVars during build, pass them from the ResourceToProfiles value instead of from TraceEvents.

5. Update tests to use ResourceKey and SampleToEvents:

- traceKey := samples.TraceAndMetaKey{ Pid: 123 }
- events := samples.KeyToEventMapping{
-   traceKey: &samples.TraceEvents{ ... },
- }
- profiles := rep.createProfile(libpf.Intern(""), support.TraceOriginSampling, events)
+ events := samples.SampleToEvents{
+   {}: &samples.TraceEvents{ ... },
+ }
+ profiles := rep.createProfile(samples.ResourceKey{PID: 123}, support.TraceOriginSampling, events)

Notes

• The new model splits resource identity and per-sample uniqueness, and introduces CPU in SampleKey. Make sure to include CPU and TID in keys where sample-level identity must remain stable across events.
• EnvVars are no longer per-sample; they are attached to the resource-level container.

References

• Grafana fork (github.com/grafana/opentelemetry-ebpf-profiler) – review recent commits and release notes for the samples package showing ResourceKey/SampleKey refactor and ResourceToProfiles introduction. The code above reflects those changes as used in this PR.

github.com/cilium/ebpf v0.20.0 -> v0.21.0 — ✅ Safe

• Scope: indirect dependency; your code doesn’t import it directly (it is pulled by the eBPF-related modules you already depend on).
• Release notes between 0.20.0 and 0.21.0 indicate internal fixes and improvements; no breaking API changes are required for consumers not directly importing it.
• Action: No code changes required.

References

• GitHub releases: https://github.com/cilium/ebpf/releases

go.opentelemetry.io/proto/otlp v1.9.0 -> v1.10.0 — ✅ Safe

• Minor version bump in the OTLP protobuf Go module.
• Additions like profiles-related protos are present (seen as additional go.sum entries for profiles/v1development), but no removals or breaking changes to existing telemetry protos used by this repository are reported.
• If you generate protobufs from .proto files locally, ensure your toolchain matches this version. Otherwise, using the published Go module is sufficient.

References

• GitHub releases: https://github.com/open-telemetry/opentelemetry-proto/releases
• Changelog: https://github.com/open-telemetry/opentelemetry-proto/blob/main/CHANGELOG.md

AWS SDK for Go v2 (multiple submodules) — ✅ Safe

Modules bumped (patch-level):

• github.com/aws/aws-sdk-go-v2 v1.41.3 -> v1.41.4
• github.com/aws/aws-sdk-go-v2/config v1.32.11 -> v1.32.12
• github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.19 -> v1.18.20
• github.com/aws/aws-sdk-go-v2/service/s3 v1.96.1 -> v1.97.2
• github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 -> v1.7.8
• github.com/aws/aws-sdk-go-v2/credentials v1.19.11 -> v1.19.12
• github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 -> v1.4.20
• github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 -> v2.7.20
• github.com/aws/aws-sdk-go-v2/internal/ini v1.8.5 -> v1.8.6
• github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18 -> v1.4.21
• github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.6 -> v1.13.7
• github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.9 -> v1.9.12
• github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.19 -> v1.13.20
• github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18 -> v1.19.20
• github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 -> v1.0.8
• github.com/aws/aws-sdk-go-v2/service/sso v1.30.12 -> v1.30.13
• github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.16 -> v1.35.17
• github.com/aws/aws-sdk-go-v2/service/sts v1.41.8 -> v1.41.9

Assessment

• All are patch-level releases with no breaking changes noted in release notes.
• No API changes are required in your code; this PR makes no code changes related to these modules.

References

• Changelogs: https://github.com/aws/aws-sdk-go-v2/tags

golang.org/x/sys v0.41.0 -> v0.42.0 — ✅ Safe

• Patch-level update; no API-level changes affecting this repo are expected.
• No code changes required.

References

• https://github.com/golang/sys/releases

golang.org/x/crypto v0.48.0 -> v0.49.0 — ✅ Safe

• Patch-level update; typical security/bug fixes.
• No API changes detected that would require code updates.

References

• https://github.com/golang/crypto/releases

golang.org/x/net v0.51.0 -> v0.52.0 — ✅ Safe

• Patch-level update; no breaking API changes expected.
• No code changes required.

References

• https://github.com/golang/net/releases

golang.org/x/text v0.34.0 -> v0.35.0 — ✅ Safe

• Patch-level update; internal fixes and improvements.
• No code changes required.

References

• https://github.com/golang/text/releases

golang.org/x/tools v0.42.0 -> v0.43.0 — ✅ Safe

• Mostly tooling/dev-only; no breaking runtime changes.
• No code changes required.

References

• https://github.com/golang/tools/releases

golang.org/x/mod v0.33.0 -> v0.34.0 — ✅ Safe

• Module tooling only; no application code changes required.

References

• https://github.com/golang/mod/releases

golang.org/x/term v0.40.0 -> v0.41.0 — ✅ Safe

• Patch-level update.
• No code changes required.

References

• https://github.com/golang/term/releases

golang.org/x/exp (pseudo-version bump) — ✅ Safe

• Experimental package; no public API usage shown in the repo that would be impacted by this bump.
• No code changes required.

References

• https://cs.opensource.google/go/x/exp

golang.org/x/telemetry (pseudo-version bump) — ✅ Safe

• Telemetry tooling; no code changes required for application behavior.

References

• https://pkg.go.dev/golang.org/x/telemetry

github.com/klauspost/compress v1.18.4 -> v1.18.5 — ✅ Safe

• Patch-level bug fixes/perf improvements.
• No API changes required.

References

• https://github.com/klauspost/compress/releases

github.com/knadh/koanf/v2 v2.3.2 -> v2.3.3 — ✅ Safe

• Patch-level update with fixes; no breaking API changes reported.
• No code changes required.

References

• https://github.com/knadh/koanf/releases

github.com/elastic/go-perf (pseudo-version bump) — ✅ Safe

• Indirect dependency used by eBPF/instrumentation tooling; no direct usage in your code.
• No code changes required.

References

• https://github.com/elastic/go-perf

Notes

• Net-new indirect dependency observed in go.sum (ignored per rules because it’s net-new and indirect):
  • github.com/open-telemetry/sig-profiling/tools/profcheck — likely pulled in by the updated ebpf-profiler fork.
• The only dependency necessitating code changes in this PR is the Grafana fork of the OpenTelemetry eBPF profiler. The PR already contains the required updates (ResourceKey/SampleKey adoption, EnvVars moved to resource level, updated createProfile signature and usage).

[blewis12]

seems like tests are failing 👀