Skip to content

Commit a5239c6

Browse files
hughesjjhughesjj
committed
Update smart agent to v5.27.2
1 parent ff6abef commit a5239c6

File tree

9 files changed

+34
-22
lines changed

9 files changed

+34
-22
lines changed

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
## Unreleased
44

5+
## v0.69.0
6+
7+
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.
8+
9+
### 💡 Enhancements 💡
10+
- Upgraded to the latest [Java agent version (v1.20.0)](https://github.com/signalfx/splunk-otel-collector/pull/2487)
11+
- Upgrade to include changes from [SignalFx Smart Agent v5.27.2](https://github.com/signalfx/signalfx-agent/releases/tag/v5.27.2)
12+
13+
### 🛑 Breaking changes 🛑
14+
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.
15+
16+
517
## v0.68.1
618

719
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.

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ require (
7777
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.69.0
7878
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.69.0
7979
github.com/signalfx/golib/v3 v3.3.47
80-
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305
80+
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4
8181
github.com/signalfx/splunk-otel-collector/extension/smartagentextension v0.0.0-00010101000000-000000000000
8282
github.com/signalfx/splunk-otel-collector/processor/timestampprocessor v0.0.0-00010101000000-000000000000
8383
github.com/signalfx/splunk-otel-collector/receiver/smartagentreceiver v0.0.0-00010101000000-000000000000
@@ -398,7 +398,7 @@ require (
398398
github.com/signalfx/golib v2.5.1+incompatible // indirect
399399
github.com/signalfx/ingest-protocols v0.1.14 // indirect
400400
github.com/signalfx/sapm-proto v0.12.0 // indirect
401-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 // indirect
401+
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 // indirect
402402
github.com/signalfx/signalfx-go v1.25.0 // indirect
403403
github.com/sijms/go-ora/v2 v2.5.21 // indirect
404404
github.com/sirupsen/logrus v1.9.0 // indirect
@@ -494,8 +494,8 @@ replace (
494494
github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.40.5
495495

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

500500
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
501501
)

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2159,10 +2159,10 @@ github.com/signalfx/sapm-proto v0.4.0/go.mod h1:x3gtwJ1GRejtkghB4nYpwixh2zqJrLbP
21592159
github.com/signalfx/sapm-proto v0.7.2/go.mod h1:HLufOh6Gd2altGxbeve+s6hh0EWCWoOM7MmuYuvs5PI=
21602160
github.com/signalfx/sapm-proto v0.12.0 h1:OtOe+Jm8L61Ml8K6X8a89zc8/RlaaMRElCImeGKR/Ew=
21612161
github.com/signalfx/sapm-proto v0.12.0/go.mod h1:wQEki8RNCYjkv19jw5aWDcmDMTQru0ckfUbgHI69U2E=
2162-
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305 h1:35yV2tI5NnU2jNFriaPMympSsGk/r6sIH8T7Ee1D/w0=
2163-
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
2164-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 h1:8AVq4/zaKQVz9Mqrm5f9heAdejfNsw5P3YbsVZyuNDI=
2165-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
2162+
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4 h1:6LbZ/VuBnBp2YgLD3IUMyzQZeTqqAbiYltg8/7V+qE0=
2163+
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
2164+
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 h1:VZCwYHyev4SEOStAGtxl/GKKfDK6noP86zc4oMHDCt8=
2165+
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
21662166
github.com/signalfx/signalfx-go v1.25.0 h1:Y+VvL82aYtQHWAQyPReSSyAy1wcB8cIYYziJKUWxahU=
21672167
github.com/signalfx/signalfx-go v1.25.0/go.mod h1:YhPTMdQJDfphcRBdk+9acbbAw1gYY7z5BIHUWzLmGlA=
21682168
github.com/signalfx/telegraf v0.10.2-0.20210820123244-82265917ca87 h1:ayeUHxiUjcxzuEzjWVkXJxf42UYNw8UKmYmIQu9mAqo=

‎internal/buildscripts/packaging/smart-agent-release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v5.27.1
1+
v5.27.2

‎pkg/extension/smartagentextension/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,6 @@ replace (
172172

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

‎pkg/extension/smartagentextension/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,10 +1643,10 @@ github.com/signalfx/gomemcache v0.0.0-20180823214636-4f7ef64c72a9/go.mod h1:Ytb8
16431643
github.com/signalfx/sapm-proto v0.7.2/go.mod h1:HLufOh6Gd2altGxbeve+s6hh0EWCWoOM7MmuYuvs5PI=
16441644
github.com/signalfx/sapm-proto v0.12.0 h1:OtOe+Jm8L61Ml8K6X8a89zc8/RlaaMRElCImeGKR/Ew=
16451645
github.com/signalfx/sapm-proto v0.12.0/go.mod h1:wQEki8RNCYjkv19jw5aWDcmDMTQru0ckfUbgHI69U2E=
1646-
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305 h1:35yV2tI5NnU2jNFriaPMympSsGk/r6sIH8T7Ee1D/w0=
1647-
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
1648-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 h1:8AVq4/zaKQVz9Mqrm5f9heAdejfNsw5P3YbsVZyuNDI=
1649-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
1646+
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4 h1:6LbZ/VuBnBp2YgLD3IUMyzQZeTqqAbiYltg8/7V+qE0=
1647+
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
1648+
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 h1:VZCwYHyev4SEOStAGtxl/GKKfDK6noP86zc4oMHDCt8=
1649+
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
16501650
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
16511651
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
16521652
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

‎pkg/receiver/smartagent/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type Config struct {
5757
}
5858

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

‎pkg/receiver/smartagent/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@ replace (
297297

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

304304
// this is the version that doesn't suffer from https://github.com/mattn/go-ieproxy/issues/45

‎pkg/receiver/smartagent/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,10 +1927,10 @@ github.com/signalfx/sapm-proto v0.4.0/go.mod h1:x3gtwJ1GRejtkghB4nYpwixh2zqJrLbP
19271927
github.com/signalfx/sapm-proto v0.7.2/go.mod h1:HLufOh6Gd2altGxbeve+s6hh0EWCWoOM7MmuYuvs5PI=
19281928
github.com/signalfx/sapm-proto v0.12.0 h1:OtOe+Jm8L61Ml8K6X8a89zc8/RlaaMRElCImeGKR/Ew=
19291929
github.com/signalfx/sapm-proto v0.12.0/go.mod h1:wQEki8RNCYjkv19jw5aWDcmDMTQru0ckfUbgHI69U2E=
1930-
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305 h1:35yV2tI5NnU2jNFriaPMympSsGk/r6sIH8T7Ee1D/w0=
1931-
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
1932-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305 h1:8AVq4/zaKQVz9Mqrm5f9heAdejfNsw5P3YbsVZyuNDI=
1933-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230104182534-9eee411fe305/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
1930+
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4 h1:6LbZ/VuBnBp2YgLD3IUMyzQZeTqqAbiYltg8/7V+qE0=
1931+
github.com/signalfx/signalfx-agent v1.0.1-0.20230117211433-9858481024e4/go.mod h1:pLK+kaun+g8gN8EgtGT/h/xmfQEU7v2+PQSXTe34K5U=
1932+
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4 h1:VZCwYHyev4SEOStAGtxl/GKKfDK6noP86zc4oMHDCt8=
1933+
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230117211433-9858481024e4/go.mod h1:ByNJRwnFF1WKXFMZLOvLD5cXSnBXOuXb0HuaNzqdc9o=
19341934
github.com/signalfx/signalfx-go v1.25.0 h1:Y+VvL82aYtQHWAQyPReSSyAy1wcB8cIYYziJKUWxahU=
19351935
github.com/signalfx/signalfx-go v1.25.0/go.mod h1:YhPTMdQJDfphcRBdk+9acbbAw1gYY7z5BIHUWzLmGlA=
19361936
github.com/signalfx/telegraf v0.10.2-0.20210820123244-82265917ca87 h1:ayeUHxiUjcxzuEzjWVkXJxf42UYNw8UKmYmIQu9mAqo=

0 commit comments

Comments
 (0)