actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-02-23 19:03:03 +01:00
Code Issues Releases Wiki Activity

Remove once_cell dependency

Browse Source
This commit is contained in:
Luca Palmieri 2024-09-02 11:21:47 +02:00
parent 9f180d6eb9
commit f9c81facb2
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/custom-root-span/Cargo.toml
View File

@ -8,7 +8,6 @@ edition = "2021"
[dependencies] [dependencies]
actix-web = "4" actix-web = "4"
once_cell = "1.19"
opentelemetry = "0.24" opentelemetry = "0.24"
opentelemetry-otlp = "0.17" opentelemetry-otlp = "0.17"
opentelemetry_sdk = { version = "0.24", features = ["rt-tokio-current-thread"] } opentelemetry_sdk = { version = "0.24", features = ["rt-tokio-current-thread"] }

6
examples/custom-root-span/src/main.rs
View File

@ -1,7 +1,6 @@
use actix_web::body::MessageBody; use actix_web::body::MessageBody;
use actix_web::dev::{ServiceRequest, ServiceResponse}; use actix_web::dev::{ServiceRequest, ServiceResponse};
use actix_web::{web, App, Error, HttpServer}; use actix_web::{web, App, Error, HttpServer};
use once_cell::sync::Lazy;
use opentelemetry::trace::TracerProvider; use opentelemetry::trace::TracerProvider;
use opentelemetry::{global, KeyValue}; use opentelemetry::{global, KeyValue};
use opentelemetry_otlp::WithExportConfig; use opentelemetry_otlp::WithExportConfig;
@ -10,6 +9,7 @@ use opentelemetry_sdk::{
}; };
use opentelemetry_semantic_conventions::resource; use opentelemetry_semantic_conventions::resource;
use std::io; use std::io;
use std::sync::LazyLock;
use tracing::Span; use tracing::Span;
use tracing_actix_web::{DefaultRootSpanBuilder, RootSpan, RootSpanBuilder, TracingLogger}; use tracing_actix_web::{DefaultRootSpanBuilder, RootSpan, RootSpanBuilder, TracingLogger};
use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer}; use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
@ -74,8 +74,8 @@ async fn main() -> io::Result<()> {
const APP_NAME: &str = "tracing-actix-web-demo"; const APP_NAME: &str = "tracing-actix-web-demo";
static RESOURCE: Lazy<Resource> = static RESOURCE: LazyLock<Resource> =
Lazy::new(|| Resource::new(vec![KeyValue::new(resource::SERVICE_NAME, APP_NAME)])); LazyLock::new(|| Resource::new(vec![KeyValue::new(resource::SERVICE_NAME, APP_NAME)]));
/// Init a `tracing` subscriber that prints spans to stdout as well as /// Init a `tracing` subscriber that prints spans to stdout as well as
/// ships them to Jaeger. /// ships them to Jaeger.

1
examples/opentelemetry/Cargo.toml
View File

@ -8,7 +8,6 @@ license = "MIT/Apache-2.0"
[dependencies] [dependencies]
actix-web = "4" actix-web = "4"
once_cell = "1.19"
opentelemetry = "0.24" opentelemetry = "0.24"
opentelemetry_sdk = { version = "0.24", features = ["rt-tokio-current-thread"] } opentelemetry_sdk = { version = "0.24", features = ["rt-tokio-current-thread"] }
opentelemetry-otlp = "0.17" opentelemetry-otlp = "0.17"

6
examples/opentelemetry/src/main.rs
View File

@ -1,5 +1,4 @@
use actix_web::{web, App, HttpServer}; use actix_web::{web, App, HttpServer};
use once_cell::sync::Lazy;
use opentelemetry::trace::TracerProvider; use opentelemetry::trace::TracerProvider;
use opentelemetry::{global, KeyValue}; use opentelemetry::{global, KeyValue};
use opentelemetry_otlp::WithExportConfig; use opentelemetry_otlp::WithExportConfig;
@ -8,14 +7,15 @@ use opentelemetry_sdk::{
}; };
use opentelemetry_semantic_conventions::resource; use opentelemetry_semantic_conventions::resource;
use std::io; use std::io;
use std::sync::LazyLock;
use tracing_actix_web::TracingLogger; use tracing_actix_web::TracingLogger;
use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer}; use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry}; use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
const APP_NAME: &str = "tracing-actix-web-demo"; const APP_NAME: &str = "tracing-actix-web-demo";
static RESOURCE: Lazy<Resource> = static RESOURCE: LazyLock<Resource> =
Lazy::new(|| Resource::new(vec![KeyValue::new(resource::SERVICE_NAME, APP_NAME)])); LazyLock::new(|| Resource::new(vec![KeyValue::new(resource::SERVICE_NAME, APP_NAME)]));
async fn hello() -> &'static str { async fn hello() -> &'static str {
"Hello world!" "Hello world!"