diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index b4f0fa3a2d2..b454b362d90 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -30,6 +30,7 @@ import (
 	_ "github.com/grafana/grafana/pkg/extensions"
 	_ "github.com/grafana/grafana/pkg/infra/metrics"
 	_ "github.com/grafana/grafana/pkg/infra/serverlock"
+	_ "github.com/grafana/grafana/pkg/infra/tracing"
 	_ "github.com/grafana/grafana/pkg/plugins"
 	_ "github.com/grafana/grafana/pkg/services/alerting"
 	_ "github.com/grafana/grafana/pkg/services/auth"
@@ -39,7 +40,6 @@ import (
 	_ "github.com/grafana/grafana/pkg/services/rendering"
 	_ "github.com/grafana/grafana/pkg/services/search"
 	_ "github.com/grafana/grafana/pkg/services/sqlstore"
-	_ "github.com/grafana/grafana/pkg/tracing"
 )
 
 func NewGrafanaServer() *GrafanaServerImpl {
diff --git a/pkg/tracing/tracing.go b/pkg/infra/tracing/tracing.go
similarity index 100%
rename from pkg/tracing/tracing.go
rename to pkg/infra/tracing/tracing.go
diff --git a/pkg/tracing/tracing_test.go b/pkg/infra/tracing/tracing_test.go
similarity index 100%
rename from pkg/tracing/tracing_test.go
rename to pkg/infra/tracing/tracing_test.go