From d26ff4a7cb88075399226c47db38c362eec22999 Mon Sep 17 00:00:00 2001
From: "Aode (lion)" <asonix@asonix.dog>
Date: Sat, 18 Sep 2021 15:47:10 -0500
Subject: [PATCH] Switch from tokio-current-thread to tokio for otel

---
 Cargo.toml        | 2 +-
 src/data/actor.rs | 4 ++--
 src/main.rs       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 79bb515..9d77525 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ dotenv = "0.15.0"
 futures-util = "0.3.17"
 lru = "0.6.0"
 mime = "0.3.16"
-opentelemetry = { version = "0.16", features = ["rt-tokio-current-thread"] }
+opentelemetry = { version = "0.16", features = ["rt-tokio"] }
 opentelemetry-otlp = "0.9"
 rand = "0.8"
 rsa = "0.5"
diff --git a/src/data/actor.rs b/src/data/actor.rs
index 9d32af7..783d4de 100644
--- a/src/data/actor.rs
+++ b/src/data/actor.rs
@@ -40,7 +40,7 @@ impl ActorCache {
         ActorCache { db }
     }
 
-    #[tracing::instrument(name = "Get Actor", skip(requests))]
+    #[tracing::instrument(name = "Get Actor")]
     pub(crate) async fn get(
         &self,
         id: &Url,
@@ -68,7 +68,7 @@ impl ActorCache {
         self.db.remove_connection(actor.id.clone()).await
     }
 
-    #[tracing::instrument(name = "Fetch remote actor", skip(requests))]
+    #[tracing::instrument(name = "Fetch remote actor")]
     pub(crate) async fn get_no_cache(&self, id: &Url, requests: &Requests) -> Result<Actor, Error> {
         let accepted_actor = requests.fetch::<AcceptedActors>(id.as_str()).await?;
 
diff --git a/src/main.rs b/src/main.rs
index 3fee9dd..aaa45a5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -58,7 +58,7 @@ async fn main() -> Result<(), anyhow::Error> {
                         .tonic()
                         .with_endpoint(url.as_str()),
                 )
-                .install_batch(opentelemetry::runtime::TokioCurrentThread)?;
+                .install_batch(opentelemetry::runtime::Tokio)?;
 
         let otel_layer = tracing_opentelemetry::layer().with_tracer(tracer);