Skip to content

Commit 0cdc5de

Browse files
committed
Merge branch 'main' into component-logger
2 parents c8b9393 + fc34c23 commit 0cdc5de

File tree

13 files changed

+22
-18
lines changed

13 files changed

+22
-18
lines changed

Diff for: .github/workflows/build-and-test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ jobs:
234234
# on macOS: https://go.dev/doc/go1.15
235235
#- goos: darwin
236236
# goarch: 386
237+
- goos: aix
238+
goarch: ppc64
237239
- goos: darwin
238240
goarch: amd64
239241
- goos: darwin

Diff for: cmd/builder/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
go.uber.org/goleak v1.3.0
1818
go.uber.org/multierr v1.11.0
1919
go.uber.org/zap v1.27.0
20-
golang.org/x/mod v0.22.0
20+
golang.org/x/mod v0.23.0
2121
)
2222

2323
require (

Diff for: cmd/builder/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: cmd/builder/internal/builder/main_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ require (
4040
var replaceModules = []string{
4141
"",
4242
"/component",
43-
"/component/componenttest",
43+
"/component/componentattribute",
4444
"/component/componentstatus",
45+
"/component/componenttest",
4546
"/client",
4647
"/config/configauth",
4748
"/config/configcompression",

Diff for: cmd/otelcorecol/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol
44

55
go 1.22.0
66

7-
toolchain go1.23.5
7+
toolchain go1.22.11
88

99
require (
1010
go.opentelemetry.io/collector/component v0.119.0
@@ -31,7 +31,7 @@ require (
3131
go.opentelemetry.io/collector/receiver v0.119.0
3232
go.opentelemetry.io/collector/receiver/nopreceiver v0.119.0
3333
go.opentelemetry.io/collector/receiver/otlpreceiver v0.119.0
34-
golang.org/x/sys v0.29.0
34+
golang.org/x/sys v0.30.0
3535
)
3636

3737
require (

Diff for: cmd/otelcorecol/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: exporter/debugexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
go.opentelemetry.io/collector/pdata/testdata v0.119.0
1919
go.uber.org/goleak v1.3.0
2020
go.uber.org/zap v1.27.0
21-
golang.org/x/sys v0.29.0
21+
golang.org/x/sys v0.30.0
2222
)
2323

2424
require (

Diff for: exporter/debugexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: otelcol/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
go.uber.org/multierr v1.11.0
2828
go.uber.org/zap v1.27.0
2929
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
30-
golang.org/x/sys v0.29.0
30+
golang.org/x/sys v0.30.0
3131
google.golang.org/grpc v1.70.0
3232
gopkg.in/yaml.v3 v3.0.1
3333
)

Diff for: otelcol/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: otelcol/otelcoltest/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ require (
111111
go.uber.org/zap v1.27.0 // indirect
112112
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
113113
golang.org/x/net v0.34.0 // indirect
114-
golang.org/x/sys v0.29.0 // indirect
114+
golang.org/x/sys v0.30.0 // indirect
115115
golang.org/x/text v0.21.0 // indirect
116116
gonum.org/v1/gonum v0.15.1 // indirect
117117
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect

Diff for: otelcol/otelcoltest/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: versions.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ module-sets:
3030
- go.opentelemetry.io/collector/cmd/builder
3131
- go.opentelemetry.io/collector/cmd/mdatagen
3232
- go.opentelemetry.io/collector/component
33-
- go.opentelemetry.io/collector/component/componenttest
33+
- go.opentelemetry.io/collector/component/componentattribute
3434
- go.opentelemetry.io/collector/component/componentstatus
35+
- go.opentelemetry.io/collector/component/componenttest
3536
- go.opentelemetry.io/collector/config/configauth
3637
- go.opentelemetry.io/collector/config/configgrpc
3738
- go.opentelemetry.io/collector/config/confighttp

0 commit comments

Comments
 (0)