From cd11f358cd65285c3371342ef936fcbc1613eae7 Mon Sep 17 00:00:00 2001
From: LukeMathWalker <contact@lpalmieri.com>
Date: Tue, 13 Jul 2021 09:33:59 +0100
Subject: [PATCH] Do not enable opentelemetry by default until they release
 1.0.

---
 Cargo.toml |  2 +-
 README.md  | 10 +++++-----
 src/lib.rs | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ce8e38f85..2fe932397 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_14", "emit_event_on_error"]
+default = ["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"]
 opentelemetry_0_15 = ["opentelemetry_0_15_pkg", "tracing-opentelemetry_0_14_pkg"]
diff --git a/README.md b/README.md
index de9027cc4..9244d213d 100644
--- a/README.md
+++ b/README.md
@@ -35,16 +35,16 @@ Add `tracing-actix-web` to your dependencies:
 ```toml
 [dependencies]
 # ...
-tracing-actix-web = "0.4.0-beta.7"
+tracing-actix-web = "0.4.0-beta.9"
 tracing = "0.1"
-actix-web = "4.0.0-beta.7"
+actix-web = "4.0.0-beta.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.
-- `opentelemetry_0_14`: same as above but using OTEL 0.14 (enabled by default).
-- `opentelemetry_0_15`: same as above but using OTEL 0.15
+- `opentelemetry_0_13`: attach [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-rust)'s context to the root span using `opentelemetry` 0.13;
+- `opentelemetry_0_14`: same as above but using `opentelemetry` 0.14;
+- `opentelemetry_0_15`: same as above but using `opentelemetry` 0.15;
 - `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 cdd20bc14..1e2ed931d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,16 +8,16 @@
 //! ```toml
 //! [dependencies]
 //! # ...
-//! tracing-actix-web = "0.4.0-beta.7"
+//! tracing-actix-web = "0.4.0-beta.9"
 //! tracing = "0.1"
-//! actix-web = "4.0.0-beta.7"
+//! actix-web = "4.0.0-beta.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;
-//! - `opentelemetry_0_14`: same as above but using OTEL 0.14 (enabled by default);
-//! - `opentelemetry_0_15`: same as above but using OTEL 0.15
+//! - `opentelemetry_0_13`: attach [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-rust)'s context to the root span using `opentelemetry` 0.13;
+//! - `opentelemetry_0_14`: same as above but using `opentelemetry` 0.14;
+//! - `opentelemetry_0_15`: same as above but using `opentelemetry` 0.15;
 //! - `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`.
@@ -251,4 +251,4 @@ mod otel_0_13;
 mod otel_0_14;
 
 #[cfg(feature = "opentelemetry_0_15")]
-mod otel_0_15;
\ No newline at end of file
+mod otel_0_15;