Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 51 additions & 7 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -945,12 +945,6 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"

[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

[[package]]
name = "hyper"
version = "0.14.32"
Expand Down Expand Up @@ -1213,6 +1207,47 @@ dependencies = [
"libc",
]

[[package]]
name = "jiff"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
dependencies = [
"jiff-static",
"jiff-tzdb-platform",
"log",
"portable-atomic",
"portable-atomic-util",
"serde",
"windows-sys 0.52.0",
]

[[package]]
name = "jiff-static"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
dependencies = [
"proc-macro2",
"quote",
"syn",
]

[[package]]
name = "jiff-tzdb"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "962e1dfe9b2d75a84536cf5bf5eaaa4319aa7906c7160134a22883ac316d5f31"

[[package]]
name = "jiff-tzdb-platform"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a63c62e404e7b92979d2792352d885a7f8f83fd1d0d31eea582d77b2ceca697e"
dependencies = [
"jiff-tzdb",
]

[[package]]
name = "jobserver"
version = "0.1.32"
Expand Down Expand Up @@ -1665,7 +1700,7 @@ version = "0.1.0"
dependencies = [
"futures-core",
"http",
"humantime",
"jiff",
"linkerd-identity",
"linkerd-proxy-transport",
"linkerd-stack",
Expand Down Expand Up @@ -3122,6 +3157,15 @@ version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"

[[package]]
name = "portable-atomic-util"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
dependencies = [
"portable-atomic",
]

[[package]]
name = "powerfmt"
version = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/access-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false
[dependencies]
futures-core = "0.3"
http = { workspace = true }
humantime = "2"
jiff = { version = "0.2", features = ["std"] }
pin-project = "1"
tokio = { version = "1", features = ["time"] }
tracing = "0.1"
Expand Down
6 changes: 3 additions & 3 deletions linkerd/http/access-log/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use std::{
net::SocketAddr,
pin::Pin,
task::{Context, Poll},
time::{Duration, SystemTime},
time::Duration,
};
use svc::{NewService, Param};
use tokio::time::Instant;
Expand Down Expand Up @@ -210,6 +210,6 @@ where
}

#[inline]
fn now() -> humantime::Rfc3339Timestamp {
humantime::format_rfc3339(SystemTime::now())
fn now() -> String {
jiff::Timestamp::now().to_string()
}
Comment on lines -213 to 215
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loading