diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index c3a73ef09667c..d9b13fcf742c0 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -411,6 +411,7 @@ timespan timestamped tzdata ubuntu +upstreaminfo useragents usergroups userguide diff --git a/Cargo.lock b/Cargo.lock index 41580f90deaa1..3364f48bce98e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -260,7 +260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e" dependencies = [ "proc-macro-hack", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -473,7 +473,7 @@ dependencies = [ "darling 0.14.2", "proc-macro-crate 1.2.1", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", "thiserror", ] @@ -593,7 +593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -615,7 +615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -632,7 +632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -1417,7 +1417,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd9e32d7420c85055e8107e5b2463c4eeefeaac18b52359fe9f9c08a18f342b2" dependencies = [ - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -1561,7 +1561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61820b4c5693eafb998b1e67485423c923db4a75f72585c247bdee32bad81e7b" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -1572,7 +1572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c76cdbfa13def20d1f8af3ae7b3c6771f06352a74221d8851262ac384c122b8e" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -1643,7 +1643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -1726,7 +1726,7 @@ dependencies = [ "cached_proc_macro_types", "darling 0.14.2", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -1951,7 +1951,7 @@ checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45" dependencies = [ "heck 0.4.0", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -1963,9 +1963,9 @@ checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "clipboard-win" -version = "4.4.2" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ "error-code", "str-buf", @@ -2405,7 +2405,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -2459,7 +2459,7 @@ dependencies = [ "codespan-reporting", "once_cell", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "scratch", "syn 1.0.109", ] @@ -2477,7 +2477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -2510,7 +2510,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "strsim 0.10.0", "syn 1.0.109", ] @@ -2524,7 +2524,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "strsim 0.10.0", "syn 1.0.109", ] @@ -2536,7 +2536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -2547,7 +2547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core 0.14.2", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -2623,19 +2623,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] [[package]] name = "derive_arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", + "quote 1.0.28", + "syn 2.0.10", ] [[package]] @@ -2646,7 +2646,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -2756,14 +2756,14 @@ dependencies = [ [[package]] name = "dns-lookup" -version = "1.0.8" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" +checksum = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812" dependencies = [ "cfg-if", "libc", - "socket2 0.4.9", - "winapi", + "socket2 0.5.3", + "windows-sys 0.48.0", ] [[package]] @@ -2902,7 +2902,7 @@ checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.0", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -2914,7 +2914,7 @@ checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.0", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -2926,7 +2926,7 @@ checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -2946,7 +2946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -3074,7 +3074,7 @@ checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" dependencies = [ "proc-macro-error", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -3170,7 +3170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -3351,7 +3351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -3434,7 +3434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -3540,7 +3540,7 @@ dependencies = [ "heck 0.4.0", "lazy_static", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "serde", "serde_json", "syn 1.0.109", @@ -4541,9 +4541,9 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" dependencies = [ "ascii-canvas", "bit-set", @@ -4554,7 +4554,7 @@ dependencies = [ "lalrpop-util", "petgraph", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.7.2", "string_cache", "term", "tiny-keccak", @@ -4563,9 +4563,9 @@ dependencies = [ [[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" [[package]] name = "lapin" @@ -4926,7 +4926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -5452,7 +5452,7 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.2.1", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -5464,7 +5464,7 @@ checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.2.1", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -5647,7 +5647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -5891,7 +5891,7 @@ dependencies = [ "pest", "pest_meta", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -5979,7 +5979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -6245,7 +6245,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", "version_check", ] @@ -6257,7 +6257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "version_check", ] @@ -6366,7 +6366,7 @@ dependencies = [ "anyhow", "itertools 0.10.5", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -6395,7 +6395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -6494,7 +6494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -6509,18 +6509,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2 1.0.63", ] [[package]] name = "quoted_printable" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24039f627d8285853cc90dcddf8c1ebfaa91f834566948872b225b9a28ed1b6" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" [[package]] name = "radium" @@ -6909,7 +6909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -7177,11 +7177,11 @@ dependencies = [ [[package]] name = "rustyline" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" +checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.2", "cfg-if", "clipboard-win", "libc", @@ -7409,7 +7409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -7420,7 +7420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -7472,7 +7472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -7531,7 +7531,7 @@ checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -7543,7 +7543,7 @@ checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" dependencies = [ "darling 0.14.2", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -7814,7 +7814,7 @@ checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" dependencies = [ "heck 0.4.0", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -7955,7 +7955,7 @@ dependencies = [ "heck 0.3.3", "proc-macro-error", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -7973,7 +7973,7 @@ checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.0", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "rustversion", "syn 1.0.109", ] @@ -8012,7 +8012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "unicode-ident", ] @@ -8023,7 +8023,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "unicode-ident", ] @@ -8040,7 +8040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -8194,7 +8194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -8340,7 +8340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -8561,7 +8561,7 @@ dependencies = [ "prettyplease", "proc-macro2 1.0.63", "prost-build", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -8665,7 +8665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -8936,7 +8936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -8966,7 +8966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3e1c30cedd24fc597f7d37a721efdbdc2b1acae012c1ef1218f4c7c2c0f3e7" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", ] @@ -9127,6 +9127,7 @@ dependencies = [ "getrandom 0.2.10", "rand 0.8.5", "serde", + "wasm-bindgen", ] [[package]] @@ -9506,7 +9507,7 @@ dependencies = [ "darling 0.13.4", "once_cell", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "serde", "serde_json", "syn 1.0.109", @@ -9519,7 +9520,7 @@ version = "0.1.0" dependencies = [ "darling 0.13.4", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "serde", "serde_derive_internals", "syn 1.0.109", @@ -9683,9 +9684,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6236fdfaaa956af732a73630b8a8b43ef75e0a42fed6b94cf3c1c19c99daca5" +checksum = "ee149a42aa313d18cf7a7e6b54e06df03b4a0e6e5dd42a2b8b6d5eeb98d582c1" dependencies = [ "aes", "ansi_term", @@ -9696,6 +9697,7 @@ dependencies = [ "bytes 1.4.0", "cbc", "cfb-mode", + "cfg-if", "charset", "chrono", "chrono-tz", @@ -9709,14 +9711,13 @@ dependencies = [ "dyn-clone", "exitcode", "flate2", - "getrandom 0.2.10", "grok", "hex", "hmac", "hostname", - "indexmap 1.9.3", + "indexmap 2.0.0", "indoc", - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop", "lalrpop-util", "md-5", @@ -9779,7 +9780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", ] [[package]] @@ -9880,7 +9881,7 @@ dependencies = [ "log", "once_cell", "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", "wasm-bindgen-shared", ] @@ -9903,7 +9904,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.29", + "quote 1.0.28", "wasm-bindgen-macro-support", ] @@ -9914,7 +9915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 2.0.10", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -10325,7 +10326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", ] @@ -10345,7 +10346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2 1.0.63", - "quote 1.0.29", + "quote 1.0.28", "syn 1.0.109", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index 63014558b28f4..40f40f0b54fe7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -114,7 +114,12 @@ members = [ "vdev", ] +[workspace.dependencies] +vrl = { version = "0.5.0", features = ["cli", "test", "test_framework", "arbitrary"] } + [dependencies] +vrl.workspace = true + # Internal libs codecs = { path = "lib/codecs", default-features = false } dnsmsg-parser = { path = "lib/dnsmsg-parser", optional = true } @@ -227,9 +232,6 @@ tui = { version = "0.19.0", optional = true, default-features = false, features hex = { version = "0.4.3", default-features = false, optional = true } sha2 = { version = "0.10.7", default-features = false, optional = true } -# VRL Lang -vrl = { package = "vrl", version = "0.4.0", features = ["cli", "test"] } - # External libs arc-swap = { version = "1.6", default-features = false, optional = true } async-compression = { version = "0.4.0", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true } diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml index 93aa9b6e2980f..85cd4cb6813a3 100644 --- a/lib/codecs/Cargo.toml +++ b/lib/codecs/Cargo.toml @@ -25,7 +25,7 @@ snafu = { version = "0.7.4", default-features = false, features = ["futures"] } syslog_loose = { version = "0.18", default-features = false, optional = true } tokio-util = { version = "0.7", default-features = false, features = ["codec"] } tracing = { version = "0.1", default-features = false } -vrl = { version = "0.4.0", default-features = false, features = ["value"] } +vrl.workspace = true vector-common = { path = "../vector-common", default-features = false } vector-config = { path = "../vector-config", default-features = false } vector-config-common = { path = "../vector-config-common", default-features = false } diff --git a/lib/enrichment/Cargo.toml b/lib/enrichment/Cargo.toml index 4dbc835c11b12..1a8e2467f0fed 100644 --- a/lib/enrichment/Cargo.toml +++ b/lib/enrichment/Cargo.toml @@ -9,7 +9,4 @@ publish = false arc-swap = { version = "1.6.0", default-features = false } chrono = { version = "0.4.19", default-features = false } dyn-clone = { version = "1.0.11", default-features = false } -vrl = { version = "0.4.0", default-features = false, features = [ - "compiler", - "diagnostic", -] } +vrl.workspace = true diff --git a/lib/opentelemetry-proto/Cargo.toml b/lib/opentelemetry-proto/Cargo.toml index 23c91e4c26282..c2e3dbfac011a 100644 --- a/lib/opentelemetry-proto/Cargo.toml +++ b/lib/opentelemetry-proto/Cargo.toml @@ -17,5 +17,5 @@ lookup = { package = "vector-lookup", path = "../vector-lookup", default-feature ordered-float = { version = "3.7.0", default-features = false } prost = { version = "0.11", default-features = false, features = ["std"] } tonic = { version = "0.9", default-features = false, features = ["codegen", "gzip", "prost", "tls", "tls-roots", "transport"] } -vrl = { version = "0.4.0", default-features = false, features = ["value"] } +vrl.workspace = true vector-core = { path = "../vector-core", default-features = false } diff --git a/lib/vector-common/Cargo.toml b/lib/vector-common/Cargo.toml index 31c6c40a2ac5e..7d578ecb4e051 100644 --- a/lib/vector-common/Cargo.toml +++ b/lib/vector-common/Cargo.toml @@ -62,7 +62,7 @@ snafu = { version = "0.7", optional = true } stream-cancel = { version = "0.8.1", default-features = false } tokio = { version = "1.29.0", default-features = false, features = ["macros", "time"] } tracing = { version = "0.1.34", default-features = false } -vrl = { version = "0.4.0", default-features = false, features = ["value", "core", "compiler"] } +vrl.workspace = true vector-config = { path = "../vector-config" } vector-config-common = { path = "../vector-config-common" } vector-config-macros = { path = "../vector-config-macros" } diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml index d843f0edb0a17..e1acd6593233c 100644 --- a/lib/vector-config/Cargo.toml +++ b/lib/vector-config/Cargo.toml @@ -26,7 +26,7 @@ snafu = { version = "0.7.4", default-features = false } toml = { version = "0.7.5", default-features = false } tracing = { version = "0.1.34", default-features = false } url = { version = "2.4.0", default-features = false, features = ["serde"] } -vrl = { version = "0.4.0", default-features = false, features = ["compiler"] } +vrl.workspace = true vector-config-common = { path = "../vector-config-common" } vector-config-macros = { path = "../vector-config-macros" } diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index 7e2b0ff88c137..a281ac35dd87e 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -65,7 +65,7 @@ vector-common = { path = "../vector-common" } vector-config = { path = "../vector-config" } vector-config-common = { path = "../vector-config-common" } vector-config-macros = { path = "../vector-config-macros" } -vrl = { version = "0.4.0" } +vrl.workspace = true [target.'cfg(target_os = "macos")'.dependencies] security-framework = "2.9.1" @@ -94,7 +94,7 @@ rand = "0.8.5" rand_distr = "0.4.3" tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt", "ansi", "registry"] } vector-common = { path = "../vector-common", default-features = false, features = ["test"] } -vrl = { version = "0.4.0", default-features = false, features = ["value", "arbitrary", "lua", "test"] } +vrl.workspace = true [features] api = ["dep:async-graphql"] diff --git a/lib/vector-lookup/Cargo.toml b/lib/vector-lookup/Cargo.toml index b1ca558a543cf..a159f31561d0f 100644 --- a/lib/vector-lookup/Cargo.toml +++ b/lib/vector-lookup/Cargo.toml @@ -10,4 +10,4 @@ license = "MPL-2.0" serde = { version = "1.0.164", default-features = false, features = ["derive", "alloc"] } vector-config = { path = "../vector-config" } vector-config-macros = { path = "../vector-config-macros" } -vrl = { version = "0.4.0", default-features = false, features = ["path"] } +vrl.workspace = true diff --git a/lib/vector-vrl/cli/Cargo.toml b/lib/vector-vrl/cli/Cargo.toml index dd2c451de79c3..106e430355c56 100644 --- a/lib/vector-vrl/cli/Cargo.toml +++ b/lib/vector-vrl/cli/Cargo.toml @@ -9,4 +9,4 @@ license = "MPL-2.0" [dependencies] clap = { version = "4.1.14", features = ["derive"] } vector-vrl-functions = { path = "../functions" } -vrl = { version = "0.4.0", default-features = false, features = ["stdlib", "cli"] } +vrl.workspace = true diff --git a/lib/vector-vrl/functions/Cargo.toml b/lib/vector-vrl/functions/Cargo.toml index 787637bad848b..432cac075cdb5 100644 --- a/lib/vector-vrl/functions/Cargo.toml +++ b/lib/vector-vrl/functions/Cargo.toml @@ -7,4 +7,4 @@ publish = false license = "MPL-2.0" [dependencies] -vrl = { version = "0.4.0", default-features = false, features = ["compiler", "path", "diagnostic"] } +vrl.workspace = true diff --git a/lib/vector-vrl/tests/Cargo.toml b/lib/vector-vrl/tests/Cargo.toml index 2ff39275589b0..b67b8afa63a4a 100644 --- a/lib/vector-vrl/tests/Cargo.toml +++ b/lib/vector-vrl/tests/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] enrichment = { path = "../../enrichment" } -vrl = { version = "0.4.0", features = ["test_framework"]} +vrl.workspace = true vector-vrl-functions = { path = "../../vector-vrl/functions" } ansi_term = "0.12" diff --git a/lib/vector-vrl/web-playground/Cargo.toml b/lib/vector-vrl/web-playground/Cargo.toml index 72a9118937ba6..b951a29661226 100644 --- a/lib/vector-vrl/web-playground/Cargo.toml +++ b/lib/vector-vrl/web-playground/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib"] [dependencies] wasm-bindgen = "0.2" -vrl = { version = "0.4.0", default-features = false, features = ["value", "stdlib"] } +vrl.workspace = true serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.5" gloo-utils = { version = "0.1", features = ["serde"] } diff --git a/src/transforms/remap.rs b/src/transforms/remap.rs index 0cbd2af1c119e..381843b9101f3 100644 --- a/src/transforms/remap.rs +++ b/src/transforms/remap.rs @@ -240,7 +240,7 @@ impl TransformConfig for RemapConfig { .compile_vrl_program(enrichment_tables, merged_definition) .map(|(program, _, _, external_context)| { ( - program.final_type_state(), + program.final_type_info().state, external_context .get_custom::() .cloned() diff --git a/website/cue/reference/remap/functions/format_timestamp.cue b/website/cue/reference/remap/functions/format_timestamp.cue index b13bbd40a74c3..0bc92a9836794 100644 --- a/website/cue/reference/remap/functions/format_timestamp.cue +++ b/website/cue/reference/remap/functions/format_timestamp.cue @@ -19,6 +19,12 @@ remap: functions: format_timestamp: { required: true type: ["string"] }, + { + name: "timezone" + description: "The timezone to use when formatting the timestamp. The uses the TZ identifier, or 'local'" + required: false + type: ["string"] + }, ] internal_failure_reasons: [] return: types: ["string"] diff --git a/website/cue/reference/remap/functions/from_unix_timestamp.cue b/website/cue/reference/remap/functions/from_unix_timestamp.cue new file mode 100644 index 0000000000000..45323b1811948 --- /dev/null +++ b/website/cue/reference/remap/functions/from_unix_timestamp.cue @@ -0,0 +1,58 @@ +package metadata + +remap: functions: from_unix_timestamp: { + category: "Convert" + description: """ + Converts the `value` integer from a [Unix timestamp](\(urls.unix_timestamp)) to a VRL `timestamp`. + + Converts from the number of seconds since the Unix epoch by default, but milliseconds or nanoseconds can also be + specified by `unit`. + """ + + arguments: [ + { + name: "value" + description: "The Unix timestamp to convert." + required: true + type: ["integer"] + }, + { + name: "unit" + description: "The time unit." + type: ["string"] + required: false + enum: { + seconds: "Express Unix time in seconds" + milliseconds: "Express Unix time in milliseconds" + nanoseconds: "Express Unix time in nanoseconds" + } + default: "seconds" + }, + ] + internal_failure_reasons: [] + return: types: ["timestamp"] + + examples: [ + { + title: "Convert from a Unix timestamp (seconds)" + source: #""" + from_unix_timestamp!(5) + """# + return: "1970-01-01T00:00:05Z" + }, + { + title: "Convert from a Unix timestamp (milliseconds)" + source: #""" + from_unix_timestamp!(5000, unit: "milliseconds") + """# + return: "1970-01-01T00:00:05Z" + }, + { + title: "Convert from a Unix timestamp (nanoseconds)" + source: #""" + from_unix_timestamp!(5000, unit: "nanoseconds") + """# + return: "1970-01-01T00:00:00.000005Z" + }, + ] +} diff --git a/website/cue/reference/remap/functions/parse_nginx_log.cue b/website/cue/reference/remap/functions/parse_nginx_log.cue index b33397e1ba416..99f48be898b4d 100644 --- a/website/cue/reference/remap/functions/parse_nginx_log.cue +++ b/website/cue/reference/remap/functions/parse_nginx_log.cue @@ -35,8 +35,9 @@ remap: functions: parse_nginx_log: { description: "The format to use for parsing the log." required: true enum: { - "combined": "Nginx combined format" - "error": "Default Nginx error format" + "combined": "Nginx combined format" + "error": "Default Nginx error format" + "ingress_upstreaminfo": "Provides detailed upstream information (Nginx Ingress Controller)" } type: ["string"] },