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

Bump the otel-dependencies group with 35 updates #4609

Merged
merged 6 commits into from
Apr 23, 2024
+438 −1,498
Merged

Bump the otel-dependencies group with 35 updates #4609

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
930a62c
Bump the otel-dependencies group with 35 updates
dependabot[bot] Apr 22, 2024
5c158b8
Update NOTICE.txt
dependabot[bot] Apr 22, 2024
366c0bd
Update otel README.md
dependabot[bot] Apr 22, 2024
38a8e29
updated to 0.99 signatures
michalpristas Apr 23, 2024
0f88ada
updated test
michalpristas Apr 23, 2024
9bd0d18
updated test
michalpristas Apr 23, 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
1,573 changes: 257 additions & 1,316 deletions NOTICE.txt
View file

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -62,24 +62,24 @@ require (
go.elastic.co/apm/module/apmgorilla v1.15.0
go.elastic.co/ecszap v1.0.1
go.elastic.co/go-licence-detector v0.5.0
go.opentelemetry.io/collector/component v0.98.0
go.opentelemetry.io/collector/confmap v0.98.0
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.0
go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.0
go.opentelemetry.io/collector/exporter v0.98.0
go.opentelemetry.io/collector/exporter/debugexporter v0.96.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0
go.opentelemetry.io/collector/featuregate v1.5.0
go.opentelemetry.io/collector/otelcol v0.96.0
go.opentelemetry.io/collector/processor v0.98.0
go.opentelemetry.io/collector/processor/batchprocessor v0.96.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.0
go.opentelemetry.io/collector/receiver v0.98.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.0
go.opentelemetry.io/collector/component v0.99.0
go.opentelemetry.io/collector/confmap v0.99.0
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0
go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0
go.opentelemetry.io/collector/exporter v0.99.0
go.opentelemetry.io/collector/exporter/debugexporter v0.99.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0
go.opentelemetry.io/collector/featuregate v1.6.0
go.opentelemetry.io/collector/otelcol v0.99.0
go.opentelemetry.io/collector/processor v0.99.0
go.opentelemetry.io/collector/processor/batchprocessor v0.99.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0
go.opentelemetry.io/collector/receiver v0.99.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.22.0
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8
@@ -145,7 +145,7 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/licenseclassifier v0.0.0-20221004142553-c1ed8fcf4bab // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
@@ -190,7 +190,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/common v0.52.3 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rs/cors v1.10.1 // indirect
@@ -209,47 +209,47 @@ require (
go.elastic.co/apm/v2 v2.0.0 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.98.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.96.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.96.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.96.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.96.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.96.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.98.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.98.0 // indirect
go.opentelemetry.io/collector/config/internal v0.96.0 // indirect
go.opentelemetry.io/collector/connector v0.96.0 // indirect
go.opentelemetry.io/collector/consumer v0.98.0 // indirect
go.opentelemetry.io/collector/extension v0.98.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.96.0 // indirect
go.opentelemetry.io/collector/pdata v1.5.0 // indirect
go.opentelemetry.io/collector/semconv v0.98.0 // indirect
go.opentelemetry.io/collector/service v0.96.0 // indirect
go.opentelemetry.io/contrib/config v0.4.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect
go.opentelemetry.io/collector v0.99.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.99.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.6.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.99.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.99.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.99.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.6.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.99.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.99.0 // indirect
go.opentelemetry.io/collector/config/internal v0.99.0 // indirect
go.opentelemetry.io/collector/connector v0.99.0 // indirect
go.opentelemetry.io/collector/consumer v0.99.0 // indirect
go.opentelemetry.io/collector/extension v0.99.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect
go.opentelemetry.io/collector/pdata v1.6.0 // indirect
go.opentelemetry.io/collector/semconv v0.99.0 // indirect
go.opentelemetry.io/collector/service v0.99.0 // indirect
go.opentelemetry.io/contrib/config v0.5.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.25.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
229 changes: 110 additions & 119 deletions go.sum
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions internal/pkg/otel/README.md
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ This section provides a summary of components included in the Elastic Distributi
| Component | Version |
|---|---|
| filelogreceiver | v0.98.0|
| otlpreceiver | v0.96.0|
| otlpreceiver | v0.99.0|



@@ -38,8 +38,8 @@ This section provides a summary of components included in the Elastic Distributi
| Component | Version |
|---|---|
| fileexporter | v0.98.0|
| debugexporter | v0.96.0|
| otlpexporter | v0.96.0|
| debugexporter | v0.99.0|
| otlpexporter | v0.99.0|



@@ -51,8 +51,8 @@ This section provides a summary of components included in the Elastic Distributi
| attributesprocessor | v0.98.0|
| resourceprocessor | v0.98.0|
| transformprocessor | v0.98.0|
| batchprocessor | v0.96.0|
| memorylimiterprocessor | v0.96.0|
| batchprocessor | v0.99.0|
| memorylimiterprocessor | v0.99.0|



12 changes: 9 additions & 3 deletions internal/pkg/otel/run.go
View file
Original file line number Diff line number Diff line change
@@ -56,9 +56,15 @@ func newSettings(version string, configPaths []string) (*otelcol.CollectorSettin
converterSet := confmap.ConverterSettings{}
configProviderSettings := otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: configPaths,
Providers: makeMapProvidersMap(fileprovider.New(), envprovider.New(), yamlprovider.New(), httpprovider.New(), httpsprovider.New()),
Converters: []confmap.Converter{expandconverter.New(converterSet)},
URIs: configPaths,
Providers: makeMapProvidersMap(
fileprovider.NewFactory().Create(confmap.ProviderSettings{}),
envprovider.NewFactory().Create(confmap.ProviderSettings{}),
yamlprovider.NewFactory().Create(confmap.ProviderSettings{}),
httpprovider.NewFactory().Create(confmap.ProviderSettings{}),
httpsprovider.NewFactory().Create(confmap.ProviderSettings{}),
),
Converters: []confmap.Converter{expandconverter.NewFactory().Create(converterSet)},
},
}
provider, err := otelcol.NewConfigProvider(configProviderSettings)
8 changes: 5 additions & 3 deletions testing/integration/otel_test.go
View file
Original file line number Diff line number Diff line change
@@ -199,12 +199,14 @@ func validateCommandIsWorking(t *testing.T, ctx context.Context, fixture *aTesti
require.NoError(t, os.WriteFile(cfgFilePath, []byte(fileProcessingConfig), 0600))

// check `elastic-agent otel validate` command works for otel config
out, err := fixture.Exec(ctx, []string{"otel", "validate", "--config", cfgFilePath})
cmd, err := fixture.PrepareAgentCommand(ctx, []string{"otel", "validate", "--config", cfgFilePath})
require.NoError(t, err)

err = cmd.Run()
require.NoError(t, err)
require.Equal(t, 0, len(out)) // no error printed out

// check feature gate works
out, err = fixture.Exec(ctx, []string{"otel", "validate", "--config", cfgFilePath, "--feature-gates", "foo.bar"})
out, err := fixture.Exec(ctx, []string{"otel", "validate", "--config", cfgFilePath, "--feature-gates", "foo.bar"})
require.Error(t, err)
require.Contains(t, string(out), `no such feature gate "foo.bar"`)