Remove unneeded cast function

open-telemetry · Mar 22, 2021 · b651d96 · b651d96
1 parent 8a99790
commit b651d96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/service/defaultcomponents/default_exporters_test.go b/service/defaultcomponents/default_exporters_test.go
@@ -194,22 +194,18 @@ type createExporterFn func(
 
 func wrapCreateLogsExp(factory component.ExporterFactory) createExporterFn {
 	return func(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.Exporter, error) {
-		return castExporter(factory.CreateLogsExporter(ctx, params, cfg))
+		return factory.CreateLogsExporter(ctx, params, cfg)
 	}
 }
 
 func wrapCreateTracesExp(factory component.ExporterFactory) createExporterFn {
 	return func(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.Exporter, error) {
-		return castExporter(factory.CreateTracesExporter(ctx, params, cfg))
+		return factory.CreateTracesExporter(ctx, params, cfg)
 	}
 }
 
 func wrapCreateMetricsExp(factory component.ExporterFactory) createExporterFn {
 	return func(ctx context.Context, params component.ExporterCreateParams, cfg configmodels.Exporter) (component.Exporter, error) {
-		return castExporter(factory.CreateMetricsExporter(ctx, params, cfg))
+		return factory.CreateMetricsExporter(ctx, params, cfg)
 	}
 }
-
-func castExporter(exp component.Exporter, err error) (component.Exporter, error) {
-	return exp, err
-}
diff --git a/service/defaultcomponents/default_processors_test.go b/service/defaultcomponents/default_processors_test.go
@@ -156,22 +156,18 @@ type createProcessorFn func(
 
 func wrapCreateLogsProc(factory component.ProcessorFactory) createProcessorFn {
 	return func(ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor) (component.Processor, error) {
-		return castProcessor(factory.CreateLogsProcessor(ctx, params, cfg, consumertest.NewLogsNop()))
+		return factory.CreateLogsProcessor(ctx, params, cfg, consumertest.NewLogsNop())
 	}
 }
 
 func wrapCreateMetricsProc(factory component.ProcessorFactory) createProcessorFn {
 	return func(ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor) (component.Processor, error) {
-		return castProcessor(factory.CreateMetricsProcessor(ctx, params, cfg, consumertest.NewMetricsNop()))
+		return factory.CreateMetricsProcessor(ctx, params, cfg, consumertest.NewMetricsNop())
 	}
 }
 
 func wrapCreateTracesProc(factory component.ProcessorFactory) createProcessorFn {
 	return func(ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor) (component.Processor, error) {
-		return castProcessor(factory.CreateTracesProcessor(ctx, params, cfg, consumertest.NewTracesNop()))
+		return factory.CreateTracesProcessor(ctx, params, cfg, consumertest.NewTracesNop())
 	}
 }
-
-func castProcessor(p component.Processor, err error) (component.Processor, error) {
-	return p, err
-}
diff --git a/service/defaultcomponents/default_receivers_test.go b/service/defaultcomponents/default_receivers_test.go
@@ -149,22 +149,18 @@ type createReceiverFn func(
 
 func wrapCreateLogsRcvr(factory component.ReceiverFactory) createReceiverFn {
 	return func(ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver) (component.Receiver, error) {
-		return castReceiver(factory.CreateLogsReceiver(ctx, params, cfg, consumertest.NewLogsNop()))
+		return factory.CreateLogsReceiver(ctx, params, cfg, consumertest.NewLogsNop())
 	}
 }
 
 func wrapCreateMetricsRcvr(factory component.ReceiverFactory) createReceiverFn {
 	return func(ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver) (component.Receiver, error) {
-		return castReceiver(factory.CreateMetricsReceiver(ctx, params, cfg, consumertest.NewMetricsNop()))
+		return factory.CreateMetricsReceiver(ctx, params, cfg, consumertest.NewMetricsNop())
 	}
 }
 
 func wrapCreateTracesRcvr(factory component.ReceiverFactory) createReceiverFn {
 	return func(ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver) (component.Receiver, error) {
-		return castReceiver(factory.CreateTracesReceiver(ctx, params, cfg, consumertest.NewTracesNop()))
+		return factory.CreateTracesReceiver(ctx, params, cfg, consumertest.NewTracesNop())
 	}
 }
-
-func castReceiver(p component.Receiver, err error) (component.Receiver, error) {
-	return p, err
-}