From 88e0dd6e85b0d5cd227f4b99d8f874a99cf63421 Mon Sep 17 00:00:00 2001 From: Benjamin Naecker Date: Fri, 15 Apr 2022 16:13:05 +0000 Subject: [PATCH] Bump dropshot dependency --- Cargo.lock | 13 +++++++------ oximeter/instruments/src/http.rs | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f4a6dba7591..38fa185c59f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -960,7 +960,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "dropshot" version = "0.6.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0590171143964e32d913113df85174771d4699d9" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#f0306232bede6a1d1b99912a4e79621284c55a9f" dependencies = [ "async-stream", "async-trait", @@ -993,12 +993,13 @@ dependencies = [ "toml", "usdt", "uuid", + "version_check", ] [[package]] name = "dropshot_endpoint" version = "0.6.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#0590171143964e32d913113df85174771d4699d9" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#f0306232bede6a1d1b99912a4e79621284c55a9f" dependencies = [ "proc-macro2", "quote", @@ -1773,9 +1774,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", @@ -2900,9 +2901,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "path-absolutize" diff --git a/oximeter/instruments/src/http.rs b/oximeter/instruments/src/http.rs index d1e1fb0c908..cf3a5b838bd 100644 --- a/oximeter/instruments/src/http.rs +++ b/oximeter/instruments/src/http.rs @@ -168,7 +168,7 @@ impl LatencyTracker { let result = handler.await; let latency = start.elapsed(); let status_code = match result { - Ok(_) => R::metadata().success.unwrap(), + Ok(_) => R::response_metadata().success.unwrap(), Err(ref e) => e.status_code, }; let request = context.request.lock().await;