Skip to content

Commit 3e2d612

Browse files
OverOrionOverOrion
authored
Merge pull request #12 from axoflow/chore/update-v0.129.0
Upgrade to otel v0.129.0
2 parents 1974cf5 + 5313583 commit 3e2d612

File tree

8 files changed

+178
-147
lines changed

8 files changed

+178
-147
lines changed

‎config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ type Config struct {
6868
//
6969
KubernetesMetadata *KubernetesMetadata `mapstructure:"kubernetes_metadata,omitempty"`
7070

71-
exporterhelper.QueueConfig `mapstructure:"sending_queue"`
72-
configretry.BackOffConfig `mapstructure:"retry_on_failure"`
71+
configretry.BackOffConfig `mapstructure:"retry_on_failure"`
72+
QueueBatchConfig exporterhelper.QueueBatchConfig `mapstructure:"sending_queue"`
7373
}
7474

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

9090
// Validate checks if the configuration is valid
9191
func (config *Config) Validate() error {
92-
if err := config.QueueConfig.Validate(); err != nil {
92+
if err := config.QueueBatchConfig.Validate(); err != nil {
9393
return fmt.Errorf("queue settings has invalid configuration: %w", err)
9494
}
9595

‎config_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"go.opentelemetry.io/collector/config/configretry"
1717
"go.opentelemetry.io/collector/config/configtls"
1818
"go.opentelemetry.io/collector/confmap/confmaptest"
19+
"go.opentelemetry.io/collector/confmap/xconfmap"
1920
"go.opentelemetry.io/collector/exporter/exporterhelper"
2021

2122
"github.com/axoflow/fluentforwardexporter/internal/metadata"
@@ -67,10 +68,11 @@ func TestLoadConfigNewExporter(t *testing.T) {
6768
RandomizationFactor: backoff.DefaultRandomizationFactor,
6869
Multiplier: backoff.DefaultMultiplier,
6970
},
70-
QueueConfig: exporterhelper.QueueConfig{
71+
QueueBatchConfig: exporterhelper.QueueBatchConfig{
7172
Enabled: true,
7273
NumConsumers: 10,
7374
QueueSize: 1000,
75+
Sizer: exporterhelper.RequestSizerTypeRequests,
7476
},
7577
},
7678
},
@@ -85,7 +87,7 @@ func TestLoadConfigNewExporter(t *testing.T) {
8587
require.NoError(t, err)
8688
require.NoError(t, sub.Unmarshal(cfg))
8789

88-
assert.NoError(t, component.ValidateConfig(cfg))
90+
assert.NoError(t, xconfmap.Validate(cfg))
8991
assert.Equal(t, tt.expected, cfg)
9092
})
9193
}
@@ -100,7 +102,7 @@ func TestConfigValidate(t *testing.T) {
100102
{
101103
desc: "QueueSettings are invalid",
102104
cfg: &Config{
103-
QueueConfig: exporterhelper.QueueConfig{
105+
QueueBatchConfig: exporterhelper.QueueBatchConfig{
104106
QueueSize: -1,
105107
Enabled: true,
106108
},

‎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: 51 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,74 @@ 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 v0.120.0
10-
go.opentelemetry.io/collector/component/componenttest v0.120.0
11-
go.opentelemetry.io/collector/config/configretry v1.26.0
12-
go.opentelemetry.io/collector/config/configtls v1.26.0
13-
go.opentelemetry.io/collector/confmap v1.26.0
14-
go.opentelemetry.io/collector/exporter v0.120.0
15-
go.opentelemetry.io/collector/pdata v1.26.0
16-
go.opentelemetry.io/otel/metric v1.34.0
17-
go.opentelemetry.io/otel/trace v1.34.0
9+
go.opentelemetry.io/collector/component v1.35.0
10+
go.opentelemetry.io/collector/component/componenttest v0.129.0
11+
go.opentelemetry.io/collector/config/configretry v1.35.0
12+
go.opentelemetry.io/collector/config/configtls v1.31.0
13+
go.opentelemetry.io/collector/confmap v1.35.0
14+
go.opentelemetry.io/collector/confmap/xconfmap v0.129.0
15+
go.opentelemetry.io/collector/exporter v0.129.0
16+
go.opentelemetry.io/collector/exporter/exportertest v0.129.0
17+
go.opentelemetry.io/collector/pdata v1.35.0
18+
go.uber.org/goleak v1.3.0
1819
go.uber.org/zap v1.27.0
1920
)
2021

2122
require (
23+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
2224
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/fsnotify/fsnotify v1.8.0 // indirect
25+
github.com/fsnotify/fsnotify v1.9.0 // indirect
2426
github.com/go-logr/logr v1.4.2 // indirect
2527
github.com/go-logr/stdr v1.2.2 // indirect
26-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
28+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
29+
github.com/gobwas/glob v0.2.3 // indirect
2730
github.com/gogo/protobuf v1.3.2 // indirect
2831
github.com/google/uuid v1.6.0 // indirect
29-
github.com/gorilla/websocket v1.5.3 // indirect
32+
github.com/gorilla/websocket v1.4.2 // indirect
3033
github.com/hashicorp/go-version v1.7.0 // indirect
3134
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
35+
github.com/knadh/koanf/maps v0.1.2 // indirect
36+
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
37+
github.com/knadh/koanf/v2 v2.2.1 // indirect
3538
github.com/mitchellh/copystructure v1.2.0 // indirect
3639
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3740
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3841
github.com/modern-go/reflect2 v1.0.2 // indirect
39-
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
42+
github.com/philhofer/fwd v1.1.2 // indirect
4043
github.com/pmezard/go-difflib v1.0.0 // indirect
41-
github.com/tinylib/msgp v1.2.5 // indirect
44+
github.com/tinylib/msgp v1.1.9 // indirect
4245
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
43-
go.opentelemetry.io/collector/config/configopaque v1.26.0 // indirect
44-
go.opentelemetry.io/collector/consumer v1.26.0 // indirect
45-
go.opentelemetry.io/collector/consumer/consumererror v0.120.0 // indirect
46-
go.opentelemetry.io/collector/extension v0.120.0 // indirect
47-
go.opentelemetry.io/collector/extension/xextension v0.120.0 // indirect
48-
go.opentelemetry.io/collector/featuregate v1.26.0 // indirect
49-
go.opentelemetry.io/collector/pdata/pprofile v0.120.0 // indirect
50-
go.opentelemetry.io/collector/pipeline v0.120.0 // indirect
51-
go.opentelemetry.io/otel v1.34.0 // indirect
52-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
53-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
46+
go.opentelemetry.io/collector/client v1.35.0 // indirect
47+
go.opentelemetry.io/collector/config/configopaque v1.31.0 // indirect
48+
go.opentelemetry.io/collector/consumer v1.35.0 // indirect
49+
go.opentelemetry.io/collector/consumer/consumererror v0.129.0 // indirect
50+
go.opentelemetry.io/collector/consumer/consumertest v0.129.0 // indirect
51+
go.opentelemetry.io/collector/consumer/xconsumer v0.129.0 // indirect
52+
go.opentelemetry.io/collector/exporter/xexporter v0.129.0 // indirect
53+
go.opentelemetry.io/collector/extension v1.35.0 // indirect
54+
go.opentelemetry.io/collector/extension/xextension v0.129.0 // indirect
55+
go.opentelemetry.io/collector/featuregate v1.35.0 // indirect
56+
go.opentelemetry.io/collector/internal/telemetry v0.129.0 // indirect
57+
go.opentelemetry.io/collector/pdata/pprofile v0.129.0 // indirect
58+
go.opentelemetry.io/collector/pdata/xpdata v0.129.0 // indirect
59+
go.opentelemetry.io/collector/pipeline v0.129.0 // indirect
60+
go.opentelemetry.io/collector/receiver v1.35.0 // indirect
61+
go.opentelemetry.io/collector/receiver/receivertest v0.129.0 // indirect
62+
go.opentelemetry.io/collector/receiver/xreceiver v0.129.0 // indirect
63+
go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
64+
go.opentelemetry.io/otel v1.36.0 // indirect
65+
go.opentelemetry.io/otel/log v0.12.2 // indirect
66+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
67+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
68+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
69+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
5470
go.uber.org/multierr v1.11.0 // indirect
55-
golang.org/x/net v0.35.0 // indirect
56-
golang.org/x/sys v0.30.0 // indirect
57-
golang.org/x/text v0.22.0 // indirect
58-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
59-
google.golang.org/grpc v1.70.0 // indirect
60-
google.golang.org/protobuf v1.36.5 // indirect
71+
golang.org/x/net v0.39.0 // indirect
72+
golang.org/x/sys v0.33.0 // indirect
73+
golang.org/x/text v0.24.0 // indirect
74+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
75+
google.golang.org/grpc v1.73.0 // indirect
76+
google.golang.org/protobuf v1.36.6 // indirect
6177
gopkg.in/yaml.v3 v3.0.1 // indirect
78+
sigs.k8s.io/yaml v1.4.0 // indirect
6279
)

0 commit comments

Comments
 (0)