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();

4
crates/http/Cargo.toml
View File

@ -17,7 +17,7 @@ http-body = "0.4.5"
hyper = "0.14.26"
hyper-rustls = { version = "0.24.0", features = ["http1", "http2"], default-features = false, optional = true }
once_cell = "1.17.1"
opentelemetry = "0.18.0"
opentelemetry = "0.19.0"
rustls = { version = "0.21.0", optional = true }
rustls-native-certs = { version = "0.6.2", optional = true }
serde = "1.0.160"
@ -28,7 +28,7 @@ tokio = { version = "1.27.0", features = ["sync", "parking_lot"], optional = tru
tower = { version = "0.4.13", features = [] }
tower-http = { version = "0.4.0", features = ["cors"] }
tracing = "0.1.37"
tracing-opentelemetry = "0.18.0"
tracing-opentelemetry = "0.19.0"
webpki = { version = "0.22.0", optional = true }
webpki-roots = { version = "0.23.0", optional = true }

4
crates/storage/Cargo.toml
View File

@ -12,12 +12,12 @@ thiserror = "1.0.40"
futures-util = "0.3.28"
apalis-core = { version = "=0.4.0-alpha.5", features = ["tokio-comp"] }
opentelemetry = "0.18.0"
opentelemetry = "0.19.0"
rand_core = "0.6.4"
serde = "1.0.160"
serde_json = "1.0.96"
tracing = "0.1.37"
tracing-opentelemetry = "0.18.0"
tracing-opentelemetry = "0.19.0"
url = "2.3.1"
ulid = "1.0.0"

4
crates/tasks/Cargo.toml
View File

@ -18,8 +18,8 @@ sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] }
thiserror = "1.0.40"
tower = "0.4.13"
tracing = "0.1.37"
tracing-opentelemetry = "0.18.0"
opentelemetry = "0.18.0"
tracing-opentelemetry = "0.19.0"
opentelemetry = "0.19.0"
ulid = "1.0.0"
url = "2.3.1"
serde = { version = "1.0.160", features = ["derive"] }

6
crates/tower/Cargo.toml
View File

@ -9,11 +9,11 @@ license = "Apache-2.0"
aws-smithy-http = { version = "0.55.1", optional = true }
http = "0.2.9"
tracing = "0.1.37"
tracing-opentelemetry = "0.18.0"
tracing-opentelemetry = "0.19.0"
tower = "0.4.13"
tokio = { version = "1.27.0", features = ["time"] }
opentelemetry = { version = "0.18.0", features = ["metrics"] }
opentelemetry-http = "0.7.0"
opentelemetry = { version = "0.19.0", features = ["metrics"] }
opentelemetry-http = "0.8.0"
pin-project-lite = "0.2.9"
[features]