Skip to content

Commit 4c6ced4

Browse files
committed
more gotidy and exporters updates
1 parent 4cea076 commit 4c6ced4

File tree

25 files changed

+70
-47
lines changed

25 files changed

+70
-47
lines changed

connector/servicegraphconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ require (
8181
go.opentelemetry.io/collector/exporter/exportertest v0.120.1-0.20250226024140-8099e51f9a77 // indirect
8282
go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250226024140-8099e51f9a77 // indirect
8383
go.opentelemetry.io/collector/extension v0.120.1-0.20250226024140-8099e51f9a77 // indirect
84-
go.opentelemetry.io/collector/extension/auth v0.120.0 // indirect
84+
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250226024140-8099e51f9a77 // indirect
8585
go.opentelemetry.io/collector/extension/extensioncapabilities v0.120.1-0.20250226024140-8099e51f9a77 // indirect
8686
go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250226024140-8099e51f9a77 // indirect
8787
go.opentelemetry.io/collector/internal/fanoutconsumer v0.120.1-0.20250226024140-8099e51f9a77 // indirect

connector/servicegraphconnector/go.sum

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/awss3exporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ require (
9393
go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9494
go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9595
go.opentelemetry.io/collector/extension v0.120.1-0.20250226024140-8099e51f9a77 // indirect
96-
go.opentelemetry.io/collector/extension/auth v0.120.0 // indirect
96+
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9797
go.opentelemetry.io/collector/extension/extensioncapabilities v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9898
go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9999
go.opentelemetry.io/collector/extension/xextension v0.120.1-0.20250226024140-8099e51f9a77 // indirect

exporter/awss3exporter/go.sum

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/coralogixexporter/config_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ func TestLoadConfig(t *testing.T) {
9494
BatcherConfig: exporterbatcher.Config{
9595
Enabled: false,
9696
FlushTimeout: 200 * time.Millisecond,
97-
MinSizeConfig: exporterbatcher.MinSizeConfig{
98-
MinSizeItems: 8192,
97+
SizeConfig: exporterbatcher.SizeConfig{
98+
Sizer: exporterbatcher.SizerTypeItems,
99+
MinSize: 8192,
99100
},
100101
},
101102
},
@@ -159,6 +160,7 @@ func TestLoadConfig(t *testing.T) {
159160
Enabled: true,
160161
FlushTimeout: 3 * time.Second,
161162
SizeConfig: exporterbatcher.SizeConfig{
163+
Sizer: exporterbatcher.SizerTypeItems,
162164
MinSize: 8888,
163165
},
164166
},

exporter/elasticsearchexporter/config_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ func TestConfig(t *testing.T) {
119119
Batcher: BatcherConfig{
120120
FlushTimeout: 30 * time.Second,
121121
MinSizeConfig: exporterbatcher.MinSizeConfig{
122-
MinSizeItems: 5000,
122+
MinSizeItems: &defaultBatcherMinSizeItems,
123123
},
124124
MaxSizeConfig: exporterbatcher.MaxSizeConfig{
125-
MaxSizeItems: 0,
125+
MaxSizeItems: nil,
126126
},
127127
},
128128
},
@@ -193,10 +193,10 @@ func TestConfig(t *testing.T) {
193193
Batcher: BatcherConfig{
194194
FlushTimeout: 30 * time.Second,
195195
MinSizeConfig: exporterbatcher.MinSizeConfig{
196-
MinSizeItems: 5000,
196+
MinSizeItems: &defaultBatcherMinSizeItems,
197197
},
198198
MaxSizeConfig: exporterbatcher.MaxSizeConfig{
199-
MaxSizeItems: 0,
199+
MaxSizeItems: nil,
200200
},
201201
},
202202
},
@@ -267,10 +267,10 @@ func TestConfig(t *testing.T) {
267267
Batcher: BatcherConfig{
268268
FlushTimeout: 30 * time.Second,
269269
MinSizeConfig: exporterbatcher.MinSizeConfig{
270-
MinSizeItems: 5000,
270+
MinSizeItems: &defaultBatcherMinSizeItems,
271271
},
272272
MaxSizeConfig: exporterbatcher.MaxSizeConfig{
273-
MaxSizeItems: 0,
273+
MaxSizeItems: nil,
274274
},
275275
},
276276
},

exporter/elasticsearchexporter/factory.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ const (
3131
defaultTracesIndex = "traces-generic-default"
3232
)
3333

34+
var defaultBatcherMinSizeItems = 5000
35+
3436
// NewFactory creates a factory for Elastic exporter.
3537
func NewFactory() exporter.Factory {
3638
return xexporter.NewFactory(
@@ -94,10 +96,10 @@ func createDefaultConfig() component.Config {
9496
Batcher: BatcherConfig{
9597
FlushTimeout: 30 * time.Second,
9698
MinSizeConfig: exporterbatcher.MinSizeConfig{
97-
MinSizeItems: 5000,
99+
MinSizeItems: &defaultBatcherMinSizeItems,
98100
},
99101
MaxSizeConfig: exporterbatcher.MaxSizeConfig{
100-
MaxSizeItems: 0,
102+
MaxSizeItems: nil,
101103
},
102104
},
103105
Flush: FlushSettings{

exporter/googlemanagedprometheusexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ require (
9393
go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9494
go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9595
go.opentelemetry.io/collector/extension v0.120.1-0.20250226024140-8099e51f9a77 // indirect
96-
go.opentelemetry.io/collector/extension/auth v0.120.0 // indirect
96+
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9797
go.opentelemetry.io/collector/extension/extensioncapabilities v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9898
go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250226024140-8099e51f9a77 // indirect
9999
go.opentelemetry.io/collector/extension/xextension v0.120.1-0.20250226024140-8099e51f9a77 // indirect

exporter/googlemanagedprometheusexporter/go.sum

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/otelarrowexporter/config_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,10 @@ func TestUnmarshalConfig(t *testing.T) {
8989
BatcherConfig: exporterbatcher.Config{
9090
Enabled: true,
9191
FlushTimeout: 200 * time.Millisecond,
92-
MinSizeConfig: exporterbatcher.MinSizeConfig{
93-
MinSizeItems: 1000,
94-
},
95-
MaxSizeConfig: exporterbatcher.MaxSizeConfig{
96-
MaxSizeItems: 10000,
92+
SizeConfig: exporterbatcher.SizeConfig{
93+
Sizer: exporterbatcher.SizerTypeItems,
94+
MinSize: 1000,
95+
MaxSize: 10000,
9796
},
9897
},
9998
Arrow: ArrowConfig{

0 commit comments

Comments
 (0)