Skip to content

Commit 19ca3bb

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collector into 14311
2 parents eaf2c26 + a9aaa99 commit 19ca3bb

File tree

79 files changed

+405
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+405
-405
lines changed

.github/workflows/builder-snapshot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
platforms: amd64, arm64,ppc64le
4444

45-
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
45+
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
4646

4747
- name: Setup Go
4848
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0

.github/workflows/go-benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
~/go/pkg/mod
3030
key: go-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/go.sum') }}
3131
- name: Run the benchmarks
32-
uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
32+
uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
3333
with:
3434
mode: walltime
3535
run: make for-all-target TARGET="timebenchmark"

cmd/builder/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ go 1.24.0
88
require (
99
github.com/knadh/koanf/parsers/yaml v1.1.0
1010
github.com/knadh/koanf/providers/env/v2 v2.0.0
11-
github.com/knadh/koanf/providers/file v1.2.0
11+
github.com/knadh/koanf/providers/file v1.2.1
1212
github.com/knadh/koanf/providers/fs v1.0.0
1313
github.com/knadh/koanf/v2 v2.3.0
1414
github.com/spf13/cobra v1.10.2

cmd/builder/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/mdatagen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ require (
7272
go.uber.org/multierr v1.11.0 // indirect
7373
go.yaml.in/yaml/v3 v3.0.4 // indirect
7474
golang.org/x/sys v0.39.0 // indirect
75-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
76-
google.golang.org/grpc v1.77.0 // indirect
75+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
76+
google.golang.org/grpc v1.78.0 // indirect
7777
google.golang.org/protobuf v1.36.11 // indirect
7878
)
7979

cmd/mdatagen/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcorecol/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ require (
101101
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
102102
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
103103
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
104-
github.com/pierrec/lz4/v4 v4.1.22 // indirect
104+
github.com/pierrec/lz4/v4 v4.1.23 // indirect
105105
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
106106
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
107107
github.com/prometheus/client_golang v1.23.2 // indirect
@@ -213,9 +213,9 @@ require (
213213
golang.org/x/text v0.32.0 // indirect
214214
golang.org/x/time v0.14.0 // indirect
215215
gonum.org/v1/gonum v0.16.0 // indirect
216-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
217-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
218-
google.golang.org/grpc v1.77.0 // indirect
216+
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
217+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
218+
google.golang.org/grpc v1.78.0 // indirect
219219
google.golang.org/protobuf v1.36.11 // indirect
220220
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
221221
gopkg.in/inf.v0 v0.9.1 // indirect

cmd/otelcorecol/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/configauth/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
go.opentelemetry.io/otel/trace v1.39.0 // indirect
2727
go.uber.org/multierr v1.11.0 // indirect
2828
go.uber.org/zap v1.27.1 // indirect
29-
google.golang.org/grpc v1.77.0 // indirect
29+
google.golang.org/grpc v1.78.0 // indirect
3030
google.golang.org/protobuf v1.36.11 // indirect
3131
gopkg.in/yaml.v3 v3.0.1 // indirect
3232
)

config/configauth/go.sum

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)