repace componenterror to comsumererror

aws-observability · Apr 10, 2021 · 4ef33c9 · 4ef33c9
1 parent d92af6b
commit 4ef33c9
Show file tree

Hide file tree

Showing 3 changed files with 349 additions and 244 deletions.
diff --git a/pkg/lambdacomponents/defaults.go b/pkg/lambdacomponents/defaults.go
@@ -13,51 +13,51 @@
  * permissions and limitations under the License.
  */
 
- package lambdacomponents
+package lambdacomponents
 
- import (
-	 "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
-	 "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
-	 "go.opentelemetry.io/collector/component"
-	 "go.opentelemetry.io/collector/component/componenterror"
-	 "go.opentelemetry.io/collector/exporter/loggingexporter"
-	 "go.opentelemetry.io/collector/exporter/otlpexporter"
-	 "go.opentelemetry.io/collector/exporter/otlphttpexporter"
-	 "go.opentelemetry.io/collector/exporter/prometheusexporter"
-	 "go.opentelemetry.io/collector/receiver/otlpreceiver"
- )
- 
- // LambdaComponents returns a set of stripped components used by the
- // OpenTelemetry collector built for Lambda env.
- func LambdaComponents() (
-	 component.Factories,
-	 error,
- ) {
-	 var errs []error
- 
-	 receivers, err := component.MakeReceiverFactoryMap(
-		 otlpreceiver.NewFactory(),
-	 )
-	 if err != nil {
-		 errs = append(errs, err)
-	 }
- 
-	 exporters, err := component.MakeExporterFactoryMap(
-		 awsxrayexporter.NewFactory(),
-		 awsemfexporter.NewFactory(),
-		 prometheusexporter.NewFactory(),
-		 loggingexporter.NewFactory(),
-		 otlpexporter.NewFactory(),
-		 otlphttpexporter.NewFactory(),
-	 )
-	 if err != nil {
-		 errs = append(errs, err)
-	 }
- 
-	 factories := component.Factories{
-		 Receivers:  receivers,
-		 Exporters:  exporters,
-	 }
- 
-	 return factories, componenterror.CombineErrors(errs)
- }
+import (
+	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/consumer/consumererror"
+	"go.opentelemetry.io/collector/exporter/loggingexporter"
+	"go.opentelemetry.io/collector/exporter/otlpexporter"
+	"go.opentelemetry.io/collector/exporter/otlphttpexporter"
+	"go.opentelemetry.io/collector/exporter/prometheusexporter"
+	"go.opentelemetry.io/collector/receiver/otlpreceiver"
+)
+
+// LambdaComponents returns a set of stripped components used by the
+// OpenTelemetry collector built for Lambda env.
+func LambdaComponents() (
+	component.Factories,
+	error,
+) {
+	var errs []error
+
+	receivers, err := component.MakeReceiverFactoryMap(
+		otlpreceiver.NewFactory(),
+	)
+	if err != nil {
+		errs = append(errs, err)
+	}
+
+	exporters, err := component.MakeExporterFactoryMap(
+		awsxrayexporter.NewFactory(),
+		awsemfexporter.NewFactory(),
+		prometheusexporter.NewFactory(),
+		loggingexporter.NewFactory(),
+		otlpexporter.NewFactory(),
+		otlphttpexporter.NewFactory(),
+	)
+	if err != nil {
+		errs = append(errs, err)
+	}
+
+	factories := component.Factories{
+		Receivers: receivers,
+		Exporters: exporters,
+	}
+
+	return factories, consumererror.CombineErrors(errs)
+}
diff --git a/pkg/lambdacomponents/go.mod b/pkg/lambdacomponents/go.mod
@@ -10,4 +10,5 @@ require (
 )
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.23.0
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.23.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,5 @@ require (
		)

		replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.23.0

		replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.23.0