Skip to content

Commit e8474a2

Browse files
andrzej-stencelrogercoll
andrzej-stencel
and
rogercoll
authored
chore(deps): update OTel Collector dependencies to v1.41.0/v0.135.0 (#756)
* chore(deps): update OTel Collector dependencies to `v1.41.0`/`v0.135.0` * fix(connector/elasticapm): fix breaking changes in config * make gotidy * make gogenerate && make license-update * test(processor/lsminterval): fix test after change in upstream Caused by open-telemetry/opentelemetry-collector#13650 * fix apmconfig integration tests * fix: elasticapmintake receiver integration tests * fix ratelimit assert.Eventually usage * bump upstream testing distribution components --------- Co-authored-by: Roger Coll <[email protected]>
1 parent 699d85a commit e8474a2

File tree

60 files changed

+2900
-2400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2900
-2400
lines changed

‎connector/elasticapmconnector/config.go‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
signaltometricsconfig "github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/config"
2626
"go.opentelemetry.io/collector/component"
27+
"go.opentelemetry.io/collector/config/configoptional"
2728

2829
lsmconfig "github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor/config"
2930
)
@@ -259,12 +260,12 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
259260
{Key: "metricset.name", DefaultValue: "service_destination"},
260261
}, toSignalToMetricsAttributes(cfg.CustomSpanAttributes)...)
261262

262-
transactionDurationHistogram := &signaltometricsconfig.ExponentialHistogram{
263+
transactionDurationHistogram := signaltometricsconfig.ExponentialHistogram{
263264
Count: "Int(AdjustedCount())",
264265
Value: "Microseconds(end_time - start_time)",
265266
}
266267

267-
transactionDurationSummaryHistogram := &signaltometricsconfig.Histogram{
268+
transactionDurationSummaryHistogram := signaltometricsconfig.Histogram{
268269
Buckets: []float64{1},
269270
Count: "Int(AdjustedCount())",
270271
Value: "Microseconds(end_time - start_time)",
@@ -275,23 +276,23 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
275276
Name: "service_summary",
276277
IncludeResourceAttributes: serviceSummaryResourceAttributes,
277278
Attributes: serviceSummaryAttributes,
278-
Sum: &signaltometricsconfig.Sum{Value: "1"},
279+
Sum: configoptional.Some(signaltometricsconfig.Sum{Value: "1"}),
279280
}},
280281

281282
Datapoints: []signaltometricsconfig.MetricInfo{{
282283
Name: "service_summary",
283284
IncludeResourceAttributes: serviceSummaryResourceAttributes,
284285
Attributes: serviceSummaryAttributes,
285-
Sum: &signaltometricsconfig.Sum{Value: "1"},
286+
Sum: configoptional.Some(signaltometricsconfig.Sum{Value: "1"}),
286287
}},
287288

288289
Spans: []signaltometricsconfig.MetricInfo{{
289290
Name: "service_summary",
290291
IncludeResourceAttributes: serviceSummaryResourceAttributes,
291292
Attributes: serviceSummaryAttributes,
292-
Sum: &signaltometricsconfig.Sum{
293+
Sum: configoptional.Some(signaltometricsconfig.Sum{
293294
Value: "Int(AdjustedCount())",
294-
},
295+
}),
295296
}, {
296297
Name: "transaction.duration.histogram",
297298
Description: "APM service transaction aggregated metrics as histogram",
@@ -301,7 +302,7 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
301302
DefaultValue: []any{"_doc_count"},
302303
}),
303304
Unit: "us",
304-
ExponentialHistogram: transactionDurationHistogram,
305+
ExponentialHistogram: configoptional.Some(transactionDurationHistogram),
305306
}, {
306307
Name: "transaction.duration.summary",
307308
Description: "APM service transaction aggregated metrics as summary",
@@ -311,7 +312,7 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
311312
DefaultValue: []any{"aggregate_metric_double"},
312313
}),
313314
Unit: "us",
314-
Histogram: transactionDurationSummaryHistogram,
315+
Histogram: configoptional.Some(transactionDurationSummaryHistogram),
315316
}, {
316317
Name: "transaction.duration.histogram",
317318
Description: "APM transaction aggregated metrics as histogram",
@@ -321,7 +322,7 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
321322
DefaultValue: []any{"_doc_count"},
322323
}),
323324
Unit: "us",
324-
ExponentialHistogram: transactionDurationHistogram,
325+
ExponentialHistogram: configoptional.Some(transactionDurationHistogram),
325326
}, {
326327
Name: "transaction.duration.summary",
327328
Description: "APM transaction aggregated metrics as summary",
@@ -331,24 +332,24 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
331332
DefaultValue: []any{"aggregate_metric_double"},
332333
}),
333334
Unit: "us",
334-
Histogram: transactionDurationSummaryHistogram,
335+
Histogram: configoptional.Some(transactionDurationSummaryHistogram),
335336
}, {
336337
Name: "span.destination.service.response_time.sum.us",
337338
Description: "APM span destination metrics",
338339
IncludeResourceAttributes: spanDestinationResourceAttributes,
339340
Attributes: spanDestinationAttributes,
340341
Unit: "us",
341-
Sum: &signaltometricsconfig.Sum{
342+
Sum: configoptional.Some(signaltometricsconfig.Sum{
342343
Value: "Double(Microseconds(end_time - start_time))",
343-
},
344+
}),
344345
}, {
345346
Name: "span.destination.service.response_time.count",
346347
Description: "APM span destination metrics",
347348
IncludeResourceAttributes: spanDestinationResourceAttributes,
348349
Attributes: spanDestinationAttributes,
349-
Sum: &signaltometricsconfig.Sum{
350+
Sum: configoptional.Some(signaltometricsconfig.Sum{
350351
Value: "Int(AdjustedCount())",
351-
},
352+
}),
352353
}, {
353354
// event.success_count is populated using 2 metric definition with different conditions
354355
// and value for the histogram bucket based on event outcome. Both metric definition
@@ -366,11 +367,11 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
366367
`attributes["event.outcome"] != nil and attributes["event.outcome"] == "success"`,
367368
},
368369
Unit: "us",
369-
Histogram: &signaltometricsconfig.Histogram{
370+
Histogram: configoptional.Some(signaltometricsconfig.Histogram{
370371
Buckets: []float64{1},
371372
Count: "Int(AdjustedCount())",
372373
Value: "Int(AdjustedCount())",
373-
},
374+
}),
374375
}, {
375376
Name: "event.success_count",
376377
Description: "Success count as a metric for service transaction",
@@ -383,11 +384,11 @@ func (cfg Config) signaltometricsConfig() *signaltometricsconfig.Config {
383384
`attributes["event.outcome"] != nil and attributes["event.outcome"] != "success"`,
384385
},
385386
Unit: "us",
386-
Histogram: &signaltometricsconfig.Histogram{
387+
Histogram: configoptional.Some(signaltometricsconfig.Histogram{
387388
Buckets: []float64{0},
388389
Count: "Int(AdjustedCount())",
389390
Value: "Double(0)",
390-
},
391+
}),
391392
}},
392393
}
393394
}

‎connector/elasticapmconnector/generated_component_test.go‎

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/elasticapmconnector/go.mod‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
11
module github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
22

3-
go 1.23.8
3+
go 1.24.0
44

55
require (
66
github.com/elastic/opentelemetry-collector-components/internal/sharedcomponent v0.0.0-20250220025958-386ba0c4bced
77
github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.8.0
8-
github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.130.0
9-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.130.0
10-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.130.0
11-
github.com/stretchr/testify v1.10.0
12-
go.opentelemetry.io/collector/client v1.36.0
13-
go.opentelemetry.io/collector/component v1.36.0
14-
go.opentelemetry.io/collector/component/componenttest v0.130.0
15-
go.opentelemetry.io/collector/confmap v1.36.0
16-
go.opentelemetry.io/collector/confmap/xconfmap v0.130.0
17-
go.opentelemetry.io/collector/connector v0.130.0
18-
go.opentelemetry.io/collector/connector/connectortest v0.130.0
19-
go.opentelemetry.io/collector/consumer v1.36.0
20-
go.opentelemetry.io/collector/consumer/consumertest v0.130.0
21-
go.opentelemetry.io/collector/pdata v1.36.0
22-
go.opentelemetry.io/collector/pipeline v0.130.0
23-
go.opentelemetry.io/collector/processor v1.36.0
8+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.135.0
9+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.135.0
10+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.135.0
11+
github.com/stretchr/testify v1.11.1
12+
go.opentelemetry.io/collector/client v1.41.0
13+
go.opentelemetry.io/collector/component v1.41.0
14+
go.opentelemetry.io/collector/component/componenttest v0.135.0
15+
go.opentelemetry.io/collector/config/configoptional v0.135.0
16+
go.opentelemetry.io/collector/confmap v1.41.0
17+
go.opentelemetry.io/collector/confmap/xconfmap v0.135.0
18+
go.opentelemetry.io/collector/connector v0.135.0
19+
go.opentelemetry.io/collector/connector/connectortest v0.135.0
20+
go.opentelemetry.io/collector/consumer v1.41.0
21+
go.opentelemetry.io/collector/consumer/consumertest v0.135.0
22+
go.opentelemetry.io/collector/pdata v1.41.0
23+
go.opentelemetry.io/collector/pipeline v1.41.0
24+
go.opentelemetry.io/collector/processor v1.41.0
2425
go.uber.org/goleak v1.3.0
2526
)
2627

2728
require (
2829
github.com/DataDog/zstd v1.5.6 // indirect
2930
github.com/alecthomas/participle/v2 v2.1.4 // indirect
3031
github.com/antchfx/xmlquery v1.4.4 // indirect
31-
github.com/antchfx/xpath v1.3.4 // indirect
32+
github.com/antchfx/xpath v1.3.5 // indirect
3233
github.com/axiomhq/hyperloglog v0.2.5 // indirect
3334
github.com/beorn7/perks v1.0.1 // indirect
3435
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -57,23 +58,23 @@ require (
5758
github.com/iancoleman/strcase v0.3.0 // indirect
5859
github.com/json-iterator/go v1.1.12 // indirect
5960
github.com/kamstrup/intmap v0.5.1 // indirect
60-
github.com/klauspost/compress v1.17.11 // indirect
61+
github.com/klauspost/compress v1.18.0 // indirect
6162
github.com/knadh/koanf/maps v0.1.2 // indirect
6263
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
63-
github.com/knadh/koanf/v2 v2.2.1 // indirect
64+
github.com/knadh/koanf/v2 v2.2.2 // indirect
6465
github.com/kr/pretty v0.3.1 // indirect
6566
github.com/kr/text v0.2.0 // indirect
6667
github.com/lightstep/go-expohisto v1.0.0 // indirect
6768
github.com/magefile/mage v1.15.0 // indirect
6869
github.com/mitchellh/copystructure v1.2.0 // indirect
6970
github.com/mitchellh/reflectwalk v1.0.2 // indirect
7071
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
71-
github.com/modern-go/reflect2 v1.0.2 // indirect
72+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7273
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
73-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.130.0 // indirect
74-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.130.0 // indirect
75-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.130.0 // indirect
76-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.130.0 // indirect
74+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.135.0 // indirect
75+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.135.0 // indirect
76+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.135.0 // indirect
77+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.135.0 // indirect
7778
github.com/pkg/errors v0.9.1 // indirect
7879
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7980
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -84,31 +85,31 @@ require (
8485
github.com/twmb/murmur3 v1.1.8 // indirect
8586
github.com/ua-parser/uap-go v0.0.0-20240611065828-3a4781585db6 // indirect
8687
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
87-
go.opentelemetry.io/collector/component/componentstatus v0.130.0 // indirect
88-
go.opentelemetry.io/collector/connector/xconnector v0.130.0 // indirect
89-
go.opentelemetry.io/collector/consumer/xconsumer v0.130.0 // indirect
90-
go.opentelemetry.io/collector/featuregate v1.36.0 // indirect
91-
go.opentelemetry.io/collector/internal/fanoutconsumer v0.130.0 // indirect
92-
go.opentelemetry.io/collector/internal/telemetry v0.130.0 // indirect
93-
go.opentelemetry.io/collector/pdata/pprofile v0.130.0 // indirect
94-
go.opentelemetry.io/collector/pipeline/xpipeline v0.130.0 // indirect
88+
go.opentelemetry.io/collector/component/componentstatus v0.135.0 // indirect
89+
go.opentelemetry.io/collector/connector/xconnector v0.135.0 // indirect
90+
go.opentelemetry.io/collector/consumer/xconsumer v0.135.0 // indirect
91+
go.opentelemetry.io/collector/featuregate v1.41.0 // indirect
92+
go.opentelemetry.io/collector/internal/fanoutconsumer v0.135.0 // indirect
93+
go.opentelemetry.io/collector/internal/telemetry v0.135.0 // indirect
94+
go.opentelemetry.io/collector/pdata/pprofile v0.135.0 // indirect
95+
go.opentelemetry.io/collector/pipeline/xpipeline v0.135.0 // indirect
9596
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
96-
go.opentelemetry.io/otel v1.37.0 // indirect
97-
go.opentelemetry.io/otel/log v0.13.0 // indirect
98-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
99-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
100-
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
101-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
97+
go.opentelemetry.io/otel v1.38.0 // indirect
98+
go.opentelemetry.io/otel/log v0.14.0 // indirect
99+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
100+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
101+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
102+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
102103
go.uber.org/multierr v1.11.0 // indirect
103104
go.uber.org/zap v1.27.0 // indirect
104105
go.yaml.in/yaml/v3 v3.0.4 // indirect
105106
golang.org/x/exp v0.0.0-20250215185904-eff6e970281f // indirect
106-
golang.org/x/net v0.41.0 // indirect
107-
golang.org/x/sys v0.33.0 // indirect
108-
golang.org/x/text v0.26.0 // indirect
109-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
110-
google.golang.org/grpc v1.73.0 // indirect
111-
google.golang.org/protobuf v1.36.6 // indirect
107+
golang.org/x/net v0.43.0 // indirect
108+
golang.org/x/sys v0.35.0 // indirect
109+
golang.org/x/text v0.28.0 // indirect
110+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
111+
google.golang.org/grpc v1.75.0 // indirect
112+
google.golang.org/protobuf v1.36.8 // indirect
112113
gopkg.in/yaml.v2 v2.4.0 // indirect
113114
gopkg.in/yaml.v3 v3.0.1 // indirect
114115
)

0 commit comments

Comments
 (0)