Skip to content

Commit

Permalink
Minor updates
Browse files Browse the repository at this point in the history
Signed-off-by: Dirk Haubenreisser <haubenr@de.ibm.com>
  • Loading branch information
haubenr committed Jul 26, 2022
1 parent 130dd10 commit 4152844
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions tracing/opencensus.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"os"
"sync"

"contrib.go.opencensus.io/exporter/jaeger"
ocjaeger "contrib.go.opencensus.io/exporter/jaeger"
oczipkin "contrib.go.opencensus.io/exporter/zipkin"
"github.com/openzipkin/zipkin-go"
httpreporter "github.com/openzipkin/zipkin-go/reporter/http"
Expand Down Expand Up @@ -136,6 +136,7 @@ func mkServiceName(name string) (string, error) {
}
name = n
}

return name, nil
}

Expand Down Expand Up @@ -183,8 +184,11 @@ func WithExporterFull(name, host string, logger *zap.SugaredLogger) ConfigOption
logger.Errorw("error creating service name", zap.Error(err))
return err
}
opts := jaeger.Options{
Process: jaeger.Process{
if name == "" {
name = host
}
opts := ocjaeger.Options{
Process: ocjaeger.Process{
ServiceName: name,
},
}
Expand All @@ -193,7 +197,7 @@ func WithExporterFull(name, host string, logger *zap.SugaredLogger) ConfigOption
} else {
opts.AgentEndpoint = cfg.JaegerAgentEndpoint
}
exp, err := jaeger.NewExporter(opts)
exp, err := ocjaeger.NewExporter(opts)
if err != nil {
logger.Errorw("error building jaeger exporter", zap.Error(err))
return err
Expand Down

0 comments on commit 4152844

Please sign in to comment.