Skip to content

Commit b3a2697

Browse files
LukeMathWalkerLukeMathWalker
committed
Merge remote-tracking branch 'tracing/actix-extras' into tracing-actix-web
2 parents 49aacfc + 1ac594a commit b3a2697

File tree

23 files changed

+2049
-2
lines changed

23 files changed

+2049
-2
lines changed

‎.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ ci-check-min-examples = "hack check --workspace --no-default-features --examples
55
ci-check = "check --workspace --tests --examples --bins"
66
ci-test = "test --workspace --lib --tests --all-features --examples --bins --no-fail-fast"
77
ci-doctest = "test --workspace --doc --all-features --no-fail-fast"
8+
ci-otel-test = "hack test --package tracing-actix-web --each-feature --exclude-all-features"

‎.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ jobs:
6969

7070
- name: tests
7171
timeout-minutes: 40
72-
run: cargo ci-test
72+
run: cargo ci-test --exclude tracing-actix-web
73+
74+
- name: otel
75+
run: cargo ci-otel-test
7376

7477
- name: CI cache clean
7578
run: cargo-ci-cache-clean
@@ -127,7 +130,10 @@ jobs:
127130

128131
- name: tests
129132
timeout-minutes: 40
130-
run: cargo ci-test --exclude=actix-session --exclude=actix-limitation
133+
run: cargo ci-test --exclude=tracing-actix-web --exclude=actix-session --exclude=actix-limitation
134+
135+
- name: otel
136+
run: cargo ci-otel-test
131137

132138
- name: CI cache clean
133139
run: cargo-ci-cache-clean

‎Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ members = [
99
"actix-settings",
1010
"actix-web-httpauth",
1111
"actix-ws",
12+
"tracing-actix-web",
13+
"tracing-actix-web/examples/opentelemetry",
14+
"tracing-actix-web/examples/custom-root-span",
15+
"tracing-actix-web/examples/request-id-response-header",
1216
]
1317

1418
[workspace.package]

‎tracing-actix-web/Cargo.toml

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
[package]
2+
name = "tracing-actix-web"
3+
version = "0.7.13"
4+
authors = ["Luca Palmieri <[email protected]>"]
5+
repository.workspace = true
6+
homepage.workspace = true
7+
license.workspace = true
8+
edition.workspace = true
9+
rust-version.workspace = true
10+
documentation = "https://docs.rs/tracing-actix-web/"
11+
readme = "README.md"
12+
description = "Structured logging middleware for actix-web."
13+
14+
keywords = ["http", "actix-web", "tracing", "logging"]
15+
categories = ["asynchronous", "web-programming"]
16+
17+
[features]
18+
default = ["emit_event_on_error"]
19+
opentelemetry_0_13 = [
20+
"opentelemetry_0_13_pkg",
21+
"tracing-opentelemetry_0_12_pkg",
22+
]
23+
opentelemetry_0_14 = [
24+
"opentelemetry_0_14_pkg",
25+
"tracing-opentelemetry_0_13_pkg",
26+
]
27+
opentelemetry_0_15 = [
28+
"opentelemetry_0_15_pkg",
29+
"tracing-opentelemetry_0_14_pkg",
30+
]
31+
opentelemetry_0_16 = [
32+
"opentelemetry_0_16_pkg",
33+
"tracing-opentelemetry_0_16_pkg",
34+
]
35+
opentelemetry_0_17 = [
36+
"opentelemetry_0_17_pkg",
37+
"tracing-opentelemetry_0_17_pkg",
38+
]
39+
opentelemetry_0_18 = [
40+
"opentelemetry_0_18_pkg",
41+
"tracing-opentelemetry_0_18_pkg",
42+
]
43+
opentelemetry_0_19 = [
44+
"opentelemetry_0_19_pkg",
45+
"tracing-opentelemetry_0_19_pkg",
46+
]
47+
opentelemetry_0_20 = [
48+
"opentelemetry_0_20_pkg",
49+
"tracing-opentelemetry_0_21_pkg",
50+
]
51+
opentelemetry_0_21 = [
52+
"opentelemetry_0_21_pkg",
53+
"tracing-opentelemetry_0_22_pkg",
54+
]
55+
opentelemetry_0_22 = [
56+
"opentelemetry_0_22_pkg",
57+
"tracing-opentelemetry_0_23_pkg",
58+
]
59+
opentelemetry_0_23 = [
60+
"opentelemetry_0_23_pkg",
61+
"tracing-opentelemetry_0_24_pkg",
62+
]
63+
opentelemetry_0_24 = [
64+
"opentelemetry_0_24_pkg",
65+
"tracing-opentelemetry_0_25_pkg",
66+
]
67+
opentelemetry_0_25 = [
68+
"opentelemetry_0_25_pkg",
69+
"tracing-opentelemetry_0_26_pkg",
70+
]
71+
emit_event_on_error = []
72+
uuid_v7 = ["uuid/v7"]
73+
74+
[dependencies]
75+
actix-web = { version = "4", default-features = false }
76+
pin-project = "1.0.0"
77+
tracing = "0.1.36"
78+
uuid = { version = "1.6", features = ["v4"] }
79+
mutually_exclusive_features = "0.1"
80+
opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional = true }
81+
opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional = true }
82+
opentelemetry_0_15_pkg = { package = "opentelemetry", version = "0.15", optional = true }
83+
opentelemetry_0_16_pkg = { package = "opentelemetry", version = "0.16", optional = true }
84+
opentelemetry_0_17_pkg = { package = "opentelemetry", version = "0.17", optional = true }
85+
opentelemetry_0_18_pkg = { package = "opentelemetry", version = "0.18", optional = true }
86+
opentelemetry_0_19_pkg = { package = "opentelemetry", version = "0.19", optional = true }
87+
opentelemetry_0_20_pkg = { package = "opentelemetry", version = "0.20", optional = true }
88+
opentelemetry_0_21_pkg = { package = "opentelemetry", version = "0.21", optional = true }
89+
opentelemetry_0_22_pkg = { package = "opentelemetry", version = "0.22", optional = true }
90+
opentelemetry_0_23_pkg = { package = "opentelemetry", version = "0.23", optional = true }
91+
opentelemetry_0_24_pkg = { package = "opentelemetry", version = "0.24", optional = true }
92+
opentelemetry_0_25_pkg = { package = "opentelemetry", version = "0.25", optional = true }
93+
tracing-opentelemetry_0_12_pkg = { package = "tracing-opentelemetry", version = "0.12", optional = true }
94+
tracing-opentelemetry_0_13_pkg = { package = "tracing-opentelemetry", version = "0.13", optional = true }
95+
tracing-opentelemetry_0_14_pkg = { package = "tracing-opentelemetry", version = "0.14", optional = true }
96+
tracing-opentelemetry_0_16_pkg = { package = "tracing-opentelemetry", version = "0.16", optional = true }
97+
tracing-opentelemetry_0_17_pkg = { package = "tracing-opentelemetry", version = "0.17", optional = true }
98+
tracing-opentelemetry_0_18_pkg = { package = "tracing-opentelemetry", version = "0.18", optional = true }
99+
tracing-opentelemetry_0_19_pkg = { package = "tracing-opentelemetry", version = "0.19", optional = true }
100+
tracing-opentelemetry_0_21_pkg = { package = "tracing-opentelemetry", version = "0.21", optional = true }
101+
tracing-opentelemetry_0_22_pkg = { package = "tracing-opentelemetry", version = "0.22", optional = true }
102+
tracing-opentelemetry_0_23_pkg = { package = "tracing-opentelemetry", version = "0.23", optional = true }
103+
tracing-opentelemetry_0_24_pkg = { package = "tracing-opentelemetry", version = "0.24", optional = true }
104+
tracing-opentelemetry_0_25_pkg = { package = "tracing-opentelemetry", version = "0.25", optional = true }
105+
tracing-opentelemetry_0_26_pkg = { package = "tracing-opentelemetry", version = "0.26", optional = true }
106+
107+
[dev-dependencies]
108+
actix-web = { version = "4", default-features = false, features = ["macros"] }
109+
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
110+
tracing-bunyan-formatter = "0.3.0"
111+
tracing-log = "0.2"

‎tracing-actix-web/LICENSE-APACHE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE-APACHE

‎tracing-actix-web/LICENSE-MIT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE-MIT

0 commit comments

Comments
 (0)