remove opentelemetry for now

kitsune-soc · May 11, 2024 · dc276c7 · dc276c7
1 parent 428d837
commit dc276c7
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 514 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,6 @@ members = [
     "lib/blowocking",
     "lib/cursiv",
     "lib/geomjeungja",
-    "lib/http-compat",
     "lib/http-signatures",
     "lib/just-retry",
     "lib/masto-id-convert",

diff --git a/crates/kitsune-observability/Cargo.toml b/crates/kitsune-observability/Cargo.toml
@@ -6,27 +6,11 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-async-trait = "0.1.80"
 eyre = "0.6.12"
-http-body-util = "0.1.1"
-http-compat = { path = "../../lib/http-compat" }
-hyper = { version = "1.3.1", default-features = false }
 kitsune-config = { path = "../kitsune-config" }
-kitsune-http-client = { path = "../kitsune-http-client" }
 opentelemetry = { version = "0.22.0", default-features = false, features = [
     "trace",
 ] }
-opentelemetry-http = "0.11.1"
-opentelemetry-otlp = { version = "0.15.0", default-features = false, features = [
-    "grpc-tonic",
-    "http-proto",
-    "tls",
-    "tls-roots",
-    "trace",
-] }
-opentelemetry_sdk = { version = "0.22.1", default-features = false, features = [
-    "rt-tokio",
-] }
 tracing = "0.1.40"
 tracing-error = "0.2.0"
 tracing-opentelemetry = { version = "0.23.0", default-features = false }

diff --git a/crates/kitsune-observability/src/lib.rs b/crates/kitsune-observability/src/lib.rs
@@ -1,13 +1,7 @@
-use async_trait::async_trait;
-use eyre::WrapErr;
-use http_body_util::BodyExt;
-use http_compat::Compat;
-use kitsune_config::{open_telemetry::Transport, Configuration};
+use eyre::{bail, WrapErr};
+use kitsune_config::Configuration;
 use opentelemetry::trace::{noop::NoopTracer, Tracer};
-use opentelemetry_http::{Bytes, HttpClient, HttpError, Request, Response};
-use opentelemetry_otlp::{SpanExporterBuilder, WithExportConfig};
-use opentelemetry_sdk::runtime::Tokio;
-use std::{env, fmt};
+use std::env;
 use tracing_error::ErrorLayer;
 use tracing_opentelemetry::{OpenTelemetryLayer, PreSampledTracer};
 use tracing_subscriber::{
@@ -16,7 +10,7 @@ use tracing_subscriber::{
     Layer as _, Registry,
 };
 
-#[derive(Clone)]
+/*#[derive(Clone)]
 struct HttpClientAdapter {
     inner: kitsune_http_client::Client,
 }
@@ -59,7 +53,7 @@ macro_rules! build_exporter {
 
         exporter
     }};
-}
+}*/
 
 fn initialise_logging<T>(tracer: T) -> eyre::Result<()>
 where
@@ -82,8 +76,8 @@ where
 }
 
 pub fn initialise(config: &Configuration) -> eyre::Result<()> {
-    if let Some(ref opentelemetry_config) = config.opentelemetry {
-        let http_client = HttpClientAdapter {
+    if config.opentelemetry.is_some() {
+        /*let http_client = HttpClientAdapter {
             inner: kitsune_http_client::Client::default(),
         };
 
@@ -99,7 +93,8 @@ pub fn initialise(config: &Configuration) -> eyre::Result<()> {
             .with_exporter(trace_exporter)
             .install_batch(Tokio)?;
 
-        initialise_logging(tracer)?;
+        initialise_logging(tracer)?;*/
+        bail!("OpenTelemetry is not supported at the moment");
     } else {
         initialise_logging(NoopTracer::new())?;
     }

diff --git a/lib/http-compat/Cargo.toml b/lib/http-compat/Cargo.toml
diff --git a/lib/http-compat/LICENSE-APACHE-2.0 b/lib/http-compat/LICENSE-APACHE-2.0
diff --git a/lib/http-compat/LICENSE-MIT b/lib/http-compat/LICENSE-MIT
diff --git a/lib/http-compat/src/lib.rs b/lib/http-compat/src/lib.rs
diff --git a/lib/http-compat/src/v0_2.rs b/lib/http-compat/src/v0_2.rs
diff --git a/lib/http-compat/src/v1.rs b/lib/http-compat/src/v1.rs