mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-05-17 09:22:38 +00:00
Code Issues Projects Releases Wiki Activity

Make websocket opentelemetry dependency optional (ref #2253)

Browse source
This commit is contained in:
Felix Ableitner 2022-05-18 15:00:06 +02:00
parent be246425f0
commit f536c722aa
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -15,7 +15,7 @@ debug = 0
[features]
console = ["console-subscriber", "opentelemetry", "opentelemetry-otlp", "tracing-opentelemetry",
"reqwest-tracing/opentelemetry_0_16"]
"reqwest-tracing/opentelemetry_0_16", "lemmy_websocket/console"]
default = []
[workspace]

10
crates/websocket/Cargo.toml
View file

@ -12,9 +12,13 @@ name = "lemmy_websocket"
path = "src/lib.rs"
doctest = false
[features]
console = ["opentelemetry", "tracing-opentelemetry"]
default = []
[dependencies]
lemmy_utils = { version = "=0.16.3", path = "../utils" }
lemmy_api_common = { version = "=0.16.3", path = "../api_common" }
lemmy_api_common = { version = "=0.16.3", path = "../api_common", features = ["full"] }
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.3", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.3", path = "../db_views_actor", features = ["full"] }
@ -33,5 +37,5 @@ strum_macros = "0.24.0"
chrono = { version = "0.4.19", features = ["serde"], default-features = false }
actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] }
actix-web-actors = { version = "4.1.0", default-features = false }
opentelemetry = "0.17.0"
tracing-opentelemetry = "0.17.2"
opentelemetry = { version = "0.17.0", optional = true }
tracing-opentelemetry = { version = "0.17.2", optional = true }

5
crates/websocket/src/handlers.rs
View file

@ -6,11 +6,9 @@ use crate::{
use actix::{Actor, Context, Handler, ResponseFuture};
use lemmy_db_schema::utils::naive_now;
use lemmy_utils::ConnectionId;
use opentelemetry::trace::TraceContextExt;
use rand::Rng;
use serde::Serialize;
use tracing::{error, info};
use tracing_opentelemetry::OpenTelemetrySpanExt;
/// Make actor from `ChatServer`
impl Actor for ChatServer {
@ -70,7 +68,10 @@ fn root_span() -> tracing::Span {
"Websocket Request",
trace_id = tracing::field::Empty,
);
#[cfg(feature = "console")]
{
use opentelemetry::trace::TraceContextExt;
use tracing_opentelemetry::OpenTelemetrySpanExt;
let trace_id = span.context().span().span_context().trace_id().to_string();
span.record("trace_id", &tracing::field::display(trace_id));
}