Skip to content

Commit 3f6bc36

Browse files
r0mdaur0mdau
committed
Upgrade to otel v0.125.0
1 parent 8068e13 commit 3f6bc36

File tree

7 files changed

+120
-103
lines changed

7 files changed

+120
-103
lines changed

‎config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ type Config struct {
4545
// DefaultLabelsEnabled is a map of default attributes to be added to each log record.
4646
DefaultLabelsEnabled map[string]bool `mapstructure:"default_labels_enabled"`
4747

48-
exporterhelper.QueueConfig `mapstructure:"sending_queue"`
49-
configretry.BackOffConfig `mapstructure:"retry_on_failure"`
48+
QueueBatchConfig exporterhelper.QueueBatchConfig `mapstructure:"sending_queue"`
49+
configretry.BackOffConfig `mapstructure:"retry_on_failure"`
5050
}
5151

5252
// Endpoint defines the address of the server to connect to.
@@ -61,7 +61,7 @@ var _ component.Config = (*Config)(nil)
6161

6262
// Validate checks if the configuration is valid
6363
func (config *Config) Validate() error {
64-
if err := config.QueueConfig.Validate(); err != nil {
64+
if err := config.QueueBatchConfig.Validate(); err != nil {
6565
return fmt.Errorf("queue settings has invalid configuration: %w", err)
6666
}
6767

‎config_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ func TestLoadConfigNewExporter(t *testing.T) {
6868
RandomizationFactor: backoff.DefaultRandomizationFactor,
6969
Multiplier: backoff.DefaultMultiplier,
7070
},
71-
QueueConfig: exporterhelper.QueueConfig{
71+
QueueBatchConfig: exporterhelper.QueueBatchConfig{
7272
Enabled: true,
7373
NumConsumers: 2,
7474
QueueSize: 10,
75+
Sizer: exporterhelper.RequestSizerTypeRequests,
7576
},
7677
},
7778
},
@@ -101,7 +102,7 @@ func TestConfigValidate(t *testing.T) {
101102
{
102103
desc: "QueueSettings are invalid",
103104
cfg: &Config{
104-
QueueConfig: exporterhelper.QueueConfig{
105+
QueueBatchConfig: exporterhelper.QueueBatchConfig{
105106
QueueSize: -1,
106107
Enabled: true,
107108
},

‎factory.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func createDefaultConfig() component.Config {
5555
"level": true,
5656
"message": true,
5757
},
58-
BackOffConfig: configretry.NewDefaultBackOffConfig(),
59-
QueueConfig: exporterhelper.NewDefaultQueueConfig(),
58+
BackOffConfig: configretry.NewDefaultBackOffConfig(),
59+
QueueBatchConfig: exporterhelper.NewDefaultQueueConfig(),
6060
}
6161
}
6262

@@ -72,7 +72,7 @@ func createLogsExporter(ctx context.Context, set exporter.Settings, config compo
7272
// explicitly disable since we rely on net.Dialer timeout logic.
7373
exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),
7474
exporterhelper.WithRetry(exporterConfig.BackOffConfig),
75-
exporterhelper.WithQueue(exporterConfig.QueueConfig),
75+
exporterhelper.WithQueue(exporterConfig.QueueBatchConfig),
7676
exporterhelper.WithStart(exp.start),
7777
exporterhelper.WithShutdown(exp.stop),
7878
)

‎factory_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestNewExporterFullConfig(t *testing.T) {
7272
RandomizationFactor: backoff.DefaultRandomizationFactor,
7373
Multiplier: backoff.DefaultMultiplier,
7474
},
75-
QueueConfig: exporterhelper.QueueConfig{
75+
QueueBatchConfig: exporterhelper.QueueBatchConfig{
7676
Enabled: true,
7777
NumConsumers: 2,
7878
QueueSize: 10,

‎go.mod‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ require (
66
github.com/IBM/fluent-forward-go v0.3.0
77
github.com/cenkalti/backoff/v4 v4.3.0
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/component v1.28.0
10-
go.opentelemetry.io/collector/component/componenttest v0.122.0
11-
go.opentelemetry.io/collector/config/configretry v1.28.0
12-
go.opentelemetry.io/collector/config/configtls v1.28.0
13-
go.opentelemetry.io/collector/confmap v1.28.1
14-
go.opentelemetry.io/collector/confmap/xconfmap v0.122.1
15-
go.opentelemetry.io/collector/exporter v0.122.0
16-
go.opentelemetry.io/collector/pdata v1.28.0
9+
go.opentelemetry.io/collector/component v1.31.0
10+
go.opentelemetry.io/collector/component/componenttest v0.125.0
11+
go.opentelemetry.io/collector/config/configretry v1.31.0
12+
go.opentelemetry.io/collector/config/configtls v1.31.0
13+
go.opentelemetry.io/collector/confmap v1.31.0
14+
go.opentelemetry.io/collector/confmap/xconfmap v0.125.0
15+
go.opentelemetry.io/collector/exporter v0.125.0
16+
go.opentelemetry.io/collector/pdata v1.31.0
1717
go.uber.org/zap v1.27.0
1818
)
1919

2020
require (
2121
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
2222
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/fsnotify/fsnotify v1.8.0 // indirect
23+
github.com/fsnotify/fsnotify v1.9.0 // indirect
2424
github.com/go-logr/logr v1.4.2 // indirect
2525
github.com/go-logr/stdr v1.2.2 // indirect
2626
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
@@ -29,9 +29,9 @@ require (
2929
github.com/gorilla/websocket v1.5.3 // indirect
3030
github.com/hashicorp/go-version v1.7.0 // indirect
3131
github.com/json-iterator/go v1.1.12 // indirect
32-
github.com/knadh/koanf/maps v0.1.1 // indirect
33-
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
34-
github.com/knadh/koanf/v2 v2.1.2 // indirect
32+
github.com/knadh/koanf/maps v0.1.2 // indirect
33+
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
34+
github.com/knadh/koanf/v2 v2.2.0 // indirect
3535
github.com/mitchellh/copystructure v1.2.0 // indirect
3636
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3737
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -40,25 +40,29 @@ require (
4040
github.com/pmezard/go-difflib v1.0.0 // indirect
4141
github.com/tinylib/msgp v1.2.5 // indirect
4242
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
43-
go.opentelemetry.io/collector/config/configopaque v1.28.0 // indirect
44-
go.opentelemetry.io/collector/consumer v1.28.0 // indirect
45-
go.opentelemetry.io/collector/consumer/consumererror v0.122.0 // indirect
46-
go.opentelemetry.io/collector/extension v1.28.0 // indirect
47-
go.opentelemetry.io/collector/extension/xextension v0.122.0 // indirect
48-
go.opentelemetry.io/collector/featuregate v1.28.1 // indirect
49-
go.opentelemetry.io/collector/pdata/pprofile v0.122.0 // indirect
50-
go.opentelemetry.io/collector/pipeline v0.122.0 // indirect
43+
go.opentelemetry.io/collector/config/configopaque v1.31.0 // indirect
44+
go.opentelemetry.io/collector/consumer v1.31.0 // indirect
45+
go.opentelemetry.io/collector/consumer/consumererror v0.125.0 // indirect
46+
go.opentelemetry.io/collector/extension v1.31.0 // indirect
47+
go.opentelemetry.io/collector/extension/xextension v0.125.0 // indirect
48+
go.opentelemetry.io/collector/featuregate v1.31.0 // indirect
49+
go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect
50+
go.opentelemetry.io/collector/pdata/pprofile v0.125.0 // indirect
51+
go.opentelemetry.io/collector/pipeline v0.125.0 // indirect
52+
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
5153
go.opentelemetry.io/otel v1.35.0 // indirect
54+
go.opentelemetry.io/otel/log v0.11.0 // indirect
5255
go.opentelemetry.io/otel/metric v1.35.0 // indirect
5356
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
5457
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
5558
go.opentelemetry.io/otel/trace v1.35.0 // indirect
5659
go.uber.org/multierr v1.11.0 // indirect
57-
golang.org/x/net v0.37.0 // indirect
58-
golang.org/x/sys v0.31.0 // indirect
59-
golang.org/x/text v0.23.0 // indirect
60+
golang.org/x/net v0.39.0 // indirect
61+
golang.org/x/sys v0.32.0 // indirect
62+
golang.org/x/text v0.24.0 // indirect
6063
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 // indirect
61-
google.golang.org/grpc v1.71.0 // indirect
62-
google.golang.org/protobuf v1.36.5 // indirect
64+
google.golang.org/grpc v1.72.0 // indirect
65+
google.golang.org/protobuf v1.36.6 // indirect
6366
gopkg.in/yaml.v3 v3.0.1 // indirect
67+
sigs.k8s.io/yaml v1.4.0 // indirect
6468
)

0 commit comments

Comments
 (0)