mirror of
https://github.com/grafana/grafana.git
synced 2024-11-21 16:38:03 -06:00
Tracing: Deprecate opentracing (#50058)
* Deprecate opentracing * Fix comment * Adjust comment * Fix docs for opentelemetry * Add deprecated to sample.ini
This commit is contained in:
parent
cc90f9bb69
commit
24c6a73095
@ -970,6 +970,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 otlp 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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user