Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OpenTelemetry Dependencies to latest #5356

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Update OpenTelemetry Dependencies to latest #5356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbfcb89
Update OpenTelemetry Dependencies to latest
srv-gh-o11y-gdi Sep 10, 2024
e468097
adopt to changed upstream API and update more deps
dmitryax Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
445 changes: 227 additions & 218 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

927 changes: 470 additions & 457 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions internal/confmapprovider/discovery/discoverer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/pdata/plog"
otelcolreceiver "go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/otel/metric"
mnoop "go.opentelemetry.io/otel/metric/noop"
tnoop "go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"
Expand Down Expand Up @@ -548,10 +549,9 @@ func (d *discoverer) createExtensionCreateSettings(observerID component.ID) otel
return otelcolextension.Settings{
ID: observerID,
TelemetrySettings: component.TelemetrySettings{
Logger: zap.New(d.logger.Core()).With(zap.String("kind", observerID.String())),
TracerProvider: tnoop.NewTracerProvider(),
MeterProvider: mnoop.NewMeterProvider(),
MetricsLevel: configtelemetry.LevelDetailed,
Logger: zap.New(d.logger.Core()).With(zap.String("kind", observerID.String())),
TracerProvider: tnoop.NewTracerProvider(),
LeveledMeterProvider: func(configtelemetry.Level) metric.MeterProvider { return mnoop.NewMeterProvider() },
},
BuildInfo: d.info,
}
Expand All @@ -560,10 +560,9 @@ func (d *discoverer) createExtensionCreateSettings(observerID component.ID) otel
func (d *discoverer) createReceiverCreateSettings() otelcolreceiver.Settings {
return otelcolreceiver.Settings{
TelemetrySettings: component.TelemetrySettings{
Logger: zap.New(d.logger.Core()).With(zap.String("kind", "receiver")),
TracerProvider: tnoop.NewTracerProvider(),
MeterProvider: mnoop.NewMeterProvider(),
MetricsLevel: configtelemetry.LevelDetailed,
Logger: zap.New(d.logger.Core()).With(zap.String("kind", "receiver")),
TracerProvider: tnoop.NewTracerProvider(),
LeveledMeterProvider: func(configtelemetry.Level) metric.MeterProvider { return mnoop.NewMeterProvider() },
},
BuildInfo: d.info,
}
Expand Down
7 changes: 4 additions & 3 deletions internal/receiver/discoveryreceiver/receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/receiverhelper"
"go.opentelemetry.io/otel/metric"
mnoop "go.opentelemetry.io/otel/metric/noop"
tnoop "go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"
Expand Down Expand Up @@ -181,9 +182,9 @@ func (d *discoveryReceiver) createAndSetReceiverCreator() error {
zap.String("kind", "receiver"),
zap.String("name", id.String()),
),
TracerProvider: tnoop.NewTracerProvider(),
MeterProvider: mnoop.NewMeterProvider(),
MetricsLevel: configtelemetry.LevelDetailed,
TracerProvider: tnoop.NewTracerProvider(),
LeveledMeterProvider: func(configtelemetry.Level) metric.MeterProvider { return mnoop.NewMeterProvider() },
MetricsLevel: configtelemetry.LevelDetailed,
},
BuildInfo: component.BuildInfo{
Command: "discovery",
Expand Down
14 changes: 8 additions & 6 deletions internal/receiver/discoveryreceiver/receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/collector/extension"
otelcolreceiver "go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/otel/metric"
mnoop "go.opentelemetry.io/otel/metric/noop"
tnoop "go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"
Expand All @@ -31,9 +33,9 @@ import (
func TestNewDiscoveryReceiver(t *testing.T) {
rcs := otelcolreceiver.Settings{
TelemetrySettings: component.TelemetrySettings{
Logger: zap.NewNop(),
MeterProvider: mnoop.NewMeterProvider(),
TracerProvider: tnoop.NewTracerProvider(),
Logger: zap.NewNop(),
LeveledMeterProvider: func(configtelemetry.Level) metric.MeterProvider { return mnoop.NewMeterProvider() },
TracerProvider: tnoop.NewTracerProvider(),
},
}
cfg := &Config{}
Expand Down Expand Up @@ -101,9 +103,9 @@ func TestObservablesFromHost(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
rcs := otelcolreceiver.Settings{
TelemetrySettings: component.TelemetrySettings{
Logger: zap.NewNop(),
TracerProvider: tnoop.NewTracerProvider(),
MeterProvider: mnoop.NewMeterProvider(),
Logger: zap.NewNop(),
TracerProvider: tnoop.NewTracerProvider(),
LeveledMeterProvider: func(configtelemetry.Level) metric.MeterProvider { return mnoop.NewMeterProvider() },
},
}
host := mockHost{extensions: test.extensions}
Expand Down
2 changes: 1 addition & 1 deletion internal/receiver/lightprometheusreceiver/factory.go
View file
Open in desktop
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.NewScraper(typeStr, s.scrape, scraperhelper.WithStart(s.start))
scraper, err := scraperhelper.NewScraperWithComponentType(component.MustNewType(typeStr), s.scrape, scraperhelper.WithStart(s.start))
if err != nil {
return nil, err
}
Expand Down
2 changes: 2 additions & 0 deletions internal/receiver/signalfxgatewayprometheusremotewritereceiver/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
type: "signalfxgatewayprometheusremotewrite"
github_project: signalfx/splunk-otel-collector

status:
class: "receiver"
stability:
Expand Down
18 changes: 9 additions & 9 deletions internal/tools/go.mod
View file
Open in desktop
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.108.1
go.opentelemetry.io/collector/cmd/mdatagen v0.109.0
golang.org/x/tools v0.25.0
golang.org/x/vuln v1.1.3
)
Expand Down Expand Up @@ -149,9 +149,9 @@ require (
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/polyfloyd/go-errorlint v1.6.0 // indirect
github.com/prometheus/client_golang v1.20.1 // indirect
github.com/prometheus/client_golang v1.20.2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.57.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
Expand Down Expand Up @@ -200,12 +200,12 @@ 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.108.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.108.1 // indirect
go.opentelemetry.io/collector/confmap v1.14.1 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1 // indirect
go.opentelemetry.io/collector/filter v0.108.1 // indirect
go.opentelemetry.io/collector/pdata v1.14.1 // 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
Expand Down
36 changes: 18 additions & 18 deletions internal/tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,8 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_golang v1.20.1 h1:IMJXHOD6eARkQpxo8KkhgEVFlBNm+nkrFUyGlIu7Na8=
github.com/prometheus/client_golang v1.20.1/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand All @@ -554,8 +554,8 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
github.com/prometheus/common v0.57.0 h1:Ro/rKjwdq9mZn1K5QPctzh+MA4Lp0BuYk5ZZEVhoNcY=
github.com/prometheus/common v0.57.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
Expand Down Expand Up @@ -724,20 +724,20 @@ 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.108.1 h1:vtilpz4S3XRBhpwTqJF9U8cLKWOtytNzNkHYzT4WhpY=
go.opentelemetry.io/collector/cmd/mdatagen v0.108.1/go.mod h1:odQfVDmt+eRJ+K0UFqvNM0fHpq+9F7TfE7P9yEEY0KY=
go.opentelemetry.io/collector/component v0.108.1 h1:X+Afj07brX0NC36t6PvAq+ehaeUO/Q9eJNOUwhInpeY=
go.opentelemetry.io/collector/component v0.108.1/go.mod h1:qrP2TiJT5qw4sSiAKne+gb+hb1qTixLXuQRZjMCnLjY=
go.opentelemetry.io/collector/config/configtelemetry v0.108.1 h1:jjdH1R6FMz4l1nSvY7F3H0F09xW9LKTke7k3ZAPcmSU=
go.opentelemetry.io/collector/config/configtelemetry v0.108.1/go.mod h1:R0MBUxjSMVMIhljuDHWIygzzJWQyZHXXWIgQNxcFwhc=
go.opentelemetry.io/collector/confmap v1.14.1 h1:GPMa+q5ThiBFQaYKJ7xeomiw9tIokkTA1AiF1zwKJck=
go.opentelemetry.io/collector/confmap v1.14.1/go.mod h1:GrIZ12P/9DPOuTpe2PIS51a0P/ZM6iKtByVee1Uf3+k=
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1 h1:EyRKaxRe8A+5JU0vYPeNqj260dguUzaFkrh63PKkGk8=
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1/go.mod h1:3Vl2shpuWraLK7ydsVjDiZuPGxDs+F54/NBLFun0EaU=
go.opentelemetry.io/collector/filter v0.108.1 h1:ufGbKhP8v7weLrfLWlR0nVLdyW9yvsSpWtkCwv7CNE0=
go.opentelemetry.io/collector/filter v0.108.1/go.mod h1:iNMJ4W+R9LUqr8uyeEIthuOKVEQBMYS32ePBza3Ofbk=
go.opentelemetry.io/collector/pdata v1.14.1 h1:wXZjtQA7Vy5HFqco+yA95ENyMQU5heBB1IxMHQf6mUk=
go.opentelemetry.io/collector/pdata v1.14.1/go.mod h1:z1dTjwwtcoXxZx2/nkHysjxMeaxe9pEmYTEr4SMNIx8=
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=
Expand Down
24 changes: 12 additions & 12 deletions pkg/extension/smartagentextension/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ 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.108.1
go.opentelemetry.io/collector/confmap v1.14.1
go.opentelemetry.io/collector/extension v0.108.1
go.opentelemetry.io/collector/component v0.109.0
go.opentelemetry.io/collector/confmap v1.15.0
go.opentelemetry.io/collector/extension v0.109.0
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -35,21 +35,21 @@ require (
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.1 // 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.53 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.108.1 // indirect
go.opentelemetry.io/collector/pdata v1.14.1 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // 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.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
Loading