Skip to content

Commit afd139d

Browse files
theSuesstheSuess
authored
chore: update collector dependency (#1757)
1 parent 904c1eb commit afd139d

File tree

23 files changed

+1187
-1087
lines changed

23 files changed

+1187
-1087
lines changed

‎collector/go.mod‎

Lines changed: 138 additions & 130 deletions
Large diffs are not rendered by default.

‎collector/go.sum‎

Lines changed: 295 additions & 278 deletions
Large diffs are not rendered by default.

‎collector/lambdacomponents/custom.go‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,40 +24,35 @@ import (
2424
custom_receiver "github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents/receiver"
2525

2626
"go.opentelemetry.io/collector/component"
27-
"go.opentelemetry.io/collector/connector"
28-
"go.opentelemetry.io/collector/exporter"
29-
"go.opentelemetry.io/collector/extension"
3027
"go.opentelemetry.io/collector/otelcol"
31-
"go.opentelemetry.io/collector/processor"
32-
"go.opentelemetry.io/collector/receiver"
3328

3429
"go.uber.org/multierr"
3530
)
3631

3732
func Components(extensionID string) (otelcol.Factories, error) {
3833
var errs []error
3934

40-
receivers, err := makeFactoryMap(custom_receiver.Factories, receiver.MakeFactoryMap, extensionID)
35+
receivers, err := makeFactoryMap(custom_receiver.Factories, extensionID)
4136
if err != nil {
4237
errs = append(errs, err)
4338
}
4439

45-
processors, err := makeFactoryMap(custom_processor.Factories, processor.MakeFactoryMap, extensionID)
40+
processors, err := makeFactoryMap(custom_processor.Factories, extensionID)
4641
if err != nil {
4742
errs = append(errs, err)
4843
}
4944

50-
exporters, err := makeFactoryMap(custom_exporter.Factories, exporter.MakeFactoryMap, extensionID)
45+
exporters, err := makeFactoryMap(custom_exporter.Factories, extensionID)
5146
if err != nil {
5247
errs = append(errs, err)
5348
}
5449

55-
extensions, err := makeFactoryMap(custom_extension.Factories, extension.MakeFactoryMap, extensionID)
50+
extensions, err := makeFactoryMap(custom_extension.Factories, extensionID)
5651
if err != nil {
5752
errs = append(errs, err)
5853
}
5954

60-
connectors, err := makeFactoryMap(custom_connector.Factories, connector.MakeFactoryMap, extensionID)
55+
connectors, err := makeFactoryMap(custom_connector.Factories, extensionID)
6156
if err != nil {
6257
errs = append(errs, err)
6358
}
@@ -73,11 +68,11 @@ func Components(extensionID string) (otelcol.Factories, error) {
7368
return factories, multierr.Combine(errs...)
7469
}
7570

76-
func makeFactoryMap[F any](factories []func(extensionId string) F, fn func(...F) (map[component.Type]F, error), extensionId string) (map[component.Type]F, error) {
71+
func makeFactoryMap[F component.Factory](factories []func(extensionId string) F, extensionId string) (map[component.Type]F, error) {
7772
preprocessedFactories := make([]F, len(factories))
7873
for i, f := range factories {
7974
preprocessedFactories[i] = f(extensionId)
8075
}
8176

82-
return fn(preprocessedFactories...)
77+
return otelcol.MakeFactoryMap(preprocessedFactories...)
8378
}

‎collector/lambdacomponents/default.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,13 @@ import (
2626
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor"
2727
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor"
2828
"github.com/open-telemetry/opentelemetry-lambda/collector/processor/decoupleprocessor"
29-
"go.opentelemetry.io/collector/exporter"
3029
"go.opentelemetry.io/collector/exporter/debugexporter"
3130
"go.opentelemetry.io/collector/exporter/otlpexporter"
3231
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
33-
"go.opentelemetry.io/collector/extension"
3432
"go.opentelemetry.io/collector/otelcol"
3533
"go.opentelemetry.io/collector/processor"
3634
"go.opentelemetry.io/collector/processor/batchprocessor"
3735
"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
38-
"go.opentelemetry.io/collector/receiver"
3936
"go.opentelemetry.io/collector/receiver/otlpreceiver"
4037
"go.uber.org/multierr"
4138

@@ -46,15 +43,15 @@ import (
4643
func Components(extensionID string) (otelcol.Factories, error) {
4744
var errs []error
4845

49-
receivers, err := receiver.MakeFactoryMap(
46+
receivers, err := otelcol.MakeFactoryMap(
5047
otlpreceiver.NewFactory(),
5148
telemetryapireceiver.NewFactory(extensionID),
5249
)
5350
if err != nil {
5451
errs = append(errs, err)
5552
}
5653

57-
exporters, err := exporter.MakeFactoryMap(
54+
exporters, err := otelcol.MakeFactoryMap(
5855
debugexporter.NewFactory(),
5956
otlpexporter.NewFactory(),
6057
otlphttpexporter.NewFactory(),
@@ -64,7 +61,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
6461
errs = append(errs, err)
6562
}
6663

67-
processors, err := processor.MakeFactoryMap(
64+
processors, err := otelcol.MakeFactoryMap[processor.Factory](
6865
attributesprocessor.NewFactory(),
6966
filterprocessor.NewFactory(),
7067
memorylimiterprocessor.NewFactory(),
@@ -79,7 +76,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
7976
errs = append(errs, err)
8077
}
8178

82-
extensions, err := extension.MakeFactoryMap(
79+
extensions, err := otelcol.MakeFactoryMap(
8380
sigv4authextension.NewFactory(),
8481
basicauthextension.NewFactory(),
8582
)

‎collector/lambdacomponents/go.mod‎

Lines changed: 131 additions & 123 deletions
Large diffs are not rendered by default.

‎collector/lambdacomponents/go.sum‎

Lines changed: 291 additions & 273 deletions
Large diffs are not rendered by default.

‎collector/processor/coldstartprocessor/factory.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ const (
3030
)
3131

3232
var (
33+
Type = component.MustNewType(typeStr)
3334
errConfigNotColdstart = errors.New("config was not a Coldstart processor config")
3435
processorCapabilities = consumer.Capabilities{MutatesData: true}
3536
)
3637

3738
func NewFactory() processor.Factory {
3839
return processor.NewFactory(
39-
component.MustNewType(typeStr),
40+
Type,
4041
createDefaultConfig,
4142
processor.WithTraces(createTracesProcessor, stability),
4243
)

‎collector/processor/coldstartprocessor/factory_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestNewFactory(t *testing.T) {
4242
cfg := factory.CreateDefaultConfig()
4343
_, err := factory.CreateTraces(
4444
context.Background(),
45-
processortest.NewNopSettings(),
45+
processortest.NewNopSettings(Type),
4646
cfg,
4747
consumertest.NewNop(),
4848
)
@@ -55,7 +55,7 @@ func TestNewFactory(t *testing.T) {
5555
factory := NewFactory()
5656
_, err := factory.CreateTraces(
5757
context.Background(),
58-
processortest.NewNopSettings(),
58+
processortest.NewNopSettings(Type),
5959
nil,
6060
consumertest.NewNop(),
6161
)

‎collector/processor/coldstartprocessor/go.mod‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ go 1.23
55
require (
66
github.com/cespare/xxhash v1.1.0
77
github.com/stretchr/testify v1.10.0
8-
go.opentelemetry.io/collector/component v0.119.0
9-
go.opentelemetry.io/collector/consumer v1.25.0
10-
go.opentelemetry.io/collector/consumer/consumertest v0.119.0
11-
go.opentelemetry.io/collector/pdata v1.25.0
12-
go.opentelemetry.io/collector/processor v0.119.0
13-
go.opentelemetry.io/collector/processor/processortest v0.119.0
14-
go.opentelemetry.io/collector/semconv v0.119.0
8+
go.opentelemetry.io/collector/component v1.29.0
9+
go.opentelemetry.io/collector/consumer v1.29.0
10+
go.opentelemetry.io/collector/consumer/consumertest v0.123.0
11+
go.opentelemetry.io/collector/pdata v1.29.0
12+
go.opentelemetry.io/collector/processor v1.29.0
13+
go.opentelemetry.io/collector/processor/processorhelper v0.123.0
14+
go.opentelemetry.io/collector/processor/processortest v0.123.0
15+
go.opentelemetry.io/collector/semconv v0.123.0
1516
go.uber.org/multierr v1.11.0
1617
go.uber.org/zap v1.27.0
1718
)
@@ -22,29 +23,33 @@ require (
2223
github.com/go-logr/stdr v1.2.2 // indirect
2324
github.com/gogo/protobuf v1.3.2 // indirect
2425
github.com/google/uuid v1.6.0 // indirect
26+
github.com/hashicorp/go-version v1.7.0 // indirect
2527
github.com/json-iterator/go v1.1.12 // indirect
2628
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2729
github.com/modern-go/reflect2 v1.0.2 // indirect
2830
github.com/pmezard/go-difflib v1.0.0 // indirect
2931
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
30-
go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect
31-
go.opentelemetry.io/collector/component/componenttest v0.119.0 // indirect
32-
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
33-
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
34-
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
35-
go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect
36-
go.opentelemetry.io/collector/pipeline v0.119.0 // indirect
37-
go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect
38-
go.opentelemetry.io/otel v1.34.0 // indirect
39-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
40-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
41-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
42-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
43-
golang.org/x/net v0.33.0 // indirect
44-
golang.org/x/sys v0.29.0 // indirect
45-
golang.org/x/text v0.21.0 // indirect
46-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
47-
google.golang.org/grpc v1.70.0 // indirect
48-
google.golang.org/protobuf v1.36.4 // indirect
32+
go.opentelemetry.io/collector/component/componentstatus v0.123.0 // indirect
33+
go.opentelemetry.io/collector/component/componenttest v0.123.0 // indirect
34+
go.opentelemetry.io/collector/consumer/xconsumer v0.123.0 // indirect
35+
go.opentelemetry.io/collector/featuregate v1.29.0 // indirect
36+
go.opentelemetry.io/collector/internal/telemetry v0.123.0 // indirect
37+
go.opentelemetry.io/collector/pdata/pprofile v0.123.0 // indirect
38+
go.opentelemetry.io/collector/pdata/testdata v0.123.0 // indirect
39+
go.opentelemetry.io/collector/pipeline v0.123.0 // indirect
40+
go.opentelemetry.io/collector/processor/xprocessor v0.123.0 // indirect
41+
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
42+
go.opentelemetry.io/otel v1.35.0 // indirect
43+
go.opentelemetry.io/otel/log v0.11.0 // indirect
44+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
45+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
46+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
47+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
48+
golang.org/x/net v0.37.0 // indirect
49+
golang.org/x/sys v0.31.0 // indirect
50+
golang.org/x/text v0.23.0 // indirect
51+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
52+
google.golang.org/grpc v1.71.0 // indirect
53+
google.golang.org/protobuf v1.36.6 // indirect
4954
gopkg.in/yaml.v3 v3.0.1 // indirect
5055
)

0 commit comments

Comments
 (0)