Add support for OpenTelemetry 0.21 (#118)

* `#[cfg(any)] awesomely accepts trailing commas

* use const assert instead of feature matrix

* Update Cargo.toml

* add Opentelemetry 0.21 support

* use the `mutually_exclusive_features` crate macro

* update README.md

Cargo.toml

@@ -28,6 +28,7 @@ opentelemetry_0_17 = ["opentelemetry_0_17_pkg", "tracing-opentelemetry_0_17_pkg"
 opentelemetry_0_18 = ["opentelemetry_0_18_pkg", "tracing-opentelemetry_0_18_pkg"]
 opentelemetry_0_19 = ["opentelemetry_0_19_pkg", "tracing-opentelemetry_0_19_pkg"]
 opentelemetry_0_20 = ["opentelemetry_0_20_pkg", "tracing-opentelemetry_0_21_pkg"]
+opentelemetry_0_21 = ["opentelemetry_0_21_pkg", "tracing-opentelemetry_0_22_pkg"]
 emit_event_on_error = []
 uuid_v7 = ["uuid/v7"]
 
@@ -36,6 +37,7 @@ actix-web = { version = "4", default-features = false }
 pin-project = "1.0.0"
 tracing = "0.1.36"
 uuid = { version = "1", features = ["v4"] }
+mutually_exclusive_features = "0.0.3"
 opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional = true }
 opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional = true }
 opentelemetry_0_15_pkg = { package = "opentelemetry", version = "0.15", optional = true }
@@ -44,6 +46,7 @@ opentelemetry_0_17_pkg = { package = "opentelemetry", version = "0.17", optional
 opentelemetry_0_18_pkg = { package = "opentelemetry", version = "0.18", optional = true }
 opentelemetry_0_19_pkg = { package = "opentelemetry", version = "0.19", optional = true }
 opentelemetry_0_20_pkg = { package = "opentelemetry", version = "0.20", optional = true }
+opentelemetry_0_21_pkg = { package = "opentelemetry", version = "0.21", optional = true }
 tracing-opentelemetry_0_12_pkg = { package = "tracing-opentelemetry",version = "0.12", optional = true }
 tracing-opentelemetry_0_13_pkg = { package = "tracing-opentelemetry", version = "0.13", optional = true }
 tracing-opentelemetry_0_14_pkg = { package = "tracing-opentelemetry",version = "0.14", optional = true }
@@ -52,6 +55,7 @@ tracing-opentelemetry_0_17_pkg = { package = "tracing-opentelemetry",version = "
 tracing-opentelemetry_0_18_pkg = { package = "tracing-opentelemetry",version = "0.18", optional = true }
 tracing-opentelemetry_0_19_pkg = { package = "tracing-opentelemetry",version = "0.19", optional = true }
 tracing-opentelemetry_0_21_pkg = { package = "tracing-opentelemetry",version = "0.21", optional = true }
+tracing-opentelemetry_0_22_pkg = { package = "tracing-opentelemetry",version = "0.22", optional = true }
 
 [dev-dependencies]
 actix-web = { version = "4", default-features = false, features = ["macros"] }

README.md

@@ -53,6 +53,8 @@ actix-web = "4"
 - `opentelemetry_0_17`: same as above but using `opentelemetry` 0.17;
 - `opentelemetry_0_18`: same as above but using `opentelemetry` 0.18;
 - `opentelemetry_0_19`: same as above but using `opentelemetry` 0.19;
+- `opentelemetry_0_20`: same as above but using `opentelemetry` 0.20;
+- `opentelemetry_0_21`: same as above but using `opentelemetry` 0.21;
 - `emit_event_on_error`: emit a [`tracing`] event when request processing fails with an error (enabled by default).
 - `uuid_v7`: use the UUID v7 implementation inside [`RequestId`] instead of UUID v4 (disabled by default).
 ## Quickstart

src/lib.rs

@@ -27,6 +27,7 @@
 //! - `opentelemetry_0_18`: same as above but using `opentelemetry` 0.18;
 //! - `opentelemetry_0_19`: same as above but using `opentelemetry` 0.19;
 //! - `opentelemetry_0_20`: same as above but using `opentelemetry` 0.20;
+//! - `opentelemetry_0_21`: same as above but using `opentelemetry` 0.21;
 //! - `emit_event_on_error`: emit a [`tracing`] event when request processing fails with an error (enabled by default).
 //! - `uuid_v7`: use the UUID v7 implementation inside [`RequestId`] instead of UUID v4 (disabled by default).
 //!
@@ -292,6 +293,18 @@ pub use tracing::Level;
 #[doc(hidden)]
 pub mod root_span_macro;
 
+mutually_exclusive_features::none_or_one_of!(
+    "opentelemetry_0_13",
+    "opentelemetry_0_14",
+    "opentelemetry_0_15",
+    "opentelemetry_0_16",
+    "opentelemetry_0_17",
+    "opentelemetry_0_18",
+    "opentelemetry_0_19",
+    "opentelemetry_0_20",
+    "opentelemetry_0_21",
+);
+
 #[cfg(any(
     feature = "opentelemetry_0_13",
     feature = "opentelemetry_0_14",
@@ -300,90 +313,7 @@ pub mod root_span_macro;
     feature = "opentelemetry_0_17",
     feature = "opentelemetry_0_18",
     feature = "opentelemetry_0_19",
-    feature = "opentelemetry_0_20"
+    feature = "opentelemetry_0_20",
+    feature = "opentelemetry_0_21",
 ))]
 mod otel;
-
-#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_14"))]
-compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_14\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_15"))]
-compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_15\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_16"))]
-compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_16\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_17"))]
-compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_18"))]
-compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_19"))]
-compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_19\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_20"))]
-compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_20\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_15"))]
-compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_15\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_16"))]
-compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_16\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_17"))]
-compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_18"))]
-compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_19"))]
-compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_19\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_20"))]
-compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_20\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_16"))]
-compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_16\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_17"))]
-compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_18"))]
-compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_19"))]
-compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_19\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_20"))]
-compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_20\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_16", feature = "opentelemetry_0_17"))]
-compile_error!("feature \"opentelemetry_0_16\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_16", feature = "opentelemetry_0_18"))]
-compile_error!("feature \"opentelemetry_0_16\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_16", feature = "opentelemetry_0_19"))]
-compile_error!("feature \"opentelemetry_0_16\" and feature \"opentelemetry_0_19\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_16", feature = "opentelemetry_0_20"))]
-compile_error!("feature \"opentelemetry_0_16\" and feature \"opentelemetry_0_20\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18"))]
-compile_error!("feature \"opentelemetry_0_17\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_17", feature = "opentelemetry_0_19"))]
-compile_error!("feature \"opentelemetry_0_17\" and feature \"opentelemetry_0_19\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_17", feature = "opentelemetry_0_20"))]
-compile_error!("feature \"opentelemetry_0_17\" and feature \"opentelemetry_0_20\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_18", feature = "opentelemetry_0_19"))]
-compile_error!("feature \"opentelemetry_0_18\" and feature \"opentelemetry_0_19\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_18", feature = "opentelemetry_0_20"))]
-compile_error!("feature \"opentelemetry_0_18\" and feature \"opentelemetry_0_20\" cannot be enabled at the same time");
-
-#[cfg(all(feature = "opentelemetry_0_19", feature = "opentelemetry_0_20"))]
-compile_error!("feature \"opentelemetry_0_19\" and feature \"opentelemetry_0_20\" cannot be enabled at the same time");

src/otel.rs

@@ -16,6 +16,8 @@ use opentelemetry_0_18_pkg as opentelemetry;
 use opentelemetry_0_19_pkg as opentelemetry;
 #[cfg(feature = "opentelemetry_0_20")]
 use opentelemetry_0_20_pkg as opentelemetry;
+#[cfg(feature = "opentelemetry_0_21")]
+use opentelemetry_0_21_pkg as opentelemetry;
 
 #[cfg(feature = "opentelemetry_0_13")]
 use tracing_opentelemetry_0_12_pkg as tracing_opentelemetry;
@@ -33,6 +35,8 @@ use tracing_opentelemetry_0_18_pkg as tracing_opentelemetry;
 use tracing_opentelemetry_0_19_pkg as tracing_opentelemetry;
 #[cfg(feature = "opentelemetry_0_20")]
 use tracing_opentelemetry_0_21_pkg as tracing_opentelemetry;
+#[cfg(feature = "opentelemetry_0_21")]
+use tracing_opentelemetry_0_22_pkg as tracing_opentelemetry;
 
 use opentelemetry::propagation::Extractor;
 
@@ -70,15 +74,17 @@ pub(crate) fn set_otel_parent(req: &ServiceRequest, span: &tracing::Span) {
         feature = "opentelemetry_0_17",
         feature = "opentelemetry_0_18",
         feature = "opentelemetry_0_19",
-        feature = "opentelemetry_0_20"
+        feature = "opentelemetry_0_20",
+        feature = "opentelemetry_0_21",
     )))]
     let trace_id = span.context().span().span_context().trace_id().to_hex();
 
     #[cfg(any(
         feature = "opentelemetry_0_17",
         feature = "opentelemetry_0_18",
         feature = "opentelemetry_0_19",
-        feature = "opentelemetry_0_20"
+        feature = "opentelemetry_0_20",
+        feature = "opentelemetry_0_21",
     ))]
     let trace_id = {
         let id = span.context().span().span_context().trace_id();

src/root_span_macro.rs

@@ -163,7 +163,8 @@ pub mod private {
             feature = "opentelemetry_0_17",
             feature = "opentelemetry_0_18",
             feature = "opentelemetry_0_19",
-            feature = "opentelemetry_0_20"
+            feature = "opentelemetry_0_20",
+            feature = "opentelemetry_0_21",
         ))]
         crate::otel::set_otel_parent(req, span);
     }