Skip to content

Commit

Permalink
Update OpenTelemetry Dependencies to latest (#5404)
Browse files Browse the repository at this point in the history 
* Update OpenTelemetry Dependencies to latest

* Update TestDiscoveryProvider_ContinuousDiscoveryConfig

To address deprecated Pipelines field

* s/component.DataType/pipeline.Signal/

* Update smartagent receiver deps

* make metrics-generate

* rerun go tidy

* replace deprecated scraperhelper.NewScraperWithComponentType with scraperhelper.NewScraper

---------

Co-authored-by: Dmitry Anoshin <anoshindx@gmail.com>
Co-authored-by: james hughes <jameshughes@splunk.com>
  • Loading branch information
@srv-gh-o11y-gdi @dmitryax @hughesjj
3 people authored Sep 26, 2024
1 parent 97a9be8 commit ad82ab6
Show file tree
Hide file tree
Showing 19 changed files with 1,077 additions and 1,134 deletions.
427 changes: 215 additions & 212 deletions go.mod
View file

Large diffs are not rendered by default.

895 changes: 450 additions & 445 deletions go.sum
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion internal/confmapprovider/discovery/discoverer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pipeline"
otelcolreceiver "go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/otel/metric"
mnoop "go.opentelemetry.io/otel/metric/noop"
Expand Down Expand Up @@ -685,7 +686,7 @@ func (d *discoverer) GetExtensions() map[component.ID]otelcolextension.Extension
}

// GetExporters is a component.Host method.
func (d *discoverer) GetExporters() map[component.DataType]map[component.ID]component.Component {
func (d *discoverer) GetExporters() map[pipeline.Signal]map[component.ID]component.Component {
return nil
}

Expand Down
9 changes: 5 additions & 4 deletions internal/confmapprovider/discovery/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/pipeline"

"github.com/signalfx/splunk-otel-collector/internal/components"
"github.com/signalfx/splunk-otel-collector/internal/configconverter"
Expand Down Expand Up @@ -163,12 +164,12 @@ func TestDiscoveryProvider_ContinuousDiscoveryConfig(t *testing.T) {
assert.Equal(t, hostobserver.NewFactory().CreateDefaultConfig(), hoc)

assert.EqualValues(t, []component.ID{component.MustNewID("host_observer")}, conf.Service.Extensions)
pipelines := conf.Service.Pipelines
pipelines := conf.Service.PipelinesWithPipelineID
assert.Equal(t, 2, len(pipelines))
assert.Equal(t, []component.ID{component.MustNewIDWithName("discovery", "host_observer")},
pipelines[component.MustNewID("metrics")].Receivers)
pipelines[pipeline.MustNewID("metrics")].Receivers)
assert.Equal(t, []component.ID{component.MustNewIDWithName("discovery", "host_observer")},
pipelines[component.MustNewIDWithName("logs", "entities")].Receivers)
pipelines[pipeline.MustNewIDWithName("logs", "entities")].Receivers)
assert.Equal(t, []component.ID{component.MustNewIDWithName("otlphttp", "entities")},
pipelines[component.MustNewIDWithName("logs", "entities")].Exporters)
pipelines[pipeline.MustNewIDWithName("logs", "entities")].Exporters)
}
2 changes: 1 addition & 1 deletion internal/receiver/lightprometheusreceiver/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func createMetricsReceiver(
c, _ := rConf.(*Config)
s := newScraper(params, c)

scraper, err := scraperhelper.NewScraperWithComponentType(component.MustNewType(typeStr), s.scrape, scraperhelper.WithStart(s.start))
scraper, err := scraperhelper.NewScraper(component.MustNewType(typeStr), s.scrape, scraperhelper.WithStart(s.start))
if err != nil {
return nil, err
}
Expand Down
12 changes: 6 additions & 6 deletions internal/receiver/signalfxgatewayprometheusremotewritereceiver/generated_component_test.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 13 additions & 11 deletions internal/tools/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/ory/go-acc v0.2.8
github.com/pavius/impi v0.0.3
github.com/tcnksm/ghr v0.16.2
go.opentelemetry.io/collector/cmd/mdatagen v0.109.0
go.opentelemetry.io/collector/cmd/mdatagen v0.110.0
golang.org/x/tools v0.25.0
golang.org/x/vuln v1.1.3
)
Expand Down Expand Up @@ -200,15 +200,17 @@ require (
gitlab.com/bosi/decorder v0.4.2 // indirect
go-simpler.org/musttag v0.12.2 // indirect
go-simpler.org/sloglint v0.7.2 // indirect
go.opentelemetry.io/collector/component v0.109.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.109.0 // indirect
go.opentelemetry.io/collector/confmap v1.15.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0 // indirect
go.opentelemetry.io/collector/filter v0.109.0 // indirect
go.opentelemetry.io/collector/pdata v1.15.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/collector/component v0.110.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect
go.opentelemetry.io/collector/confmap v1.16.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0 // indirect
go.opentelemetry.io/collector/filter v0.110.0 // indirect
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect
go.opentelemetry.io/collector/pdata v1.16.0 // indirect
go.opentelemetry.io/collector/pipeline v0.110.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
Expand All @@ -223,7 +225,7 @@ require (
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
golang.org/x/text v0.18.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.66.0 // indirect
google.golang.org/grpc v1.66.2 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
48 changes: 26 additions & 22 deletions internal/tools/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,26 +724,30 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
go.opentelemetry.io/collector/cmd/mdatagen v0.109.0 h1:fMcCxHJ0rCy8As3/N+MTYryaDvBAXhX/WEnvLIWVvyc=
go.opentelemetry.io/collector/cmd/mdatagen v0.109.0/go.mod h1:PfOLyh+qgR61d4MG2jCtgPgMUeKYayL3eeNB5k0fGeg=
go.opentelemetry.io/collector/component v0.109.0 h1:AU6eubP1htO8Fvm86uWn66Kw0DMSFhgcRM2cZZTYfII=
go.opentelemetry.io/collector/component v0.109.0/go.mod h1:jRVFY86GY6JZ61SXvUN69n7CZoTjDTqWyNC+wJJvzOw=
go.opentelemetry.io/collector/config/configtelemetry v0.109.0 h1:ItbYw3tgFMU+TqGcDVEOqJLKbbOpfQg3AHD8b22ygl8=
go.opentelemetry.io/collector/config/configtelemetry v0.109.0/go.mod h1:R0MBUxjSMVMIhljuDHWIygzzJWQyZHXXWIgQNxcFwhc=
go.opentelemetry.io/collector/confmap v1.15.0 h1:KaNVG6fBJXNqEI+/MgZasH0+aShAU1yAkSYunk6xC4E=
go.opentelemetry.io/collector/confmap v1.15.0/go.mod h1:GrIZ12P/9DPOuTpe2PIS51a0P/ZM6iKtByVee1Uf3+k=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0 h1:qO9sgYUYHeASlH+hqf9uUj6NcN+WjB2ZglhsU1VPb6M=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0/go.mod h1:mPK7NOS3NCLpPM+g9vul6esU5bYttauDNi3lcC47jG8=
go.opentelemetry.io/collector/filter v0.109.0 h1:kXRV/YzGH4+Udy3sZYm5AooazqZx8tChGE+mL2DQEBU=
go.opentelemetry.io/collector/filter v0.109.0/go.mod h1:KowpGOq69yMhlC9mjEMjgWPUeZ/aCPXV1ConIcpqUQo=
go.opentelemetry.io/collector/pdata v1.15.0 h1:q/T1sFpRKJnjDrUsHdJ6mq4uSqViR/f92yvGwDby/gY=
go.opentelemetry.io/collector/pdata v1.15.0/go.mod h1:2wcsTIiLAJSbqBq/XUUYbi+cP+N87d0jEJzmb9nT19U=
go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
go.opentelemetry.io/collector/cmd/mdatagen v0.110.0 h1:wKAH4pkFtAa51Iu2ca2xBhSF+xzlePVIhmxpgDFxnyk=
go.opentelemetry.io/collector/cmd/mdatagen v0.110.0/go.mod h1:i2pfbvuoEYqt/9xQDiRVp06ttLJ44Aybe8QOeujkNus=
go.opentelemetry.io/collector/component v0.110.0 h1:z7uSY/1dcK+vTY2z3v0XxeCoi2wqgHTow/ds3Gozuz4=
go.opentelemetry.io/collector/component v0.110.0/go.mod h1:W99gZdfGtQ5Zg6Bhrwrcl/uZcCG+2qBnZ1z2JO5WCW0=
go.opentelemetry.io/collector/config/configtelemetry v0.110.0 h1:V8Y/Xv7TJpnNGHLrheRKrMydcKBxWYAZ+dj71Kllyos=
go.opentelemetry.io/collector/config/configtelemetry v0.110.0/go.mod h1:R0MBUxjSMVMIhljuDHWIygzzJWQyZHXXWIgQNxcFwhc=
go.opentelemetry.io/collector/confmap v1.16.0 h1:0bWw/XSosX6xoE1sGsaD3glzRtSxanrF4sgib3jAYr4=
go.opentelemetry.io/collector/confmap v1.16.0/go.mod h1:GrIZ12P/9DPOuTpe2PIS51a0P/ZM6iKtByVee1Uf3+k=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0 h1:Z1vNHogJr5POhZxjP8XJunCo1MbVS8tnc2DLa0d0Xcw=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0/go.mod h1:danW43O0F/15a+0hggGi4HMcQilcHGbGVZ08XR9OPzA=
go.opentelemetry.io/collector/filter v0.110.0 h1:yepvSd82x8gQwFaEb49AS2wOWdJxWVC+RCY5J+JMxgY=
go.opentelemetry.io/collector/filter v0.110.0/go.mod h1:cYdCpDj9WtHZkLtPCMsOWH9QFU686j8K93n2jO+mdjw=
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 h1:S6bfFEiek8vJeXAbciWS7W8UR6ZrVJB3ftNyFTMHQaY=
go.opentelemetry.io/collector/internal/globalsignal v0.110.0/go.mod h1:GqMXodPWOxK5uqpX8MaMXC2389y2XJTa5nPwf8FYDK8=
go.opentelemetry.io/collector/pdata v1.16.0 h1:g02K8jlRnmQ7TQDuXpdgVL6vIxIVqr5Gbb1qIR27rto=
go.opentelemetry.io/collector/pdata v1.16.0/go.mod h1:YZZJIt2ehxosYf/Y1pbvexjNWsIGNNrzzlCTO9jC1F4=
go.opentelemetry.io/collector/pipeline v0.110.0 h1:nArQj8lt2R6ajbbmZ0f7JqkzAzvIOSwxsxDEv9HGKHw=
go.opentelemetry.io/collector/pipeline v0.110.0/go.mod h1:qWk90kohDYBgI/1Kw4DQaQU82+y9GJY8MDse7H2JTWg=
go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts=
go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc=
go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w=
go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ=
go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc=
go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
Expand Down Expand Up @@ -968,8 +972,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
Expand Down
32 changes: 13 additions & 19 deletions pkg/extension/smartagentextension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ require (
github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657
github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.109.0
go.opentelemetry.io/collector/confmap v1.15.0
go.opentelemetry.io/collector/extension v0.109.0
go.opentelemetry.io/collector/component v0.110.0
go.opentelemetry.io/collector/confmap v1.16.0
go.opentelemetry.io/collector/extension v0.110.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -27,29 +26,24 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.20.2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect
github.com/signalfx/golib/v3 v3.3.54 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.109.0 // indirect
go.opentelemetry.io/collector/pdata v1.15.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.51.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect
go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect
go.opentelemetry.io/collector/pdata v1.16.0 // indirect
go.opentelemetry.io/collector/pipeline v0.110.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.28.0 // indirect
Expand Down
Loading

0 comments on commit ad82ab6

Please sign in to comment.