build(deps): bump the opentelemetry group across 1 directory with 6 updates

Cargo.toml

@@ -5,7 +5,6 @@ resolver = "2"
 
 # Updated in the CI with a `sed` command
 package.version = "0.12.0"
-
 package.license = "AGPL-3.0-only"
 package.authors = ["Element Backend Team"]
 package.edition = "2021"
@@ -337,17 +336,46 @@ version = "0.3.19"
 
 # OpenTelemetry
 [workspace.dependencies.opentelemetry]
-version = "0.24.0"
+version = "0.27.1"
 features = ["trace", "metrics"]
+
 [workspace.dependencies.opentelemetry-http]
-version = "0.13.0"
+version = "0.27.0"
 features = ["reqwest"]
+
+[workspace.dependencies.opentelemetry-jaeger-propagator]
+version = "0.27.0"
+
+[workspace.dependencies.opentelemetry-otlp]
+version = "0.27.0"
+default-features = false
+features = ["trace", "metrics", "http-proto"]
+
+[workspace.dependencies.opentelemetry-prometheus]
+version = "0.27.0"
+
+[workspace.dependencies.opentelemetry-resource-detectors]
+version = "0.6.0"
+
 [workspace.dependencies.opentelemetry-semantic-conventions]
-version = "0.16.0"
+version = "0.27.0"
+features = ["semconv_experimental"]
+
+[workspace.dependencies.opentelemetry-stdout]
+version = "0.27.0"
+features = ["trace", "metrics"]
+
+[workspace.dependencies.opentelemetry_sdk]
+version = "0.27.1"
+features = ["rt-tokio"]
+
 [workspace.dependencies.tracing-opentelemetry]
-version = "0.25.0"
+version = "0.28.0"
 default-features = false
 
+[workspace.dependencies.prometheus]
+version = "0.13.4"
+
 # URL manipulation
 [workspace.dependencies.url]
 version = "2.5.4"

crates/cli/Cargo.toml

@@ -49,22 +49,14 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tracing-opentelemetry.workspace = true
 opentelemetry.workspace = true
 opentelemetry-http.workspace = true
-opentelemetry-jaeger-propagator = "0.3.0"
-opentelemetry-otlp = { version = "0.17.0", default-features = false, features = [
-    "trace",
-    "metrics",
-    "http-proto",
-] }
-opentelemetry-prometheus = "0.17.0"
-opentelemetry-resource-detectors = "0.3.0"
+opentelemetry-jaeger-propagator.workspace = true
+opentelemetry-otlp.workspace = true
+opentelemetry-prometheus.workspace = true
+opentelemetry-resource-detectors.workspace = true
 opentelemetry-semantic-conventions.workspace = true
-opentelemetry-stdout = { version = "0.5.0", features = ["trace", "metrics"] }
-opentelemetry_sdk = { version = "0.24.1", features = [
-    "trace",
-    "metrics",
-    "rt-tokio",
-] }
-prometheus = "0.13.4"
+opentelemetry-stdout.workspace = true
+opentelemetry_sdk.workspace = true
+prometheus.workspace = true
 sentry.workspace = true
 sentry-tracing.workspace = true
 sentry-tower.workspace = true

crates/cli/src/app_state.rs

@@ -25,13 +25,12 @@ use mas_router::UrlBuilder;
 use mas_storage::{BoxClock, BoxRepository, BoxRng, SystemClock};
 use mas_storage_pg::PgRepository;
 use mas_templates::Templates;
-use opentelemetry::{
-    metrics::{Histogram, MetricsError},
-    KeyValue,
-};
+use opentelemetry::{metrics::Histogram, KeyValue};
 use rand::SeedableRng;
 use sqlx::PgPool;
 
+use crate::telemetry::METER;
+
 #[derive(Clone)]
 pub struct AppState {
     pub pool: PgPool,
@@ -55,50 +54,38 @@ pub struct AppState {
 
 impl AppState {
     /// Init the metrics for the app state.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if the metrics could not be initialized.
-    pub fn init_metrics(&mut self) -> Result<(), MetricsError> {
-        // XXX: do we want to put that somewhere else?
-        let meter = opentelemetry::global::meter_with_version(
-            env!("CARGO_PKG_NAME"),
-            Some(env!("CARGO_PKG_VERSION")),
-            Some(opentelemetry_semantic_conventions::SCHEMA_URL),
-            None,
-        );
+    pub fn init_metrics(&mut self) {
         let pool = self.pool.clone();
-        let usage = meter
+        METER
             .i64_observable_up_down_counter("db.connections.usage")
             .with_description("The number of connections that are currently in `state` described by the state attribute.")
             .with_unit("{connection}")
-            .init();
+            .with_callback(move |instrument| {
+                let idle = u32::try_from(pool.num_idle()).unwrap_or(u32::MAX);
+                let used = pool.size() - idle;
+                instrument.observe(i64::from(idle), &[KeyValue::new("state", "idle")]);
+                instrument.observe(i64::from(used), &[KeyValue::new("state", "used")]);
+            })
+            .build();
 
-        let max = meter
+        let pool = self.pool.clone();
+        METER
             .i64_observable_up_down_counter("db.connections.max")
             .with_description("The maximum number of open connections allowed.")
             .with_unit("{connection}")
-            .init();
-
-        // Observe the number of active and idle connections in the pool
-        meter.register_callback(&[usage.as_any(), max.as_any()], move |observer| {
-            let idle = u32::try_from(pool.num_idle()).unwrap_or(u32::MAX);
-            let used = pool.size() - idle;
-            let max_conn = pool.options().get_max_connections();
-            observer.observe_i64(&usage, i64::from(idle), &[KeyValue::new("state", "idle")]);
-            observer.observe_i64(&usage, i64::from(used), &[KeyValue::new("state", "used")]);
-            observer.observe_i64(&max, i64::from(max_conn), &[]);
-        })?;
+            .with_callback(move |instrument| {
+                let max_conn = pool.options().get_max_connections();
+                instrument.observe(i64::from(max_conn), &[]);
+            })
+            .build();
 
         // Track the connection acquisition time
-        let histogram = meter
+        let histogram = METER
             .u64_histogram("db.client.connections.create_time")
             .with_description("The time it took to create a new connection.")
             .with_unit("ms")
-            .init();
+            .build();
         self.conn_acquisition_histogram = Some(histogram);
-
-        Ok(())
     }
 
     /// Init the metadata cache.

crates/cli/src/commands/server.rs

@@ -228,7 +228,7 @@ impl Options {
                 limiter,
                 conn_acquisition_histogram: None,
             };
-            s.init_metrics()?;
+            s.init_metrics();
             // XXX: this might panic
             s.init_metadata_cache().await;
             s

crates/cli/src/main.rs

@@ -119,11 +119,11 @@ async fn try_main() -> anyhow::Result<ExitCode> {
     });
 
     // Setup OpenTelemetry tracing and metrics
-    let tracer = telemetry::setup(&telemetry_config).context("failed to setup OpenTelemetry")?;
+    self::telemetry::setup(&telemetry_config).context("failed to setup OpenTelemetry")?;
 
-    let telemetry_layer = tracer.map(|tracer| {
+    let telemetry_layer = self::telemetry::TRACER.get().map(|tracer| {
         tracing_opentelemetry::layer()
-            .with_tracer(tracer)
+            .with_tracer(tracer.clone())
             .with_tracked_inactivity(false)
             .with_filter(LevelFilter::INFO)
     });

crates/cli/src/server.rs

@@ -248,14 +248,14 @@ pub fn build_router(
     router
         .layer(
             InFlightCounterLayer::new("http.server.active_requests").on_request((
-                name.map(|name| MAS_LISTENER_NAME.string(name.to_owned())),
+                name.map(|name| KeyValue::new(MAS_LISTENER_NAME, name.to_owned())),
                 metrics_attributes_fn(on_http_request_labels),
             )),
         )
         .layer(
             DurationRecorderLayer::new("http.server.duration")
                 .on_request((
-                    name.map(|name| MAS_LISTENER_NAME.string(name.to_owned())),
+                    name.map(|name| KeyValue::new(MAS_LISTENER_NAME, name.to_owned())),
                     metrics_attributes_fn(on_http_request_labels),
                 ))
                 .on_response_fn(on_http_response_labels),