From 1bac7a830634561e3bc8eeb07ce38fcf58b23a84 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 7 Jun 2022 05:53:37 -0400
Subject: [PATCH] [v9.0.x] Tracing: Deprecate opentracing (#50082)

* Tracing: Deprecate opentracing (#50058)

* Deprecate opentracing

* Fix comment

* Adjust comment

* Fix docs for opentelemetry

* Add deprecated to sample.ini

(cherry picked from commit 24c6a73095cb97112f7477c3f0ba63156b9f2eb8)

* Update docs/sources/administration/configuration.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---
 conf/defaults.ini                            |  1 +
 conf/sample.ini                              |  1 +
 docs/sources/administration/configuration.md | 30 ++++++++++++++++++++
 pkg/infra/tracing/tracing.go                 |  1 +
 4 files changed, 33 insertions(+)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index d23c0aeeff0..370bf1ff46f 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -972,6 +972,7 @@ url = https://grafana.com
 url = https://grafana.com
 
 #################################### Distributed tracing ############
+# Opentracing is deprecated use opentelemetry instead
 [tracing.jaeger]
 # jaeger destination (ex localhost:6831)
 address =
diff --git a/conf/sample.ini b/conf/sample.ini
index 8d8fd35ae33..b5c2e2eae2f 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -937,6 +937,7 @@
 ;url = https://grafana.com
 
 #################################### Distributed tracing ############
+# Opentracing is deprecated use opentelemetry instead
 [tracing.jaeger]
 # Enable by setting the address sending traces to jaeger (ex localhost:6831)
 ;address = localhost:6831
diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md
index e0a5eb71766..66d36eb8d80 100644
--- a/docs/sources/administration/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -1445,6 +1445,8 @@ Default is https://grafana.com.
 
 ## [tracing.jaeger]
 
+[Deprecated - use tracing.opentelemetry.jaeger or tracing.opentelemetry.otlp instead]
+
 Configure Grafana's Jaeger client for distributed tracing.
 
 You can also use the standard `JAEGER_*` environment variables to configure
@@ -1508,6 +1510,34 @@ Setting this to `true` turns off shared RPC spans. Leaving this available is the
 
 <hr>
 
+## [tracing.opentelemetry.jaeger]
+
+Configure Grafana's Jaeger client for distributed tracing.
+
+### address
+
+The host:port destination for reporting spans. (ex: `localhost:14268/api/traces`)
+
+### propagation
+
+The propagation specifies the text map propagation format.(ex: jaeger, w3c)
+
+<hr>
+
+## [tracing.opentelemetry.otlp]
+
+Configure Grafana's OLTP client for distributed tracing.
+
+### address
+
+The host:port destination for reporting spans. (ex: `localhost:4317`)
+
+### propagation
+
+The propagation specifies the text map propagation format.(ex: jaeger, w3c)
+
+<hr>
+
 ## [external_image_storage]
 
 These options control how images should be made public so they can be shared on services like Slack or email message.
diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go
index 5b2e4ce628d..f78d84c563a 100644
--- a/pkg/infra/tracing/tracing.go
+++ b/pkg/infra/tracing/tracing.go
@@ -50,6 +50,7 @@ func parseSettings(cfg *setting.Cfg) (*Opentracing, *Opentelemetry, error) {
 		return ts, nil, err
 	}
 	if ts.enabled {
+		cfg.Logger.Warn("[Deprecated] the configuration setting 'tracing.jaeger' is deprecated, please use 'tracing.opentelemetry.jaeger' instead")
 		return ts, nil, nil
 	}