Update opentelemetry, ring, http-signature-normalization, tracing-log

Cargo.toml

@@ -15,7 +15,7 @@ name = "relay"
 path = "src/main.rs"
 
 [features]
-console = ["console-subscriber"]
+console = ["dep:console-subscriber"]
 default = []
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -28,11 +28,12 @@ actix-webfinger = { version = "0.5.0", default-features = false }
 activitystreams = "0.7.0-alpha.25"
 activitystreams-ext = "0.1.0-alpha.3"
 ammonia = "3.1.0"
+async-cpupool = { version = "0.1.0", git = "https://git.asonix.dog/safe-async/async-cpupool" }
 bcrypt = "0.15"
 base64 = "0.21"
 clap = { version = "4.0.0", features = ["derive"] }
 config = "0.13.0"
-console-subscriber = { version = "0.1", optional = true }
+console-subscriber = { version = "0.2", optional = true }
 dashmap = "5.1.0"
 dotenv = "0.15.0"
 flume = "0.11.0"
@@ -44,15 +45,16 @@ metrics-exporter-prometheus = { version = "0.12.0", default-features = false, fe
 metrics-util = "0.15.0"
 mime = "0.3.16"
 minify-html = "0.11.0"
-opentelemetry = { version = "0.20", features = ["rt-tokio"] }
+opentelemetry = "0.21"
-opentelemetry-otlp = "0.13"
+opentelemetry_sdk = { version = "0.21", features = ["rt-tokio"] }
+opentelemetry-otlp = "0.14"
 pin-project-lite = "0.2.9"
 quanta = "0.11.0"
 rand = "0.8"
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"]}
 reqwest-middleware = "0.2"
 reqwest-tracing = "0.4.5"
-ring = "0.16.20"
+ring = "0.17.5"
 rsa = { version = "0.9" }
 rsa-magic-public-key = "0.8.0"
 rustls = "0.21.0"
@@ -70,8 +72,8 @@ time = { version = "0.3.17", features = ["serde"] }
 tracing = "0.1"
 tracing-error = "0.2"
 tracing-futures = "0.2"
-tracing-log = "0.1"
+tracing-log = "0.2"
-tracing-opentelemetry = "0.21"
+tracing-opentelemetry = "0.22"
 tracing-subscriber = { version = "0.3", features = [
   "ansi",
   "env-filter",
@@ -87,23 +89,23 @@ default-features = false
 features = ["background-jobs-actix", "error-logging"]
 
 [dependencies.http-signature-normalization-actix]
-version = "0.10.1"
+version = "0.11.0"
 default-features = false
 features = ["server", "ring"]
 
 [dependencies.http-signature-normalization-reqwest]
-version = "0.10.0"
+version = "0.11.0"
 default-features = false
 features = ["middleware", "ring"]
 
 [dependencies.tracing-actix-web]
-version = "0.7.6"
+version = "0.7.9"
 
 [build-dependencies]
 anyhow = "1.0"
 dotenv = "0.15.0"
 ructe = { version = "0.17.0", features = ["sass", "mime03"] }
-toml = "0.7.0"
+toml = "0.8.0"
 
 [profile.dev.package.rsa]
 opt-level = 3

src/main.rs

@@ -13,8 +13,9 @@ use error::Error;
 use http_signature_normalization_actix::middleware::VerifySignature;
 use metrics_exporter_prometheus::PrometheusBuilder;
 use metrics_util::layers::FanoutBuilder;
-use opentelemetry::{sdk::Resource, KeyValue};
+use opentelemetry::KeyValue;
 use opentelemetry_otlp::WithExportConfig;
+use opentelemetry_sdk::Resource;
 use reqwest_middleware::ClientWithMiddleware;
 use rustls::ServerConfig;
 use tracing_actix_web::TracingLogger;
@@ -81,18 +82,19 @@ fn init_subscriber(
     let subscriber = subscriber.with(console_layer);
 
     if let Some(url) = opentelemetry_url {
-        let tracer =
+        let tracer = opentelemetry_otlp::new_pipeline()
-            opentelemetry_otlp::new_pipeline()
+            .tracing()
-                .tracing()
+            .with_trace_config(
-                .with_trace_config(opentelemetry::sdk::trace::config().with_resource(
+                opentelemetry_sdk::trace::config().with_resource(Resource::new(vec![
-                    Resource::new(vec![KeyValue::new("service.name", software_name)]),
+                    KeyValue::new("service.name", software_name),
-                ))
+                ])),
-                .with_exporter(
+            )
-                    opentelemetry_otlp::new_exporter()
+            .with_exporter(
-                        .tonic()
+                opentelemetry_otlp::new_exporter()
-                        .with_endpoint(url.as_str()),
+                    .tonic()
-                )
+                    .with_endpoint(url.as_str()),
-                .install_batch(opentelemetry::runtime::Tokio)?;
+            )
+            .install_batch(opentelemetry_sdk::runtime::Tokio)?;
 
         let otel_layer = tracing_opentelemetry::layer()
             .with_tracer(tracer)

src/requests.rs

@@ -432,7 +432,7 @@ struct Signer {
 
 impl Signer {
     fn sign(&self, signing_string: &str) -> Result<String, Error> {
-        let mut signature = vec![0; self.private_key.public_modulus_len()];
+        let mut signature = vec![0; self.private_key.public().modulus_len()];
 
         self.private_key
             .sign(