Skip to content

Commit f61b2fc

Browse files
committed
chore: update collector dependency
1 parent 42f5214 commit f61b2fc

File tree

6 files changed

+866
-823
lines changed

6 files changed

+866
-823
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
)

0 commit comments

Comments
 (0)