Skip to content

Commit

Permalink
Avoid using consumererror in no Consumer code (#2657)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu committed Mar 11, 2021
1 parent 49c6574 commit 55d2be2
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions cmd/otelcontribcol/components.go
Expand Up @@ -16,7 +16,6 @@ package main

import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumererror"
"go.opentelemetry.io/collector/service/defaultcomponents"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter"
Expand Down Expand Up @@ -76,7 +75,6 @@ import (
)

func components() (component.Factories, error) {
var errs []error
factories, err := defaultcomponents.Components()
if err != nil {
return component.Factories{}, err
Expand All @@ -94,7 +92,7 @@ func components() (component.Factories, error) {

factories.Extensions, err = component.MakeExtensionFactoryMap(extensions...)
if err != nil {
errs = append(errs, err)
return component.Factories{}, err
}

receivers := []component.ReceiverFactory{
Expand Down Expand Up @@ -127,7 +125,7 @@ func components() (component.Factories, error) {
}
factories.Receivers, err = component.MakeReceiverFactoryMap(receivers...)
if err != nil {
errs = append(errs, err)
return component.Factories{}, err
}

exporters := []component.ExporterFactory{
Expand Down Expand Up @@ -160,7 +158,7 @@ func components() (component.Factories, error) {
}
factories.Exporters, err = component.MakeExporterFactoryMap(exporters...)
if err != nil {
errs = append(errs, err)
return component.Factories{}, err
}

processors := []component.ProcessorFactory{
Expand All @@ -178,8 +176,8 @@ func components() (component.Factories, error) {
}
factories.Processors, err = component.MakeProcessorFactoryMap(processors...)
if err != nil {
errs = append(errs, err)
return component.Factories{}, err
}

return factories, consumererror.CombineErrors(errs)
return factories, nil
}

0 comments on commit 55d2be2

Please sign in to comment.