Support PHP 8.2 (#38)
diff --git a/.github/workflows/pecl.yml b/.github/workflows/pecl.yml
index af42373..5535c87 100644
--- a/.github/workflows/pecl.yml
+++ b/.github/workflows/pecl.yml
@@ -50,7 +50,7 @@
- ubuntu-20.04
- macos-12
version:
- - php: "8.1"
+ - php: "8.2"
swoole: "5.0.0"
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b407ec1..19fc98b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -62,6 +62,8 @@
swoole: "5.0.0"
- php: "8.1"
swoole: "5.0.0"
+ - php: "8.2"
+ swoole: "5.0.0"
runs-on: ${{ matrix.os }}
steps:
diff --git a/Cargo.lock b/Cargo.lock
index a147dfc..222e2d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@
[[package]]
name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
@@ -36,19 +36,10 @@
]
[[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.64"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
dependencies = [
"backtrace",
]
@@ -76,9 +67,9 @@
[[package]]
name = "async-trait"
-version = "0.1.57"
+version = "0.1.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
+checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
dependencies = [
"proc-macro2",
"quote",
@@ -104,12 +95,12 @@
[[package]]
name = "axum"
-version = "0.5.16"
+version = "0.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043"
+checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
dependencies = [
"async-trait",
- "axum-core",
+ "axum-core 0.2.9",
"bitflags",
"bytes",
"futures-util",
@@ -117,7 +108,7 @@
"http-body",
"hyper",
"itoa",
- "matchit",
+ "matchit 0.5.0",
"memchr",
"mime",
"percent-encoding",
@@ -134,10 +125,39 @@
]
[[package]]
-name = "axum-core"
-version = "0.2.8"
+name = "axum"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f0c0a60006f2a293d82d571f635042a72edf927539b7685bd62d361963839b"
+checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48"
+dependencies = [
+ "async-trait",
+ "axum-core 0.3.0",
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "itoa",
+ "matchit 0.7.0",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper",
+ "tower",
+ "tower-http",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
dependencies = [
"async-trait",
"bytes",
@@ -150,6 +170,23 @@
]
[[package]]
+name = "axum-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
name = "backtrace"
version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -166,9 +203,9 @@
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "bincode"
@@ -181,15 +218,13 @@
[[package]]
name = "bindgen"
-version = "0.60.1"
+version = "0.63.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
+checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
dependencies = [
"bitflags",
"cexpr",
"clang-sys",
- "clap",
- "env_logger",
"lazy_static",
"lazycell",
"log",
@@ -199,6 +234,7 @@
"regex",
"rustc-hash",
"shlex",
+ "syn",
"which",
]
@@ -228,15 +264,15 @@
[[package]]
name = "bumpalo"
-version = "3.11.0"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
[[package]]
name = "bytes"
-version = "1.2.1"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
[[package]]
name = "bytesize"
@@ -246,9 +282,9 @@
[[package]]
name = "cc"
-version = "1.0.73"
+version = "1.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
[[package]]
name = "cexpr"
@@ -267,15 +303,15 @@
[[package]]
name = "chrono"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
dependencies = [
"iana-time-zone",
"js-sys",
"num-integer",
"num-traits",
- "time 0.1.44",
+ "time 0.1.45",
"wasm-bindgen",
"winapi",
]
@@ -304,9 +340,9 @@
[[package]]
name = "clang-sys"
-version = "1.3.3"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
dependencies = [
"glob",
"libc",
@@ -315,9 +351,9 @@
[[package]]
name = "clap"
-version = "3.2.20"
+version = "3.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
dependencies = [
"atty",
"bitflags",
@@ -353,6 +389,16 @@
]
[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
name = "convert_case"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -395,12 +441,11 @@
[[package]]
name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.8.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
dependencies = [
"cfg-if",
- "once_cell",
]
[[package]]
@@ -414,6 +459,50 @@
]
[[package]]
+name = "cxx"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "dashmap"
version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -428,9 +517,9 @@
[[package]]
name = "data-encoding"
-version = "2.3.2"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
[[package]]
name = "derive_more"
@@ -453,9 +542,9 @@
[[package]]
name = "digest"
-version = "0.10.3"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
"block-buffer",
"crypto-common",
@@ -478,9 +567,9 @@
[[package]]
name = "enum-as-inner"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
dependencies = [
"heck",
"proc-macro2",
@@ -489,19 +578,6 @@
]
[[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 = "fastcgi-client"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -559,30 +635,30 @@
[[package]]
name = "futures-channel"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
[[package]]
name = "futures-io"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
[[package]]
name = "futures-macro"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
dependencies = [
"proc-macro2",
"quote",
@@ -591,21 +667,21 @@
[[package]]
name = "futures-sink"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
[[package]]
name = "futures-task"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
[[package]]
name = "futures-util"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
dependencies = [
"futures-core",
"futures-macro",
@@ -627,9 +703,9 @@
[[package]]
name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
dependencies = [
"cfg-if",
"libc",
@@ -674,9 +750,9 @@
[[package]]
name = "h2"
-version = "0.3.14"
+version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
+checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
dependencies = [
"bytes",
"fnv",
@@ -770,16 +846,10 @@
checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
[[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.20"
+version = "0.14.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
dependencies = [
"bytes",
"futures-channel",
@@ -826,19 +896,29 @@
[[package]]
name = "iana-time-zone"
-version = "0.1.47"
+version = "0.1.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
dependencies = [
"android_system_properties",
"core-foundation-sys",
+ "iana-time-zone-haiku",
"js-sys",
- "once_cell",
"wasm-bindgen",
"winapi",
]
[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
+[[package]]
name = "idna"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -879,9 +959,9 @@
[[package]]
name = "indexmap"
-version = "1.9.1"
+version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown",
@@ -898,42 +978,42 @@
[[package]]
name = "ipconfig"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
+checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be"
dependencies = [
"socket2",
"widestring",
"winapi",
- "winreg 0.7.0",
+ "winreg",
]
[[package]]
name = "ipnet"
-version = "2.5.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
[[package]]
name = "itertools"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
[[package]]
name = "itoa"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
[[package]]
name = "js-sys"
-version = "0.3.59"
+version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
dependencies = [
"wasm-bindgen",
]
@@ -952,21 +1032,30 @@
[[package]]
name = "libc"
-version = "0.2.132"
+version = "0.2.138"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
[[package]]
name = "libloading"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
dependencies = [
"cfg-if",
"winapi",
]
[[package]]
+name = "link-cplusplus"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+dependencies = [
+ "cc",
+]
+
+[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -974,9 +1063,9 @@
[[package]]
name = "lock_api"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
dependencies = [
"autocfg",
"scopeguard",
@@ -1019,6 +1108,12 @@
checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
[[package]]
+name = "matchit"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
+
+[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1047,14 +1142,14 @@
[[package]]
name = "mio"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
dependencies = [
"libc",
"log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -1065,9 +1160,9 @@
[[package]]
name = "native-tls"
-version = "0.2.10"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
dependencies = [
"lazy_static",
"libc",
@@ -1092,6 +1187,16 @@
]
[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1112,24 +1217,15 @@
[[package]]
name = "num_cpus"
-version = "1.13.1"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
-]
-
-[[package]]
name = "object"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1140,15 +1236,15 @@
[[package]]
name = "once_cell"
-version = "1.14.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "openssl"
-version = "0.10.41"
+version = "0.10.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566"
dependencies = [
"bitflags",
"cfg-if",
@@ -1178,9 +1274,9 @@
[[package]]
name = "openssl-sys"
-version = "0.9.75"
+version = "0.9.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
dependencies = [
"autocfg",
"cc",
@@ -1191,9 +1287,15 @@
[[package]]
name = "os_str_bytes"
-version = "6.3.0"
+version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "parking_lot"
@@ -1207,15 +1309,15 @@
[[package]]
name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
- "windows-sys",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -1241,9 +1343,9 @@
[[package]]
name = "pest"
-version = "2.3.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4"
+checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
dependencies = [
"thiserror",
"ucd-trie",
@@ -1251,9 +1353,9 @@
[[package]]
name = "pest_derive"
-version = "2.3.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905708f7f674518498c1f8d644481440f476d39ca6ecae83319bba7c6c12da91"
+checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344"
dependencies = [
"pest",
"pest_generator",
@@ -1261,9 +1363,9 @@
[[package]]
name = "pest_generator"
-version = "2.3.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad"
+checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c"
dependencies = [
"pest",
"pest_meta",
@@ -1274,13 +1376,13 @@
[[package]]
name = "pest_meta"
-version = "2.3.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04"
+checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20"
dependencies = [
"once_cell",
"pest",
- "sha-1",
+ "sha1",
]
[[package]]
@@ -1334,12 +1436,10 @@
[[package]]
name = "phper"
-version = "0.5.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f00d5aaeb2c801be4ae2b649ca516f3d5673b1b183ff2f60a9fc824ee507442"
+checksum = "7510c145d5ce7aabbe2ba0dc417b280ebd7ffc0acc9ea28e7424b6c064509e0b"
dependencies = [
- "anyhow",
- "clap",
"dashmap",
"derive_more",
"indexmap",
@@ -1353,9 +1453,9 @@
[[package]]
name = "phper-alloc"
-version = "0.5.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b56bc8fe1e25cd77ae79eb5870dd1838e16f2f6bdb5f6c91650e4d2e39d108de"
+checksum = "3f9feb2b31579d9ddf8ff5c99e4fc37be9460c56ae56b4cff09e7af34ae5fd49"
dependencies = [
"phper-build",
"phper-sys",
@@ -1363,18 +1463,18 @@
[[package]]
name = "phper-build"
-version = "0.5.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90c5bdb2c0c9501d557153ac8733b08c01ff8b2d81229a61089ea621786942dd"
+checksum = "03153aac0d2dd4afea8f2574466acd96e3d550194e6a5532ed06dc4f5609d075"
dependencies = [
"phper-sys",
]
[[package]]
name = "phper-macros"
-version = "0.5.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fb09917092f9a1d9596eb1e0caa943373b686774174d92ce9decc78586145ce"
+checksum = "8397be688dcaf8f656e38224b36e72061e63cc65f2591e78f8f4c67a77c23dca"
dependencies = [
"proc-macro2",
"quote",
@@ -1383,9 +1483,9 @@
[[package]]
name = "phper-sys"
-version = "0.5.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfadd8ae438b9cb5ce35b0f14bdad1755f58b3602c3a54e0b0f048180769b0e0"
+checksum = "7b2ad8d939c7e41dfe089dcbb68e2d81242ce4ee51151c02bd39a80f2d6eacbe"
dependencies = [
"bindgen",
"cc",
@@ -1425,27 +1525,27 @@
[[package]]
name = "pkg-config"
-version = "0.3.25"
+version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
name = "portable-atomic"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16"
+checksum = "ac662b3a6490de378b0ee15cf2dfff7127aebfe0b19acc65e7fbca3d299c3788"
[[package]]
name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "prettyplease"
-version = "0.1.19"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49e86d2c26a24059894a3afa13fd17d063419b05dfb83f06d9c3566060c3f5a"
+checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51"
dependencies = [
"proc-macro2",
"syn",
@@ -1477,18 +1577,18 @@
[[package]]
name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
dependencies = [
"unicode-ident",
]
[[package]]
name = "prost"
-version = "0.11.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
+checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0"
dependencies = [
"bytes",
"prost-derive",
@@ -1496,9 +1596,9 @@
[[package]]
name = "prost-build"
-version = "0.11.1"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb"
+checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94"
dependencies = [
"bytes",
"heck",
@@ -1507,18 +1607,20 @@
"log",
"multimap",
"petgraph",
+ "prettyplease",
"prost",
"prost-types",
"regex",
+ "syn",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
-version = "0.11.0"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
+checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306"
dependencies = [
"anyhow",
"itertools",
@@ -1529,9 +1631,9 @@
[[package]]
name = "prost-types"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
+checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a"
dependencies = [
"bytes",
"prost",
@@ -1575,9 +1677,9 @@
[[package]]
name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom",
]
@@ -1593,9 +1695,9 @@
[[package]]
name = "regex"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
dependencies = [
"aho-corasick",
"memchr",
@@ -1604,9 +1706,9 @@
[[package]]
name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
name = "remove_dir_all"
@@ -1619,9 +1721,9 @@
[[package]]
name = "reqwest"
-version = "0.11.11"
+version = "0.11.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
dependencies = [
"base64",
"bytes",
@@ -1635,10 +1737,10 @@
"hyper-tls",
"ipnet",
"js-sys",
- "lazy_static",
"log",
"mime",
"native-tls",
+ "once_cell",
"percent-encoding",
"pin-project-lite",
"serde",
@@ -1653,7 +1755,7 @@
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "winreg 0.10.1",
+ "winreg",
]
[[package]]
@@ -1688,6 +1790,12 @@
]
[[package]]
+name = "rustversion"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+
+[[package]]
name = "ryu"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1709,7 +1817,7 @@
checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
dependencies = [
"lazy_static",
- "windows-sys",
+ "windows-sys 0.36.1",
]
[[package]]
@@ -1719,6 +1827,12 @@
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
+name = "scratch"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+
+[[package]]
name = "scripts"
version = "0.0.0"
dependencies = [
@@ -1756,24 +1870,24 @@
[[package]]
name = "semver"
-version = "1.0.13"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
+checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
[[package]]
name = "serde"
-version = "1.0.144"
+version = "1.0.150"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.144"
+version = "1.0.150"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
dependencies = [
"proc-macro2",
"quote",
@@ -1782,9 +1896,9 @@
[[package]]
name = "serde_json"
-version = "1.0.87"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [
"indexmap",
"itoa",
@@ -1805,10 +1919,10 @@
]
[[package]]
-name = "sha-1"
-version = "0.10.0"
+name = "sha1"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -1874,7 +1988,7 @@
version = "0.3.0-dev"
dependencies = [
"anyhow",
- "axum",
+ "axum 0.5.17",
"bincode",
"chrono",
"dashmap",
@@ -1889,6 +2003,7 @@
"serde_json",
"skywalking",
"systemstat",
+ "thiserror",
"tokio",
"tokio-stream",
"tonic",
@@ -1918,9 +2033,9 @@
[[package]]
name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "socket2"
@@ -1940,9 +2055,9 @@
[[package]]
name = "syn"
-version = "1.0.99"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
dependencies = [
"proc-macro2",
"quote",
@@ -1957,15 +2072,15 @@
[[package]]
name = "systemstat"
-version = "0.2.0"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79ef8054a60d76603befaecaf7efe08d32d1a05a1e5df70c547b07507e9e262d"
+checksum = "ed5158fd55089515c923306476aaf3fa8ffc29a902561bf0017166a93218831c"
dependencies = [
"bytesize",
"lazy_static",
"libc",
"nom",
- "time 0.3.14",
+ "time 0.3.17",
"winapi",
]
@@ -1985,9 +2100,9 @@
[[package]]
name = "tera"
-version = "1.17.0"
+version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d4685e72cb35f0eb74319c8fe2d3b61e93da5609841cde2cb87fcc3bea56d20"
+checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c"
dependencies = [
"chrono",
"chrono-tz",
@@ -2016,24 +2131,24 @@
[[package]]
name = "textwrap"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.34"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.34"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
dependencies = [
"proc-macro2",
"quote",
@@ -2051,9 +2166,9 @@
[[package]]
name = "time"
-version = "0.1.44"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
@@ -2062,13 +2177,29 @@
[[package]]
name = "time"
-version = "0.3.14"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
+checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [
"itoa",
- "libc",
- "num_threads",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+
+[[package]]
+name = "time-macros"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+dependencies = [
+ "time-core",
]
[[package]]
@@ -2088,9 +2219,9 @@
[[package]]
name = "tokio"
-version = "1.21.0"
+version = "1.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
dependencies = [
"autocfg",
"bytes",
@@ -2098,13 +2229,12 @@
"memchr",
"mio",
"num_cpus",
- "once_cell",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
- "winapi",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -2119,9 +2249,9 @@
[[package]]
name = "tokio-macros"
-version = "1.8.0"
+version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [
"proc-macro2",
"quote",
@@ -2140,9 +2270,9 @@
[[package]]
name = "tokio-stream"
-version = "0.1.9"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
+checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -2165,13 +2295,13 @@
[[package]]
name = "tonic"
-version = "0.8.1"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11cd56bdb54ef93935a6a79dbd1d91f1ebd4c64150fd61654031fd6b8b775c91"
+checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
dependencies = [
"async-stream",
"async-trait",
- "axum",
+ "axum 0.6.1",
"base64",
"bytes",
"futures-core",
@@ -2197,9 +2327,9 @@
[[package]]
name = "tonic-build"
-version = "0.8.0"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fbcd2800e34e743b9ae795867d5f77b535d3a3be69fd731e39145719752df8c"
+checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
dependencies = [
"prettyplease",
"proc-macro2",
@@ -2230,9 +2360,9 @@
[[package]]
name = "tower-http"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba"
+checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
dependencies = [
"bitflags",
"bytes",
@@ -2249,9 +2379,9 @@
[[package]]
name = "tower-layer"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
[[package]]
name = "tower-service"
@@ -2261,9 +2391,9 @@
[[package]]
name = "tracing"
-version = "0.1.36"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
"cfg-if",
"log",
@@ -2279,15 +2409,15 @@
checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
dependencies = [
"crossbeam-channel",
- "time 0.3.14",
+ "time 0.3.17",
"tracing-subscriber",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.22"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
@@ -2296,9 +2426,9 @@
[[package]]
name = "tracing-core"
-version = "0.1.29"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
dependencies = [
"once_cell",
"valuable",
@@ -2327,11 +2457,11 @@
[[package]]
name = "tracing-subscriber"
-version = "0.3.15"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
dependencies = [
- "ansi_term",
+ "nu-ansi-term",
"sharded-slab",
"smallvec",
"thread_local",
@@ -2341,9 +2471,9 @@
[[package]]
name = "trust-dns-proto"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
+checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
dependencies = [
"async-trait",
"cfg-if",
@@ -2355,32 +2485,32 @@
"idna 0.2.3",
"ipnet",
"lazy_static",
- "log",
"rand",
"smallvec",
"thiserror",
"tinyvec",
"tokio",
+ "tracing",
"url",
]
[[package]]
name = "trust-dns-resolver"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
+checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
dependencies = [
"cfg-if",
"futures-util",
"ipconfig",
"lazy_static",
- "log",
"lru-cache",
"parking_lot",
"resolv-conf",
"smallvec",
"thiserror",
"tokio",
+ "tracing",
"trust-dns-proto",
]
@@ -2392,9 +2522,9 @@
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "ucd-trie"
@@ -2469,20 +2599,26 @@
[[package]]
name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
[[package]]
name = "unicode-normalization"
-version = "0.1.21"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
dependencies = [
"tinyvec",
]
[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
name = "url"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2495,9 +2631,9 @@
[[package]]
name = "uuid"
-version = "1.1.2"
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
+checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
dependencies = [
"getrandom",
"serde",
@@ -2556,9 +2692,9 @@
[[package]]
name = "wasm-bindgen"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2566,9 +2702,9 @@
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
dependencies = [
"bumpalo",
"log",
@@ -2581,9 +2717,9 @@
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.32"
+version = "0.4.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
dependencies = [
"cfg-if",
"js-sys",
@@ -2593,9 +2729,9 @@
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2603,9 +2739,9 @@
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
@@ -2616,15 +2752,15 @@
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
[[package]]
name = "web-sys"
-version = "0.3.59"
+version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2684,51 +2820,99 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
]
[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
+[[package]]
name = "windows_aarch64_msvc"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+
+[[package]]
name = "windows_i686_gnu"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
[[package]]
+name = "windows_i686_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+
+[[package]]
name = "windows_i686_msvc"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
[[package]]
+name = "windows_i686_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+
+[[package]]
name = "windows_x86_64_gnu"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+
+[[package]]
name = "windows_x86_64_msvc"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
[[package]]
-name = "winreg"
-version = "0.7.0"
+name = "windows_x86_64_msvc"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
-dependencies = [
- "winapi",
-]
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
[[package]]
name = "winreg"
diff --git a/Cargo.toml b/Cargo.toml
index 95fa875..c9e699e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,11 +44,12 @@
hostname = "0.3.1"
libc = "0.2.132"
once_cell = "1.14.0"
-phper = "0.5.1"
+phper = "0.8.0"
prost = "0.11.0"
serde_json = { version = "1.0.87", features = ["preserve_order"] }
skywalking = "0.4.0"
systemstat = "0.2.0"
+thiserror = "1.0.37"
tokio = { version = "1.21.0", features = ["full"] }
tokio-stream = "0.1.9"
tonic = "0.8.0"
diff --git a/src/exception_frame.rs b/src/errors.rs
similarity index 65%
rename from src/exception_frame.rs
rename to src/errors.rs
index 612a98c..78f5a55 100644
--- a/src/exception_frame.rs
+++ b/src/errors.rs
@@ -13,28 +13,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use phper::sys;
-use std::marker;
+use std::{result, str::Utf8Error};
-pub struct ExceptionFrame {
- phantom: marker::PhantomData<isize>,
+pub type Result<T> = result::Result<T, Error>;
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+ #[error(transparent)]
+ PHPer(#[from] phper::Error),
+
+ #[error(transparent)]
+ Anyhow(#[from] anyhow::Error),
}
-impl ExceptionFrame {
- pub fn new() -> Self {
- unsafe {
- sys::zend_exception_save();
- }
- ExceptionFrame {
- phantom: marker::PhantomData,
- }
- }
-}
-
-impl Drop for ExceptionFrame {
- fn drop(&mut self) {
- unsafe {
- sys::zend_exception_restore();
- }
+impl From<Utf8Error> for Error {
+ fn from(e: Utf8Error) -> Self {
+ Self::Anyhow(e.into())
}
}
diff --git a/src/execute.rs b/src/execute.rs
index 06cb946..ea82d3a 100644
--- a/src/execute.rs
+++ b/src/execute.rs
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use crate::{plugin::select_plugin, request::IS_SWOOLE, util::catch_unwind_anyhow};
+use crate::{plugin::select_plugin, request::IS_SWOOLE, util::catch_unwind_result};
use anyhow::{bail, Context};
use phper::{
objects::ZObj,
@@ -25,10 +25,10 @@
use tracing::{error, trace};
pub type BeforeExecuteHook =
- dyn FnOnce(Option<i64>, &mut ExecuteData) -> anyhow::Result<Box<dyn Any>>;
+ dyn FnOnce(Option<i64>, &mut ExecuteData) -> crate::Result<Box<dyn Any>>;
pub type AfterExecuteHook =
- dyn FnOnce(Option<i64>, Box<dyn Any>, &mut ExecuteData, &mut ZVal) -> anyhow::Result<()>;
+ dyn FnOnce(Option<i64>, Box<dyn Any>, &mut ExecuteData, &mut ZVal) -> crate::Result<()>;
pub trait Noop {
fn noop() -> Self;
@@ -37,7 +37,7 @@
impl Noop for Box<BeforeExecuteHook> {
#[inline]
fn noop() -> Self {
- fn f(_: Option<i64>, _: &mut ExecuteData) -> anyhow::Result<Box<dyn Any>> {
+ fn f(_: Option<i64>, _: &mut ExecuteData) -> crate::Result<Box<dyn Any>> {
Ok(Box::new(()))
}
Box::new(f)
@@ -49,7 +49,7 @@
fn noop() -> Self {
fn f(
_: Option<i64>, _: Box<dyn Any>, _: &mut ExecuteData, _: &mut ZVal,
- ) -> anyhow::Result<()> {
+ ) -> crate::Result<()> {
Ok(())
}
Box::new(f)
@@ -125,7 +125,7 @@
"execute_internal infer request id"
);
- let result = catch_unwind_anyhow(AssertUnwindSafe(|| before(request_id, execute_data)));
+ let result = catch_unwind_result(AssertUnwindSafe(|| before(request_id, execute_data)));
if let Err(err) = &result {
error!(?err, "before execute internal");
}
@@ -134,7 +134,7 @@
// If before hook return error, don't execute the after hook.
if let Ok(data) = result {
- if let Err(err) = catch_unwind_anyhow(AssertUnwindSafe(|| {
+ if let Err(err) = catch_unwind_result(AssertUnwindSafe(|| {
after(request_id, data, execute_data, return_value)
})) {
error!(?err, "after execute internal");
@@ -199,7 +199,7 @@
"execute_ex infer request id"
);
- let result = catch_unwind_anyhow(AssertUnwindSafe(|| before(request_id, execute_data)));
+ let result = catch_unwind_result(AssertUnwindSafe(|| before(request_id, execute_data)));
if let Err(err) = &result {
error!(?err, "before execute ex");
}
@@ -215,7 +215,7 @@
return;
}
};
- if let Err(err) = catch_unwind_anyhow(AssertUnwindSafe(|| {
+ if let Err(err) = catch_unwind_result(AssertUnwindSafe(|| {
after(request_id, data, execute_data, return_value)
})) {
error!(?err, "after execute ex");
diff --git a/src/lib.rs b/src/lib.rs
index 6569149..56a4c4f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,7 +20,7 @@
mod channel;
mod component;
mod context;
-mod exception_frame;
+mod errors;
mod execute;
mod module;
mod plugin;
@@ -29,11 +29,9 @@
mod util;
mod worker;
-use phper::{
- ini::{Ini, Policy},
- modules::Module,
- php_get_module,
-};
+use phper::{ini::Policy, modules::Module, php_get_module};
+
+pub use errors::{Error, Result};
/// Enable agent and report or not.
const SKYWALKING_AGENT_ENABLE: &str = "skywalking_agent.enable";
@@ -65,25 +63,25 @@
);
// Register skywalking ini.
- Ini::add(SKYWALKING_AGENT_ENABLE, false, Policy::System);
- Ini::add(SKYWALKING_AGENT_SKYWALKING_VERSION, 8i64, Policy::System);
- Ini::add(
+ module.add_ini(SKYWALKING_AGENT_ENABLE, false, Policy::System);
+ module.add_ini(SKYWALKING_AGENT_SKYWALKING_VERSION, 8i64, Policy::System);
+ module.add_ini(
SKYWALKING_AGENT_SERVER_ADDR,
"http://127.0.0.1:11800".to_string(),
Policy::System,
);
- Ini::add(
+ module.add_ini(
SKYWALKING_AGENT_SERVICE_NAME,
"hello-skywalking".to_string(),
Policy::System,
);
- Ini::add(SKYWALKING_AGENT_WORKER_THREADS, 0i64, Policy::System);
- Ini::add(
+ module.add_ini(SKYWALKING_AGENT_WORKER_THREADS, 0i64, Policy::System);
+ module.add_ini(
SKYWALKING_AGENT_LOG_LEVEL,
"OFF".to_string(),
Policy::System,
);
- Ini::add(
+ module.add_ini(
SKYWALKING_AGENT_LOG_FILE,
"/tmp/skywalking-agent.log".to_string(),
Policy::System,
@@ -100,7 +98,6 @@
module.add_function(
"skywalking_hack_swoole_on_request_please_do_not_use",
request::skywalking_hack_swoole_on_request,
- vec![],
);
module
diff --git a/src/module.rs b/src/module.rs
index fce178f..0c49466 100644
--- a/src/module.rs
+++ b/src/module.rs
@@ -22,23 +22,27 @@
SKYWALKING_AGENT_SERVICE_NAME, SKYWALKING_AGENT_SKYWALKING_VERSION,
};
use once_cell::sync::Lazy;
-use phper::{arrays::ZArr, ini::Ini, modules::ModuleContext, sys};
+use phper::{arrays::ZArr, ini::ini_get, modules::ModuleContext, sys};
use skywalking::{
common::random_generator::RandomGenerator,
trace::tracer::{self, Tracer},
};
-use std::{env, path::Path, str::FromStr, time::SystemTime};
+use std::{borrow::ToOwned, env, ffi::CStr, path::Path, str::FromStr, time::SystemTime};
use tracing::{info, metadata::LevelFilter};
use tracing_subscriber::FmtSubscriber;
-pub static SERVICE_NAME: Lazy<String> =
- Lazy::new(|| Ini::get::<String>(SKYWALKING_AGENT_SERVICE_NAME).unwrap_or_default());
+pub static SERVICE_NAME: Lazy<String> = Lazy::new(|| {
+ ini_get::<Option<&CStr>>(SKYWALKING_AGENT_SERVICE_NAME)
+ .and_then(|s| s.to_str().ok())
+ .map(ToOwned::to_owned)
+ .unwrap_or_default()
+});
pub static SERVICE_INSTANCE: Lazy<String> =
Lazy::new(|| RandomGenerator::generate() + "@" + &IPS[0]);
pub static SKYWALKING_VERSION: Lazy<i64> =
- Lazy::new(|| Ini::get::<i64>(SKYWALKING_AGENT_SKYWALKING_VERSION).unwrap_or_default());
+ Lazy::new(|| ini_get::<i64>(SKYWALKING_AGENT_SKYWALKING_VERSION));
pub static SOCKET_FILE_PATH: Lazy<String> = Lazy::new(|| {
let dur = SystemTime::now()
@@ -89,11 +93,14 @@
}
fn init_logger() {
- let log_level =
- Ini::get::<String>(SKYWALKING_AGENT_LOG_LEVEL).unwrap_or_else(|| "OFF".to_string());
+ let log_level = ini_get::<Option<&CStr>>(SKYWALKING_AGENT_LOG_LEVEL)
+ .and_then(|s| s.to_str().ok())
+ .unwrap_or("OFF");
let log_level = log_level.trim();
- let log_file = Ini::get::<String>(SKYWALKING_AGENT_LOG_FILE).unwrap_or_default();
+ let log_file = ini_get::<Option<&CStr>>(SKYWALKING_AGENT_LOG_FILE)
+ .and_then(|s| s.to_str().ok())
+ .unwrap_or_default();
let log_file = log_file.trim();
if !log_file.is_empty() {
@@ -121,7 +128,7 @@
}
fn is_enable() -> bool {
- if !Ini::get::<bool>(SKYWALKING_AGENT_ENABLE).unwrap_or_default() {
+ if !ini_get::<bool>(SKYWALKING_AGENT_ENABLE) {
return false;
}
diff --git a/src/plugin/plugin_curl.rs b/src/plugin/plugin_curl.rs
index 41481d9..8cc1f17 100644
--- a/src/plugin/plugin_curl.rs
+++ b/src/plugin/plugin_curl.rs
@@ -114,8 +114,7 @@
let cid = Self::get_resource_id(execute_data)?;
let ch = execute_data.get_parameter(0);
- let result =
- call("curl_getinfo", &mut [ch.clone()]).context("Call curl_get_info failed")?;
+ let result = call("curl_getinfo", &mut [ch.clone()])?;
let result = result.as_z_arr().context("result isn't array")?;
let url = result
@@ -128,7 +127,7 @@
url.insert_str(0, "http://");
}
- let url: Url = url.parse()?;
+ let url: Url = url.parse().context("parse url")?;
if url.scheme() != "http" && url.scheme() != "https" {
return Ok(Box::new(()));
}
@@ -173,8 +172,7 @@
call(
"curl_setopt",
&mut [ch.clone(), ZVal::from(CURLOPT_HTTPHEADER), val],
- )
- .context("Call curl_setopt")?;
+ )?;
}
Ok(Box::new(span))
@@ -183,8 +181,7 @@
let mut span = span.downcast::<Span>().unwrap();
let ch = execute_data.get_parameter(0);
- let result =
- call("curl_getinfo", &mut [ch.clone()]).context("Call curl_get_info")?;
+ let result = call("curl_getinfo", &mut [ch.clone()])?;
let response = result.as_z_arr().context("response in not arr")?;
let http_code = response
.get("http_code")
@@ -192,8 +189,7 @@
.context("Call curl_getinfo, http_code is null")?;
span.add_tag("status_code", &*http_code.to_string());
if http_code == 0 {
- let result =
- call("curl_error", &mut [ch.clone()]).context("Call curl_get_info")?;
+ let result = call("curl_error", &mut [ch.clone()])?;
let curl_error = result
.as_z_str()
.context("curl_error is not string")?
diff --git a/src/plugin/plugin_memcached.rs b/src/plugin/plugin_memcached.rs
index 3c0716c..979422b 100644
--- a/src/plugin/plugin_memcached.rs
+++ b/src/plugin/plugin_memcached.rs
@@ -19,7 +19,6 @@
use crate::{
component::COMPONENT_PHP_MEMCACHED_ID,
context::RequestContext,
- exception_frame::ExceptionFrame,
execute::{get_this_mut, AfterExecuteHook, BeforeExecuteHook},
tag::{CacheOp, TAG_CACHE_CMD, TAG_CACHE_KEY, TAG_CACHE_OP, TAG_CACHE_TYPE},
};
@@ -305,7 +304,7 @@
#[instrument(skip_all)]
fn after_hook(
_: Option<i64>, span: Box<dyn Any>, execute_data: &mut ExecuteData, return_value: &mut ZVal,
-) -> anyhow::Result<()> {
+) -> crate::Result<()> {
let mut span = span.downcast::<Span>().expect("Downcast to Span failed");
if let Some(b) = return_value.as_bool() {
if !b {
@@ -366,10 +365,7 @@
fn get_peer(this: &mut ZObj, key: ZVal) -> String {
let f = || {
- let info = {
- let _e = ExceptionFrame::new();
- this.call(&"getServerByKey".to_ascii_lowercase(), [key])?
- };
+ let info = this.call(&"getServerByKey".to_ascii_lowercase(), [key])?;
let info = info.as_z_arr().context("Server isn't array")?;
let host = info
.get("host")
@@ -382,7 +378,7 @@
.context("Server port not exists")?
.as_long()
.context("Server port isn't long")?;
- Ok::<_, anyhow::Error>(format!("{}:{}", host, port))
+ Ok::<_, crate::Error>(format!("{}:{}", host, port))
};
f().unwrap_or_else(|err| {
warn!(?err, "Get peer failed");
diff --git a/src/plugin/plugin_pdo.rs b/src/plugin/plugin_pdo.rs
index 9febec4..2d98884 100644
--- a/src/plugin/plugin_pdo.rs
+++ b/src/plugin/plugin_pdo.rs
@@ -17,7 +17,6 @@
use crate::{
component::COMPONENT_PHP_PDO_ID,
context::RequestContext,
- exception_frame::ExceptionFrame,
execute::{get_this_mut, validate_num_args, AfterExecuteHook, BeforeExecuteHook, Noop},
tag::{TAG_DB_STATEMENT, TAG_DB_TYPE},
};
@@ -190,7 +189,7 @@
fn after_hook(
_: Option<i64>, span: Box<dyn Any>, execute_data: &mut ExecuteData, return_value: &mut ZVal,
-) -> anyhow::Result<()> {
+) -> crate::Result<()> {
if let Some(b) = return_value.as_bool() {
if !b {
return after_hook_when_false(
@@ -207,8 +206,7 @@
Ok(())
}
-fn after_hook_when_false(this: &mut ZObj, span: &mut Span) -> anyhow::Result<()> {
- let _e = ExceptionFrame::new();
+fn after_hook_when_false(this: &mut ZObj, span: &mut Span) -> crate::Result<()> {
let info = this.call("errorInfo", [])?;
let info = info.as_z_arr().context("errorInfo isn't array")?;
@@ -233,7 +231,7 @@
Ok(())
}
-fn after_hook_when_pdo_statement(pdo: &mut ZObj, pdo_statement: &mut ZObj) -> anyhow::Result<()> {
+fn after_hook_when_pdo_statement(pdo: &mut ZObj, pdo_statement: &mut ZObj) -> crate::Result<()> {
let dsn = DSN_MAP
.get(&pdo.handle())
.map(|r| r.value().clone())
diff --git a/src/plugin/plugin_predis.rs b/src/plugin/plugin_predis.rs
index 918a954..9d75b19 100644
--- a/src/plugin/plugin_predis.rs
+++ b/src/plugin/plugin_predis.rs
@@ -194,12 +194,10 @@
.map(ToOwned::to_owned)
.unwrap_or_default();
- let id = command.call("getid", []).context("call getId failed")?;
+ let id = command.call("getid", [])?;
let cmd = id.expect_z_str()?.to_str()?.to_ascii_uppercase();
- let mut arguments = command
- .call("getarguments", [])
- .context("call getArguments failed")?;
+ let mut arguments = command.call("getarguments", [])?;
let arguments = arguments.expect_mut_z_arr()?;
let op = if REDIS_READ_COMMANDS.contains(&*cmd) {
diff --git a/src/plugin/plugin_redis.rs b/src/plugin/plugin_redis.rs
index 1a29307..c93dc6b 100644
--- a/src/plugin/plugin_redis.rs
+++ b/src/plugin/plugin_redis.rs
@@ -357,7 +357,7 @@
fn after_hook(
_request_id: Option<i64>, span: Box<dyn Any>, _execute_data: &mut ExecuteData,
_return_value: &mut ZVal,
-) -> anyhow::Result<()> {
+) -> crate::Result<()> {
let mut span = span.downcast::<Span>().unwrap();
let ex = unsafe { ZObj::try_from_mut_ptr(eg!(exception)) };
diff --git a/src/request.rs b/src/request.rs
index 63d464e..007a336 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -17,7 +17,7 @@
component::COMPONENT_PHP_ID,
context::RequestContext,
module::SKYWALKING_VERSION,
- util::{catch_unwind_anyhow, get_sapi_module_name, z_val_to_string},
+ util::{catch_unwind_result, get_sapi_module_name, z_val_to_string},
};
use anyhow::{anyhow, Context};
use dashmap::DashMap;
@@ -34,7 +34,7 @@
#[instrument(skip_all)]
pub fn init(_module: ModuleContext) -> bool {
if get_sapi_module_name().to_bytes() == b"fpm-fcgi" {
- if let Err(err) = catch_unwind_anyhow(request_init_for_fpm) {
+ if let Err(err) = catch_unwind_result(request_init_for_fpm) {
error!(mode = "fpm", ?err, "request init failed");
}
}
@@ -44,14 +44,14 @@
#[instrument(skip_all)]
pub fn shutdown(_module: ModuleContext) -> bool {
if get_sapi_module_name().to_bytes() == b"fpm-fcgi" {
- if let Err(err) = catch_unwind_anyhow(request_shutdown_for_fpm) {
+ if let Err(err) = catch_unwind_result(request_shutdown_for_fpm) {
error!(mode = "fpm", ?err, "request shutdown failed");
}
}
true
}
-fn request_init_for_fpm() -> anyhow::Result<()> {
+fn request_init_for_fpm() -> crate::Result<()> {
jit_initialization();
let server = get_page_request_server()?;
@@ -63,7 +63,7 @@
create_request_context(None, header.as_deref(), &method, &uri)
}
-fn request_shutdown_for_fpm() -> anyhow::Result<()> {
+fn request_shutdown_for_fpm() -> crate::Result<()> {
let status_code = unsafe { sg!(sapi_headers).http_response_code };
finish_request_context(None, status_code)
@@ -75,7 +75,7 @@
let jit_initialization: u8 = pg!(auto_globals_jit).into();
if jit_initialization != 0 {
let mut server = "_SERVER".to_string();
- sys::zend_is_auto_global_str(server.as_mut_ptr().cast(), server.len() as sys::size_t);
+ sys::zend_is_auto_global_str(server.as_mut_ptr().cast(), server.len());
}
}
}
@@ -138,7 +138,7 @@
}
let f = unsafe { ZVal::from_mut_ptr(f) };
- let result = catch_unwind_anyhow(AssertUnwindSafe(|| request_init_for_swoole(&mut args[0])));
+ let result = catch_unwind_result(AssertUnwindSafe(|| request_init_for_swoole(&mut args[0])));
if let Err(err) = &result {
error!(mode = "swoole", ?err, "request init failed");
}
@@ -152,7 +152,7 @@
}
if result.is_ok() {
- if let Err(err) = catch_unwind_anyhow(AssertUnwindSafe(move || {
+ if let Err(err) = catch_unwind_result(AssertUnwindSafe(move || {
request_shutdown_for_swoole(&mut args[1])
})) {
error!(mode = "swoole", ?err, "request shutdown failed");
@@ -160,7 +160,7 @@
}
}
-fn request_init_for_swoole(request: &mut ZVal) -> anyhow::Result<()> {
+fn request_init_for_swoole(request: &mut ZVal) -> crate::Result<()> {
let request = request
.as_mut_z_obj()
.context("swoole request isn't object")?;
@@ -189,7 +189,7 @@
create_request_context(Some(fd), header.as_deref(), &method, &uri)
}
-fn request_shutdown_for_swoole(response: &mut ZVal) -> anyhow::Result<()> {
+fn request_shutdown_for_swoole(response: &mut ZVal) -> crate::Result<()> {
let response = response
.as_mut_z_obj()
.context("swoole response isn't object")?;
@@ -236,7 +236,7 @@
fn create_request_context(
request_id: Option<i64>, header: Option<&str>, method: &str, uri: &str,
-) -> anyhow::Result<()> {
+) -> crate::Result<()> {
let propagation = header
.map(decode_propagation)
.transpose()
@@ -268,7 +268,7 @@
Ok(())
}
-fn finish_request_context(request_id: Option<i64>, status_code: i32) -> anyhow::Result<()> {
+fn finish_request_context(request_id: Option<i64>, status_code: i32) -> crate::Result<()> {
let RequestContext {
tracing_context,
mut entry_span,
diff --git a/src/util.rs b/src/util.rs
index 6711ca1..984f5c1 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -13,11 +13,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use anyhow::bail;
+use anyhow::anyhow;
use chrono::Local;
use once_cell::sync::Lazy;
-use phper::{arrays::IterKey, sys, values::ZVal};
-use serde_json::{json, Number, Value};
+use phper::{sys, values::ZVal};
use std::{
ffi::CStr,
panic::{catch_unwind, UnwindSafe},
@@ -93,18 +92,18 @@
.map(|s| s.to_string())
}
-pub fn catch_unwind_anyhow<F: FnOnce() -> anyhow::Result<R> + UnwindSafe, R>(
+pub fn catch_unwind_result<F: FnOnce() -> crate::Result<R> + UnwindSafe, R>(
f: F,
-) -> anyhow::Result<R> {
+) -> crate::Result<R> {
match catch_unwind(f) {
Ok(r) => r,
Err(e) => {
if let Some(s) = e.downcast_ref::<&str>() {
- bail!("paniced: {}", s);
+ Err(anyhow!("paniced: {}", s).into())
} else if let Some(s) = e.downcast_ref::<String>() {
- bail!("paniced: {}", s);
+ Err(anyhow!("paniced: {}", s).into())
} else {
- bail!("paniced");
+ Err(anyhow!("paniced").into())
}
}
}
@@ -114,75 +113,6 @@
unsafe { CStr::from_ptr(sys::sapi_module.name) }
}
-/// Use for later scene.
-#[allow(dead_code)]
-pub fn json_encode_values(values: &[ZVal]) -> serde_json::Result<String> {
- fn add(json_value: &mut Value, key: Option<String>, item: Value) {
- match key {
- Some(key) => {
- json_value.as_object_mut().unwrap().insert(key, item);
- }
- None => {
- json_value.as_array_mut().unwrap().push(item);
- }
- }
- }
-
- fn handle(json_value: &mut Value, key: Option<String>, val: &ZVal) {
- let type_info = val.get_type_info();
-
- if type_info.is_null() {
- add(json_value, key, Value::Null);
- } else if type_info.is_true() {
- add(json_value, key, Value::Bool(true));
- } else if type_info.is_false() {
- add(json_value, key, Value::Bool(false));
- } else if type_info.is_long() {
- let i = val.as_long().unwrap();
- add(json_value, key, Value::Number(i.into()));
- } else if type_info.is_double() {
- let d = val.as_double().unwrap();
- let n = match Number::from_f64(d) {
- Some(n) => Value::Number(n),
- None => Value::String("<NaN>".to_owned()),
- };
- add(json_value, key, n);
- } else if type_info.is_string() {
- let s = val
- .as_z_str()
- .unwrap()
- .to_str()
- .map(ToOwned::to_owned)
- .unwrap_or_default();
- add(json_value, key, Value::String(s));
- } else if type_info.is_array() {
- let arr = val.as_z_arr().unwrap();
- let is_arr = arr.iter().all(|(key, _)| matches!(key, IterKey::Index(_)));
- let mut new_json_value = if is_arr { json!([]) } else { json!({}) };
- for (key, new_val) in arr.iter() {
- if is_arr {
- handle(&mut new_json_value, None, new_val);
- } else {
- let key = match key {
- IterKey::Index(i) => i.to_string(),
- IterKey::ZStr(s) => s.to_str().map(ToOwned::to_owned).unwrap_or_default(),
- };
- handle(&mut new_json_value, Some(key), new_val);
- }
- }
- add(json_value, key, new_json_value);
- } else if type_info.is_object() {
- add(json_value, key, Value::String("<Object>".to_owned()));
- }
- }
-
- let mut json_value = json!([]);
- for val in values {
- handle(&mut json_value, None, val);
- }
- serde_json::to_string(&json_value)
-}
-
pub fn change_permission(f: &str, mode: libc::mode_t) {
let mut path = Vec::with_capacity(f.len() + 1);
path.extend_from_slice(f.as_bytes());
diff --git a/src/worker.rs b/src/worker.rs
index 2a3b6ed..d82674c 100644
--- a/src/worker.rs
+++ b/src/worker.rs
@@ -18,13 +18,13 @@
SKYWALKING_AGENT_WORKER_THREADS,
};
use once_cell::sync::{Lazy, OnceCell};
-use phper::ini::Ini;
+use phper::ini::ini_get;
use skywalking::reporter::{
grpc::{ColletcItemConsume, GrpcReporter},
CollectItem,
};
use std::{
- cmp::Ordering, error::Error, fs, io, num::NonZeroUsize, process::exit,
+ cmp::Ordering, error::Error, ffi::CStr, fs, io, num::NonZeroUsize, process::exit,
thread::available_parallelism, time::Duration,
};
use tokio::{
@@ -44,7 +44,10 @@
static WORKER_PID: OnceCell<libc::pid_t> = OnceCell::new();
pub fn init_worker() {
- let server_addr = Ini::get::<String>(SKYWALKING_AGENT_SERVER_ADDR).unwrap_or_default();
+ let server_addr = ini_get::<Option<&CStr>>(SKYWALKING_AGENT_SERVER_ADDR)
+ .and_then(|s| s.to_str().ok())
+ .unwrap_or_default()
+ .to_owned();
let worker_threads = worker_threads();
unsafe {
@@ -79,7 +82,7 @@
}
fn worker_threads() -> usize {
- let worker_threads = Ini::get::<i64>(SKYWALKING_AGENT_WORKER_THREADS).unwrap_or(0);
+ let worker_threads = ini_get::<i64>(SKYWALKING_AGENT_WORKER_THREADS);
if worker_threads <= 0 {
available_parallelism().map(NonZeroUsize::get).unwrap_or(1)
} else {
