[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 24c6a73095) * 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>
2022-06-07 11:53:37 +02:00
parent 5275a21c5c
commit 1bac7a8306
4 changed files with 33 additions and 0 deletions
@@ -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 =
@@ -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
@@ -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.
@@ -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
 	}