Bump versions.

This commit is contained in:
Syfaro 2021-12-08 23:45:17 -05:00
parent 1eb5fba3f7
commit de95393147
10 changed files with 447 additions and 478 deletions

869
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -15,7 +15,7 @@ download = ["tokio"]
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
tracing = "0.1" tracing = "0.1"
tracing-subscriber = "0.2" tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "time"] }
tracing-log = "0.1" tracing-log = "0.1"
tokio = { version = "1", features = ["rt", "fs"], optional = true } tokio = { version = "1", features = ["rt", "fs"], optional = true }
@ -34,11 +34,11 @@ tempfile = { version = "3", optional = true }
faktory = { version = "0.11", optional = true } faktory = { version = "0.11", optional = true }
opentelemetry = { version = "0.15.0", features = ["rt-tokio"], optional = true } opentelemetry = { version = "0.16.0", features = ["rt-tokio"], optional = true }
opentelemetry-jaeger = { version = "0.14", features = ["tokio"], optional = true } opentelemetry-jaeger = { version = "0.15", features = ["rt-tokio"], optional = true }
tracing-opentelemetry = { version = "0.14", optional = true } tracing-opentelemetry = { version = "0.16", optional = true }
opentelemetry-http = { version = "0.4", optional = true } opentelemetry-http = { version = "0.5", optional = true }
hyper = { version = "0.14", features = ["server", "http2", "tcp"], optional = true } hyper = { version = "0.14", features = ["server", "http2", "tcp"], optional = true }
prometheus = { version = "0.12", optional = true } prometheus = { version = "0.13", optional = true }
reqwest = { version = "0.11", optional = true } reqwest = { version = "0.11", optional = true }

View File

@ -27,7 +27,7 @@ pub fn init_logger() {
tracing_subscriber::fmt::Subscriber::builder() tracing_subscriber::fmt::Subscriber::builder()
.json() .json()
.with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
.with_timer(tracing_subscriber::fmt::time::ChronoUtc::rfc3339()) .with_timer(tracing_subscriber::fmt::time::UtcTime::rfc_3339())
.init(); .init();
} else { } else {
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();

View File

@ -31,7 +31,7 @@ pub fn configure_tracing(service_name: &'static str) {
if matches!(std::env::var("LOG_FMT").as_deref(), Ok("json")) { if matches!(std::env::var("LOG_FMT").as_deref(), Ok("json")) {
let subscriber = tracing_subscriber::fmt::layer() let subscriber = tracing_subscriber::fmt::layer()
.json() .json()
.with_timer(tracing_subscriber::fmt::time::ChronoUtc::rfc3339()) .with_timer(tracing_subscriber::fmt::time::UtcTime::rfc_3339())
.with_target(true); .with_target(true);
let subscriber = tracing_subscriber::Registry::default() let subscriber = tracing_subscriber::Registry::default()
.with(env_filter) .with(env_filter)

View File

@ -14,12 +14,12 @@ tokio-stream = "0.1"
tempfile = "3" tempfile = "3"
image = "0.23" image = "0.23"
actix-web = "4.0.0-beta.5" actix-web = "4.0.0-beta.13"
actix-http = "3.0.0-beta.5" actix-http = "3.0.0-beta.14"
actix-multipart = "0.4.0-beta.4" actix-multipart = "0.4.0-beta.9"
tracing-actix-web = { version = "0.4.0-beta.4", features = ["opentelemetry_0_15"] } tracing-actix-web = { version = "0.5.0-beta.4", features = ["opentelemetry_0_16"] }
lazy_static = "1" lazy_static = "1"
prometheus = { version = "0.12", features = ["process"] } prometheus = { version = "0.13", features = ["process"] }
fuzzysearch-common = { path = "../fuzzysearch-common" } fuzzysearch-common = { path = "../fuzzysearch-common" }

View File

@ -99,13 +99,7 @@ async fn post_image(
while let Ok(Some(field)) = form.try_next().await { while let Ok(Some(field)) = form.try_next().await {
tracing::debug!("got multipart field: {:?}", field); tracing::debug!("got multipart field: {:?}", field);
let content_type = if let Some(content_disposition) = field.content_disposition() { if !matches!(field.content_disposition().get_name(), Some("image")) {
content_disposition
} else {
continue;
};
if !matches!(content_type.get_name(), Some("image")) {
continue; continue;
} }

View File

@ -17,7 +17,7 @@ sqlx = { version = "0.5", features = ["runtime-tokio-native-tls", "postgres", "m
image = "0.23" image = "0.23"
img_hash = "3" img_hash = "3"
sha2 = "0.9" sha2 = "0.10"
tracing = "0.1" tracing = "0.1"
tracing-unwrap = "0.9" tracing-unwrap = "0.9"
@ -25,6 +25,6 @@ tracing-unwrap = "0.9"
anyhow = "1" anyhow = "1"
lazy_static = "1" lazy_static = "1"
prometheus = { version = "0.12", features = ["process"] } prometheus = { version = "0.13", features = ["process"] }
fuzzysearch-common = { path = "../fuzzysearch-common", features = ["queue"] } fuzzysearch-common = { path = "../fuzzysearch-common", features = ["queue"] }

View File

@ -10,7 +10,7 @@ tokio = { version = "1", features = ["full"] }
tokio-postgres = { version = "0.7.0", features = ["with-chrono-0_4"] } tokio-postgres = { version = "0.7.0", features = ["with-chrono-0_4"] }
chrono = "0.4" chrono = "0.4"
hyper = { version = "0.14", features = ["server"] } hyper = { version = "0.14", features = ["server"] }
prometheus = { version = "0.12", features = ["process"] } prometheus = { version = "0.13", features = ["process"] }
lazy_static = "1" lazy_static = "1"
futures-retry = "0.6" futures-retry = "0.6"
tracing = "0.1" tracing = "0.1"

View File

@ -10,7 +10,7 @@ anyhow = "1"
tracing = "0.1" tracing = "0.1"
tracing-unwrap = "0.9" tracing-unwrap = "0.9"
prometheus = "0.12" prometheus = "0.13"
lazy_static = "1" lazy_static = "1"
reqwest = { version = "0.11", features = ["json"] } reqwest = { version = "0.11", features = ["json"] }
@ -22,7 +22,7 @@ serde_json = "1"
image = "0.23" image = "0.23"
img_hash = "3" img_hash = "3"
sha2 = "0.9" sha2 = "0.10"
fuzzysearch-common = { path = "../fuzzysearch-common", features = ["queue"] } fuzzysearch-common = { path = "../fuzzysearch-common", features = ["queue"] }

View File

@ -6,17 +6,17 @@ edition = "2018"
[dependencies] [dependencies]
tracing = "0.1" tracing = "0.1"
tracing-subscriber = "0.2" tracing-subscriber = "0.3"
tracing-futures = "0.2" tracing-futures = "0.2"
tracing-log = "0.1" tracing-log = "0.1"
prometheus = { version = "0.12", features = ["process"] } prometheus = { version = "0.13", features = ["process"] }
lazy_static = "1" lazy_static = "1"
opentelemetry = { version = "0.15.0", features = ["rt-tokio"] } opentelemetry = { version = "0.16", features = ["rt-tokio"] }
opentelemetry-jaeger = { version = "0.14", features = ["tokio"] } opentelemetry-jaeger = { version = "0.15", features = ["tokio"] }
tracing-opentelemetry = "0.14" tracing-opentelemetry = "0.16"
opentelemetry-http = "0.4" opentelemetry-http = "0.5"
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }
tokio-stream = "0.1" tokio-stream = "0.1"