mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-06-24 08:10:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into asonix/document-opentelemetry-url

Browse source
This commit is contained in:
Riley 2022-02-04 21:22:27 -06:00 committed by GitHub
parent 1546e5fd0d 0f8caac689
commit 6b500f6cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cargo.toml
View file

@ -13,6 +13,10 @@ doctest = false
[profile.dev]
debug = 0
[features]
console = ["console-subscriber"]
default = []
[workspace]
members = [
"crates/api",
@ -54,7 +58,7 @@ tracing-actix-web = { version = "0.5.0-beta.8", default-features = false }
tracing-error = "0.2.0"
tracing-log = "0.1.2"
tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
console-subscriber = "0.1.0"
console-subscriber = { version = "0.1.0", optional = true }
strum = "0.23.0"
url = { version = "2.2.2", features = ["serde"] }
openssl = "0.10.38"

8
src/lib.rs
View file

@ -4,6 +4,7 @@ pub mod code_migrations;
pub mod root_span_builder;
pub mod scheduled_tasks;
#[cfg(feature = "console")]
use console_subscriber::ConsoleLayer;
use lemmy_utils::LemmyError;
use opentelemetry::{
@ -30,6 +31,7 @@ pub fn init_tracing(opentelemetry_url: Option<&str>) -> Result<(), LemmyError> {
let format_layer = tracing_subscriber::fmt::layer().with_filter(targets.clone());
#[cfg(feature = "console")]
let console_layer = ConsoleLayer::builder()
.with_default_env()
.server_addr(([0, 0, 0, 0], 6669))
@ -38,8 +40,10 @@ pub fn init_tracing(opentelemetry_url: Option<&str>) -> Result<(), LemmyError> {
let subscriber = Registry::default()
.with(format_layer)
.with(ErrorLayer::default())
.with(console_layer);
.with(ErrorLayer::default());
#[cfg(feature = "console")]
let subscriber = subscriber.with(console_layer);
if let Some(url) = opentelemetry_url {
let tracer = opentelemetry_otlp::new_pipeline()