Skip to content

Chore/update v0.143.0 #13

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 3 commits into from
Jan 23, 2026
Merged

Chore/update v0.143.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5cc49e
chore: update v0.143.0
OverOrion Jan 16, 2026
5179da1
chore: followup changes for v0.143.0
OverOrion Jan 16, 2026
8dae18e
fix(exporter): fix stop method
OverOrion Jan 16, 2026
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
5 changes: 3 additions & 2 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/exporter/exporterhelper"
Expand Down Expand Up @@ -69,7 +70,7 @@ type Config struct {
KubernetesMetadata *KubernetesMetadata `mapstructure:"kubernetes_metadata,omitempty"`

configretry.BackOffConfig `mapstructure:"retry_on_failure"`
QueueBatchConfig exporterhelper.QueueBatchConfig `mapstructure:"sending_queue"`
QueueConfig configoptional.Optional[exporterhelper.QueueBatchConfig] `mapstructure:"sending_queue"`
}

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

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

Expand Down
12 changes: 6 additions & 6 deletions config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap/confmaptest"
Expand Down Expand Up @@ -68,12 +69,12 @@ func TestLoadConfigNewExporter(t *testing.T) {
RandomizationFactor: backoff.DefaultRandomizationFactor,
Multiplier: backoff.DefaultMultiplier,
},
QueueBatchConfig: exporterhelper.QueueBatchConfig{
Enabled: true,
QueueConfig: configoptional.Some(exporterhelper.QueueBatchConfig{
NumConsumers: 10,
QueueSize: 1000,
Sizer: exporterhelper.RequestSizerTypeRequests,
},
Batch: exporterhelper.NewDefaultQueueConfig().Batch,
}),
},
},
}
Expand Down Expand Up @@ -102,10 +103,9 @@ func TestConfigValidate(t *testing.T) {
{
desc: "QueueSettings are invalid",
cfg: &Config{
QueueBatchConfig: exporterhelper.QueueBatchConfig{
QueueConfig: configoptional.Some(exporterhelper.QueueBatchConfig{
QueueSize: -1,
Enabled: true,
Comment thread
OverOrion marked this conversation as resolved.
},
}),
},
err: fmt.Errorf("queue settings has invalid configuration"),
},
Expand Down
5 changes: 4 additions & 1 deletion exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ func (f *fluentforwardExporter) start(ctx context.Context, host component.Host)

func (f *fluentforwardExporter) stop(context.Context) (err error) {
f.wg.Wait()
return f.client.Disconnect()
if f.client != nil {
return f.client.Disconnect()
}
return nil
}

// connectForward connects to the Fluent Forward endpoint and keep running otel even if the connection is failing
Expand Down
7 changes: 4 additions & 3 deletions factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/exporter"
Expand Down Expand Up @@ -55,8 +56,8 @@ func createDefaultConfig() component.Config {
"level": true,
"message": true,
},
BackOffConfig: configretry.NewDefaultBackOffConfig(),
QueueBatchConfig: exporterhelper.NewDefaultQueueConfig(),
BackOffConfig: configretry.NewDefaultBackOffConfig(),
QueueConfig: configoptional.Some(exporterhelper.NewDefaultQueueConfig()),
}
}

Expand All @@ -72,7 +73,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.QueueBatchConfig),
exporterhelper.WithQueue(exporterConfig.QueueConfig),
exporterhelper.WithStart(exp.start),
exporterhelper.WithShutdown(exp.stop),
)
Expand Down
6 changes: 3 additions & 3 deletions factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/cenkalti/backoff/v4"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/exporter/exporterhelper"
Expand Down Expand Up @@ -72,11 +73,10 @@ func TestNewExporterFullConfig(t *testing.T) {
RandomizationFactor: backoff.DefaultRandomizationFactor,
Multiplier: backoff.DefaultMultiplier,
},
QueueBatchConfig: exporterhelper.QueueBatchConfig{
Enabled: true,
Comment thread
OverOrion marked this conversation as resolved.
QueueConfig: configoptional.Some(exporterhelper.QueueBatchConfig{
NumConsumers: 2,
QueueSize: 10,
},
}),
}
exp := newExporter(config, componenttest.NewNopTelemetrySettings())
require.NotNil(t, exp)
Expand Down
97 changes: 49 additions & 48 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,76 @@ go 1.24.0
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 v1.35.0
go.opentelemetry.io/collector/component/componenttest v0.129.0
go.opentelemetry.io/collector/config/configretry v1.35.0
github.com/stretchr/testify v1.11.1
go.opentelemetry.io/collector/component v1.49.0
go.opentelemetry.io/collector/component/componenttest v0.143.0
go.opentelemetry.io/collector/config/configretry v1.49.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.opentelemetry.io/collector/confmap v1.49.0
go.opentelemetry.io/collector/confmap/xconfmap v0.143.0
go.opentelemetry.io/collector/exporter v1.49.0
go.opentelemetry.io/collector/exporter/exporterhelper v0.143.0
go.opentelemetry.io/collector/exporter/exportertest v0.143.0
go.opentelemetry.io/collector/pdata v1.49.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
go.uber.org/zap v1.27.1
)

require (
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
go.opentelemetry.io/collector/config/configoptional v1.49.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/tools v0.38.0 // indirect
)

require (
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
github.com/go-viper/mapstructure/v2 v2.4.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.4.2 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/go-version v1.8.0 // indirect
github.com/json-iterator/go v1.1.12 // 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/knadh/koanf/v2 v2.3.0 // 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/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/tinylib/msgp v1.1.9 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/client v1.35.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/collector/client v1.49.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.opentelemetry.io/collector/consumer v1.49.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.143.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.143.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.143.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.143.0 // indirect
go.opentelemetry.io/collector/extension v1.49.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.143.0 // indirect
go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.143.0 // indirect
go.opentelemetry.io/collector/pdata/xpdata v0.143.0 // indirect
go.opentelemetry.io/collector/pipeline v1.49.0 // indirect
go.opentelemetry.io/collector/receiver v1.49.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.143.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.143.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.uber.org/multierr v1.11.0 // 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
golang.org/x/sys v0.39.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
google.golang.org/grpc v1.78.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading