diff --git a/.golangci.yml b/.golangci.yml
index 7fbc3d439b..948d2f4791 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 d028ddf8fb..5be24faaac 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))
 	}