Skip to content

Commit 7544f64

Browse files
authored
Merge branch 'main' into fix-ecsobserver-task-tags
2 parents b2acb97 + af3bf51 commit 7544f64

File tree

11 files changed

+21
-13
lines changed

11 files changed

+21
-13
lines changed

cmd/opampsupervisor/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/knadh/koanf/providers/file v1.1.2
1111
github.com/knadh/koanf/providers/rawbytes v0.1.0
1212
github.com/knadh/koanf/v2 v2.1.2
13-
github.com/open-telemetry/opamp-go v0.18.0
13+
github.com/open-telemetry/opamp-go v0.19.0
1414
github.com/stretchr/testify v1.10.0
1515
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250226024140-8099e51f9a77
1616
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250226024140-8099e51f9a77

cmd/opampsupervisor/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/opampsupervisor/specification/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ extensions:
462462
The extension uses an OpAMP connection to the Supervisor when used with
463463
the Supervisor model.
464464
465-
The extensions' configuration cannot be overridden by the remote
465+
The extension's configuration cannot be overridden by the remote
466466
configuration.
467467
468468
The same extension can be used to connect directly to the OpAMP Server,

cmd/opampsupervisor/supervisor/supervisor_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,10 @@ func (m mockOpAMPClient) SendCustomMessage(message *protobufs.CustomMessage) (me
10401040

10411041
func (m mockOpAMPClient) SetFlags(_ protobufs.AgentToServerFlags) {}
10421042

1043+
func (m mockOpAMPClient) SetAvailableComponents(_ *protobufs.AvailableComponents) error {
1044+
return nil
1045+
}
1046+
10431047
type mockConn struct {
10441048
sendFunc func(ctx context.Context, message *protobufs.ServerToAgent) error
10451049
}

extension/opampcustommessages/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/opamp
22

33
go 1.23.0
44

5-
require github.com/open-telemetry/opamp-go v0.18.0
5+
require github.com/open-telemetry/opamp-go v0.19.0
66

77
require google.golang.org/protobuf v1.36.5 // indirect
88

extension/opampcustommessages/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.

extension/opampextension/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
require (
66
github.com/google/uuid v1.6.0
77
github.com/oklog/ulid/v2 v2.1.0
8-
github.com/open-telemetry/opamp-go v0.18.0
8+
github.com/open-telemetry/opamp-go v0.19.0
99
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.120.1
1010
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.120.1
1111
github.com/shirou/gopsutil/v4 v4.25.1

extension/opampextension/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.

extension/opampextension/opamp_agent_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,10 @@ func (m mockOpAMPClient) SendCustomMessage(_ *protobufs.CustomMessage) (messageS
658658

659659
func (m mockOpAMPClient) SetFlags(_ protobufs.AgentToServerFlags) {}
660660

661+
func (m mockOpAMPClient) SetAvailableComponents(_ *protobufs.AvailableComponents) error {
662+
return nil
663+
}
664+
661665
type mockStatusEvent struct {
662666
status componentstatus.Status
663667
err error

receiver/awss3receiver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/aws/aws-sdk-go-v2/config v1.29.7
88
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.63
99
github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1
10-
github.com/open-telemetry/opamp-go v0.18.0
10+
github.com/open-telemetry/opamp-go v0.19.0
1111
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.120.1
1212
github.com/stretchr/testify v1.10.0
1313
go.opentelemetry.io/collector/component v0.120.1-0.20250226024140-8099e51f9a77

receiver/awss3receiver/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.

0 commit comments

Comments
 (0)