Skip to content

Commit fa4f899

Browse files
jvoravongjvoravong
committed
Add temporary workaround to pull in fix open-telemetry/opentelemetry-collector#10560 
1 parent 2b32de4 commit fa4f899

File tree

13 files changed

+56
-23
lines changed

13 files changed

+56
-23
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
make install-tools
6565
make for-all CMD="make tidy"
6666
if ! git diff --exit-code; then
67-
echo "One or more Go files are not tidied. Run 'make for-all CMD="make tidy"' and push the changes."
67+
echo "One or more Go files are not tidied. Run 'make for-all CMD=\"make tidy\"' and push the changes."
6868
exit 1
6969
fi
7070

‎go.mod

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,3 +643,12 @@ replace (
643643

644644
// Required for github.com/hashicorp/[email protected]
645645
replace github.com/pires/go-proxyproto v1.0.0 => github.com/peteski22/go-proxyproto v1.0.0
646+
647+
// TODO: Remove with v0.105.0 release, temporary workaround to pull in fix https://github.com/open-telemetry/opentelemetry-collector/pull/10560
648+
replace (
649+
go.opentelemetry.io/collector/confmap => go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7
650+
go.opentelemetry.io/collector/confmap/converter/expandconverter => go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.1-0.20240710141741-637b1f42fcb7
651+
go.opentelemetry.io/collector/confmap/provider/envprovider => go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.1-0.20240710141741-637b1f42fcb7
652+
go.opentelemetry.io/collector/confmap/provider/fileprovider => go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240710141741-637b1f42fcb7
653+
go.opentelemetry.io/collector/confmap/provider/yamlprovider => go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.1-0.20240710141741-637b1f42fcb7
654+
)

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,18 +1849,18 @@ go.opentelemetry.io/collector/config/configtls v0.104.0 h1:bMmLz2+r+REpO7cDOR+sr
18491849
go.opentelemetry.io/collector/config/configtls v0.104.0/go.mod h1:e33o7TWcKfe4ToLFyGISEPGMgp6ezf3yHRGY4gs9nKk=
18501850
go.opentelemetry.io/collector/config/internal v0.104.0 h1:h3OkxTfXWWrHRyPEGMpJb4fH+54puSBuzm6GQbuEZ2o=
18511851
go.opentelemetry.io/collector/config/internal v0.104.0/go.mod h1:KjH43jsAUFyZPeTOz7GrPORMQCK13wRMCyQpWk99gMo=
1852-
go.opentelemetry.io/collector/confmap v0.104.0 h1:d3yuwX+CHpoyCh0iMv3rqb/vwAekjSm4ZDL6UK1nZSA=
1853-
go.opentelemetry.io/collector/confmap v0.104.0/go.mod h1:F8Lue+tPPn2oldXcfqI75PPMJoyzgUsKVtM/uHZLA4w=
1854-
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.0 h1:7BhJk71V8xhm8wUpuHG4CVRAPu8JajKj8VmGZ6zS7SA=
1855-
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.0/go.mod h1:o2xTZJpc65SyYPOAGOjyvWwQEqYSWT4Q4/gMfOYpAzc=
1856-
go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 h1:/3iSlUHH1Q3xeZc55oVekd4dibXzqgphXZI7EaYJ+ak=
1857-
go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0/go.mod h1:RZDXvP81JwvIGeq3rvDBrRKMUfn2BeKCmppHm4Qm0D8=
1858-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 h1:B+nMVlIUQxuP52CZSegGuA2z9S+Cv2XwFb2a/TLFPhc=
1859-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0/go.mod h1:O0RcaP/I/kn7JHrwohUfj6AwvQYLxjbqg/HnjkvLLTw=
1852+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7 h1:Oj8J46n16agq8nyviCzBfbOW3pe/OgRsmOqAaMS8+JA=
1853+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:wmKSXPfOatdKyqVi0L/OaJsH2isw7NzPqYpGbtkaZIY=
1854+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.1-0.20240710141741-637b1f42fcb7 h1:nuMxrTuOhGCYVwJZMCr177WKVXDDrx280hHMV8sUgi0=
1855+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:TpCkSA/c5cAxBePjo7tvnBIy2RMAQ7agE4r+JCnm2No=
1856+
go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.1-0.20240710141741-637b1f42fcb7 h1:ul4WeS1Rb5pIDVQ+6N2g1jSYXzBXmIRQQCHUxanStl8=
1857+
go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:qW8yRuCdsmEnVJ5/m0cJ49LoxK4U1ssOFeYL+bN9LzY=
1858+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240710141741-637b1f42fcb7 h1:uE4DfJGNbTaY0oz8MWHzDGNpSqz3ekn+wIs5bvQHALk=
1859+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:aZ0ei+u9BS0+NXROn+la4p5ytX3CkV2+9Cx6QhOiEBQ=
18601860
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0 h1:6UreSAu64Ft3VfKWE3sjcmf+mWMyWemSsrjS/fjRPpQ=
18611861
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.0/go.mod h1:+vP6R5i9h+oYJNjp4bQHvtSHEu1t+CgSKIeZYZZRQXA=
1862-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0 h1:itBGhyEbX+iz8kz3nc4PYxQx4bL7y87xXNUcGnbKPuY=
1863-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.0/go.mod h1:iPVsTBkRFHZ21UEfSGWk8c4maOzTp6BWWpTk+l6PjJI=
1862+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.1-0.20240710141741-637b1f42fcb7 h1:uAmNNShGxxlRRu1XT+p9bG8oS/EX/ijLWasHR/kxd/E=
1863+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:Jch4QGcvRHuVS8mWht6C/Xwja9UhqNig8v/JFeyTwww=
18641864
go.opentelemetry.io/collector/connector v0.104.0 h1:Y82ytwZZ+EruWafEebO0dgWMH+TdkcSONEqZ5bm9JYA=
18651865
go.opentelemetry.io/collector/connector v0.104.0/go.mod h1:78SEHel3B3taFnSBg/syW4OV9aU1Ec9KjgbgHf/L8JA=
18661866
go.opentelemetry.io/collector/connector/forwardconnector v0.104.0 h1:35tTQfTDb+baDcP1F/wdm/mV7CyMKaOx5un4QWEHYRk=

‎internal/tools/go.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ require (
206206
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 // indirect
207207
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
208208
go.opentelemetry.io/collector/filter v0.104.0 // indirect
209+
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
209210
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
210211
go.opentelemetry.io/otel v1.27.0 // indirect
211212
go.opentelemetry.io/otel/metric v1.27.0 // indirect
@@ -233,3 +234,9 @@ require (
233234
mvdan.cc/gofumpt v0.6.0 // indirect
234235
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
235236
)
237+
238+
// TODO: Remove with v0.105.0 release, temporary workaround to pull in fix https://github.com/open-telemetry/opentelemetry-collector/pull/10560
239+
replace (
240+
go.opentelemetry.io/collector/confmap => go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7
241+
go.opentelemetry.io/collector/confmap/provider/fileprovider => go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240710141741-637b1f42fcb7
242+
)

‎internal/tools/go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -726,14 +726,16 @@ go.opentelemetry.io/collector/component v0.104.0 h1:jqu/X9rnv8ha0RNZ1a9+x7OU49Kw
726726
go.opentelemetry.io/collector/component v0.104.0/go.mod h1:1C7C0hMVSbXyY1ycCmaMUAR9fVwpgyiNQqxXtEWhVpw=
727727
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 h1:eHv98XIhapZA8MgTiipvi+FDOXoFhCYOwyKReOt+E4E=
728728
go.opentelemetry.io/collector/config/configtelemetry v0.104.0/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40=
729-
go.opentelemetry.io/collector/confmap v0.104.0 h1:d3yuwX+CHpoyCh0iMv3rqb/vwAekjSm4ZDL6UK1nZSA=
730-
go.opentelemetry.io/collector/confmap v0.104.0/go.mod h1:F8Lue+tPPn2oldXcfqI75PPMJoyzgUsKVtM/uHZLA4w=
731-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 h1:B+nMVlIUQxuP52CZSegGuA2z9S+Cv2XwFb2a/TLFPhc=
732-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0/go.mod h1:O0RcaP/I/kn7JHrwohUfj6AwvQYLxjbqg/HnjkvLLTw=
729+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7 h1:Oj8J46n16agq8nyviCzBfbOW3pe/OgRsmOqAaMS8+JA=
730+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:wmKSXPfOatdKyqVi0L/OaJsH2isw7NzPqYpGbtkaZIY=
731+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240710141741-637b1f42fcb7 h1:uE4DfJGNbTaY0oz8MWHzDGNpSqz3ekn+wIs5bvQHALk=
732+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:aZ0ei+u9BS0+NXROn+la4p5ytX3CkV2+9Cx6QhOiEBQ=
733733
go.opentelemetry.io/collector/featuregate v1.11.0 h1:Z7puIymKoQRm3oNM/NH8reWc2zRPz2PNaJvuokh0lQY=
734734
go.opentelemetry.io/collector/featuregate v1.11.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U=
735735
go.opentelemetry.io/collector/filter v0.104.0 h1:6BkLJuqWtWFdXHEgbn4TpK5d7Ha5aMdDhLmdvZ6VHxk=
736736
go.opentelemetry.io/collector/filter v0.104.0/go.mod h1:l9+6CTcA0wHOg+J3HSereMuXy47cHPGiHevCun0SbNM=
737+
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 h1:gQ4Fncp80vh+WvGgRQEmQmibdg7rRGWH/EWf1YIrrUQ=
738+
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038/go.mod h1:lC66DIONH2+irSDc+lVazcyCvLNlW+K5IWI/TdmZtPI=
737739
go.opentelemetry.io/collector/pdata v1.11.0 h1:rzYyV1zfTQQz1DI9hCiaKyyaczqawN75XO9mdXmR/hE=
738740
go.opentelemetry.io/collector/pdata v1.11.0/go.mod h1:IHxHsp+Jq/xfjORQMDJjSH6jvedOSTOyu3nbxqhWSYE=
739741
go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=

‎pkg/extension/smartagentextension/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ require (
4141
github.com/sirupsen/logrus v1.9.3 // indirect
4242
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
4343
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
44+
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
4445
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
4546
go.opentelemetry.io/otel v1.27.0 // indirect
4647
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
@@ -64,3 +65,6 @@ replace (
6465
github.com/signalfx/signalfx-agent => ../../../internal/signalfx-agent
6566
github.com/signalfx/splunk-otel-collector/tests => ../../../tests
6667
)
68+
69+
// TODO: Remove with v0.105.0 release, temporary workaround to pull in fix https://github.com/open-telemetry/opentelemetry-collector/pull/10560
70+
replace go.opentelemetry.io/collector/confmap => go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7

‎pkg/extension/smartagentextension/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,14 @@ go.opentelemetry.io/collector/component v0.104.0 h1:jqu/X9rnv8ha0RNZ1a9+x7OU49Kw
303303
go.opentelemetry.io/collector/component v0.104.0/go.mod h1:1C7C0hMVSbXyY1ycCmaMUAR9fVwpgyiNQqxXtEWhVpw=
304304
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 h1:eHv98XIhapZA8MgTiipvi+FDOXoFhCYOwyKReOt+E4E=
305305
go.opentelemetry.io/collector/config/configtelemetry v0.104.0/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40=
306-
go.opentelemetry.io/collector/confmap v0.104.0 h1:d3yuwX+CHpoyCh0iMv3rqb/vwAekjSm4ZDL6UK1nZSA=
307-
go.opentelemetry.io/collector/confmap v0.104.0/go.mod h1:F8Lue+tPPn2oldXcfqI75PPMJoyzgUsKVtM/uHZLA4w=
306+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7 h1:Oj8J46n16agq8nyviCzBfbOW3pe/OgRsmOqAaMS8+JA=
307+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:wmKSXPfOatdKyqVi0L/OaJsH2isw7NzPqYpGbtkaZIY=
308308
go.opentelemetry.io/collector/extension v0.104.0 h1:bftkgFMKya/QIwK+bOxEAPVs/TvTez+s1mlaiUznJkA=
309309
go.opentelemetry.io/collector/extension v0.104.0/go.mod h1:x7K0KyM1JGrtLbafEbRoVp0VpGBHpyx9hu87bsja6S4=
310310
go.opentelemetry.io/collector/featuregate v1.11.0 h1:Z7puIymKoQRm3oNM/NH8reWc2zRPz2PNaJvuokh0lQY=
311311
go.opentelemetry.io/collector/featuregate v1.11.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U=
312+
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 h1:gQ4Fncp80vh+WvGgRQEmQmibdg7rRGWH/EWf1YIrrUQ=
313+
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038/go.mod h1:lC66DIONH2+irSDc+lVazcyCvLNlW+K5IWI/TdmZtPI=
312314
go.opentelemetry.io/collector/pdata v1.11.0 h1:rzYyV1zfTQQz1DI9hCiaKyyaczqawN75XO9mdXmR/hE=
313315
go.opentelemetry.io/collector/pdata v1.11.0/go.mod h1:IHxHsp+Jq/xfjORQMDJjSH6jvedOSTOyu3nbxqhWSYE=
314316
go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=

‎pkg/processor/timestampprocessor/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ require (
4343
google.golang.org/protobuf v1.34.2 // indirect
4444
gopkg.in/yaml.v3 v3.0.1 // indirect
4545
)
46+
47+
// TODO: Remove with v0.105.0 release, temporary workaround to pull in fix https://github.com/open-telemetry/opentelemetry-collector/pull/10560
48+
replace go.opentelemetry.io/collector/confmap => go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7

‎pkg/processor/timestampprocessor/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ go.opentelemetry.io/collector/component v0.104.0 h1:jqu/X9rnv8ha0RNZ1a9+x7OU49Kw
271271
go.opentelemetry.io/collector/component v0.104.0/go.mod h1:1C7C0hMVSbXyY1ycCmaMUAR9fVwpgyiNQqxXtEWhVpw=
272272
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 h1:eHv98XIhapZA8MgTiipvi+FDOXoFhCYOwyKReOt+E4E=
273273
go.opentelemetry.io/collector/config/configtelemetry v0.104.0/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40=
274-
go.opentelemetry.io/collector/confmap v0.104.0 h1:d3yuwX+CHpoyCh0iMv3rqb/vwAekjSm4ZDL6UK1nZSA=
275-
go.opentelemetry.io/collector/confmap v0.104.0/go.mod h1:F8Lue+tPPn2oldXcfqI75PPMJoyzgUsKVtM/uHZLA4w=
274+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7 h1:Oj8J46n16agq8nyviCzBfbOW3pe/OgRsmOqAaMS8+JA=
275+
go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7/go.mod h1:wmKSXPfOatdKyqVi0L/OaJsH2isw7NzPqYpGbtkaZIY=
276276
go.opentelemetry.io/collector/consumer v0.104.0 h1:Z1ZjapFp5mUcbkGEL96ljpqLIUMhRgQQpYKkDRtxy+4=
277277
go.opentelemetry.io/collector/consumer v0.104.0/go.mod h1:60zcIb0W9GW0z9uJCv6NmjpSbCfBOeRUyrtEwqK6Hzo=
278278
go.opentelemetry.io/collector/featuregate v1.11.0 h1:Z7puIymKoQRm3oNM/NH8reWc2zRPz2PNaJvuokh0lQY=

‎pkg/receiver/smartagentreceiver/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,3 +244,6 @@ replace (
244244
github.com/signalfx/splunk-otel-collector/pkg/extension/smartagentextension => ./../../extension/smartagentextension
245245
github.com/signalfx/splunk-otel-collector/tests => ../../../tests
246246
)
247+
248+
// TODO: Remove with v0.105.0 release, temporary workaround to pull in fix https://github.com/open-telemetry/opentelemetry-collector/pull/10560
249+
replace go.opentelemetry.io/collector/confmap => go.opentelemetry.io/collector/confmap v0.104.1-0.20240710141741-637b1f42fcb7

0 commit comments

Comments
 (0)