summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-01-13 20:06:42 +0100
committerValentin Rothberg <rothberg@redhat.com>2020-01-14 09:54:48 +0100
commit4fb24ab145ad75051092e4e76f720f533ad7bb71 (patch)
treed4043c45747102853be054cc8daa04af5ae0095b
parent79ec2a9a6d5d39d4f0b6253395b2434d70ba174d (diff)
downloadpodman-4fb24ab145ad75051092e4e76f720f533ad7bb71.tar.gz
podman-4fb24ab145ad75051092e4e76f720f533ad7bb71.tar.bz2
podman-4fb24ab145ad75051092e4e76f720f533ad7bb71.zip
make lint: include pkg/tracing
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
-rw-r--r--.golangci.yml6
-rw-r--r--pkg/tracing/tracing.go3
2 files changed, 4 insertions, 5 deletions
diff --git a/.golangci.yml b/.golangci.yml
index 7fbc3d439..948d2f479 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -8,12 +8,10 @@ run:
deadline: 5m
skip-dirs-use-default: true
skip-dirs:
- - dependencies
- contrib
- - test/e2e
+ - dependencies
+ - test
- docs
- - test/
- - tracing
skip-files:
- iopodman.go
linters:
diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go
index d028ddf8f..5be24faaa 100644
--- a/pkg/tracing/tracing.go
+++ b/pkg/tracing/tracing.go
@@ -12,6 +12,7 @@ import (
// Init returns an instance of Jaeger Tracer that samples 100% of traces and logs all spans to stdout.
func Init(service string) (opentracing.Tracer, io.Closer) {
cfg := &config.Configuration{
+ ServiceName: service,
Sampler: &config.SamplerConfig{
Type: "const",
Param: 1,
@@ -20,7 +21,7 @@ func Init(service string) (opentracing.Tracer, io.Closer) {
LogSpans: true,
},
}
- tracer, closer, err := cfg.New(service, config.Logger(jaeger.StdLogger))
+ tracer, closer, err := cfg.NewTracer(config.Logger(jaeger.StdLogger))
if err != nil {
panic(fmt.Sprintf("ERROR: cannot init Jaeger: %v\n", err))
}