matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00
Code Activity

Bump the OTEL crates to 0.19.0 (#1132)

Browse Source 
* Bump the OTEL crates to 0.19.0

Also pins a bunch of versions in the Dockerfile and fixes the docker build in CI
This commit is contained in:
Quentin Gliech
2023-04-24 19:10:55 +02:00
committed by GitHub
parent 3979e9f46a
commit 5cd93a5f93
11 changed files with 130 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/cli/Cargo.toml
View File

@ -31,14 +31,14 @@ watchman_client = "0.8.0"
tracing = "0.1.37"
tracing-appender = "0.2.2"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
tracing-opentelemetry = "0.18.0"
opentelemetry = { version = "0.18.0", features = ["trace", "metrics", "rt-tokio"] }
opentelemetry-semantic-conventions = "0.10.0"
opentelemetry-jaeger = { version = "0.17.0", features = ["rt-tokio", "collector_client"], optional = true }
opentelemetry-otlp = { version = "0.11.0", features = ["trace", "metrics", "http-proto"], optional = true }
opentelemetry-zipkin = { version = "0.16.0", features = ["opentelemetry-http"], default-features = false, optional = true }
opentelemetry-http = { version = "0.7.0", features = ["tokio", "hyper"], optional = true }
opentelemetry-prometheus = { version = "0.11.0", optional = true }
tracing-opentelemetry = "0.19.0"
opentelemetry = { version = "0.19.0", features = ["trace", "metrics", "rt-tokio"] }
opentelemetry-semantic-conventions = "0.11.0"
opentelemetry-jaeger = { version = "0.18.0", features = ["rt-tokio", "collector_client"], optional = true }
opentelemetry-otlp = { version = "0.12.0", features = ["trace", "metrics"], optional = true }
opentelemetry-zipkin = { version = "0.17.0", features = ["opentelemetry-http"], default-features = false, optional = true }
opentelemetry-http = { version = "0.8.0", features = ["tokio", "hyper"], optional = true }
opentelemetry-prometheus = { version = "0.12.0", optional = true }
prometheus = { version = "0.13.3", optional = true }
sentry = { version = "0.30.0", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] }
sentry-tracing = "0.30.0"

17
crates/cli/src/telemetry.rs
View File

@ -368,16 +368,13 @@ fn prometheus_meter() -> anyhow::Result<BasicController> {
#[cfg(feature = "prometheus")]
fn prometheus_meter() -> anyhow::Result<BasicController> {
let controller = sdk::metrics::controllers::basic(
sdk::metrics::processors::factory(
// All histogram metrics are in milliseconds. Each bucket is ~2x the previous one.
sdk::metrics::selectors::simple::histogram([
1.0, 3.0, 5.0, 10.0, 30.0, 50.0, 100.0, 300.0, 1000.0,
]),
sdk::export::metrics::aggregation::cumulative_temporality_selector(),
)
.with_memory(true),
)
let controller = sdk::metrics::controllers::basic(sdk::metrics::processors::factory(
// All histogram metrics are in milliseconds. Each bucket is ~2x the previous one.
sdk::metrics::selectors::simple::histogram([
1.0, 3.0, 5.0, 10.0, 30.0, 50.0, 100.0, 300.0, 1000.0,
]),
sdk::export::metrics::aggregation::cumulative_temporality_selector(),
))
.with_resource(resource())
.build();