Skip to content

Commit 5027201

Browse files
feat(deps): update rust crate axum to 0.8 (#197)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 389b84b commit 5027201

13 files changed

+38
-35
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ rust-version = "1.80.0"
2323

2424
[workspace.dependencies]
2525
assert2 = "0.3"
26-
axum = { version = "0.7", default-features = false }
26+
axum = { version = "0.8", default-features = false }
2727
http = "^1"
2828
hyper = "1"
2929
insta = { version = "1.40", features = ["yaml", "redactions"] }

axum-tracing-opentelemetry/src/middleware/trace_extractor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ mod tests {
212212
let mut fake_env = FakeEnvironment::setup().await;
213213
{
214214
let mut svc = Router::new()
215-
.route("/users/:id", get(|| async { StatusCode::OK }))
215+
.route("/users/{id}", get(|| async { StatusCode::OK }))
216216
.route(
217217
"/status/500",
218218
get(|| async { StatusCode::INTERNAL_SERVER_ERROR }),
@@ -231,7 +231,7 @@ mod tests {
231231
.nest(
232232
"/nest",
233233
Router::new()
234-
.route("/:nest_id", get(|| async {}))
234+
.route("/{nest_id}", get(|| async {}))
235235
.fallback(|| async { (StatusCode::NOT_FOUND, "inner fallback") }),
236236
)
237237
.fallback(|| async { (StatusCode::NOT_FOUND, "outer fallback") })

deny.toml

+5-2
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,11 @@ deny = [
208208
skip = [
209209
#"ansi_term@0.11.0",
210210
#{ crate = "ansi_term@0.11.0", reason = "you can specify a reason why it can't be updated/removed" },
211-
"tower@0.4", # axum 0.7 use tower 0.5, but hyper still use 0.4
212-
"sync_wrapper", # axum direct and transive dependency use multiple version
211+
"axum@0.7", # tonic depend on axum 0.7
212+
"axum-core@0.4", # tonic depend on axum 0.7
213+
"matchit@0.7", # tonic depend on axum 0.7
214+
"tower@0.4", # axum 0.7 use tower 0.5, but hyper still use 0.4
215+
# "sync_wrapper", # axum direct and transive dependency use multiple version
213216
"regex-syntax",
214217
"regex-automata",
215218
"indexmap",

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__call_with_w3c_trace.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: tracing_events
4+
snapshot_kind: text
45
---
56
- fields:
67
message: new
@@ -27,11 +28,11 @@ expression: tracing_events
2728
span:
2829
http.request.method: GET
2930
http.response.status_code: 200
30-
http.route: "/users/:id"
31+
http.route: "/users/{id}"
3132
name: HTTP request
3233
network.protocol.version: "1.1"
3334
otel.kind: Server
34-
otel.name: "GET /users/:id"
35+
otel.name: "GET /users/{id}"
3536
server.address: ""
3637
span.type: web
3738
url.path: /users/123
@@ -40,4 +41,3 @@ expression: tracing_events
4041
spans: []
4142
target: "otel::tracing"
4243
timestamp: "[timestamp]"
43-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__call_with_w3c_trace_otel_spans.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: otel_spans
4+
snapshot_kind: text
45
---
56
- trace_id: "[trace_id:lg32]"
67
span_id: "[span_id:lg16]"
78
trace_state: ""
89
parent_span_id: "[span_id:lg16]"
9-
name: "GET /users/:id"
10+
name: "GET /users/{id}"
1011
kind: SPAN_KIND_SERVER
1112
start_time_unix_nano: "[timestamp]"
1213
end_time_unix_nano: "[timestamp]"
@@ -17,7 +18,7 @@ expression: otel_spans
1718
code.namespace: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
1819
http.request.method: "Some(AnyValue { value: Some(StringValue(\"GET\")) })"
1920
http.response.status_code: "Some(AnyValue { value: Some(StringValue(\"200\")) })"
20-
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/:id\")) })"
21+
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/{id}\")) })"
2122
idle_ns: ignore
2223
network.protocol.version: "Some(AnyValue { value: Some(StringValue(\"1.1\")) })"
2324
server.address: "Some(AnyValue { value: Some(StringValue(\"\")) })"
@@ -35,4 +36,3 @@ expression: otel_spans
3536
status:
3637
message: ""
3738
code: STATUS_CODE_UNSET
38-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__extract_route_from_nested.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: tracing_events
4+
snapshot_kind: text
45
---
56
- fields:
67
message: new
@@ -27,11 +28,11 @@ expression: tracing_events
2728
span:
2829
http.request.method: GET
2930
http.response.status_code: 200
30-
http.route: "/nest/:nest_id"
31+
http.route: "/nest/{nest_id}"
3132
name: HTTP request
3233
network.protocol.version: "1.1"
3334
otel.kind: Server
34-
otel.name: "GET /nest/:nest_id"
35+
otel.name: "GET /nest/{nest_id}"
3536
server.address: ""
3637
span.type: web
3738
url.path: /nest/123
@@ -40,4 +41,3 @@ expression: tracing_events
4041
spans: []
4142
target: "otel::tracing"
4243
timestamp: "[timestamp]"
43-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__extract_route_from_nested_otel_spans.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: otel_spans
4+
snapshot_kind: text
45
---
56
- trace_id: "[trace_id:lg32]"
67
span_id: "[span_id:lg16]"
78
trace_state: ""
89
parent_span_id: "[span_id:lg0]"
9-
name: "GET /nest/:nest_id"
10+
name: "GET /nest/{nest_id}"
1011
kind: SPAN_KIND_SERVER
1112
start_time_unix_nano: "[timestamp]"
1213
end_time_unix_nano: "[timestamp]"
@@ -17,7 +18,7 @@ expression: otel_spans
1718
code.namespace: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
1819
http.request.method: "Some(AnyValue { value: Some(StringValue(\"GET\")) })"
1920
http.response.status_code: "Some(AnyValue { value: Some(StringValue(\"200\")) })"
20-
http.route: "Some(AnyValue { value: Some(StringValue(\"/nest/:nest_id\")) })"
21+
http.route: "Some(AnyValue { value: Some(StringValue(\"/nest/{nest_id}\")) })"
2122
idle_ns: ignore
2223
network.protocol.version: "Some(AnyValue { value: Some(StringValue(\"1.1\")) })"
2324
server.address: "Some(AnyValue { value: Some(StringValue(\"\")) })"
@@ -35,4 +36,3 @@ expression: otel_spans
3536
status:
3637
message: ""
3738
code: STATUS_CODE_UNSET
38-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__filled_http_headers.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: tracing_events
4+
snapshot_kind: text
45
---
56
- fields:
67
message: new
@@ -27,11 +28,11 @@ expression: tracing_events
2728
span:
2829
http.request.method: GET
2930
http.response.status_code: 200
30-
http.route: "/users/:id"
31+
http.route: "/users/{id}"
3132
name: HTTP request
3233
network.protocol.version: "1.1"
3334
otel.kind: Server
34-
otel.name: "GET /users/:id"
35+
otel.name: "GET /users/{id}"
3536
server.address: ""
3637
span.type: web
3738
url.path: /users/123
@@ -40,4 +41,3 @@ expression: tracing_events
4041
spans: []
4142
target: "otel::tracing"
4243
timestamp: "[timestamp]"
43-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__filled_http_headers_otel_spans.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: otel_spans
4+
snapshot_kind: text
45
---
56
- trace_id: "[trace_id:lg32]"
67
span_id: "[span_id:lg16]"
78
trace_state: ""
89
parent_span_id: "[span_id:lg0]"
9-
name: "GET /users/:id"
10+
name: "GET /users/{id}"
1011
kind: SPAN_KIND_SERVER
1112
start_time_unix_nano: "[timestamp]"
1213
end_time_unix_nano: "[timestamp]"
@@ -17,7 +18,7 @@ expression: otel_spans
1718
code.namespace: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
1819
http.request.method: "Some(AnyValue { value: Some(StringValue(\"GET\")) })"
1920
http.response.status_code: "Some(AnyValue { value: Some(StringValue(\"200\")) })"
20-
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/:id\")) })"
21+
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/{id}\")) })"
2122
idle_ns: ignore
2223
network.protocol.version: "Some(AnyValue { value: Some(StringValue(\"1.1\")) })"
2324
server.address: "Some(AnyValue { value: Some(StringValue(\"\")) })"
@@ -35,4 +36,3 @@ expression: otel_spans
3536
status:
3637
message: ""
3738
code: STATUS_CODE_UNSET
38-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__filled_http_route_for_existing_route.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: tracing_events
4+
snapshot_kind: text
45
---
56
- fields:
67
message: new
@@ -27,11 +28,11 @@ expression: tracing_events
2728
span:
2829
http.request.method: GET
2930
http.response.status_code: 200
30-
http.route: "/users/:id"
31+
http.route: "/users/{id}"
3132
name: HTTP request
3233
network.protocol.version: "1.1"
3334
otel.kind: Server
34-
otel.name: "GET /users/:id"
35+
otel.name: "GET /users/{id}"
3536
server.address: example.com
3637
span.type: web
3738
url.path: /users/123
@@ -40,4 +41,3 @@ expression: tracing_events
4041
spans: []
4142
target: "otel::tracing"
4243
timestamp: "[timestamp]"
43-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__filled_http_route_for_existing_route_otel_spans.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: otel_spans
4+
snapshot_kind: text
45
---
56
- trace_id: "[trace_id:lg32]"
67
span_id: "[span_id:lg16]"
78
trace_state: ""
89
parent_span_id: "[span_id:lg0]"
9-
name: "GET /users/:id"
10+
name: "GET /users/{id}"
1011
kind: SPAN_KIND_SERVER
1112
start_time_unix_nano: "[timestamp]"
1213
end_time_unix_nano: "[timestamp]"
@@ -17,7 +18,7 @@ expression: otel_spans
1718
code.namespace: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
1819
http.request.method: "Some(AnyValue { value: Some(StringValue(\"GET\")) })"
1920
http.response.status_code: "Some(AnyValue { value: Some(StringValue(\"200\")) })"
20-
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/:id\")) })"
21+
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/{id}\")) })"
2122
idle_ns: ignore
2223
network.protocol.version: "Some(AnyValue { value: Some(StringValue(\"1.1\")) })"
2324
server.address: "Some(AnyValue { value: Some(StringValue(\"example.com\")) })"
@@ -35,4 +36,3 @@ expression: otel_spans
3536
status:
3637
message: ""
3738
code: STATUS_CODE_UNSET
38-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__status_code_on_close_for_ok.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: tracing_events
4+
snapshot_kind: text
45
---
56
- fields:
67
message: new
@@ -27,11 +28,11 @@ expression: tracing_events
2728
span:
2829
http.request.method: GET
2930
http.response.status_code: 200
30-
http.route: "/users/:id"
31+
http.route: "/users/{id}"
3132
name: HTTP request
3233
network.protocol.version: "1.1"
3334
otel.kind: Server
34-
otel.name: "GET /users/:id"
35+
otel.name: "GET /users/{id}"
3536
server.address: ""
3637
span.type: web
3738
url.path: /users/123
@@ -40,4 +41,3 @@ expression: tracing_events
4041
spans: []
4142
target: "otel::tracing"
4243
timestamp: "[timestamp]"
43-

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__status_code_on_close_for_ok_otel_spans.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
source: testing-tracing-opentelemetry/src/lib.rs
33
expression: otel_spans
4+
snapshot_kind: text
45
---
56
- trace_id: "[trace_id:lg32]"
67
span_id: "[span_id:lg16]"
78
trace_state: ""
89
parent_span_id: "[span_id:lg0]"
9-
name: "GET /users/:id"
10+
name: "GET /users/{id}"
1011
kind: SPAN_KIND_SERVER
1112
start_time_unix_nano: "[timestamp]"
1213
end_time_unix_nano: "[timestamp]"
@@ -17,7 +18,7 @@ expression: otel_spans
1718
code.namespace: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
1819
http.request.method: "Some(AnyValue { value: Some(StringValue(\"GET\")) })"
1920
http.response.status_code: "Some(AnyValue { value: Some(StringValue(\"200\")) })"
20-
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/:id\")) })"
21+
http.route: "Some(AnyValue { value: Some(StringValue(\"/users/{id}\")) })"
2122
idle_ns: ignore
2223
network.protocol.version: "Some(AnyValue { value: Some(StringValue(\"1.1\")) })"
2324
server.address: "Some(AnyValue { value: Some(StringValue(\"\")) })"
@@ -35,4 +36,3 @@ expression: otel_spans
3536
status:
3637
message: ""
3738
code: STATUS_CODE_UNSET
38-

0 commit comments

Comments
 (0)