Skip to content

Commit

Permalink
Update smart agent to v5.27.2 (open-telemetry#2495)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hughesjj
hughesjj authored Jan 21, 2023
1 parent ff6abef commit 1c00666
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 22 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

## Unreleased

## v0.69.0

This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.69.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.69.1) and the [opentelemetry-collector-contrib v0.69.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.69.0) releases where appropriate.

### 💡 Enhancements 💡
- Upgraded to the latest [Java agent version (v1.20.0)](https://github.com/signalfx/splunk-otel-collector/pull/2487)
- Upgrade to include changes from [SignalFx Smart Agent v5.27.2](https://github.com/signalfx/signalfx-agent/releases/tag/v5.27.2)

### 🛑 Breaking changes 🛑
Resource detection for `gke`/`gce` have been combined into the `gcp` resource detector. While the Splunk distribution of the opentelemetry collector will currently automatically detect and translate any "deprecated" configuration using `gke`/`gce`, we recommend users with affected configurations specify the new `gcp` detector.


## v0.68.1

This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.68.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.68.0) and the [opentelemetry-collector-contrib v0.68.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.68.0) releases where appropriate.
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.69.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.69.0
github.com/signalfx/golib/v3 v3.3.47
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4
github.com/signalfx/splunk-otel-collector/extension/smartagentextension v0.0.0-00010101000000-000000000000
github.com/signalfx/splunk-otel-collector/processor/timestampprocessor v0.0.0-00010101000000-000000000000
github.com/signalfx/splunk-otel-collector/receiver/smartagentreceiver v0.0.0-00010101000000-000000000000
Expand Down Expand Up @@ -398,7 +398,7 @@ require (
github.com/signalfx/golib v2.5.1+incompatible // indirect
github.com/signalfx/ingest-protocols v0.1.14 // indirect
github.com/signalfx/sapm-proto v0.12.0 // indirect
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 // indirect
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 // indirect
github.com/signalfx/signalfx-go v1.25.0 // indirect
github.com/sijms/go-ora/v2 v2.5.21 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
Expand Down Expand Up @@ -494,8 +494,8 @@ replace (
github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.40.5

// To prevent attempted downgrading for agent deps, do not remove signalfx-agent or signalfx/pkg/apm replace directives
github.com/signalfx/signalfx-agent => github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305
github.com/signalfx/signalfx-agent/pkg/apm => github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305
github.com/signalfx/signalfx-agent => github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4
github.com/signalfx/signalfx-agent/pkg/apm => github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4

github.com/soheilhy/cmux => github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5 // required for smartagentreceiver to drop google.golang.org/grpc/examples/helloworld/helloworld test dep
)
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2159,10 +2159,10 @@ github.com/signalfx/sapm-proto v0.4.0/go.mod h1:x3gtwJ1GRejtkghB4nYpwixh2zqJrLbP
github.com/signalfx/sapm-proto v0.7.2/go.mod h1:HLufOh6Gd2altGxbeve+s6hh0EWCWoOM7MmuYuvs5PI=
github.com/signalfx/sapm-proto v0.12.0 h1:OtOe+Jm8L61Ml8K6X8a89zc8/RlaaMRElCImeGKR/Ew=
github.com/signalfx/sapm-proto v0.12.0/go.mod h1:wQEki8RNCYjkv19jw5aWDcmDMTQru0ckfUbgHI69U2E=
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305 h1:35yV2tI5NnU2jNFriaPMympSsGk/r6sIH8T7Ee1D/w0=
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 h1:8AVq4/zaKQVz9Mqrm5f9heAdejfNsw5P3YbsVZyuNDI=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4 h1:6LbZ/VuBnBp2YgLD3IUMyzQZeTqqAbiYltg8/7V+qE0=
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 h1:VZCwYHyev4SEOStAGtxl/GKKfDK6noP86zc4oMHDCt8=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
github.com/signalfx/signalfx-go v1.25.0 h1:Y+VvL82aYtQHWAQyPReSSyAy1wcB8cIYYziJKUWxahU=
github.com/signalfx/signalfx-go v1.25.0/go.mod h1:YhPTMdQJDfphcRBdk+9acbbAw1gYY7z5BIHUWzLmGlA=
github.com/signalfx/telegraf v0.10.2-0.20210820123244-82265917ca87 h1:ayeUHxiUjcxzuEzjWVkXJxf42UYNw8UKmYmIQu9mAqo=
Expand Down
2 changes: 1 addition & 1 deletion internal/buildscripts/packaging/smart-agent-release.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v5.27.1
v5.27.2
4 changes: 2 additions & 2 deletions pkg/extension/smartagentextension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,6 @@ replace (

// To prevent attempted downgrading for agent deps, do not remove signalfx-agent or signalfx/pkg/apm replace directives
replace (
github.com/signalfx/signalfx-agent => github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305
github.com/signalfx/signalfx-agent/pkg/apm => github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 // indirect
github.com/signalfx/signalfx-agent => github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4
github.com/signalfx/signalfx-agent/pkg/apm => github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 // indirect
)
8 changes: 4 additions & 4 deletions pkg/extension/smartagentextension/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,10 +1643,10 @@ github.com/signalfx/gomemcache v0.0.0-20180823214636-4f7ef64c72a9/go.mod h1:Ytb8
github.com/signalfx/sapm-proto v0.7.2/go.mod h1:HLufOh6Gd2altGxbeve+s6hh0EWCWoOM7MmuYuvs5PI=
github.com/signalfx/sapm-proto v0.12.0 h1:OtOe+Jm8L61Ml8K6X8a89zc8/RlaaMRElCImeGKR/Ew=
github.com/signalfx/sapm-proto v0.12.0/go.mod h1:wQEki8RNCYjkv19jw5aWDcmDMTQru0ckfUbgHI69U2E=
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305 h1:35yV2tI5NnU2jNFriaPMympSsGk/r6sIH8T7Ee1D/w0=
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 h1:8AVq4/zaKQVz9Mqrm5f9heAdejfNsw5P3YbsVZyuNDI=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4 h1:6LbZ/VuBnBp2YgLD3IUMyzQZeTqqAbiYltg8/7V+qE0=
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 h1:VZCwYHyev4SEOStAGtxl/GKKfDK6noP86zc4oMHDCt8=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
Expand Down
2 changes: 1 addition & 1 deletion pkg/receiver/smartagent/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ type Config struct {
}

func (cfg *Config) validate() error {
if cfg.monitorConfig == nil {
if cfg == nil || cfg.monitorConfig == nil {
return fmt.Errorf("you must supply a valid Smart Agent Monitor config")
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/receiver/smartagent/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ replace (

// To prevent attempted downgrading for agent deps, do not remove signalfx-agent or signalfx/pkg/apm replace directives
replace (
github.com/signalfx/signalfx-agent => github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305
github.com/signalfx/signalfx-agent/pkg/apm => github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305
github.com/signalfx/signalfx-agent => github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4
github.com/signalfx/signalfx-agent/pkg/apm => github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4
)

// this is the version that doesn't suffer from https://github.com/mattn/go-ieproxy/issues/45
Expand Down
8 changes: 4 additions & 4 deletions pkg/receiver/smartagent/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1927,10 +1927,10 @@ github.com/signalfx/sapm-proto v0.4.0/go.mod h1:x3gtwJ1GRejtkghB4nYpwixh2zqJrLbP
github.com/signalfx/sapm-proto v0.7.2/go.mod h1:HLufOh6Gd2altGxbeve+s6hh0EWCWoOM7MmuYuvs5PI=
github.com/signalfx/sapm-proto v0.12.0 h1:OtOe+Jm8L61Ml8K6X8a89zc8/RlaaMRElCImeGKR/Ew=
github.com/signalfx/sapm-proto v0.12.0/go.mod h1:wQEki8RNCYjkv19jw5aWDcmDMTQru0ckfUbgHI69U2E=
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305 h1:35yV2tI5NnU2jNFriaPMympSsGk/r6sIH8T7Ee1D/w0=
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 h1:8AVq4/zaKQVz9Mqrm5f9heAdejfNsw5P3YbsVZyuNDI=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4 h1:6LbZ/VuBnBp2YgLD3IUMyzQZeTqqAbiYltg8/7V+qE0=
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 h1:VZCwYHyev4SEOStAGtxl/GKKfDK6noP86zc4oMHDCt8=
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
github.com/signalfx/signalfx-go v1.25.0 h1:Y+VvL82aYtQHWAQyPReSSyAy1wcB8cIYYziJKUWxahU=
github.com/signalfx/signalfx-go v1.25.0/go.mod h1:YhPTMdQJDfphcRBdk+9acbbAw1gYY7z5BIHUWzLmGlA=
github.com/signalfx/telegraf v0.10.2-0.20210820123244-82265917ca87 h1:ayeUHxiUjcxzuEzjWVkXJxf42UYNw8UKmYmIQu9mAqo=
Expand Down

0 comments on commit 1c00666

Please sign in to comment.