feat(beyla.ebpf): Bump Beyla to v3.6

[marctc]

Brief description of Pull Request

• Bump beyla.ebpf to Beyla v3.6
• Add missing fields from last updates
• Add integration test for java injector sdk

PR Checklist

• Documentation added
• Tests updated
• Config converters updated

[github-actions]

💻 Deploy preview available (feat(beyla.ebpf): bump Beyla to v3.6):

• https://deploy-preview-alloy-5833-zb444pucvq-vp.a.run.app/docs/alloy/latest/

[github-actions]

💻 Deploy preview available (chore(beyla.ebpf): Bump Beyla to v3.6):

• https://deploy-preview-alloy-5833-zb444pucvq-vp.a.run.app/docs/alloy/latest/

[github-actions]

🔍 Dependency Review

Below are the notable Go module dependency changes in this PR and what they mean for your code. For each changed dependency, I indicate whether changes are required, include concise diffs you can apply, and include expandable details with more context and evidence from the code adjustments in this PR.

Note: Many updates here are patch/minor bumps and are safe. I focus code change guidance on the few that introduced breaking changes or new types/behaviors you already adapted in this PR.

---

github.com/grafana/beyla/v2 v2.8.5 -> github.com/grafana/beyla/v3 v3.6.0 — ❌ Changes Needed

Impact

• This is a major version upgrade (module path changes to v3). It introduces several breaking API/config refactors that required code changes (already reflected in this PR). Key changes:
  • Instrumentation list type changed from []string to []instrumentations.Instrumentation
  • NetworkFlows no longer exposes an explicit Enable flag (enablement inferred from features)
  • Port range enum refactored from services.PortEnum to services.IntEnum (+ generic naming for non-port ints)
  • Kubernetes agent interface selector type changed (AgentIPIface string -> obi.AgentTypeIface)
  • Sampler name is now a typed enum (services.SamplerName)
  • Context propagation token for TCP-level propagation is now "tcp" (value "ip" deprecated/no-op)
  • Metric “features” are now loaded via export.LoadFeatures into cfg.Metrics.Features (not cfg.Prometheus.Features)
  • New protocol-aware payload extraction (e.g., OpenAI) is available under ebpf.payload_extraction
  • SDK Injector (automatic SDK injection) config added

Required code changes (already done in this PR)

• Update beyla config shapes and conversions:

- import "github.com/grafana/beyla/v2/pkg/beyla"
+ import "github.com/grafana/beyla/v3/pkg/beyla"

- cfg.Prometheus.Features = args.Features
- cfg.Prometheus.Instrumentations = args.Instrumentations
+ cfg.Metrics.Features = export.LoadFeatures(args.Features)
+ cfg.Prometheus.Instrumentations = stringsToInstrumentations(args.Instrumentations)

- networks := beyla.DefaultConfig().NetworkFlows
- networks.Enable = enable
+ networks := beyla.DefaultConfig().NetworkFlows
  // enablement now implied by features; no explicit Enable in v3

- ports, err := stringToPortEnum(s.OpenPorts) // services.PortEnum
+ ports, err := stringToPortEnum(s.OpenPorts) // services.IntEnum

- ebpf.ContextPropagation = obiCfg.ContextPropagationIPOptionsOnly
+ ebpf.ContextPropagation = obiCfg.ContextPropagationTCP

+ ebpf.PayloadExtraction.HTTP.OpenAI.Enabled = args.PayloadExtraction.HTTP.OpenAI.Enabled

- type Service struct {
-   OpenPorts string
-   Path      string
- }
+ type Service struct {
+   OpenPorts string
+   Path      string
+   CmdArgs   string // new selector in v3 criteria
+ }

- type Injector struct {} // not present before
+ type Injector struct {
+   Instrument        Services
+   Webhook           InjectorWebhook
+   OTELEndpoint      string
+   NoAutoRestart     *bool
+   HostPathVolumeDir string
+   SDKPkgVersion     string
+   HostMountPath     string
+   ManageSDKVersions *bool
+   DefaultSampler    SamplerConfig
+   Propagators       []string
+   Export            InjectorSDKExport
+   Resources         InjectorSDKResource
+   EnabledSDKs       []string
+   Debug             *bool
+ }

• Replace string lists of instrumentations with typed values:

- config.Instrumentations = []string{"http", "grpc", "kafka"}
+ config.Instrumentations = []instrumentations.Instrumentation{
+   instrumentations.InstrumentationHTTP,
+   instrumentations.InstrumentationGRPC,
+   instrumentations.InstrumentationKafka,
+ }

• Enum/typed refactors:

- type PortEnum = services.PortEnum
+ type PortEnum = services.IntEnum

- config.Sampler = services.SamplerConfig{Name: "traceidratio", Arg: "0.2"}
+ config.Sampler = services.SamplerConfig{Name: services.SamplerTraceIDRatio, Arg: "0.2"}

- networks.AgentIPIface = "local"
+ networks.AgentIPIface = obi.AgentTypeIface("local")

• Example of the new payload extraction under ebpf:

 ebpf {
   ...
+  payload_extraction {
+    http {
+      openai {
+        enabled = true
+      }
+    }
+  }
 }

• Example Injector usage:

+beyla.ebpf "default" {
+  injector {
+    instrument {
+      exe_path = "*java"
+    }
+    enabled_sdks  = ["java"]
+    otel_endpoint = "http://alloy:4318"
+  }
+}

Evidence (from this PR)

• internal/component/beyla/ebpf:
  • services.PortEnum → services.IntEnum
  • Add CmdArgs in discovery criteria and ConvertGlob usage
  • Context propagation “ip” → “tcp”
  • Prometheus.Instrumentations now typed; features loaded via export.LoadFeatures into cfg.Metrics.Features
  • Introduces Injector block (+ validations and conversions)
  • EBPF payload_extraction support
• integration-tests add SDK injector and protocol-aware payload parsing usage

---

go.opentelemetry.io/obi v1.2.2 -> v0.6.0 (plus replace → github.com/grafana/opentelemetry-ebpf-instrumentation v1.12.2…) — ❌ Changes Needed

Impact

• This OBI update (with a newer Grafana fork via replace) comes with refactors in data model/types mirrored by the Beyla v3 update:
  • Port enum generalized (services.PortEnum → services.IntEnum)
  • Sampler name is typed (services.SamplerName)
  • Instrumentations are typed constants instead of strings
  • Context propagation value shape changed ("ip" deprecated in favor of "tcp")
  • Agent interface kind is now a dedicated type (obi.AgentTypeIface)
  • Some route ignore knobs are marked deprecated in OBI; you can keep them (they remain wired in this PR) but they’re on the path to removal

Code changes (already implemented here)

- ports, _ := stringToPortEnum(...)
- s.OpenPorts services.PortEnum
+ ports, _ := stringToPortEnum(...)
+ s.OpenPorts services.IntEnum

- services.SamplerConfig{Name: "traceidratio", Arg: "0.1"}
+ services.SamplerConfig{Name: services.SamplerTraceIDRatio, Arg: "0.1"}

- cfg.TracesReceiver.Instrumentations = []string{"http", "grpc"}
+ cfg.TracesReceiver.Instrumentations = []instrumentations.Instrumentation{
+   instrumentations.InstrumentationHTTP,
+   instrumentations.InstrumentationGRPC,
+ }

- ebpf.ContextPropagation = obiCfg.ContextPropagationIPOptionsOnly
+ ebpf.ContextPropagation = obiCfg.ContextPropagationTCP

- networks.AgentIPIface = "local"
+ networks.AgentIPIface = obi.AgentTypeIface("local")

Notes

• The replace directive bumps the Grafana fork to v1.12.2-… which aligns to these changes and underpins Beyla v3.
• Keeping your route ignore fields in place is fine; they’re still present but flagged deprecated upstream.

---

go.opentelemetry.io/otel v1.40.0 -> v1.42.0 — ⚠️ Needs Review

Impact

• Minor OTel update; stable APIs generally remain backward-compatible. One subtle but frequent change with OTel releases is the semantic-conventions package version track (semconv).
• In this PR, semconv usage was updated to track the spec version (v1.40.0 semconv path) alongside the OTel bump.

Typical code touch (already done)

- import semconv "go.opentelemetry.io/otel/semconv/v1.39.0"
+ import semconv "go.opentelemetry.io/otel/semconv/v1.40.0"

No additional code changes are required beyond this convention bump.

---

github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 -> v2.28.0 — ✅ Safe

• Patch/minor features and bugfixes in the gateway runtime and codegen; no API changes impacting existing usage in this repository.
• No code changes required.

---

github.com/prometheus/procfs v0.19.2 -> v0.20.1 — ✅ Safe

• Incremental fields and fixes in procfs readers; existing code compiles unchanged.
• No code changes required.

---

github.com/go-playground/validator/v10 v10.26.0 -> v10.30.1 — ✅ Safe

• Patch/minor validations and fixes; no breaking API changes in common paths.
• No code changes required.

---

go.mongodb.org/mongo-driver/v2 v2.3.1 -> v2.5.0 — ✅ Safe

• Minor improvements and fixes (e.g., retry semantics, options tweaks). Public API preserved across 2.x minors.
• No code changes required (watch for deprecation warnings in IDE/build output).

---

go.etcd.io/etcd/client/pkg/v3 v3.6.4 -> v3.6.5; go.etcd.io/etcd/client/v3 v3.6.4 -> v3.6.5 — ✅ Safe

• Patch updates only; no API changes required.

---

k8s.io/* modules — k8s.io/api v0.35.1 -> v0.35.2; k8s.io/apimachinery v0.35.1 -> v0.35.2; k8s.io/client-go v0.35.1 -> v0.35.2; k8s.io/apiextensions-apiserver v0.34.1 -> v0.35.0; sigs.k8s.io/controller-runtime v0.23.1 -> v0.23.3 — ✅ Safe

• All are patch/minor bumps within the same minor track and controller-runtime v0.23.x. No API changes observed in this codebase.
• No code changes required.

---

Miscellaneous safe patch/minor bumps — ✅ Safe

The following were bumped with no breaking API surface in typical usage. No code changes required.

• github.com/gabriel-vasile/mimetype v1.4.8 -> v1.4.12
• github.com/go-openapi/{jsonpointer,jsonreference,swag} patch bumps
• github.com/vektah/gqlparser/v2 v2.5.31 -> v2.5.32
• github.com/pelletier/go-toml/v2 v2.2.3 -> v2.2.4
• github.com/stretchr/objx v0.5.2 -> v0.5.3
• github.com/google/gnostic-models v0.7.0 -> v0.7.1
• golang.org/x/{arch v0.25.0, sync v0.20.0}
• google.golang.org/genproto/googleapis/{api,rpc} new revs
• AWS SDK v2 family: core v1.41.2 -> v1.41.3; config/credentials/imds/internals/etc. patch bumps
  • No code changes needed; purely internal fixes/enhancements.

---

Notable code diffs you can reuse

• Replace “ip” with “tcp” for context propagation in ebpf:

- context_propagation = "ip"
+ context_propagation = "tcp"

• Move metrics “features” into the metrics feature loader (and keep Prometheus instrumentations typed):

- cfg.Prometheus.Features = args.Features
+ cfg.Metrics.Features = export.LoadFeatures(args.Features)

• Update instrumentations to typed constants:

- cfg.TracesReceiver.Instrumentations = []string{"http", "grpc", "kafka"}
+ cfg.TracesReceiver.Instrumentations = []instrumentations.Instrumentation{
+   instrumentations.InstrumentationHTTP,
+   instrumentations.InstrumentationGRPC,
+   instrumentations.InstrumentationKafka,
+ }

• Update port enum usage:

- s.OpenPorts services.PortEnum
+ s.OpenPorts services.IntEnum

• Update sampler config name to typed enum:

- services.SamplerConfig{Name: "traceidratio", Arg:"0.1"}
+ services.SamplerConfig{Name: services.SamplerTraceIDRatio, Arg:"0.1"}

• Update agent interface kind type:

- networks.AgentIPIface = "local"
+ networks.AgentIPIface = obi.AgentTypeIface("local")

• New optional CmdArgs selector support (v3):

 type Service struct {
   OpenPorts string
   Path      string
+  CmdArgs   string
 }

• Update semconv spec version import:

- import semconv "go.opentelemetry.io/otel/semconv/v1.39.0"
+ import semconv "go.opentelemetry.io/otel/semconv/v1.40.0"

• Enable OpenAI payload extraction (optional):

 ebpf {
   ...
+  payload_extraction {
+    http {
+      openai { enabled = true }
+    }
+  }
}

• Use SDK Injector for non-eBPF automatic instrumentation (optional):

 beyla.ebpf "default" {
+  injector {
+    instrument { exe_path = "*java" }
+    enabled_sdks  = ["java"]
+    otel_endpoint = "http://alloy:4318"
+  }
}

---

📝 Notes

• The replace directive for go.opentelemetry.io/obi now points to github.com/grafana/opentelemetry-ebpf-instrumentation v1.12.2-…; this aligns with the Beyla v3 updates and the OBI refactors above.
• A new indirect dependency github.com/invopop/jsonschema v0.13.0 is introduced; it does not impact your code paths here.
• Many minor/patch bumps were evaluated and are safe with no code changes needed.

If you want me to produce a focused checklist for a specific area (e.g., only Beyla/OBI changes in your internal components), I can extract those separately.

[rafaelroquetto]

I believe this should point to v1.15

[marctc]

It's actually pointing to that, but somewhat Go needs to have valid semver tag: https://go.dev/doc/modules/version-numbers

[kalleep]

Not sure you want to use chore in the title, it will not be added to changelog with that prefix. Probably feat instead?

[marctc]

We have automatic changelog now? 😍

[kalleep]

We have automatic changelog now?

Yes we do! It will also pick up changes from description if you want to add more details https://github.com/grafana/alloy/blob/main/docs/developer/contributing.md#pull-request-titles-and-commit-messages

[github-actions]

💻 Deploy preview deleted (feat(beyla.ebpf): Bump Beyla to v3.6).

[skl]

lgtm, optional comments/follow-up suggestions