Skip to content

Commit

Permalink
Merge branch 'main' into blt/punch_uds___prometheus_directly
Browse files Browse the repository at this point in the history
  • Loading branch information
blt authored Jul 10, 2024
2 parents 0176342 + c4926fa commit 570acc3
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 57 deletions.
77 changes: 29 additions & 48 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ members = [
]

[workspace.dependencies]
bytes = { version = "1.5.0", default-features = false, features = ["std"] }
bytes = { version = "1.5", default-features = false, features = ["std"] }
byte-unit = { version = "4.0", features = ["serde"] }
metrics = { git = "https://github.com/scottopell/metrics.git", rev = "c1e14d5e65c7bcef67930a91dd2b1e5504eba77a"} # tracks https://github.com/scottopell/metrics/tree/sopell/uds-listener
metrics-util = { git = "https://github.com/scottopell/metrics.git", rev = "c1e14d5e65c7bcef67930a91dd2b1e5504eba77a"} # tracks https://github.com/scottopell/metrics/tree/sopell/uds-listener
metrics-exporter-prometheus = { git = "https://github.com/scottopell/metrics.git", rev = "c1e14d5e65c7bcef67930a91dd2b1e5504eba77a", default-features = false, features = ["http-listener", "uds-listener"]} # tracks https://github.com/scottopell/metrics/tree/sopell/uds-listener
prost = "0.11"
prost-build = { version = "0.12" }
rand = { version = "0.8", default-features = false }
rustc-hash = { version = "1.1.0" }
rustc-hash = { version = "1.1" }
serde = { version = "1.0", features = ["std", "derive"] }
serde_json = { version = "1.0", features = ["std"] }
thiserror = { version = "1.0" }
tokio = { version = "1.32" }
tokio = { version = "1.38" }
tracing = { version = "0.1" }
uuid = { version = "1.6", default-features = false, features = ["v4", "serde"] }

Expand Down
12 changes: 6 additions & 6 deletions lading/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ lading-capture = { version = "0.1", path = "../lading_capture" }
lading-payload = { version = "0.1", path = "../lading_payload" }
lading-throttle = { version = "0.1", path = "../lading_throttle" }

byte-unit = {workspace = true }
average = { version = "0.15", default-features = false, features = [] }
bollard ={ version = "0.16", default-features = false, features = [] }
byte-unit = {workspace = true }
bytes = { workspace = true, features = ["std"] }
clap = { version = "3.2", default-features = false, features = ["std", "suggestions", "derive"] }
flate2 = { version = "1.0.27", default-features = false, features = ["rust_backend" ] }
Expand All @@ -31,17 +32,17 @@ is_executable = "1.0.1"
metrics = { workspace = true }
metrics-exporter-prometheus = { workspace = true }
metrics-util = { workspace = true}
nix = { version = "0.27", default-features = false, features = ["process", "signal"] }
nix = { version = "0.29", default-features = false, features = ["process", "signal"] }
num_cpus = { version = "1.16" }
once_cell = { version = "1.18" }
rand = { workspace = true, default-features = false, features = ["small_rng", "std", "std_rng" ]}
regex = { version = "1.10" }
reqwest = { version = "0.11", default-features = false, features = ["json"] }
reqwest = { version = "0.12", default-features = false, features = ["json"] }
rustc-hash = { workspace = true }
serde = { workspace = true }
serde_json = {workspace = true }
serde_qs = "0.12"
serde_yaml = "0.9"
serde_qs = { version = "0.13", default-features = false }
serde_yaml = { version = "0.9" }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "fs", "io-util", "process", "signal", "time", "net"] }
tokio-util = { version = "0.7", features = ["io"] }
Expand All @@ -50,7 +51,6 @@ tower = { version = "0.4", default-features = false, features = ["timeout", "lim
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] }
uuid = { workspace = true }
average = { version = "0.14.1", default-features = false, features = [] }
zstd = "0.13.1"

[target.'cfg(target_os = "linux")'.dependencies]
Expand Down

0 comments on commit 570acc3

Please sign in to comment.