Skip to content

chore: update collector dependency #1757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2025
Merged

chore: update collector dependency #1757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
268 changes: 138 additions & 130 deletions collector/go.mod
View file
Open in desktop

Large diffs are not rendered by default.

573 changes: 295 additions & 278 deletions collector/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 7 additions & 12 deletions collector/lambdacomponents/custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,40 +24,35 @@ import (
custom_receiver "github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents/receiver"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/connector"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/processor"
"go.opentelemetry.io/collector/receiver"

"go.uber.org/multierr"
)

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

receivers, err := makeFactoryMap(custom_receiver.Factories, receiver.MakeFactoryMap, extensionID)
receivers, err := makeFactoryMap(custom_receiver.Factories, extensionID)
if err != nil {
errs = append(errs, err)
}

processors, err := makeFactoryMap(custom_processor.Factories, processor.MakeFactoryMap, extensionID)
processors, err := makeFactoryMap(custom_processor.Factories, extensionID)
if err != nil {
errs = append(errs, err)
}

exporters, err := makeFactoryMap(custom_exporter.Factories, exporter.MakeFactoryMap, extensionID)
exporters, err := makeFactoryMap(custom_exporter.Factories, extensionID)
if err != nil {
errs = append(errs, err)
}

extensions, err := makeFactoryMap(custom_extension.Factories, extension.MakeFactoryMap, extensionID)
extensions, err := makeFactoryMap(custom_extension.Factories, extensionID)
if err != nil {
errs = append(errs, err)
}

connectors, err := makeFactoryMap(custom_connector.Factories, connector.MakeFactoryMap, extensionID)
connectors, err := makeFactoryMap(custom_connector.Factories, extensionID)
if err != nil {
errs = append(errs, err)
}
Expand All @@ -73,11 +68,11 @@ func Components(extensionID string) (otelcol.Factories, error) {
return factories, multierr.Combine(errs...)
}

func makeFactoryMap[F any](factories []func(extensionId string) F, fn func(...F) (map[component.Type]F, error), extensionId string) (map[component.Type]F, error) {
func makeFactoryMap[F component.Factory](factories []func(extensionId string) F, extensionId string) (map[component.Type]F, error) {
preprocessedFactories := make([]F, len(factories))
for i, f := range factories {
preprocessedFactories[i] = f(extensionId)
}

return fn(preprocessedFactories...)
return otelcol.MakeFactoryMap(preprocessedFactories...)
}
11 changes: 4 additions & 7 deletions collector/lambdacomponents/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,13 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor"
"github.com/open-telemetry/opentelemetry-lambda/collector/processor/decoupleprocessor"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/debugexporter"
"go.opentelemetry.io/collector/exporter/otlpexporter"
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/processor"
"go.opentelemetry.io/collector/processor/batchprocessor"
"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
"go.uber.org/multierr"

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

receivers, err := receiver.MakeFactoryMap(
receivers, err := otelcol.MakeFactoryMap(
otlpreceiver.NewFactory(),
telemetryapireceiver.NewFactory(extensionID),
)
if err != nil {
errs = append(errs, err)
}

exporters, err := exporter.MakeFactoryMap(
exporters, err := otelcol.MakeFactoryMap(
debugexporter.NewFactory(),
otlpexporter.NewFactory(),
otlphttpexporter.NewFactory(),
Expand All @@ -64,7 +61,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
errs = append(errs, err)
}

processors, err := processor.MakeFactoryMap(
processors, err := otelcol.MakeFactoryMap[processor.Factory](
attributesprocessor.NewFactory(),
filterprocessor.NewFactory(),
memorylimiterprocessor.NewFactory(),
Expand All @@ -79,7 +76,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
errs = append(errs, err)
}

extensions, err := extension.MakeFactoryMap(
extensions, err := otelcol.MakeFactoryMap(
sigv4authextension.NewFactory(),
basicauthextension.NewFactory(),
)
Expand Down
254 changes: 131 additions & 123 deletions collector/lambdacomponents/go.mod
View file
Open in desktop

Large diffs are not rendered by default.

564 changes: 291 additions & 273 deletions collector/lambdacomponents/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion collector/processor/coldstartprocessor/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ const (
)

var (
Type = component.MustNewType(typeStr)
errConfigNotColdstart = errors.New("config was not a Coldstart processor config")
processorCapabilities = consumer.Capabilities{MutatesData: true}
)

func NewFactory() processor.Factory {
return processor.NewFactory(
component.MustNewType(typeStr),
Type,
createDefaultConfig,
processor.WithTraces(createTracesProcessor, stability),
)
Expand Down
4 changes: 2 additions & 2 deletions collector/processor/coldstartprocessor/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestNewFactory(t *testing.T) {
cfg := factory.CreateDefaultConfig()
_, err := factory.CreateTraces(
context.Background(),
processortest.NewNopSettings(),
processortest.NewNopSettings(Type),
cfg,
consumertest.NewNop(),
)
Expand All @@ -55,7 +55,7 @@ func TestNewFactory(t *testing.T) {
factory := NewFactory()
_, err := factory.CreateTraces(
context.Background(),
processortest.NewNopSettings(),
processortest.NewNopSettings(Type),
nil,
consumertest.NewNop(),
)
Expand Down
57 changes: 31 additions & 26 deletions collector/processor/coldstartprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ go 1.23
require (
github.com/cespare/xxhash v1.1.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.119.0
go.opentelemetry.io/collector/consumer v1.25.0
go.opentelemetry.io/collector/consumer/consumertest v0.119.0
go.opentelemetry.io/collector/pdata v1.25.0
go.opentelemetry.io/collector/processor v0.119.0
go.opentelemetry.io/collector/processor/processortest v0.119.0
go.opentelemetry.io/collector/semconv v0.119.0
go.opentelemetry.io/collector/component v1.29.0
go.opentelemetry.io/collector/consumer v1.29.0
go.opentelemetry.io/collector/consumer/consumertest v0.123.0
go.opentelemetry.io/collector/pdata v1.29.0
go.opentelemetry.io/collector/processor v1.29.0
go.opentelemetry.io/collector/processor/processorhelper v0.123.0
go.opentelemetry.io/collector/processor/processortest v0.123.0
go.opentelemetry.io/collector/semconv v0.123.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
)
Expand All @@ -22,29 +23,33 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.119.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect
go.opentelemetry.io/collector/pipeline v0.119.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.119.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.4 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.123.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.123.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.123.0 // indirect
go.opentelemetry.io/collector/featuregate v1.29.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.123.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.123.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.123.0 // indirect
go.opentelemetry.io/collector/pipeline v0.123.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.123.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/log v0.11.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
golang.org/x/net v0.37.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/text v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/grpc v1.71.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading