Skip to content

Commit 48f034a

Browse files
authored
Remove redundant code (#3155)
1 parent db29967 commit 48f034a

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

exporter/jaegerexporter/exporter.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
// The exporter name is the name to be used in the observability of the exporter.
4040
// The collectorEndpoint should be of the form "hostname:14250" (a gRPC target).
4141
func newTracesExporter(cfg *Config, logger *zap.Logger) (component.TracesExporter, error) {
42-
4342
opts, err := cfg.GRPCClientSettings.ToDialOptions()
4443
if err != nil {
4544
return nil, err
@@ -58,16 +57,14 @@ func newTracesExporter(cfg *Config, logger *zap.Logger) (component.TracesExporte
5857
cfg.WaitForReady,
5958
conn,
6059
)
61-
exp, err := exporterhelper.NewTracesExporter(
60+
return exporterhelper.NewTracesExporter(
6261
cfg, logger, s.pushTraceData,
6362
exporterhelper.WithStart(s.start),
6463
exporterhelper.WithShutdown(s.shutdown),
6564
exporterhelper.WithTimeout(cfg.TimeoutSettings),
6665
exporterhelper.WithRetry(cfg.RetrySettings),
6766
exporterhelper.WithQueue(cfg.QueueSettings),
6867
)
69-
70-
return exp, err
7168
}
7269

7370
// protoGRPCSender forwards spans encoded in the jaeger proto

exporter/jaegerexporter/factory.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,10 @@ func createTracesExporter(
5959
expCfg := config.(*Config)
6060
if expCfg.Endpoint == "" {
6161
// TODO: Improve error message, see #215
62-
err := fmt.Errorf(
62+
return nil, fmt.Errorf(
6363
"%q config requires a non-empty \"endpoint\"",
6464
expCfg.ID().String())
65-
return nil, err
6665
}
6766

68-
exp, err := newTracesExporter(expCfg, params.Logger)
69-
if err != nil {
70-
return nil, err
71-
}
72-
73-
return exp, nil
67+
return newTracesExporter(expCfg, params.Logger)
7468
}

0 commit comments

Comments
 (0)