Skip to content

Merge 11 upstream commits (up to codeql-action v4.34.1) #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gnurizen merged 12 commits into from
Apr 14, 2026
Merged

Merge 11 upstream commits (up to codeql-action v4.34.1) #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4c9ae93
fix(ruby): regex match 3.3.10 (#1256)
korniltsev-grafanista Mar 17, 2026
fa7b0cc
Upgrade collector to v1.54.0 (#1266)
dmathieu Mar 18, 2026
c7e873a
ruby: support EC offset extraction for statically-linked Ruby (#1227)
dalehamel Mar 19, 2026
18242e4
fix(deps): update module google.golang.org/grpc to v1.79.3 [security]…
renovate[bot] Mar 20, 2026
41302aa
chore(deps): update github actions (#1269)
renovate[bot] Mar 20, 2026
2dcbb75
chore(deps): lock file maintenance (#1272)
renovate[bot] Mar 20, 2026
2670586
fix(deps): update go dependencies (#1271)
renovate[bot] Mar 20, 2026
fbc3686
chore(deps): update ocb (manifest) dependencies (#1270)
renovate[bot] Mar 20, 2026
6ff0091
Pass non-zero mapID into UpdateStackDeltaPages to fix cleanups (#1274)
bobrik Mar 23, 2026
2e47991
fix(deps): update go dependencies (#1276)
renovate[bot] Mar 23, 2026
4e8bd96
chore(deps): update github/codeql-action action to v4.34.1 (#1277)
renovate[bot] Mar 23, 2026
e6f0835
Merge commit '4e8bd96a0cb2ec367e89915e599c271ff9743d4a' into upstream…
gnurizen Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
uses: ./.github/workflows/env

- name: Initialize CodeQL
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
with:
languages: go

- name: Build Artifact
run: make

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
with:
category: "/language:Go"
timeout-minutes: 10
2 changes: 1 addition & 1 deletion .github/workflows/collector-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
with:
go-version: stable
- name: Cache coredump modules
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: tools/coredump/modulecache
key: coredumps-collector-${{ hashFiles('tools/coredump/testdata/*/*.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ossf-scorecard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
uses: github/codeql-action/upload-sarif@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions .github/workflows/unit-test-on-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Set up environment
uses: ./.github/workflows/env
- name: Cache coredump modules
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: tools/coredump/modulecache
key: coredumps-${{ matrix.target_arch }}-${{ hashFiles('tools/coredump/testdata/*/*.json') }}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
go-version-file: go.mod
cache-dependency-path: go.sum
- name: Cache coredump modules
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: tools/coredump/modulecache
key: coredumps-arm64-${{ hashFiles('tools/coredump/testdata/*/*.json') }}
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions cmd/otelcol-ebpf-profiler/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ dist:
version: dev

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.147.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.148.0
- gomod: go.opentelemetry.io/ebpf-profiler v0.0.202610
import: go.opentelemetry.io/ebpf-profiler/collector

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.147.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.147.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.147.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.148.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.148.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.148.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.53.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.53.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.53.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.54.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.54.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.54.0

replaces:
- go.opentelemetry.io/ebpf-profiler => ../../
40 changes: 20 additions & 20 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.11.1
github.com/testcontainers/testcontainers-go v0.42.0
github.com/zeebo/xxh3 v1.1.0
go.opentelemetry.io/collector/component v1.53.0
go.opentelemetry.io/collector/confmap/xconfmap v0.147.0
go.opentelemetry.io/collector/consumer/consumertest v0.147.0
go.opentelemetry.io/collector/consumer/xconsumer v0.147.0
go.opentelemetry.io/collector/pdata v1.53.0
go.opentelemetry.io/collector/pdata/pprofile v0.147.0
go.opentelemetry.io/collector/receiver v1.53.0
go.opentelemetry.io/collector/receiver/receivertest v0.147.0
go.opentelemetry.io/collector/receiver/xreceiver v0.147.0
go.opentelemetry.io/collector/component v1.54.0
go.opentelemetry.io/collector/confmap/xconfmap v0.148.0
go.opentelemetry.io/collector/consumer/consumertest v0.148.0
go.opentelemetry.io/collector/consumer/xconsumer v0.148.0
go.opentelemetry.io/collector/pdata v1.54.0
go.opentelemetry.io/collector/pdata/pprofile v0.148.0
go.opentelemetry.io/collector/receiver v1.54.0
go.opentelemetry.io/collector/receiver/receivertest v0.148.0
go.opentelemetry.io/collector/receiver/xreceiver v0.148.0
go.opentelemetry.io/otel v1.42.0
go.opentelemetry.io/otel/metric v1.42.0
go.opentelemetry.io/proto/otlp/profiles/v1development v0.3.0
Expand All @@ -49,7 +49,7 @@ require (
golang.org/x/mod v0.34.0
golang.org/x/sync v0.20.0
golang.org/x/sys v0.42.0
google.golang.org/grpc v1.79.2
google.golang.org/grpc v1.79.3
google.golang.org/protobuf v1.36.11
)

Expand Down Expand Up @@ -100,7 +100,7 @@ require (
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/knadh/koanf/maps v0.1.2 // indirect
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
github.com/knadh/koanf/v2 v2.3.2 // indirect
github.com/knadh/koanf/v2 v2.3.3 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.10 // indirect
github.com/mdlayher/netlink v1.7.2 // indirect
Expand All @@ -126,16 +126,16 @@ require (
github.com/tklauser/numcpus v0.11.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/collector/component/componenttest v0.147.0 // indirect
go.opentelemetry.io/collector/confmap v1.53.0 // indirect
go.opentelemetry.io/collector/consumer v1.53.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.147.0 // indirect
go.opentelemetry.io/collector/featuregate v1.53.0 // indirect
go.opentelemetry.io/collector/internal/componentalias v0.147.0 // indirect
go.opentelemetry.io/collector/pipeline v1.53.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.148.0 // indirect
go.opentelemetry.io/collector/confmap v1.54.0 // indirect
go.opentelemetry.io/collector/consumer v1.54.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.148.0 // indirect
go.opentelemetry.io/collector/featuregate v1.54.0 // indirect
go.opentelemetry.io/collector/internal/componentalias v0.148.0 // indirect
go.opentelemetry.io/collector/pipeline v1.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
go.opentelemetry.io/otel/sdk v1.42.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.42.0 // indirect
go.opentelemetry.io/otel/trace v1.42.0 // indirect
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
Expand Down
Loading