IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tracing: Deprecate opentracing (#50058)

Browse Source 
* Deprecate opentracing

* Fix comment

* Adjust comment

* Fix docs for opentelemetry

* Add deprecated to sample.ini
This commit is contained in:
idafurjes 2022-06-02 14:13:00 +02:00 committed by GitHub
parent cc90f9bb69
commit 24c6a73095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/defaults.ini
View File

@ -970,6 +970,7 @@ url = https://grafana.com
url = https://grafana.com url = https://grafana.com
#################################### Distributed tracing ############ #################################### Distributed tracing ############
# Opentracing is deprecated use opentelemetry instead
[tracing.jaeger] [tracing.jaeger]
# jaeger destination (ex localhost:6831) # jaeger destination (ex localhost:6831)
address = address =

1
conf/sample.ini
View File

@ -937,6 +937,7 @@
;url = https://grafana.com ;url = https://grafana.com
#################################### Distributed tracing ############ #################################### Distributed tracing ############
# Opentracing is deprecated use opentelemetry instead
[tracing.jaeger] [tracing.jaeger]
# Enable by setting the address sending traces to jaeger (ex localhost:6831) # Enable by setting the address sending traces to jaeger (ex localhost:6831)
;address = localhost:6831 ;address = localhost:6831

30
docs/sources/administration/configuration.md
View File

@ -1445,6 +1445,8 @@ Default is https://grafana.com.
## [tracing.jaeger] ## [tracing.jaeger]
[Deprecated - use tracing.opentelemetry.jaeger or tracing.opentelemetry.otlp instead]
Configure Grafana's Jaeger client for distributed tracing. Configure Grafana's Jaeger client for distributed tracing.
You can also use the standard `JAEGER_*` environment variables to configure 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> <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] ## [external_image_storage]
These options control how images should be made public so they can be shared on services like Slack or email message. These options control how images should be made public so they can be shared on services like Slack or email message.

1
pkg/infra/tracing/tracing.go
View File

@ -50,6 +50,7 @@ func parseSettings(cfg *setting.Cfg) (*Opentracing, *Opentelemetry, error) {
return ts, nil, err return ts, nil, err
} }
if ts.enabled { if ts.enabled {
cfg.Logger.Warn("[Deprecated] the configuration setting 'tracing.jaeger' is deprecated, please use 'tracing.opentelemetry.jaeger' instead")
return ts, nil, nil return ts, nil, nil
} }