fix(deps): update module github.com/open-telemetry/opamp-go to v0.17.0 (

open-telemetry#35513) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/open-telemetry/opamp-go](https://redirect.github.com/open-telemetry/opamp-go) | `v0.15.0` -> `v0.17.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopamp-go/v0.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopamp-go/v0.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopamp-go/v0.15.0/v0.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopamp-go/v0.15.0/v0.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>open-telemetry/opamp-go (github.com/open-telemetry/opamp-go)</summary> ### [`v0.17.0`](https://redirect.github.com/open-telemetry/opamp-go/releases/tag/v0.17.0) [Compare Source](https://redirect.github.com/open-telemetry/opamp-go/compare/v0.16.0...v0.17.0) ##### What's Changed - Add signature to UpdateContent by [@&open-telemetry#8203;BinaryFissionGames](https://redirect.github.com/BinaryFissionGames) in [https://github.com/open-telemetry/opamp-go/pull/301](https://redirect.github.com/open-telemetry/opamp-go/pull/301) **Full Changelog**: open-telemetry/opamp-go@v0.16.0...v0.17.0 ### [`v0.16.0`](https://redirect.github.com/open-telemetry/opamp-go/releases/tag/v0.16.0) [Compare Source](https://redirect.github.com/open-telemetry/opamp-go/compare/v0.15.0...v0.16.0) ##### What's Changed - Fix race condition on TestConnectionAllowsConcurrentWrites by [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) in [https://github.com/open-telemetry/opamp-go/pull/282](https://redirect.github.com/open-telemetry/opamp-go/pull/282) - docs: fix broken link by [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) in [https://github.com/open-telemetry/opamp-go/pull/281](https://redirect.github.com/open-telemetry/opamp-go/pull/281) - docs: fix ClientSyncedState docstring with a valid link by [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) in [https://github.com/open-telemetry/opamp-go/pull/285](https://redirect.github.com/open-telemetry/opamp-go/pull/285) - fix(deps): update module github.com/gorilla/websocket to v1.5.2 by [@&open-telemetry#8203;renovate](https://redirect.github.com/renovate) in [https://github.com/open-telemetry/opamp-go/pull/284](https://redirect.github.com/open-telemetry/opamp-go/pull/284) - Amend Retry-After parsing logic for negative durations by [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) in [https://github.com/open-telemetry/opamp-go/pull/283](https://redirect.github.com/open-telemetry/opamp-go/pull/283) - Enable clients to set flags by [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) in [https://github.com/open-telemetry/opamp-go/pull/286](https://redirect.github.com/open-telemetry/opamp-go/pull/286) - fix(deps): update module google.golang.org/protobuf to v1.34.2 by [@&open-telemetry#8203;renovate](https://redirect.github.com/renovate) in [https://github.com/open-telemetry/opamp-go/pull/287](https://redirect.github.com/open-telemetry/opamp-go/pull/287) - chore(deps): update actions/setup-go action to v5.0.2 by [@&open-telemetry#8203;renovate](https://redirect.github.com/renovate) in [https://github.com/open-telemetry/opamp-go/pull/293](https://redirect.github.com/open-telemetry/opamp-go/pull/293) - fix(deps): update module github.com/gorilla/websocket to v1.5.3 by [@&open-telemetry#8203;renovate](https://redirect.github.com/renovate) in [https://github.com/open-telemetry/opamp-go/pull/288](https://redirect.github.com/open-telemetry/opamp-go/pull/288) - Fix flaky TestSendCustomMessagePendingError by [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) in [https://github.com/open-telemetry/opamp-go/pull/292](https://redirect.github.com/open-telemetry/opamp-go/pull/292) - Limit to single inflight package syncing operation by [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) in [https://github.com/open-telemetry/opamp-go/pull/289](https://redirect.github.com/open-telemetry/opamp-go/pull/289) - Support client heartbeat by [@&open-telemetry#8203;haoqixu](https://redirect.github.com/haoqixu) in [https://github.com/open-telemetry/opamp-go/pull/296](https://redirect.github.com/open-telemetry/opamp-go/pull/296) - Add HeaderFunc to allow modifying headers before every request by [@&open-telemetry#8203;BinaryFissionGames](https://redirect.github.com/BinaryFissionGames) in [https://github.com/open-telemetry/opamp-go/pull/298](https://redirect.github.com/open-telemetry/opamp-go/pull/298) ##### New Contributors - [@&open-telemetry#8203;tpaschalis](https://redirect.github.com/tpaschalis) made their first contribution in [https://github.com/open-telemetry/opamp-go/pull/282](https://redirect.github.com/open-telemetry/opamp-go/pull/282) - [@&open-telemetry#8203;BinaryFissionGames](https://redirect.github.com/BinaryFissionGames) made their first contribution in [https://github.com/open-telemetry/opamp-go/pull/298](https://redirect.github.com/open-telemetry/opamp-go/pull/298) **Full Changelog**: open-telemetry/opamp-go@v0.15.0...v0.16.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib).  --------- Signed-off-by: Alex Boten <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <[email protected]> Co-authored-by: Alex Boten <[email protected]>
sbylica-splunk · Dec 17, 2024 · bfef836 · bfef836
1 parent fb35e64
commit bfef836
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 22 deletions.
diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/knadh/koanf/providers/file v1.1.2
 	github.com/knadh/koanf/providers/rawbytes v0.1.0
 	github.com/knadh/koanf/v2 v2.1.2
-	github.com/open-telemetry/opamp-go v0.15.0
+	github.com/open-telemetry/opamp-go v0.17.0
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/config/configopaque v1.20.0
 	go.opentelemetry.io/collector/config/configtls v1.20.0
@@ -27,10 +27,9 @@ require (
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
 )
diff --git a/cmd/opampsupervisor/go.sum b/cmd/opampsupervisor/go.sum
diff --git a/cmd/opampsupervisor/supervisor/supervisor.go b/cmd/opampsupervisor/supervisor/supervisor.go
@@ -653,11 +653,11 @@ func (s *Supervisor) onOpampConnectionSettings(_ context.Context, settings *prot
 		newServerConfig.Headers = s.getHeadersFromSettings(settings.Headers)
 	}
 	if settings.Certificate != nil {
-		if len(settings.Certificate.CaPublicKey) != 0 {
-			newServerConfig.TLSSetting.CAPem = configopaque.String(settings.Certificate.CaPublicKey)
+		if len(settings.Certificate.CaCert) != 0 {
+			newServerConfig.TLSSetting.CAPem = configopaque.String(settings.Certificate.CaCert)
 		}
-		if len(settings.Certificate.PublicKey) != 0 {
-			newServerConfig.TLSSetting.CertPem = configopaque.String(settings.Certificate.PublicKey)
+		if len(settings.Certificate.Cert) != 0 {
+			newServerConfig.TLSSetting.CertPem = configopaque.String(settings.Certificate.Cert)
 		}
 		if len(settings.Certificate.PrivateKey) != 0 {
 			newServerConfig.TLSSetting.KeyPem = configopaque.String(settings.Certificate.PrivateKey)

diff --git a/cmd/opampsupervisor/supervisor/supervisor_test.go b/cmd/opampsupervisor/supervisor/supervisor_test.go
@@ -1033,6 +1033,8 @@ func (m mockOpAMPClient) SendCustomMessage(message *protobufs.CustomMessage) (me
 	return msgChan, nil
 }
 
+func (m mockOpAMPClient) SetFlags(_ protobufs.AgentToServerFlags) {}
+
 type mockConn struct {
 	sendFunc func(ctx context.Context, message *protobufs.ServerToAgent) error
 }

diff --git a/extension/opampcustommessages/go.mod b/extension/opampcustommessages/go.mod
@@ -2,6 +2,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/opamp
 
 go 1.22.0
 
-require github.com/open-telemetry/opamp-go v0.15.0
+require github.com/open-telemetry/opamp-go v0.17.0
 
-require google.golang.org/protobuf v1.34.1 // indirect
+require google.golang.org/protobuf v1.34.2 // indirect
diff --git a/extension/opampcustommessages/go.sum b/extension/opampcustommessages/go.sum
diff --git a/receiver/awss3receiver/go.mod b/receiver/awss3receiver/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/config v1.28.3
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.37
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3
-	github.com/open-telemetry/opamp-go v0.15.0
+	github.com/open-telemetry/opamp-go v0.17.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.114.0
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/component v0.114.0

diff --git a/receiver/awss3receiver/go.sum b/receiver/awss3receiver/go.sum