Add tracing (#1942)

[lemmy.git] / Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
index aa8d170b8acc99e8192bf41411e453980aa59925..e71f11f3f7d9e739cf5487de3e547d191569892f 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -311,6 +311,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.45"
@@ -365,17 +374,6 @@ dependencies = [
  "quick-xml",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -1104,19 +1102,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca"
 
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "event-listener"
 version = "2.5.1"
@@ -1557,12 +1542,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
-[[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.15"
@@ -1769,7 +1748,6 @@ dependencies = [
  "lemmy_db_views_moderator",
  "lemmy_utils",
  "lemmy_websocket",
- "log",
  "openssl",
  "rand 0.8.4",
  "reqwest",
@@ -1796,7 +1774,6 @@ dependencies = [
  "lemmy_db_views_actor",
  "lemmy_db_views_moderator",
  "lemmy_utils",
- "log",
  "serde",
  "serde_json",
  "url",
@@ -1830,7 +1807,6 @@ dependencies = [
  "lemmy_db_views_moderator",
  "lemmy_utils",
  "lemmy_websocket",
- "log",
  "openssl",
  "rand 0.8.4",
  "reqwest",
@@ -1841,6 +1817,7 @@ dependencies = [
  "strum_macros",
  "thiserror",
  "tokio",
+ "tracing",
  "url",
  "uuid",
  "webmention",
@@ -1874,7 +1851,6 @@ dependencies = [
  "lemmy_db_views_actor",
  "lemmy_utils",
  "lemmy_websocket",
- "log",
  "once_cell",
  "percent-encoding",
  "rand 0.8.4",
@@ -1888,6 +1864,7 @@ dependencies = [
  "strum_macros",
  "thiserror",
  "tokio",
+ "tracing",
  "url",
  "uuid",
 ]
@@ -1908,13 +1885,13 @@ dependencies = [
  "http-signature-normalization-reqwest",
  "lemmy_apub_lib_derive",
  "lemmy_utils",
- "log",
  "once_cell",
  "openssl",
  "reqwest",
  "serde",
  "serde_json",
  "sha2",
+ "tracing",
  "url",
 ]
 
@@ -1939,7 +1916,6 @@ dependencies = [
  "diesel_migrations",
  "lemmy_apub_lib",
  "lemmy_utils",
- "log",
  "once_cell",
  "regex",
  "serde",
@@ -1957,9 +1933,9 @@ version = "0.14.1"
 dependencies = [
  "diesel",
  "lemmy_db_schema",
- "log",
  "serde",
  "serial_test",
+ "tracing",
  "url",
 ]
 
@@ -2000,7 +1976,6 @@ dependencies = [
  "lemmy_db_views_actor",
  "lemmy_utils",
  "lemmy_websocket",
- "log",
  "once_cell",
  "rss",
  "serde",
@@ -2024,7 +1999,6 @@ dependencies = [
  "diesel",
  "diesel_migrations",
  "doku",
- "env_logger",
  "http-signature-normalization-actix",
  "lemmy_api",
  "lemmy_api_common",
@@ -2038,13 +2012,17 @@ dependencies = [
  "lemmy_routes",
  "lemmy_utils",
  "lemmy_websocket",
- "log",
  "openssl",
  "reqwest",
  "serde",
  "serde_json",
  "strum",
  "tokio",
+ "tracing",
+ "tracing-actix-web",
+ "tracing-error",
+ "tracing-log",
+ "tracing-subscriber",
  "url",
 ]
 
@@ -2065,7 +2043,6 @@ dependencies = [
  "itertools",
  "jsonwebtoken",
  "lettre",
- "log",
  "once_cell",
  "openssl",
  "percent-encoding",
@@ -2079,6 +2056,8 @@ dependencies = [
  "strum_macros",
  "thiserror",
  "tokio",
+ "tracing",
+ "tracing-error",
  "url",
  "uuid",
  "webpage",
@@ -2100,7 +2079,6 @@ dependencies = [
  "lemmy_db_views",
  "lemmy_db_views_actor",
  "lemmy_utils",
- "log",
  "rand 0.8.4",
  "reqwest",
  "serde",
@@ -2108,6 +2086,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -2257,6 +2236,15 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -3102,6 +3090,15 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.25"
@@ -3998,6 +3995,19 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-actix-web"
+version = "0.5.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cac34827e06f78b69523b2fbe5b2dd4dfc75940b2ea5ba37e4fa2a25d4a0edf"
+dependencies = [
+ "actix-web",
+ "pin-project",
+ "tracing",
+ "tracing-futures",
+ "uuid",
+]
+
 [[package]]
 name = "tracing-attributes"
 version = "0.1.18"
@@ -4038,15 +4048,33 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tracing-log"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80a4ddde70311d8da398062ecf6fc2c309337de6b0f77d6c27aff8d53f6fca52"
+checksum = "7507ec620f809cdf07cccb5bc57b13069a88031b795efd4079b1c71b66c1613d"
 dependencies = [
+ "ansi_term",
+ "lazy_static",
+ "matchers",
+ "regex",
  "sharded-slab",
+ "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]