diff --git a/Cargo.toml b/Cargo.toml index 0abbf1bd1..9c9c4a87f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ keywords = ["http", "actix-web", "tracing", "logging"] categories = ["asynchronous", "web-programming"] [features] -default = ["opentelemetry_0_13", "emit_event_on_error"] +default = ["opentelemetry_0_14", "emit_event_on_error"] opentelemetry_0_13 = ["opentelemetry_0_13_pkg", "tracing-opentelemetry_0_12_pkg"] opentelemetry_0_14 = ["opentelemetry_0_14_pkg", "tracing-opentelemetry_0_13_pkg"] emit_event_on_error = [] diff --git a/README.md b/README.md index ea780cc9d..441d6e5cc 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ actix-web = "4.0.0-beta.7" `tracing-actix-web` exposes three feature flags: -- `opentelemetry_0_13`: attach [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-rust)'s context to the root span using OTEL 0.13 (enabled by default). -- `opentelemetry_0_14`: same as above but using OTEL 0.14. +- `opentelemetry_0_13`: attach [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-rust)'s context to the root span using OTEL 0.13. +- `opentelemetry_0_14`: same as above but using OTEL 0.14 (enabled by default). - `emit_event_on_error`: emit a [`tracing`] event when request processing fails with an error (enabled by default). `tracing-actix-web` will release `0.4.0`, going out of beta, as soon as `actix-web` releases a stable `4.0.0`. diff --git a/src/lib.rs b/src/lib.rs index 15e552a38..715895d6c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,8 +15,8 @@ //! //! `tracing-actix-web` exposes three feature flags: //! -//! - `opentelemetry_0_13`: attach [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-rust)'s context to the root span using OTEL 0.13 (enabled by default). -//! - `opentelemetry_0_14`: same as above but using OTEL 0.14. +//! - `opentelemetry_0_13`: attach [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-rust)'s context to the root span using OTEL 0.13; +//! - `opentelemetry_0_14`: same as above but using OTEL 0.14 (enabled by default); //! - `emit_event_on_error`: emit a [`tracing`] event when request processing fails with an error (enabled by default). //! //! `tracing-actix-web` will release `0.4.0`, going out of beta, as soon as `actix-web` releases a stable `4.0.0`.