diff --git a/Cargo.lock b/Cargo.lock index b1deccd..0235f34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -774,9 +774,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes", "fnv", @@ -865,9 +865,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd" dependencies = [ "cfg-if", ] @@ -1158,7 +1158,7 @@ dependencies = [ [[package]] name = "pict-rs" -version = "0.3.0-alpha.34" +version = "0.3.0-alpha.35" dependencies = [ "actix-form-data", "actix-rt", @@ -1749,9 +1749,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +checksum = "5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0" dependencies = [ "proc-macro2", "quote", @@ -1860,9 +1860,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5241dd6f21443a3606b432718b166d3cedc962fd4b8bea54a8bc7f514ebda986" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -1875,9 +1875,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" +checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" dependencies = [ "autocfg", "bytes", @@ -2040,8 +2040,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.4.0-beta.12" -source = "git+https://github.com/asonix/tracing-actix-web?branch=asonix/tracing-error-work-around#51e7911af7d1dd6a9c8265fa19b94224ddff56e2" +version = "0.4.0-beta.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64be7b20ed6dfa15ddd89a964f28724360f9769eee60712666f20924d9a82c35" dependencies = [ "actix-web", "opentelemetry", @@ -2072,9 +2073,11 @@ dependencies = [ "awc", "bytes", "futures-core", + "opentelemetry", "serde", "tracing", "tracing-futures", + "tracing-opentelemetry", ] [[package]] @@ -2142,9 +2145,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c42e73a9d277d4d2b6a88389a137ccf3c58599660b17e8f5fc39305e490669" +checksum = "fdd0568dbfe3baf7048b7908d2b32bca0d81cd56bec6d2a8f894b01d74f86be3" dependencies = [ "ansi_term 0.12.1", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 9b861ae..553011e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pict-rs" description = "A simple image hosting service" -version = "0.3.0-alpha.34" +version = "0.3.0-alpha.35" authors = ["asonix "] license = "AGPL-3.0" readme = "README.md" @@ -35,7 +35,6 @@ time = { version = "0.3.0", features = ["serde"] } tokio = { version = "1", default-features = false, features = ["fs", "io-util", "process", "sync"] } tokio-util = { version = "0.6", default-features = false, features = ["codec"] } tracing = "0.1.15" -tracing-awc = "0.1.0-beta.4" tracing-error = "0.1.2" tracing-futures = "0.2.4" tracing-log = "0.1.2" @@ -44,8 +43,11 @@ tracing-subscriber = { version = "0.2.5", features = ["fmt", "tracing-log"] } url = "2.2" [dependencies.tracing-actix-web] -version = "0.4.0-beta.8" -git = "https://github.com/asonix/tracing-actix-web" -branch = "asonix/tracing-error-work-around" +version = "0.4.0-beta.13" +default-features = false +features = ["emit_event_on_error", "opentelemetry_0_16"] + +[dependencies.tracing-awc] +version = "0.1.0-beta.4" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh index 2ffb91b..19e71c2 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -81,7 +81,7 @@ if [ "$push" == "true" ]; then ./manifest.sh pictrs $new_tag ./manifest.sh pictrs latest - # pushd ../../ - # cargo publish - # popd + pushd ../../ + cargo publish + popd fi diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index f9082bd..a9195c4 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: pictrs: - image: asonix/pictrs:v0.3.0-alpha.34 + image: asonix/pictrs:v0.3.0-alpha.35 ports: - "127.0.0.1:8080:8080" restart: always