Skip to content

Upgrade to otel v0.129.0 #12

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

Merged
OverOrion merged 4 commits into from
Jul 23, 2025
Merged

Upgrade to otel v0.129.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c00acc
Upgrade to otel v0.122.0
r0mdau Mar 24, 2025
e4bee47
Upgrade to otel v0.125.0
r0mdau Apr 30, 2025
9bd8a02
Upgrade to otel v0.129.0
OverOrion Jun 30, 2025
5313583
chore(tests): update test values
OverOrion Jul 10, 2025
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
6 changes: 3 additions & 3 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ type Config struct {
//
KubernetesMetadata *KubernetesMetadata `mapstructure:"kubernetes_metadata,omitempty"`

exporterhelper.QueueConfig `mapstructure:"sending_queue"`
configretry.BackOffConfig `mapstructure:"retry_on_failure"`
configretry.BackOffConfig `mapstructure:"retry_on_failure"`
QueueBatchConfig exporterhelper.QueueBatchConfig `mapstructure:"sending_queue"`
}

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

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

Expand Down
8 changes: 5 additions & 3 deletions config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"
"go.opentelemetry.io/collector/exporter/exporterhelper"

"github.com/axoflow/fluentforwardexporter/internal/metadata"
Expand Down Expand Up @@ -67,10 +68,11 @@ func TestLoadConfigNewExporter(t *testing.T) {
RandomizationFactor: backoff.DefaultRandomizationFactor,
Multiplier: backoff.DefaultMultiplier,
},
QueueConfig: exporterhelper.QueueConfig{
QueueBatchConfig: exporterhelper.QueueBatchConfig{
Enabled: true,
NumConsumers: 10,
QueueSize: 1000,
Sizer: exporterhelper.RequestSizerTypeRequests,
},
},
},
Expand All @@ -85,7 +87,7 @@ func TestLoadConfigNewExporter(t *testing.T) {
require.NoError(t, err)
require.NoError(t, sub.Unmarshal(cfg))

assert.NoError(t, component.ValidateConfig(cfg))
assert.NoError(t, xconfmap.Validate(cfg))
assert.Equal(t, tt.expected, cfg)
})
}
Expand All @@ -100,7 +102,7 @@ func TestConfigValidate(t *testing.T) {
{
desc: "QueueSettings are invalid",
cfg: &Config{
QueueConfig: exporterhelper.QueueConfig{
QueueBatchConfig: exporterhelper.QueueBatchConfig{
QueueSize: -1,
Enabled: true,
},
Expand Down
6 changes: 3 additions & 3 deletions factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func createDefaultConfig() component.Config {
"level": true,
"message": true,
},
BackOffConfig: configretry.NewDefaultBackOffConfig(),
QueueConfig: exporterhelper.NewDefaultQueueConfig(),
BackOffConfig: configretry.NewDefaultBackOffConfig(),
QueueBatchConfig: exporterhelper.NewDefaultQueueConfig(),
}
}

Expand All @@ -72,7 +72,7 @@ func createLogsExporter(ctx context.Context, set exporter.Settings, config compo
// explicitly disable since we rely on net.Dialer timeout logic.
exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}),
exporterhelper.WithRetry(exporterConfig.BackOffConfig),
exporterhelper.WithQueue(exporterConfig.QueueConfig),
exporterhelper.WithQueue(exporterConfig.QueueBatchConfig),
exporterhelper.WithStart(exp.start),
exporterhelper.WithShutdown(exp.stop),
)
Expand Down
2 changes: 1 addition & 1 deletion factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func TestNewExporterFullConfig(t *testing.T) {
RandomizationFactor: backoff.DefaultRandomizationFactor,
Multiplier: backoff.DefaultMultiplier,
},
QueueConfig: exporterhelper.QueueConfig{
QueueBatchConfig: exporterhelper.QueueBatchConfig{
Enabled: true,
NumConsumers: 2,
QueueSize: 10,
Expand Down
85 changes: 51 additions & 34 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,57 +6,74 @@ require (
github.com/IBM/fluent-forward-go v0.3.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.120.0
go.opentelemetry.io/collector/component/componenttest v0.120.0
go.opentelemetry.io/collector/config/configretry v1.26.0
go.opentelemetry.io/collector/config/configtls v1.26.0
go.opentelemetry.io/collector/confmap v1.26.0
go.opentelemetry.io/collector/exporter v0.120.0
go.opentelemetry.io/collector/pdata v1.26.0
go.opentelemetry.io/otel/metric v1.34.0
go.opentelemetry.io/otel/trace v1.34.0
go.opentelemetry.io/collector/component v1.35.0
go.opentelemetry.io/collector/component/componenttest v0.129.0
go.opentelemetry.io/collector/config/configretry v1.35.0
go.opentelemetry.io/collector/config/configtls v1.31.0
go.opentelemetry.io/collector/confmap v1.35.0
go.opentelemetry.io/collector/confmap/xconfmap v0.129.0
go.opentelemetry.io/collector/exporter v0.129.0
go.opentelemetry.io/collector/exporter/exportertest v0.129.0
go.opentelemetry.io/collector/pdata v1.35.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
)

require (
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.2 // indirect
github.com/knadh/koanf/maps v0.1.2 // indirect
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
github.com/knadh/koanf/v2 v2.2.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/tinylib/msgp v1.2.5 // indirect
github.com/tinylib/msgp v1.1.9 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.26.0 // indirect
go.opentelemetry.io/collector/consumer v1.26.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.120.0 // indirect
go.opentelemetry.io/collector/extension v0.120.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.120.0 // indirect
go.opentelemetry.io/collector/featuregate v1.26.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.120.0 // indirect
go.opentelemetry.io/collector/pipeline v0.120.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
go.opentelemetry.io/collector/client v1.35.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.31.0 // indirect
go.opentelemetry.io/collector/consumer v1.35.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.129.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.129.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.129.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.129.0 // indirect
go.opentelemetry.io/collector/extension v1.35.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.129.0 // indirect
go.opentelemetry.io/collector/featuregate v1.35.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.129.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.129.0 // indirect
go.opentelemetry.io/collector/pdata/xpdata v0.129.0 // indirect
go.opentelemetry.io/collector/pipeline v0.129.0 // indirect
go.opentelemetry.io/collector/receiver v1.35.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.129.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.129.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/log v0.12.2 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.24.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/grpc v1.73.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading