Upstream tracing-actix-web into actix-extras

.cargo/config.toml

@@ -5,3 +5,4 @@ ci-check-min-examples = "hack check --workspace --no-default-features --examples
 ci-check = "check --workspace --tests --examples --bins"
 ci-test = "test --workspace --lib --tests --all-features --examples --bins --no-fail-fast"
 ci-doctest = "test --workspace --doc --all-features --no-fail-fast"
+ci-otel-test = "hack test --package tracing-actix-web --each-feature --exclude-all-features"

.github/workflows/ci.yml

@@ -69,7 +69,10 @@ jobs:
 
       - name: tests
         timeout-minutes: 40
-        run: cargo ci-test
+        run: cargo ci-test --exclude tracing-actix-web
+
+      - name: otel
+        run: cargo ci-otel-test
 
       - name: CI cache clean
         run: cargo-ci-cache-clean
@@ -127,7 +130,10 @@ jobs:
 
       - name: tests
         timeout-minutes: 40
-        run: cargo ci-test --exclude=actix-session --exclude=actix-limitation
+        run: cargo ci-test --exclude=tracing-actix-web --exclude=actix-session --exclude=actix-limitation
+
+      - name: otel
+        run: cargo ci-otel-test
 
       - name: CI cache clean
         run: cargo-ci-cache-clean

.github/workflows/lint.yml

@@ -44,7 +44,16 @@ jobs:
           reporter: github-pr-check
           github_token: ${{ secrets.GITHUB_TOKEN }}
           clippy_flags: >-
-            --workspace --all-features --tests --examples --bins --
+            --workspace --all-features --exclude tracing-actix-web --tests --examples --bins --
+            -A unknown_lints -D clippy::todo -D clippy::dbg_macro
+
+      - name: Check OTEL with Clippy
+        uses: giraffate/[email protected]
+        with:
+          reporter: github-pr-check
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          clippy_flags: >-
+            --package tracing-actix-web --tests --examples --
             -A unknown_lints -D clippy::todo -D clippy::dbg_macro
 
   public-api-diff:
@@ -70,8 +79,8 @@ jobs:
 
       - name: generate API diff
         run: |
-          for f in $(find -mindepth 2 -maxdepth 2 -name Cargo.toml); do
-
+          for f in $(find -mindepth 2 -maxdepth 2 -not \( -path "./tracing-actix-web/Cargo.toml" -prune \) -name Cargo.toml); do
             cargo public-api --manifest-path "$f" --all-features diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }} >> /tmp/diff.txt
           done
+          cargo public-api --manifest-path "tracing-actix-web/Cargo.toml" diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }} >> /tmp/diff.txt
           cat /tmp/diff.txt

Cargo.toml

@@ -9,6 +9,10 @@ members = [
     "actix-settings",
     "actix-web-httpauth",
     "actix-ws",
+    "tracing-actix-web",
+    "tracing-actix-web/examples/opentelemetry",
+    "tracing-actix-web/examples/custom-root-span",
+    "tracing-actix-web/examples/request-id-response-header",
 ]
 
 [workspace.package]

justfile

@@ -66,12 +66,12 @@ test-coverage-lcov: test-coverage
 [group("test")]
 [group("docs")]
 test-docs:
-    cargo {{ toolchain }} test --doc --workspace --all-features --no-fail-fast -- --nocapture
+    cargo {{ toolchain }} test --doc --workspace --all-features --no-fail-fast --exclude tracing-actix-web -- --nocapture
 
 # Document crates in workspace.
 [group("docs")]
 doc *args: && doc-set-workspace-crates
-    RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --workspace --all-features {{ args }}
+    RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --workspace --all-features --exclude tracing-actix-web {{ args }}
 
 [group("docs")]
 [private]

tracing-actix-web/Cargo.toml

@@ -0,0 +1,111 @@
+[package]
+name = "tracing-actix-web"
+version = "0.7.13"
+authors = ["Luca Palmieri <[email protected]>"]
+repository.workspace = true
+homepage.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+documentation = "https://docs.rs/tracing-actix-web/"
+readme = "README.md"
+description = "Structured logging middleware for actix-web."
+
+keywords = ["http", "actix-web", "tracing", "logging"]
+categories = ["asynchronous", "web-programming"]
+
+[features]
+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",
+]
+opentelemetry_0_16 = [
+    "opentelemetry_0_16_pkg",
+    "tracing-opentelemetry_0_16_pkg",
+]
+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",
+]
+opentelemetry_0_22 = [
+    "opentelemetry_0_22_pkg",
+    "tracing-opentelemetry_0_23_pkg",
+]
+opentelemetry_0_23 = [
+    "opentelemetry_0_23_pkg",
+    "tracing-opentelemetry_0_24_pkg",
+]
+opentelemetry_0_24 = [
+    "opentelemetry_0_24_pkg",
+    "tracing-opentelemetry_0_25_pkg",
+]
+opentelemetry_0_25 = [
+    "opentelemetry_0_25_pkg",
+    "tracing-opentelemetry_0_26_pkg",
+]
+emit_event_on_error = []
+uuid_v7 = ["uuid/v7"]
+
+[dependencies]
+actix-web = { version = "4", default-features = false }
+pin-project = "1.0.0"
+tracing = "0.1.36"
+uuid = { version = "1.6", features = ["v4"] }
+mutually_exclusive_features = "0.1"
+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 }
+opentelemetry_0_16_pkg = { package = "opentelemetry", version = "0.16", optional = true }
+opentelemetry_0_17_pkg = { package = "opentelemetry", version = "0.17", optional = true }
+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 }
+opentelemetry_0_22_pkg = { package = "opentelemetry", version = "0.22", optional = true }
+opentelemetry_0_23_pkg = { package = "opentelemetry", version = "0.23", optional = true }
+opentelemetry_0_24_pkg = { package = "opentelemetry", version = "0.24", optional = true }
+opentelemetry_0_25_pkg = { package = "opentelemetry", version = "0.25", 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 }
+tracing-opentelemetry_0_16_pkg = { package = "tracing-opentelemetry", version = "0.16", optional = true }
+tracing-opentelemetry_0_17_pkg = { package = "tracing-opentelemetry", version = "0.17", optional = true }
+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 }
+tracing-opentelemetry_0_23_pkg = { package = "tracing-opentelemetry", version = "0.23", optional = true }
+tracing-opentelemetry_0_24_pkg = { package = "tracing-opentelemetry", version = "0.24", optional = true }
+tracing-opentelemetry_0_25_pkg = { package = "tracing-opentelemetry", version = "0.25", optional = true }
+tracing-opentelemetry_0_26_pkg = { package = "tracing-opentelemetry", version = "0.26", optional = true }
+
+[dev-dependencies]
+actix-web = { version = "4", default-features = false, features = ["macros"] }
+tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
+tracing-bunyan-formatter = "0.3.0"
+tracing-log = "0.2"

tracing-actix-web/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

tracing-actix-web/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT