Skip to content

Commit 024c915

Browse files
axwaxw
authored
Update opentelemetry-collector-contrib (#552)
* Update opentelemetry-collector-contrib Update to v0.125.0 * elasticapmconnector: use last good commit open-telemetry/opentelemetry-collector-contrib@21a039e seems to have broken the tests, so pin to the previous commit for now. * Remove whitespace from README (Just trying to force an update on github)
1 parent 5127427 commit 024c915

File tree

39 files changed

+1552
-1416
lines changed

39 files changed

+1552
-1416
lines changed

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ In order to build a collector with a custom component, e.g. for testing purposes
3232
```shell
3333
make builddocker TAG=v0.1.0 USERNAME=johndoe
3434
```
35-
35+
3636
## Load generator
3737

3838
See [./loadgen/README.md](./loadgen/README.md).
39-

‎connector/elasticapmconnector/connector.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ func newElasticAPMConnector(
4646
set connector.Settings,
4747
nextConsumer consumer.Metrics,
4848
) (*elasticapmConnector, error) {
49-
lsmintervalSettings := processor.Settings(set)
49+
lsmintervalSettings := processor.Settings{
50+
ID: set.ID,
51+
TelemetrySettings: set.TelemetrySettings,
52+
BuildInfo: set.BuildInfo,
53+
}
5054
lsmintervalSettings.ID = component.NewIDWithName(lsmintervalFactory.Type(), set.ID.Name())
5155
lsminterval, err := lsmintervalFactory.CreateMetrics(
5256
ctx,

‎connector/elasticapmconnector/go.mod‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ go 1.23.6
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.4.0
8-
github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.124.1
9-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.124.1
10-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.124.1
8+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.124.2-0.20250425060700-a372d054d598
9+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.125.0
10+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0
1111
github.com/stretchr/testify v1.10.0
12-
go.opentelemetry.io/collector/client v1.30.0
13-
go.opentelemetry.io/collector/component v1.30.0
14-
go.opentelemetry.io/collector/component/componenttest v0.124.0
15-
go.opentelemetry.io/collector/confmap v1.30.0
16-
go.opentelemetry.io/collector/confmap/xconfmap v0.124.0
17-
go.opentelemetry.io/collector/connector v0.124.0
18-
go.opentelemetry.io/collector/connector/connectortest v0.124.0
19-
go.opentelemetry.io/collector/consumer v1.30.0
20-
go.opentelemetry.io/collector/consumer/consumertest v0.124.0
21-
go.opentelemetry.io/collector/pdata v1.30.0
22-
go.opentelemetry.io/collector/pipeline v0.124.0
23-
go.opentelemetry.io/collector/processor v1.30.0
12+
go.opentelemetry.io/collector/client v1.31.0
13+
go.opentelemetry.io/collector/component v1.31.0
14+
go.opentelemetry.io/collector/component/componenttest v0.125.0
15+
go.opentelemetry.io/collector/confmap v1.31.0
16+
go.opentelemetry.io/collector/confmap/xconfmap v0.125.0
17+
go.opentelemetry.io/collector/connector v0.125.0
18+
go.opentelemetry.io/collector/connector/connectortest v0.125.0
19+
go.opentelemetry.io/collector/consumer v1.31.0
20+
go.opentelemetry.io/collector/consumer/consumertest v0.125.0
21+
go.opentelemetry.io/collector/pdata v1.31.0
22+
go.opentelemetry.io/collector/pipeline v0.125.0
23+
go.opentelemetry.io/collector/processor v1.31.0
2424
go.uber.org/goleak v1.3.0
2525
)
2626

@@ -59,8 +59,8 @@ require (
5959
github.com/kamstrup/intmap v0.5.1 // indirect
6060
github.com/klauspost/compress v1.17.11 // indirect
6161
github.com/knadh/koanf/maps v0.1.2 // indirect
62-
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
63-
github.com/knadh/koanf/v2 v2.1.2 // indirect
62+
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
63+
github.com/knadh/koanf/v2 v2.2.0 // indirect
6464
github.com/kr/pretty v0.3.1 // indirect
6565
github.com/kr/text v0.2.0 // indirect
6666
github.com/lightstep/go-expohisto v1.0.0 // indirect
@@ -70,10 +70,10 @@ require (
7070
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7171
github.com/modern-go/reflect2 v1.0.2 // indirect
7272
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
73-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.124.1 // indirect
74-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.124.1 // indirect
75-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.124.1 // indirect
76-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.124.1 // indirect
73+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.125.0 // indirect
74+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.125.0 // indirect
75+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.125.0 // indirect
76+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.125.0 // indirect
7777
github.com/pkg/errors v0.9.1 // indirect
7878
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7979
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -84,15 +84,15 @@ require (
8484
github.com/twmb/murmur3 v1.1.8 // indirect
8585
github.com/ua-parser/uap-go v0.0.0-20240611065828-3a4781585db6 // indirect
8686
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
87-
go.opentelemetry.io/collector/component/componentstatus v0.124.0 // indirect
88-
go.opentelemetry.io/collector/connector/xconnector v0.124.0 // indirect
89-
go.opentelemetry.io/collector/consumer/xconsumer v0.124.0 // indirect
90-
go.opentelemetry.io/collector/featuregate v1.30.0 // indirect
91-
go.opentelemetry.io/collector/internal/fanoutconsumer v0.124.0 // indirect
92-
go.opentelemetry.io/collector/internal/telemetry v0.124.0 // indirect
93-
go.opentelemetry.io/collector/pdata/pprofile v0.124.0 // indirect
94-
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.0 // indirect
95-
go.opentelemetry.io/collector/semconv v0.124.0 // indirect
87+
go.opentelemetry.io/collector/component/componentstatus v0.125.0 // indirect
88+
go.opentelemetry.io/collector/connector/xconnector v0.125.0 // indirect
89+
go.opentelemetry.io/collector/consumer/xconsumer v0.125.0 // indirect
90+
go.opentelemetry.io/collector/featuregate v1.31.0 // indirect
91+
go.opentelemetry.io/collector/internal/fanoutconsumer v0.125.0 // indirect
92+
go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect
93+
go.opentelemetry.io/collector/pdata/pprofile v0.125.0 // indirect
94+
go.opentelemetry.io/collector/pipeline/xpipeline v0.125.0 // indirect
95+
go.opentelemetry.io/collector/semconv v0.125.0 // indirect
9696
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
9797
go.opentelemetry.io/otel v1.35.0 // indirect
9898
go.opentelemetry.io/otel/log v0.11.0 // indirect
@@ -106,11 +106,12 @@ require (
106106
golang.org/x/net v0.39.0 // indirect
107107
golang.org/x/sys v0.32.0 // indirect
108108
golang.org/x/text v0.24.0 // indirect
109-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
110-
google.golang.org/grpc v1.71.1 // indirect
109+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
110+
google.golang.org/grpc v1.72.0 // indirect
111111
google.golang.org/protobuf v1.36.6 // indirect
112112
gopkg.in/yaml.v2 v2.4.0 // indirect
113113
gopkg.in/yaml.v3 v3.0.1 // indirect
114+
sigs.k8s.io/yaml v1.4.0 // indirect
114115
)
115116

116117
replace github.com/elastic/opentelemetry-collector-components/internal/sharedcomponent => ../../internal/sharedcomponent

0 commit comments

Comments
 (0)