diff --git a/.github/workflows/npm_publish_light.yml b/.github/workflows/npm_publish_dev_light.yml similarity index 100% rename from .github/workflows/npm_publish_light.yml rename to .github/workflows/npm_publish_dev_light.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..9dba2b36 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,110 @@ +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Publishes tagged version to crates.io and to GitHub Packages NPM +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +name: Publish tagged crates and NPMs +on: + push: + tags: + - 'v[0-9]+.[0-9]+.[0-9]' +env: + REGISTRY: "https://npm.pkg.github.com" + SDK_JS_PACKAGE_NAME: "@kindredgroup/cohort_sdk_js" + DIR_SDK_JS: packages/cohort_sdk_js + DIR_SDK_JS_CLIENT: cohort_sdk_client +jobs: + publish: + name: Publish crates + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: stable + - run: scripts/ubuntu-setup.sh + - run: rustup component add rustfmt clippy + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: 16 + check-latest: true + registry-url: "https://npm.pkg.github.com" + + - name: "Extract tag name" + shell: bash + run: |- + echo "VERSION_NAME=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV + + - name: "Publish ${{ env.DIR_SDK_JS }} NPM" + shell: bash + env: + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: |- + currentDir=$(pwd) + cd $DIR_SDK_JS + pwd + ls -l + echo "Current version is" + npm version + npm publish --foreground-scripts + echo "" + + - name: "Publish ${{ env.DIR_SDK_JS_CLIENT }} NPM" + shell: bash + env: + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: |- + currentDir=$(pwd) + cd $DIR_SDK_JS_CLIENT + pwd + ls -l + echo "Current version is" + echo "Updating $SDK_JS_PACKAGE_NAME to $VERSION_NAME" + rm package-lock.json || true + echo "D: npm install $SDK_JS_PACKAGE_NAME@$VERSION_NAME --foreground-scripts" + npm install $SDK_JS_PACKAGE_NAME@$VERSION_NAME --foreground-scripts + npm version + npm publish --foreground-scripts + echo "" + cd $currentDir + + - name: Publish talos_metrics@ ${{ env.VERSION_NAME }} crate + shell: bash + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN_TALOS }} + run: |- + cargo publish -v -p talos_metrics + + - name: Publish talos_suffix@ ${{ env.VERSION_NAME }} crate + shell: bash + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN_TALOS }} + run: |- + cargo publish -v -p talos_suffix + + - name: Publish talos_certifier@ ${{ env.VERSION_NAME }} crate + shell: bash + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN_TALOS }} + run: |- + cargo publish -v -p talos_certifier + + - name: Publish talos_common_utils@ ${{ env.VERSION_NAME }} crate + shell: bash + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN_TALOS }} + run: |- + cargo publish -v -p talos_common_utils + + - name: Publish talos_rdkafka_utils@ ${{ env.VERSION_NAME }} crate + shell: bash + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN_TALOS }} + run: |- + cargo publish -v -p talos_rdkafka_utils + + - name: Publish talos_certifier_adapters@ ${{ env.VERSION_NAME }} crate + shell: bash + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN_TALOS }} + run: |- + cargo publish -v -p talos_certifier_adapters \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index eaa10469..2cd83656 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,7 +19,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent_client" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-channel", "async-trait", @@ -33,16 +33,16 @@ dependencies = [ "strum 0.25.0", "talos_agent", "talos_rdkafka_utils", - "time 0.3.26", + "time", "tokio", "uuid", ] [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -51,21 +51,22 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -93,9 +94,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "arrayvec" @@ -133,18 +134,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -166,9 +167,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -181,7 +182,7 @@ dependencies = [ [[package]] name = "banking_common" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-trait", "deadpool", @@ -198,7 +199,7 @@ dependencies = [ [[package]] name = "banking_replicator" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-trait", "banking_common", @@ -208,7 +209,6 @@ dependencies = [ "env_logger", "futures", "log", - "metrics", "opentelemetry", "opentelemetry_api", "opentelemetry_sdk", @@ -220,6 +220,7 @@ dependencies = [ "talos_certifier", "talos_certifier_adapters", "talos_cohort_replicator", + "talos_metrics", "talos_rdkafka_utils", "tokio", "tokio-postgres", @@ -228,9 +229,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bitflags" @@ -240,9 +241,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitvec" @@ -312,9 +313,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" @@ -340,15 +341,15 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cargo-husky" @@ -373,12 +374,11 @@ dependencies = [ [[package]] name = "certifier_kafka_pg" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "cargo-husky", "env_logger", "log", - "logger", "refinery", "talos_certifier", "talos_certifier_adapters", @@ -396,18 +396,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -451,21 +450,21 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.23" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.23" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstyle", - "clap_lex 0.5.0", + "clap_lex 0.6.0", ] [[package]] @@ -479,13 +478,13 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cohort_banking" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-channel", "async-trait", @@ -494,7 +493,6 @@ dependencies = [ "env_logger", "futures", "log", - "metrics", "opentelemetry", "opentelemetry_api", "opentelemetry_sdk", @@ -508,6 +506,7 @@ dependencies = [ "talos_certifier", "talos_cohort_replicator", "talos_common_utils", + "talos_metrics", "talos_suffix", "tokio", "tokio-postgres", @@ -516,7 +515,7 @@ dependencies = [ [[package]] name = "cohort_banking_with_sdk" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-channel", "async-trait", @@ -527,7 +526,6 @@ dependencies = [ "env_logger", "examples_support", "log", - "metrics", "opentelemetry", "opentelemetry-stdout", "opentelemetry_api", @@ -540,8 +538,9 @@ dependencies = [ "talos_agent", "talos_certifier", "talos_certifier_adapters", + "talos_metrics", "talos_rdkafka_utils", - "time 0.3.26", + "time", "tokio", "tokio-postgres", "uuid", @@ -549,7 +548,7 @@ dependencies = [ [[package]] name = "cohort_replicator_kafka_pg" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-trait", "banking_common", @@ -566,7 +565,7 @@ dependencies = [ "talos_cohort_replicator", "talos_common_utils", "talos_rdkafka_utils", - "time 0.3.26", + "time", "tokio", "tokio-postgres", "uuid", @@ -574,13 +573,12 @@ dependencies = [ [[package]] name = "cohort_sdk" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-trait", "env_logger", "futures", "log", - "metrics", "opentelemetry", "opentelemetry_api", "opentelemetry_sdk", @@ -592,6 +590,7 @@ dependencies = [ "talos_agent", "talos_certifier", "talos_cohort_replicator", + "talos_metrics", "talos_rdkafka_utils", "tokio", "uuid", @@ -599,7 +598,7 @@ dependencies = [ [[package]] name = "cohort_sdk_js" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-trait", "chrono", @@ -623,9 +622,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -647,9 +646,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -689,7 +688,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.3.23", + "clap 4.4.7", "criterion-plot", "is-terminal", "itertools", @@ -771,22 +770,22 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -818,18 +817,21 @@ dependencies = [ [[package]] name = "deadpool-runtime" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" +checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" dependencies = [ "tokio", ] [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "difflib" @@ -893,34 +895,23 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.29" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc978899517288e3ebbd1a3bfc1d9537dbb87eeab149e53ea490e63bcdff561a" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -929,19 +920,19 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "examples_support" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-channel", "async-trait", "deadpool-postgres", "env_logger", "log", - "metrics", "refinery", "rust_decimal", "strum 0.24.1", + "talos_metrics", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-postgres", "uuid", @@ -953,6 +944,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + [[package]] name = "float-cmp" version = "0.9.0" @@ -985,9 +982,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1000,9 +997,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1010,15 +1007,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1027,38 +1024,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1090,14 +1087,14 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "half" @@ -1111,7 +1108,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -1120,14 +1117,14 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1146,9 +1143,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hmac" @@ -1167,16 +1164,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1210,12 +1207,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "rayon", ] @@ -1225,7 +1222,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "rustix", "windows-sys", ] @@ -1262,9 +1259,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -1290,15 +1287,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1314,32 +1311,21 @@ dependencies = [ "value-bag", ] -[[package]] -name = "logger" -version = "0.1.0" -dependencies = [ - "chrono", - "env_logger", - "log", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1352,9 +1338,9 @@ dependencies = [ [[package]] name = "messenger_using_kafka" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "async-trait", "env_logger", "log", @@ -1371,22 +1357,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "metrics" -version = "0.0.1" -dependencies = [ - "env_logger", - "log", - "once_cell", - "opentelemetry", - "opentelemetry-stdout", - "opentelemetry_api", - "opentelemetry_sdk", - "serde", - "serde_json", - "time 0.3.26", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1398,12 +1368,12 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -1436,20 +1406,20 @@ dependencies = [ [[package]] name = "multimap" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631" +checksum = "e1a5d38b9b352dbd913288736af36af41c48d61b1a8cd34bcecd727561b7d511" dependencies = [ "serde", ] [[package]] name = "napi" -version = "2.13.2" +version = "2.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e" +checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "chrono", "ctor", "napi-derive", @@ -1512,9 +1482,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1525,7 +1495,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", ] @@ -1552,9 +1522,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1647,9 +1617,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.9.0" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126d3e6f3926bfb0fb24495b4f4da50626f547e54956594748e3d8882a0320b4" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -1666,9 +1636,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "parking_lot" @@ -1682,9 +1652,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", @@ -1714,14 +1684,14 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1765,9 +1735,9 @@ dependencies = [ [[package]] name = "postgres" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2843af30d9b6dccec9f8779eb50d56cfbec54b38c7b1bbaf50b37d6c8a4f8959" +checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" dependencies = [ "bytes", "fallible-iterator", @@ -1809,6 +1779,12 @@ dependencies = [ "uuid", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1866,9 +1842,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1940,9 +1916,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1950,14 +1926,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1994,18 +1968,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "refinery" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb0436d0dd7bd8d4fce1e828751fa79742b08e35f27cfea7546f8a322b5ef24" +checksum = "529664dbccc0a296947615c997a857912d72d1c44be1fafb7bae54ecfa7a8c24" dependencies = [ "refinery-core", "refinery-macros", @@ -2013,9 +1987,9 @@ dependencies = [ [[package]] name = "refinery-core" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19206547cd047e8f4dfa6b20c30d3ecaf24be05841b6aa0aa926a47a3d0662bb" +checksum = "e895cb870cf06e92318cbbeb701f274d022d5ca87a16fa8244e291cd035ef954" dependencies = [ "async-trait", "cfg-if", @@ -2023,34 +1997,34 @@ dependencies = [ "log", "regex", "serde", - "siphasher", + "siphasher 1.0.0", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-postgres", - "toml 0.7.6", + "toml 0.7.8", "url", "walkdir", ] [[package]] name = "refinery-macros" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94d4b9241859ba19eaa5c04c86e782eb3aa0aae2c5868e0cfa90c856e58a174" +checksum = "123e8b80f8010c3ae38330c81e76938fc7adf6cdbfbaad20295bb8c22718b4f1" dependencies = [ "proc-macro2", "quote", "refinery-core", "regex", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2060,9 +2034,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2071,15 +2045,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rend" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" dependencies = [ "bytecheck", ] @@ -2114,13 +2088,12 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a2ab0025103a60ecaaf3abf24db1db240a4e1c15837090d2c32f625ac98abea" +checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" dependencies = [ "arrayvec", "borsh", - "byteorder", "bytes", "num-traits", "postgres", @@ -2139,11 +2112,11 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -2197,28 +2170,28 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2232,9 +2205,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2243,9 +2216,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -2272,14 +2245,14 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2313,30 +2286,36 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", @@ -2344,10 +2323,11 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -2367,7 +2347,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.25.2", + "strum_macros 0.25.3", ] [[package]] @@ -2385,15 +2365,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2404,15 +2384,15 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" -version = "2.6.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b031320a434d3e9477ccf9b5756d57d4272937b8d22cb88af80b7633a1b78b1" +checksum = "b15df12a8db7c216a04b4b438f90d50d5335cd38f161b56389c9f5c9d96d0873" [[package]] name = "sval_buffer" -version = "2.6.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf7e9412af26b342f3f2cc5cc4122b0105e9d16eb76046cd14ed10106cf6028" +checksum = "57e80556bc8acea0446e574ce542ad6114a76a0237f28a842bc01ca3ea98f479" dependencies = [ "sval", "sval_ref", @@ -2420,18 +2400,18 @@ dependencies = [ [[package]] name = "sval_dynamic" -version = "2.6.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ef628e8a77a46ed3338db8d1b08af77495123cc229453084e47cd716d403cf" +checksum = "9d93d2259edb1d7b4316179f0a98c62e3ffc726f47ab200e07cfe382771f57b8" dependencies = [ "sval", ] [[package]] name = "sval_fmt" -version = "2.6.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dc09e9364c2045ab5fa38f7b04d077b3359d30c4c2b3ec4bae67a358bd64326" +checksum = "532f7f882226f7a5a4656f5151224aaebf8217e0d539cb1595b831bace921343" dependencies = [ "itoa", "ryu", @@ -2440,9 +2420,9 @@ dependencies = [ [[package]] name = "sval_json" -version = "2.6.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada6f627e38cbb8860283649509d87bc4a5771141daa41c78fd31f2b9485888d" +checksum = "76e03bd8aa0ae6ee018f7ae95c9714577687a4415bd1a5f19b26e34695f7e072" dependencies = [ "itoa", "ryu", @@ -2451,18 +2431,18 @@ dependencies = [ [[package]] name = "sval_ref" -version = "2.6.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703ca1942a984bd0d9b5a4c0a65ab8b4b794038d080af4eb303c71bc6bf22d7c" +checksum = "75ed054f2fb8c2a0ab5d36c1ec57b412919700099fc5e32ad8e7a38b23e1a9e1" dependencies = [ "sval", ] [[package]] name = "sval_serde" -version = "2.6.1" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830926cd0581f7c3e5d51efae4d35c6b6fc4db583842652891ba2f1bed8db046" +checksum = "7ff191c4ff05b67e3844c161021427646cde5d6624597958be158357d9200586" dependencies = [ "serde", "sval", @@ -2483,9 +2463,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2494,7 +2474,7 @@ dependencies = [ [[package]] name = "talos_agent" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ "async-trait", "env_logger", @@ -2507,7 +2487,7 @@ dependencies = [ "strum 0.25.0", "talos_rdkafka_utils", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-test", "uuid", @@ -2515,38 +2495,35 @@ dependencies = [ [[package]] name = "talos_certifier" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "async-trait", "cargo-husky", "criterion 0.4.0", "env_logger", "futures-util", "log", - "logger", "serde", "serde_json", "strum 0.24.1", "talos_suffix", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-test", ] [[package]] name = "talos_certifier_adapters" -version = "0.0.1" +version = "0.2.7-dev" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "async-trait", "deadpool-postgres", "env_logger", "futures-util", "log", - "logger", - "metrics", "mockall", "rdkafka", "refinery", @@ -2555,10 +2532,11 @@ dependencies = [ "serial_test", "talos_certifier", "talos_common_utils", + "talos_metrics", "talos_rdkafka_utils", "talos_suffix", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-postgres", "uuid", @@ -2566,12 +2544,12 @@ dependencies = [ [[package]] name = "talos_cohort_replicator" -version = "0.1.0" +version = "0.2.7-dev" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "async-trait", "env_logger", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "mockall", "rand", @@ -2581,14 +2559,14 @@ dependencies = [ "talos_certifier", "talos_suffix", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-test", ] [[package]] name = "talos_common_utils" -version = "0.1.0" +version = "0.2.7-dev" dependencies = [ "env_logger", "log", @@ -2597,14 +2575,14 @@ dependencies = [ [[package]] name = "talos_messenger_actions" -version = "0.1.0" +version = "0.2.7-dev" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "async-trait", "env_logger", "futures-executor", "futures-util", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "mockall", "rand", @@ -2617,21 +2595,21 @@ dependencies = [ "talos_messenger_core", "talos_rdkafka_utils", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-test", ] [[package]] name = "talos_messenger_core" -version = "0.1.0" +version = "0.2.7-dev" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "async-trait", "env_logger", "futures-executor", "futures-util", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "mockall", "rand", @@ -2643,14 +2621,30 @@ dependencies = [ "talos_common_utils", "talos_suffix", "thiserror", - "time 0.3.26", + "time", "tokio", "tokio-test", ] +[[package]] +name = "talos_metrics" +version = "0.2.7-dev" +dependencies = [ + "env_logger", + "log", + "once_cell", + "opentelemetry", + "opentelemetry-stdout", + "opentelemetry_api", + "opentelemetry_sdk", + "serde", + "serde_json", + "time", +] + [[package]] name = "talos_rdkafka_utils" -version = "0.1.0" +version = "0.2.7-dev" dependencies = [ "async-trait", "criterion 0.5.1", @@ -2667,7 +2661,7 @@ dependencies = [ [[package]] name = "talos_suffix" -version = "0.1.0" +version = "0.2.7-dev" dependencies = [ "async-trait", "criterion 0.4.0", @@ -2689,9 +2683,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -2710,43 +2704,33 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "syn 2.0.38", ] [[package]] name = "time" -version = "0.3.26" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2754,15 +2738,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -2794,9 +2778,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -2819,14 +2803,14 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "tokio-postgres" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000387915083ea6406ee44b50ca74813aba799fe682a7689e382bf9e13b74ce9" +checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" dependencies = [ "async-trait", "byteorder", @@ -2861,9 +2845,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -2874,9 +2858,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2897,9 +2881,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -2909,20 +2893,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -2931,11 +2915,10 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2943,29 +2926,29 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" @@ -2975,9 +2958,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -2996,9 +2979,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -3013,9 +2996,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", "serde", @@ -3023,9 +3006,9 @@ dependencies = [ [[package]] name = "value-bag" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -3033,9 +3016,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b9f3feef403a50d4d67e9741a6d8fc688bcbb4e4f31bd4aab72cc690284394" +checksum = "07ba39dc791ecb35baad371a3fc04c6eab688c04937d2e0ac6c22b612c0357bf" dependencies = [ "erased-serde", "serde", @@ -3044,9 +3027,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b24f4146b6f3361e91cbf527d1fb35e9376c3c0cef72ca5ec5af6d640fad7d" +checksum = "c3e06c10810a57bbf45778d023d432a50a1daa7d185991ae06bcfb6c654d0945" dependencies = [ "sval", "sval_buffer", @@ -3071,20 +3054,14 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3112,7 +3089,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3134,7 +3111,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3183,9 +3160,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -3197,10 +3174,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -3273,9 +3250,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.14" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -3288,3 +3265,23 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "zerocopy" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] diff --git a/Cargo.toml b/Cargo.toml index aeb92f68..e5aa3dd7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,3 +22,7 @@ serde_json = "1.0" # Async tokio = { version = "1", features = ["full", "test-util"] } async-trait = "0.1" + +[workspace.metadata.release] +shared-version = true +pre-release-commit-message = "chore(crate): Release {{version}}" diff --git a/cohort_banking_initiator_js/package.json b/cohort_banking_initiator_js/package.json index 341a928b..4378a84c 100644 --- a/cohort_banking_initiator_js/package.json +++ b/cohort_banking_initiator_js/package.json @@ -1,7 +1,7 @@ { "name": "cohort_banking_initiator_js", "author": "Kindredgroup", - "license": "UNLICENSED", + "license": "MIT", "version": "0.0.1", "description": "Cohort Initiator example", "type": "commonjs", diff --git a/cohort_banking_replicator_js/package.json b/cohort_banking_replicator_js/package.json index 31e8450e..dde9b6a7 100644 --- a/cohort_banking_replicator_js/package.json +++ b/cohort_banking_replicator_js/package.json @@ -2,7 +2,7 @@ "name": "cohort_banking_replicator_js", "version": "0.0.1", "author": "Kindred", - "license": "UNLICENSED", + "license": "MIT", "description": "Cohort Replicator example", "type": "commonjs", "main": "dist/main.js", diff --git a/cohort_sdk_client/package-lock.json b/cohort_sdk_client/package-lock.json index 578cb52d..8d16217b 100644 --- a/cohort_sdk_client/package-lock.json +++ b/cohort_sdk_client/package-lock.json @@ -1,12 +1,12 @@ { "name": "@kindredgroup/cohort_sdk_client", - "version": "0.0.1", + "version": "0.2.7-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@kindredgroup/cohort_sdk_client", - "version": "0.0.1", + "version": "0.2.7-dev", "license": "UNLICENSED", "dependencies": { "@kindredgroup/cohort_sdk_js": "^0.0.1", diff --git a/cohort_sdk_client/package.json b/cohort_sdk_client/package.json index a42e63a1..bcf37ce0 100644 --- a/cohort_sdk_client/package.json +++ b/cohort_sdk_client/package.json @@ -1,8 +1,8 @@ { "name": "@kindredgroup/cohort_sdk_client", - "version": "0.0.1", + "version": "0.2.7-dev", "author": "Kindredgroup", - "license": "UNLICENSED", + "license": "MIT", "description": "", "type": "commonjs", "main": "dist/index.js", diff --git a/examples/agent_client/Cargo.toml b/examples/agent_client/Cargo.toml index cdccb907..31a33499 100644 --- a/examples/agent_client/Cargo.toml +++ b/examples/agent_client/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "agent_client" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dev-dependencies] -talos_agent = { path = "../../packages/talos_agent" } -talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils" } -examples_support = { path = "../../packages/examples_support" } +talos_agent = { path = "../../packages/talos_agent", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils", version = "0.2.7-dev" } +examples_support = { path = "../../packages/examples_support", version = "0.2.7-dev" } async-channel = { version = "1.8.0" } async-trait = { workspace = true } @@ -16,9 +16,7 @@ log = { workspace = true } rand = { version = "0.8.5" } rdkafka = { version = "0.34.0", features = ["sasl"] } -#rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] } -#openssl-sys = { version = "0.9", features = ["vendored"] } -#openssl = { version = "0.10", features = ["vendored", "v111"] } + serde = { workspace = true } serde_json = { workspace = true } diff --git a/examples/certifier_kafka_pg/Cargo.toml b/examples/certifier_kafka_pg/Cargo.toml index 950a560c..8ed2ba0e 100644 --- a/examples/certifier_kafka_pg/Cargo.toml +++ b/examples/certifier_kafka_pg/Cargo.toml @@ -1,7 +1,7 @@ [package] # [package] name = "certifier_kafka_pg" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" keywords = ["talos"] description = "Talos Certifier using Kafka and Pg adapters" @@ -17,12 +17,11 @@ tokio = { workspace = true } refinery = { version = "0.8.7", features = ["tokio-postgres"] } # internal crates -logger = { path = "../../packages/logger" } -talos_certifier = { path = "../../packages/talos_certifier" } -talos_suffix = { path = "../../packages/talos_suffix" } -talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters" } -talos_common_utils = { path = "../../packages/talos_common_utils" } -talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils" } +talos_certifier = { path = "../../packages/talos_certifier", version = "0.2.7-dev" } +talos_suffix = { path = "../../packages/talos_suffix", version = "0.2.7-dev" } +talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters", version = "0.2.7-dev" } +talos_common_utils = { path = "../../packages/talos_common_utils", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils", version = "0.2.7-dev" } [dev-dependencies.cargo-husky] version = "1" diff --git a/examples/certifier_kafka_pg/examples/certifier_kafka_pg.rs b/examples/certifier_kafka_pg/examples/certifier_kafka_pg.rs index 5c79ff27..dff50829 100644 --- a/examples/certifier_kafka_pg/examples/certifier_kafka_pg.rs +++ b/examples/certifier_kafka_pg/examples/certifier_kafka_pg.rs @@ -5,8 +5,6 @@ use talos_rdkafka_utils::kafka_config::KafkaConfig; use talos_suffix::core::SuffixConfig; use tokio::signal; -use logger::logs; - struct MockConfig { db_mock: bool, certifier_mock: bool, @@ -14,7 +12,7 @@ struct MockConfig { #[tokio::main] async fn main() -> Result<(), impl std::error::Error> { - logs::init(); + env_logger::builder().format_timestamp_millis().init(); info!("Talos certifier starting..."); diff --git a/examples/cohort_banking_with_sdk/Cargo.toml b/examples/cohort_banking_with_sdk/Cargo.toml index 1fe9fbfb..9bbd8e6d 100644 --- a/examples/cohort_banking_with_sdk/Cargo.toml +++ b/examples/cohort_banking_with_sdk/Cargo.toml @@ -1,19 +1,19 @@ [package] name = "cohort_banking_with_sdk" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dev-dependencies] -banking_common = { path = "../../packages/banking_common" } -cohort_sdk = { path = "../../packages/cohort_sdk" } -cohort_banking = { path = "../../packages/cohort_banking" } -examples_support = { path = "../../packages/examples_support" } -metrics = { path = "../../packages/metrics" } -talos_agent = { path = "../../packages/talos_agent" } -talos_certifier = { path = "../../packages/talos_certifier" } -talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters" } -talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils" } +banking_common = { path = "../../packages/banking_common", version = "0.2.7-dev" } +cohort_sdk = { path = "../../packages/cohort_sdk", version = "0.2.7-dev" } +cohort_banking = { path = "../../packages/cohort_banking", version = "0.2.7-dev" } +examples_support = { path = "../../packages/examples_support", version = "0.2.7-dev" } +talos_metrics = { path = "../../packages/talos_metrics", version = "0.2.7-dev" } +talos_agent = { path = "../../packages/talos_agent", version = "0.2.7-dev" } +talos_certifier = { path = "../../packages/talos_certifier", version = "0.2.7-dev" } +talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils", version = "0.2.7-dev" } async-trait = { workspace = true } env_logger = { workspace = true } @@ -31,11 +31,9 @@ opentelemetry = { version = "0.20.0", features = ["metrics"] } rand = { version = "0.8.5" } rdkafka = { version = "0.34.0", features = ["sasl"] } -#rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] } -#openssl-sys = { version = "0.9", features = ["vendored"] } -#openssl = { version = "0.10", features = ["vendored", "v111"] } + rust_decimal = { version = "1.30.0", features = ["db-tokio-postgres", "serde-with-float"] } time = { version = "0.3.17" } tokio-postgres = { version = "0.7", features = [ "with-uuid-1", "with-serde_json-1" ] } -uuid = { version = "1.4.1", features = ["v4"] } \ No newline at end of file +uuid = { version = "1.4.1", features = ["v4"] } diff --git a/examples/cohort_banking_with_sdk/examples/cohort_banking_with_sdk.rs b/examples/cohort_banking_with_sdk/examples/cohort_banking_with_sdk.rs index b2896fc7..85d57789 100644 --- a/examples/cohort_banking_with_sdk/examples/cohort_banking_with_sdk.rs +++ b/examples/cohort_banking_with_sdk/examples/cohort_banking_with_sdk.rs @@ -9,9 +9,6 @@ use cohort_sdk::model::{BackoffConfig, Config}; use examples_support::load_generator::models::Generator; use examples_support::load_generator::{generator::ControlledRateLoadGenerator, models::StopType}; -use metrics::opentel::aggregation_selector::CustomHistogramSelector; -use metrics::opentel::printer::MetricsToStringPrinter; -use metrics::opentel::scaling::ScalingConfig; use opentelemetry_api::global; use opentelemetry_api::metrics::MetricsError; use opentelemetry_sdk::metrics::reader::DefaultTemporalitySelector; @@ -20,6 +17,9 @@ use opentelemetry_sdk::runtime; use opentelemetry_stdout::MetricsExporterBuilder; use rand::Rng; use rust_decimal::prelude::FromPrimitive; +use talos_metrics::opentel::aggregation_selector::CustomHistogramSelector; +use talos_metrics::opentel::printer::MetricsToStringPrinter; +use talos_metrics::opentel::scaling::ScalingConfig; use talos_rdkafka_utils::kafka_config::KafkaConfig; use tokio::{signal, task::JoinHandle, try_join}; diff --git a/examples/cohort_replicator_kafka_pg/Cargo.toml b/examples/cohort_replicator_kafka_pg/Cargo.toml index d1b65f58..3cd32485 100644 --- a/examples/cohort_replicator_kafka_pg/Cargo.toml +++ b/examples/cohort_replicator_kafka_pg/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "cohort_replicator_kafka_pg" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dev-dependencies] -banking_common = { path = "../../packages/banking_common" } -banking_replicator = { path = "../../packages/banking_replicator" } -cohort_banking = { path = "../../packages/cohort_banking" } -talos_cohort_replicator = { path = "../../packages/talos_cohort_replicator" } -talos_certifier = { path = "../../packages/talos_certifier" } -talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters" } -talos_common_utils = { path = "../../packages/talos_common_utils" } -talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils" } +banking_common = { path = "../../packages/banking_common", version = "0.2.7-dev" } +banking_replicator = { path = "../../packages/banking_replicator", version = "0.2.7-dev" } +cohort_banking = { path = "../../packages/cohort_banking", version = "0.2.7-dev" } +talos_cohort_replicator = { path = "../../packages/talos_cohort_replicator", version = "0.2.7-dev" } +talos_certifier = { path = "../../packages/talos_certifier", version = "0.2.7-dev" } +talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters", version = "0.2.7-dev" } +talos_common_utils = { path = "../../packages/talos_common_utils", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils", version = "0.2.7-dev" } async-trait = { workspace = true } env_logger = { workspace = true } @@ -21,11 +21,8 @@ serde_json = { workspace = true } tokio = { workspace = true, features = ["full"] } rdkafka = { version = "0.34.0", features = ["sasl"] } -#rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] } -#openssl-sys = { version = "0.9", features = ["vendored"] } -#openssl = { version = "0.10", features = ["vendored", "v111"] } rust_decimal = { version = "1.30.0", features = ["db-tokio-postgres", "serde-with-float"] } time = { version = "0.3.17" } tokio-postgres = { version = "0.7", features = [ "with-uuid-1", "with-serde_json-1" ] } -uuid = { version = "1.4.1", features = ["v4"] } \ No newline at end of file +uuid = { version = "1.4.1", features = ["v4"] } diff --git a/examples/messenger_using_kafka/Cargo.toml b/examples/messenger_using_kafka/Cargo.toml index 56a41d87..850e0978 100644 --- a/examples/messenger_using_kafka/Cargo.toml +++ b/examples/messenger_using_kafka/Cargo.toml @@ -1,7 +1,7 @@ [package] # [package] name = "messenger_using_kafka" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" keywords = ["talos"] description = "Example on consuming `talos_messenger`" @@ -24,10 +24,10 @@ rdkafka = { version = "0.34.0", features = ["sasl"] } ahash = "0.8.3" # internal crates -talos_certifier = { path = "../../packages/talos_certifier" } -talos_suffix = { path = "../../packages/talos_suffix" } -talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters" } -talos_common_utils = { path = "../../packages/talos_common_utils" } -talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils" } -talos_messenger_core = { path = "../../packages/talos_messenger_core" } -talos_messenger_actions = { path = "../../packages/talos_messenger_actions" } +talos_certifier = { path = "../../packages/talos_certifier", version = "0.2.7-dev" } +talos_suffix = { path = "../../packages/talos_suffix", version = "0.2.7-dev" } +talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters", version = "0.2.7-dev" } +talos_common_utils = { path = "../../packages/talos_common_utils", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils", version = "0.2.7-dev" } +talos_messenger_core = { path = "../../packages/talos_messenger_core", version = "0.2.7-dev" } +talos_messenger_actions = { path = "../../packages/talos_messenger_actions", version = "0.2.7-dev" } diff --git a/packages/banking_common/Cargo.toml b/packages/banking_common/Cargo.toml index a87f595e..c7bdb84b 100644 --- a/packages/banking_common/Cargo.toml +++ b/packages/banking_common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "banking_common" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dependencies] @@ -19,4 +19,4 @@ tokio-postgres = { version = "0.7", features = [ "with-uuid-1", "with-serde_j deadpool = { version = "0.10.0" } deadpool-postgres = { version = "0.11.0" } -talos_common_utils = { path = "../talos_common_utils" } \ No newline at end of file +talos_common_utils = { path = "../talos_common_utils", version = "0.2.7-dev" } diff --git a/packages/banking_replicator/Cargo.toml b/packages/banking_replicator/Cargo.toml index ecb1b794..6223321b 100644 --- a/packages/banking_replicator/Cargo.toml +++ b/packages/banking_replicator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "banking_replicator" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dependencies] @@ -25,10 +25,10 @@ opentelemetry = { version = "0.20.0" } strum = { version = "0.25", features = ["derive"] } uuid = { version = "1.4.1", features = ["v4"] } -banking_common = { path = "../banking_common" } -cohort_sdk = { path = "../cohort_sdk" } -metrics = { path = "../metrics" } -talos_cohort_replicator = { path = "../talos_cohort_replicator" } -talos_rdkafka_utils = { path = "../talos_rdkafka_utils" } -talos_certifier = { path = "../../packages/talos_certifier" } -talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters" } \ No newline at end of file +banking_common = { path = "../banking_common", version = "0.2.7-dev" } +cohort_sdk = { path = "../cohort_sdk", version = "0.2.7-dev" } +talos_metrics = { path = "../talos_metrics", version = "0.2.7-dev" } +talos_cohort_replicator = { path = "../talos_cohort_replicator", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../talos_rdkafka_utils", version = "0.2.7-dev" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_certifier_adapters = { path = "../talos_certifier_adapters", version = "0.2.7-dev" } diff --git a/packages/cohort_banking/Cargo.toml b/packages/cohort_banking/Cargo.toml index dbf13445..2218e2b7 100644 --- a/packages/cohort_banking/Cargo.toml +++ b/packages/cohort_banking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cohort_banking" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dependencies] @@ -23,11 +23,11 @@ strum = { version = "0.25", features = ["derive"] } tokio-postgres = { version = "0.7", features = [ "with-uuid-1", "with-serde_json-1" ] } uuid = { version = "1.4.1", features = ["v4"] } -cohort_sdk = { path = "../cohort_sdk" } -banking_common = { path = "../banking_common" } -talos_agent = { path = "../talos_agent" } -metrics = { path = "../metrics" } -talos_certifier = { path = "../talos_certifier" } -talos_cohort_replicator = { path = "../talos_cohort_replicator" } -talos_common_utils = { path = "../talos_common_utils" } -talos_suffix = { path = "../talos_suffix" } \ No newline at end of file +cohort_sdk = { path = "../cohort_sdk", version = "0.2.7-dev" } +banking_common = { path = "../banking_common", version = "0.2.7-dev" } +talos_agent = { path = "../talos_agent", version = "0.2.7-dev" } +talos_metrics = { path = "../talos_metrics", version = "0.2.7-dev" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_cohort_replicator = { path = "../talos_cohort_replicator", version = "0.2.7-dev" } +talos_common_utils = { path = "../talos_common_utils", version = "0.2.7-dev" } +talos_suffix = { path = "../talos_suffix", version = "0.2.7-dev" } diff --git a/packages/cohort_banking/src/metrics.rs b/packages/cohort_banking/src/metrics.rs index 8ad8a1ce..6b24c71b 100644 --- a/packages/cohort_banking/src/metrics.rs +++ b/packages/cohort_banking/src/metrics.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, time::Duration}; -use metrics::model::MinMax; +use talos_metrics::model::MinMax; #[derive(Debug, Clone)] pub struct Span { diff --git a/packages/cohort_sdk/Cargo.toml b/packages/cohort_sdk/Cargo.toml index 13cfa937..4cf8057f 100644 --- a/packages/cohort_sdk/Cargo.toml +++ b/packages/cohort_sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cohort_sdk" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dependencies] @@ -15,19 +15,15 @@ opentelemetry = { version = "0.20.0" } rand = { version = "0.8.5" } rdkafka = { version = "0.34.0", features = ["sasl"] } -#rdkafka-sys = { version = "4.6.0" } -#rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] } -#openssl-sys = { version = "0.9", features = ["vendored"] } -#openssl = { version = "0.10", features = ["vendored", "v111"] } serde = { workspace = true } serde_json = { workspace = true } strum = { version = "0.25", features = ["derive"] } -metrics = { path = "../metrics" } -talos_agent = { path = "../talos_agent" } -talos_certifier = { path = "../talos_certifier" } -talos_cohort_replicator = { path = "../talos_cohort_replicator" } -talos_rdkafka_utils = { path = "../talos_rdkafka_utils" } +talos_metrics = { path = "../talos_metrics", version = "0.2.7-dev" } +talos_agent = { path = "../talos_agent", version = "0.2.7-dev" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_cohort_replicator = { path = "../talos_cohort_replicator", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../talos_rdkafka_utils", version = "0.2.7-dev" } uuid = { version = "1.4.1", features = ["v4"] } tokio = { workspace = true, features = ["full"] } diff --git a/packages/cohort_sdk_js/Cargo.toml b/packages/cohort_sdk_js/Cargo.toml index 319371e6..6ce0178c 100644 --- a/packages/cohort_sdk_js/Cargo.toml +++ b/packages/cohort_sdk_js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cohort_sdk_js" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" @@ -33,12 +33,12 @@ env_logger = { workspace = true } log = { workspace = true } tokio = { workspace = true, features = ["full"] } -cohort_sdk = { path = "../cohort_sdk" } -talos_agent = { path = "../talos_agent" } -talos_cohort_replicator = { path = "../talos_cohort_replicator" } -talos_certifier = { path = "../talos_certifier" } -talos_certifier_adapters = { path = "../talos_certifier_adapters" } -talos_rdkafka_utils = { path = "../talos_rdkafka_utils" } +cohort_sdk = { path = "../cohort_sdk", version = "0.2.7-dev" } +talos_agent = { path = "../talos_agent", version = "0.2.7-dev" } +talos_cohort_replicator = { path = "../talos_cohort_replicator", version = "0.2.7-dev" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_certifier_adapters = { path = "../talos_certifier_adapters", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../talos_rdkafka_utils", version = "0.2.7-dev" } async-trait = "0.1.72" diff --git a/packages/cohort_sdk_js/npm/darwin-arm64/package.json b/packages/cohort_sdk_js/npm/darwin-arm64/package.json index 7a348eca..a187f851 100644 --- a/packages/cohort_sdk_js/npm/darwin-arm64/package.json +++ b/packages/cohort_sdk_js/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "cohort_sdk_js-darwin-arm64", - "version": "0.0.27", + "version": "0.2.7-dev", "os": [ "darwin" ], diff --git a/packages/cohort_sdk_js/npm/darwin-universal/package.json b/packages/cohort_sdk_js/npm/darwin-universal/package.json index 79d10d0f..10103529 100644 --- a/packages/cohort_sdk_js/npm/darwin-universal/package.json +++ b/packages/cohort_sdk_js/npm/darwin-universal/package.json @@ -1,6 +1,6 @@ { "name": "cohort_sdk_js-darwin-universal", - "version": "0.0.27", + "version": "0.2.7-dev", "os": [ "darwin" ], diff --git a/packages/cohort_sdk_js/npm/darwin-x64/package.json b/packages/cohort_sdk_js/npm/darwin-x64/package.json index e61fa014..3c677d7d 100644 --- a/packages/cohort_sdk_js/npm/darwin-x64/package.json +++ b/packages/cohort_sdk_js/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "cohort_sdk_js-darwin-x64", - "version": "0.0.27", + "version": "0.2.7-dev", "os": [ "darwin" ], diff --git a/packages/cohort_sdk_js/npm/linux-x64-gnu/package.json b/packages/cohort_sdk_js/npm/linux-x64-gnu/package.json index 62441e19..dcfdd13e 100644 --- a/packages/cohort_sdk_js/npm/linux-x64-gnu/package.json +++ b/packages/cohort_sdk_js/npm/linux-x64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "cohort_sdk_js-linux-x64", - "version": "0.0.27", + "version": "0.2.7-dev", "os": [ "linux" ], diff --git a/packages/cohort_sdk_js/npm/win32-x64-msvc/package.json b/packages/cohort_sdk_js/npm/win32-x64-msvc/package.json index 9adfe222..87c5bc10 100644 --- a/packages/cohort_sdk_js/npm/win32-x64-msvc/package.json +++ b/packages/cohort_sdk_js/npm/win32-x64-msvc/package.json @@ -1,6 +1,6 @@ { "name": "cohort_sdk_js-win32-x64-msvc", - "version": "0.0.27", + "version": "0.2.7-dev", "os": [ "win32" ], diff --git a/packages/cohort_sdk_js/package-lock.json b/packages/cohort_sdk_js/package-lock.json index 7c7f57ec..e9f4608e 100644 --- a/packages/cohort_sdk_js/package-lock.json +++ b/packages/cohort_sdk_js/package-lock.json @@ -1,12 +1,12 @@ { "name": "cohort_sdk_js", - "version": "0.0.27", + "version": "0.2.7-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cohort_sdk_js", - "version": "0.0.27", + "version": "0.2.7-dev", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/packages/cohort_sdk_js/package.json b/packages/cohort_sdk_js/package.json index c97f1b14..fc66317e 100644 --- a/packages/cohort_sdk_js/package.json +++ b/packages/cohort_sdk_js/package.json @@ -1,8 +1,8 @@ { "name": "@kindredgroup/cohort_sdk_js", - "version": "0.0.1", + "version": "0.2.7-dev", "author": "Kindredgroup", - "license": "UNLICENSED", + "license": "MIT", "main": "index.js", "types": "index.d.ts", "napi": { diff --git a/packages/cohort_sdk_js/scripts/bundle-talos.sh b/packages/cohort_sdk_js/scripts/bundle-talos.sh index bb0ec34e..eaad0e5f 100755 --- a/packages/cohort_sdk_js/scripts/bundle-talos.sh +++ b/packages/cohort_sdk_js/scripts/bundle-talos.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - Copies all talos sources into TARGET_DIR (default to dist/talos) # - Modifies Cargo.toml workspace file to include only packages/*. diff --git a/packages/cohort_sdk_js/scripts/postinstall.sh b/packages/cohort_sdk_js/scripts/postinstall.sh index 9d82a685..14327d96 100755 --- a/packages/cohort_sdk_js/scripts/postinstall.sh +++ b/packages/cohort_sdk_js/scripts/postinstall.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - Invoked after this module is installed as dependency into node_modules/ # - The content of node_modules/cohort_sdk_js/ will have everything under dist/ diff --git a/packages/examples_support/Cargo.toml b/packages/examples_support/Cargo.toml index 77ae3b0f..d6aa8691 100644 --- a/packages/examples_support/Cargo.toml +++ b/packages/examples_support/Cargo.toml @@ -1,12 +1,11 @@ [package] name = "examples_support" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dependencies] -# cohort = { path = "../cohort" } -metrics = { path = "../metrics" } +talos_metrics = { path = "../talos_metrics", version = "0.2.7-dev" } # Postgres refinery = { version = "0.8.7", features = ["tokio-postgres"] } @@ -26,6 +25,6 @@ rust_decimal = { version = "1.30.0", features = [ "serde-with-float", ] } thiserror = { version = "1.0.31" } -time = { version = "0.3.17" } +time = { version = "0.3.30" } tokio = { workspace = true, features = ["full"] } uuid = { version = "1.4.1", features = ["v4"] } diff --git a/packages/logger/Cargo.toml b/packages/logger/Cargo.toml deleted file mode 100644 index 5e4149b4..00000000 --- a/packages/logger/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "logger" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -serde = { workspace = true } -serde_json = { workspace = true } -# Logging -log = { workspace = true } -env_logger = { workspace = true } - -# Error -thiserror = "1.0.31" - -# Date Time -chrono = { version = "0.4", features = ["serde"] } diff --git a/packages/logger/src/lib.rs b/packages/logger/src/lib.rs deleted file mode 100644 index af2c2c34..00000000 --- a/packages/logger/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod logs; diff --git a/packages/logger/src/logs.rs b/packages/logger/src/logs.rs deleted file mode 100644 index 9f686e8c..00000000 --- a/packages/logger/src/logs.rs +++ /dev/null @@ -1,166 +0,0 @@ -use chrono::{SecondsFormat, Utc}; -use env_logger::fmt::Formatter; -use log::{kv, Level, Record}; -use serde::Serialize; -use std::io::Write; - -pub trait SerdeLogging { - fn as_json_str(&self) -> String; -} - -impl SerdeLogging for T { - #[cfg(debug_assertions)] - fn as_json_str(&self) -> String { - serde_json::to_string_pretty(self).unwrap_or_else(|_| "{}".to_owned()) - } - - #[cfg(not(debug_assertions))] - fn as_json_str(&self) -> String { - serde_json::to_string(self).unwrap_or_else(|_| "{}".to_owned()) - } -} - -fn level_to_str(level: Level) -> &'static str { - match level { - Level::Error => "Error", - Level::Debug => "Debug", - Level::Info => "Info", - Level::Warn => "Warn", - Level::Trace => "Trace", - } -} - -fn log_params<'a>(record: &'a Record) -> (&'static str, String, &'a str, &'a str, u32) { - let severity = level_to_str(record.metadata().level()); - let date = Utc::now().to_rfc3339_opts(SecondsFormat::Millis, true); - let module_path = record.module_path().unwrap_or_default(); - let file = record.file().unwrap_or_default(); - let line = record.line().unwrap_or_default(); - (severity, date, module_path, file, line) -} - -#[cfg(any(test, debug_assertions))] -fn write_debug(f: &mut Formatter, record: &log::Record) -> std::io::Result<()> { - use env_logger::fmt::Color; - - struct LogVisitor<'a, W: Write> { - writer: &'a mut W, - } - impl<'kvs, 'a, W: Write> kv::Visitor<'kvs> for LogVisitor<'a, W> { - fn visit_pair(&mut self, key: kv::Key<'kvs>, val: kv::Value<'kvs>) -> Result<(), kv::Error> { - write!(self.writer, "\n{} {}", key, val).unwrap(); - Ok(()) - } - } - - // let project_dir = env!("CARGO_MANIFEST_DIR"); - let (severity, date, module_path, file, line) = log_params(record); - // #[rustfmt::skip] - - let mut level_style = f.default_level_style(record.level()); - level_style.set_bold(true); - - let mut general_style = f.style(); - general_style.set_color(Color::Rgb(33, 33, 33)); - - let mut module_style = f.style(); - module_style.set_color(Color::Yellow); - - write!( - f, - "{} {:5} {} ({}:{}) {}", - general_style.value(date), - level_style.value(severity), - module_style.value(module_path), - general_style.value(file), - general_style.value(line), - record.args() - )?; - // key / value pairs - let mut visitor = LogVisitor { writer: f }; - record.key_values().visit(&mut visitor).unwrap(); - writeln!(f) -} - -#[cfg(debug_assertions)] -pub fn init() { - env_logger::builder().format(write_debug).init(); -} - -#[cfg(any(test, not(debug_assertions)))] -fn write_json(f: &mut F, record: &log::Record) -> std::io::Result<()> { - struct LogVisitor<'a, W: Write> { - writer: &'a mut W, - } - impl<'kvs, 'a, W: Write> kv::Visitor<'kvs> for LogVisitor<'a, W> { - fn visit_pair(&mut self, key: kv::Key<'kvs>, val: kv::Value<'kvs>) -> Result<(), kv::Error> { - let vs = val.to_borrowed_str().unwrap_or_default(); - if serde_json::from_str::(vs).is_ok() { - write!(self.writer, ",\"{}\":{}", key, val).unwrap(); - } else { - write!(self.writer, ",\"{}\":\"{}\"", key, val).unwrap(); - } - Ok(()) - } - } - - let (severity, date, module_path, file, line) = log_params(record); - #[rustfmt::skip] - write!(f, r#"{{"date":"{}","severity":"{}","message":"{}","className":"{}","file":"{}","line":{}"#, date, severity, record.args(), module_path, file, line)?; - // key / value pairs - let mut visitor = LogVisitor { writer: f }; - record.key_values().visit(&mut visitor).unwrap(); - writeln!(f, "}}") -} - -#[cfg(not(debug_assertions))] -pub fn init() { - env_logger::builder().format(write_json).init(); -} - -#[cfg(test)] -mod tests { - use super::*; - use serde_json::json; - - // #[test] - // fn test_write_debug() { - // let kvs = vec![("key1", "val1"), ("key2", "val2")]; - // let record = log::Record::builder() - // .args(format_args!("hello")) - // .level(log::Level::Info) - // .module_path(Some("foo::bar")) - // .file(Some("src/file1.rs")) - // .line(Some(12)) - // .key_values(&kvs) - // .build(); - // let mut buf = Vec::new(); - // write_debug(&mut buf, &record).unwrap(); - // let output = std::str::from_utf8(&buf); - // assert!(output.is_ok()) - // } - - #[test] - fn test_write_json() { - let kvs = vec![("key1", "val1"), ("key2", "{\"foo\":12}")]; - let record = log::Record::builder() - .args(format_args!("hello")) - .level(log::Level::Info) - .module_path(Some("foo::bar")) - .file(Some("src/file1.rs")) - .line(Some(12)) - .key_values(&kvs) - .build(); - let mut buf = Vec::new(); - write_json(&mut buf, &record).unwrap(); - let output = std::str::from_utf8(&buf).unwrap(); - let json: serde_json::Value = serde_json::from_str(output).unwrap(); - assert_eq!(json["severity"], "Info"); - assert_eq!(json["message"], "hello"); - assert_eq!(json["className"], "foo::bar"); - assert_eq!(json["file"], "src/file1.rs"); - assert_eq!(json["line"], json!(12)); - assert_eq!(json["key1"], "val1"); - assert_eq!(json["key2"], json!({"foo":12})); - } -} diff --git a/packages/talos_agent/Cargo.toml b/packages/talos_agent/Cargo.toml index f2a3a28a..f918bd0f 100644 --- a/packages/talos_agent/Cargo.toml +++ b/packages/talos_agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "talos_agent" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" [dependencies] @@ -9,13 +9,7 @@ async-trait = { workspace = true } env_logger = { workspace = true } log = { workspace = true } multimap = { version = "0.9.0" } - -rdkafka = { version = "0.34.0", features = ["sasl"] } -#rdkafka-sys = { version = "4.6.0" } -#rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] } -#openssl-sys = { version = "0.9", features = ["vendored"] } -#openssl = { version = "0.10", features = ["vendored", "v111"] } - +rdkafka = { version = "0.34.0", features = ["sasl"] } serde = { workspace = true } serde_json = { workspace = true } strum = { version = "0.25", features = ["derive"] } @@ -24,7 +18,7 @@ time = { version = "0.3.17" } tokio = { workspace = true, features = ["full"] } uuid = { version = "1.4.1", features = ["v4"] } -talos_rdkafka_utils = { path = "../talos_rdkafka_utils" } +talos_rdkafka_utils = { path = "../talos_rdkafka_utils", version = "0.2.7-dev" } [dev-dependencies] mockall = { version = "0.11.3" } diff --git a/packages/talos_certifier/Cargo.toml b/packages/talos_certifier/Cargo.toml index 2991df12..68db6d16 100644 --- a/packages/talos_certifier/Cargo.toml +++ b/packages/talos_certifier/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "talos_certifier" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" keywords = ["talos"] +license = "MIT" +homepage = "https://github.com/kindredgroup/talos" +repository = "https://github.com/kindredgroup/talos" +readme = "README.md" description = "Talos is based on the STRIDE algorithm for strict serializable certification of distributed transactions" [dependencies] @@ -25,15 +29,13 @@ async-trait = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -time = { version = "0.3.17" } +time = { version = "0.3.30", features = ["formatting"]} # Error thiserror = "1.0.31" # internal crates -talos_suffix = { path = "../talos_suffix" } -logger = { path = "../logger" } - +talos_suffix = { path = "../talos_suffix", version = "0.2.7-dev" } [dev-dependencies] tokio-test = "0.4" diff --git a/packages/talos_certifier/README.md b/packages/talos_certifier/README.md new file mode 100644 index 00000000..52ebcb4d --- /dev/null +++ b/packages/talos_certifier/README.md @@ -0,0 +1,2 @@ +# Talos Certifier Core +Read more on the home page: https://github.com/kindredgroup/talos \ No newline at end of file diff --git a/packages/talos_certifier/src/config.rs b/packages/talos_certifier/src/config.rs index d0cdf0e9..a3df9ba1 100644 --- a/packages/talos_certifier/src/config.rs +++ b/packages/talos_certifier/src/config.rs @@ -1,5 +1,4 @@ -use log::{debug, trace}; -use logger::logs::SerdeLogging; +use log::debug; use serde::{Deserialize, Serialize}; use std::env; use std::fmt::Debug; @@ -74,7 +73,7 @@ impl Config { pg_database: var("PG_DATABASE"), }; - trace!(config = config.as_json_str(); "Config loaded from environment variables" ); + log::debug!("Config loaded from environment variables: {:?}", config); config } diff --git a/packages/talos_certifier_adapters/Cargo.toml b/packages/talos_certifier_adapters/Cargo.toml index 0a6a6723..314faf05 100644 --- a/packages/talos_certifier_adapters/Cargo.toml +++ b/packages/talos_certifier_adapters/Cargo.toml @@ -1,9 +1,13 @@ [package] # [package] name = "talos_certifier_adapters" -version = "0.0.1" +version = "0.2.7-dev" edition = "2021" keywords = ["talos", "adapters"] +license = "MIT" +homepage = "https://github.com/kindredgroup/talos" +repository = "https://github.com/kindredgroup/talos" +readme = "README.md" description = "Adapters used in Talos Certifier" [dependencies] @@ -21,10 +25,6 @@ async-trait = { workspace = true } futures-util = "0.3.21" # Kafka rdkafka = { version = "0.34.0", features = ["sasl"] } -#rdkafka-sys = { version = "4.6.0" } -#rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] } -#openssl-sys = { version = "0.9", features = ["vendored"] } -#openssl = { version = "0.10", features = ["vendored", "v111"] } # Ahash hashmap ahash = "0.8.3" @@ -39,7 +39,7 @@ tokio-postgres = { version = "0.7", features = [ deadpool-postgres = "0.11.0" refinery = { version = "0.8.7", features = ["tokio-postgres"] } -time = { version = "0.3.17" } +time = { version = "0.3.30" } # Error thiserror = "1.0.31" @@ -48,12 +48,11 @@ thiserror = "1.0.31" mockall = "0.11.0" # internal crates -logger = { path = "../logger" } -metrics = { path = "../metrics" } -talos_certifier = { path = "../talos_certifier" } -talos_suffix = { path = "../talos_suffix" } -talos_common_utils = { path = "../talos_common_utils" } -talos_rdkafka_utils = { path = "../talos_rdkafka_utils" } +talos_metrics = { path = "../talos_metrics", version = "0.2.7-dev" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_suffix = { path = "../talos_suffix", version = "0.2.7-dev" } +talos_common_utils = { path = "../talos_common_utils", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../talos_rdkafka_utils", version = "0.2.7-dev" } [dev-dependencies] diff --git a/packages/talos_certifier_adapters/README.md b/packages/talos_certifier_adapters/README.md new file mode 100644 index 00000000..09efd3a1 --- /dev/null +++ b/packages/talos_certifier_adapters/README.md @@ -0,0 +1,2 @@ +# Adapters for Talos +Read more on the home page: https://github.com/kindredgroup/talos \ No newline at end of file diff --git a/packages/talos_certifier_adapters/src/bin/histogram_decision_timeline_from_kafka.rs b/packages/talos_certifier_adapters/src/bin/histogram_decision_timeline_from_kafka.rs index dbf56d60..8def214c 100644 --- a/packages/talos_certifier_adapters/src/bin/histogram_decision_timeline_from_kafka.rs +++ b/packages/talos_certifier_adapters/src/bin/histogram_decision_timeline_from_kafka.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, time::Duration}; -use metrics::model::MinMax; use talos_certifier::{model::metrics::TxProcessingTimeline, ports::MessageReciever, ChannelMessage}; use talos_certifier_adapters::KafkaConsumer; +use talos_metrics::model::MinMax; use talos_rdkafka_utils::kafka_config::KafkaConfig; use time::OffsetDateTime; use tokio::time::timeout; diff --git a/packages/talos_cohort_replicator/Cargo.toml b/packages/talos_cohort_replicator/Cargo.toml index 28bb389c..7bc813a5 100644 --- a/packages/talos_cohort_replicator/Cargo.toml +++ b/packages/talos_cohort_replicator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "talos_cohort_replicator" -version = "0.1.0" +version = "0.2.7-dev" edition = "2021" [lib] @@ -26,10 +26,10 @@ time = { version = "0.3.17" } indexmap = { version = "2.0.0", features = ["rayon"]} ahash = "0.8.3" -talos_certifier = { path = "../talos_certifier" } -talos_suffix = { path = "../talos_suffix" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_suffix = { path = "../talos_suffix", version = "0.2.7-dev" } [dev-dependencies] mockall = { version = "0.11.3" } tokio-test = { version = "0.4.2" } -rand = { version = "0.8.5" } \ No newline at end of file +rand = { version = "0.8.5" } diff --git a/packages/talos_common_utils/Cargo.toml b/packages/talos_common_utils/Cargo.toml index 94413e14..2cec4fb3 100644 --- a/packages/talos_common_utils/Cargo.toml +++ b/packages/talos_common_utils/Cargo.toml @@ -1,7 +1,12 @@ [package] name = "talos_common_utils" -version = "0.1.0" +version = "0.2.7-dev" edition = "2021" +license = "MIT" +homepage = "https://github.com/kindredgroup/talos" +repository = "https://github.com/kindredgroup/talos" +readme = "README.md" +description = "Common utilities used in Talos" [lib] doctest = false @@ -13,4 +18,4 @@ log = { workspace = true } env_logger = { workspace = true } [dev-dependencies] -serial_test = "2.0.0" \ No newline at end of file +serial_test = "2.0.0" diff --git a/packages/talos_common_utils/README.md b/packages/talos_common_utils/README.md new file mode 100644 index 00000000..78946ad0 --- /dev/null +++ b/packages/talos_common_utils/README.md @@ -0,0 +1,2 @@ +# Common utilities for Talos Certifier crate +Read more on the home page: https://github.com/kindredgroup/talos \ No newline at end of file diff --git a/packages/talos_messenger_actions/Cargo.toml b/packages/talos_messenger_actions/Cargo.toml index 2de8863f..8cf78062 100644 --- a/packages/talos_messenger_actions/Cargo.toml +++ b/packages/talos_messenger_actions/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "talos_messenger_actions" -version = "0.1.0" +version = "0.2.7-dev" edition = "2021" [lib] @@ -29,16 +29,16 @@ thiserror = { version = "1.0.31" } rdkafka = { version = "0.34.0", features = ["sasl"] } # Time -time = { version = "0.3.17" } +time = { version = "0.3.30" } # indexmap indexmap = { version = "2.0.0", features = ["rayon"] } ahash = "0.8.3" -talos_certifier = { path = "../talos_certifier" } -talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters" } -talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils" } -talos_messenger_core = { path = "../../packages/talos_messenger_core" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_certifier_adapters = { path = "../../packages/talos_certifier_adapters", version = "0.2.7-dev" } +talos_rdkafka_utils = { path = "../../packages/talos_rdkafka_utils", version = "0.2.7-dev" } +talos_messenger_core = { path = "../../packages/talos_messenger_core", version = "0.2.7-dev" } [dev-dependencies] mockall = { version = "0.11.3" } diff --git a/packages/talos_messenger_core/Cargo.toml b/packages/talos_messenger_core/Cargo.toml index e149ed37..e4b2adad 100644 --- a/packages/talos_messenger_core/Cargo.toml +++ b/packages/talos_messenger_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "talos_messenger_core" -version = "0.1.0" +version = "0.2.7-dev" edition = "2021" [lib] @@ -29,15 +29,15 @@ thiserror = { version = "1.0.31" } rdkafka = { version = "0.34.0", features = ["sasl"] } # Time -time = { version = "0.3.17" } +time = { version = "0.3.30" } # indexmap indexmap = { version = "2.0.0", features = ["rayon"] } ahash = "0.8.3" -talos_certifier = { path = "../talos_certifier" } -talos_suffix = { path = "../talos_suffix" } -talos_common_utils = { path = "../../packages/talos_common_utils" } +talos_certifier = { path = "../talos_certifier", version = "0.2.7-dev" } +talos_suffix = { path = "../talos_suffix", version = "0.2.7-dev" } +talos_common_utils = { path = "../../packages/talos_common_utils", version = "0.2.7-dev" } [dev-dependencies] mockall = { version = "0.11.3" } diff --git a/packages/metrics/Cargo.toml b/packages/talos_metrics/Cargo.toml similarity index 73% rename from packages/metrics/Cargo.toml rename to packages/talos_metrics/Cargo.toml index 348e4f2b..ac2ce41b 100644 --- a/packages/metrics/Cargo.toml +++ b/packages/talos_metrics/Cargo.toml @@ -1,7 +1,12 @@ [package] -name = "metrics" -version = "0.0.1" +name = "talos_metrics" +version = "0.2.7-dev" edition = "2021" +license = "MIT" +homepage = "https://github.com/kindredgroup/talos" +repository = "https://github.com/kindredgroup/talos" +readme = "README.md" +description = "Metric utilities used in Talos" [dependencies] diff --git a/packages/talos_metrics/README.md b/packages/talos_metrics/README.md new file mode 100644 index 00000000..9793f5f6 --- /dev/null +++ b/packages/talos_metrics/README.md @@ -0,0 +1,2 @@ +# Metric utilities for Talos Certifier project +Read more on the home page: https://github.com/kindredgroup/talos \ No newline at end of file diff --git a/packages/metrics/src/lib.rs b/packages/talos_metrics/src/lib.rs similarity index 100% rename from packages/metrics/src/lib.rs rename to packages/talos_metrics/src/lib.rs diff --git a/packages/metrics/src/model.rs b/packages/talos_metrics/src/model.rs similarity index 100% rename from packages/metrics/src/model.rs rename to packages/talos_metrics/src/model.rs diff --git a/packages/metrics/src/opentel/aggregation_selector.rs b/packages/talos_metrics/src/opentel/aggregation_selector.rs similarity index 100% rename from packages/metrics/src/opentel/aggregation_selector.rs rename to packages/talos_metrics/src/opentel/aggregation_selector.rs diff --git a/packages/metrics/src/opentel/buckets.rs b/packages/talos_metrics/src/opentel/buckets.rs similarity index 100% rename from packages/metrics/src/opentel/buckets.rs rename to packages/talos_metrics/src/opentel/buckets.rs diff --git a/packages/metrics/src/opentel/mod.rs b/packages/talos_metrics/src/opentel/mod.rs similarity index 100% rename from packages/metrics/src/opentel/mod.rs rename to packages/talos_metrics/src/opentel/mod.rs diff --git a/packages/metrics/src/opentel/model.rs b/packages/talos_metrics/src/opentel/model.rs similarity index 100% rename from packages/metrics/src/opentel/model.rs rename to packages/talos_metrics/src/opentel/model.rs diff --git a/packages/metrics/src/opentel/printer.rs b/packages/talos_metrics/src/opentel/printer.rs similarity index 100% rename from packages/metrics/src/opentel/printer.rs rename to packages/talos_metrics/src/opentel/printer.rs diff --git a/packages/metrics/src/opentel/scaling.rs b/packages/talos_metrics/src/opentel/scaling.rs similarity index 100% rename from packages/metrics/src/opentel/scaling.rs rename to packages/talos_metrics/src/opentel/scaling.rs diff --git a/packages/talos_rdkafka_utils/Cargo.toml b/packages/talos_rdkafka_utils/Cargo.toml index 142d33bd..4ef54736 100644 --- a/packages/talos_rdkafka_utils/Cargo.toml +++ b/packages/talos_rdkafka_utils/Cargo.toml @@ -1,7 +1,12 @@ [package] name = "talos_rdkafka_utils" -version = "0.1.0" +version = "0.2.7-dev" edition = "2021" +license = "MIT" +homepage = "https://github.com/kindredgroup/talos" +repository = "https://github.com/kindredgroup/talos" +readme = "README.md" +description = "RD Kafka utilities used in Talos" [lib] doctest = false @@ -10,7 +15,7 @@ doctest = false [dependencies] async-trait = { workspace = true } tokio = { workspace = true, features = ["macros", "rt"] } -talos_common_utils = { path = "../talos_common_utils" } +talos_common_utils = { path = "../talos_common_utils", version = "0.2.7-dev" } # Logging log = { workspace = true } env_logger = { workspace = true } @@ -22,11 +27,8 @@ mockall = "0.11.0" thiserror = "1.0.31" rdkafka = { version = "0.34.0", features = ["sasl"] } -#rdkafka-sys = { version = "4.6.0" } -#openssl-sys = { version = "0.9", features = ["vendored"] } -#openssl = { version = "0.10", features = ["vendored", "v111"] } [dev-dependencies] tokio-test = "0.4" criterion = "0.5.1" -serial_test = "2.0.0" \ No newline at end of file +serial_test = "2.0.0" diff --git a/packages/talos_rdkafka_utils/README.md b/packages/talos_rdkafka_utils/README.md new file mode 100644 index 00000000..c0bef34a --- /dev/null +++ b/packages/talos_rdkafka_utils/README.md @@ -0,0 +1,2 @@ +# RD Kafka utilities for Talos +Read more on the home page: https://github.com/kindredgroup/talos \ No newline at end of file diff --git a/packages/talos_suffix/Cargo.toml b/packages/talos_suffix/Cargo.toml index 652e11fb..869e97b8 100644 --- a/packages/talos_suffix/Cargo.toml +++ b/packages/talos_suffix/Cargo.toml @@ -1,7 +1,12 @@ [package] name = "talos_suffix" -version = "0.1.0" +version = "0.2.7-dev" edition = "2021" +license = "MIT" +homepage = "https://github.com/kindredgroup/talos" +repository = "https://github.com/kindredgroup/talos" +readme = "README.md" +description = "Suffix implementations for Talos Certifier and Replicator" [lib] doctest = false diff --git a/packages/talos_suffix/README.md b/packages/talos_suffix/README.md new file mode 100644 index 00000000..834d85e4 --- /dev/null +++ b/packages/talos_suffix/README.md @@ -0,0 +1,2 @@ +# Suffix implementations for Talos +Read more on the home page: https://github.com/kindredgroup/talos \ No newline at end of file diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 00000000..c9dc2391 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,201 @@ +#!/bin/sh +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# This script will collect some input from user and proceed with bumping versions +# in crates and libraries, setting up tag and finally bumping versions again. +# +# The following is collected from user: +# - new version +# - the next version +# +# The new tag will look like this: "v${newVersion}". +# +# Changes to Cargo.toml files will be comitted. +# +# Script will not proceed if project is not clean, not on "master" branch or +# current master differs from remote master. +# +# Preprequisites: +# Before running this script make sure "cargo-release" software in installed: +# https://github.com/crate-ci/cargo-release +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +line="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -" + +WORK_STATUS=$(git status --porcelain) +if [ "${WORK_STATUS}" != "" ]; +then + echo $line + echo "Working directory must be clean. Currently it contains some changes!" + echo $WORK_STATUS + echo $line + exit 1 +fi + +# Are we allowed to execute this script on the branch other than master? +ALLOW_BRANCH="n" +for param in $1 +do + case "$param" in + "--allow-branch") + ALLOW_BRANCH="yes" + echo "Execution of this script on non-master branch is allowed" + ;; + esac +done +CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) + +if [ "$ALLOW_BRANCH" == "n" ]; +then + + if [ "${CURRENT_BRANCH}" != "master" ]; + then + echo $line + echo "Current branch must be master!" + echo $CURRENT_BRANCH + echo $line + exit 1 + else + # refresh master branch + echo "Fetching master from remote..." + git fetch + git pull + + returnStatus=$(($?+0)) + if [ $returnStatus -ne 0 ]; + then + exit $returnStatus + fi + + echo "Comparing current master with remote..." + PUSH_STATUS=$(git diff HEAD origin/master --name-status) + if [ "${PUSH_STATUS}" != "" ]; + then + echo "There are comitted but not pushed changes in your current branch!!!" + exit 1 + fi + fi # end of when on master + +fi # end of allow branch + +LATEST_TAG=$(git describe --abbrev=0 --tags) +LATEST_SEMVER=${LATEST_TAG/v/} + +echo $line +echo "" +echo "CURRENT_BRANCH=$CURRENT_BRANCH" +echo "LATEST_TAG=$LATEST_TAG" +echo "LATEST_SEMVER=$LATEST_SEMVER" +echo "" + +echo "Provide a new semver number. Type: 'a' or just press 'enter' for cancel and abort here." +echo "Otherwise type version number, for example, type '2.0.0' the tag name will be v2.0.0" +unset ANSWER +read ANSWER +if [ "${ANSWER}" == "a" ] || [ "${ANSWER}" == "" ]; +then + echo "Your answer was '${ANSWER}', aborting" + exit 1 +fi + +echo "You answered '$ANSWER', validating ..." +echo "" + +IFS='.' read -a segments <<< "$ANSWER" +len=${#segments[@]} +if [ $len -ne 3 ]; +then + echo "Invalid version format: '${ANSWER}'. We expect exactly three segments separated by dot." + exit 1 +fi + +NEW_VERSION=$ANSWER + +echo $line +echo "Provide the next version number (aka 'dev version' or 'shapshot')" +echo "Type: 'a' or just press 'enter' for cancel and abort here." +echo "Otherwise type the next version (witout suffix), for example, if you are releasing '2.0.0' then the next dev version will be '2.1.0'. We will add '-dev' suffix automatically" +unset ANSWER +read ANSWER +if [ "${ANSWER}" == "a" ] || [ "${ANSWER}" == "" ]; +then + echo "Your answer was '${ANSWER}', aborting" + exit 1 +fi + +NEXT_VERSION=$(echo $ANSWER | sed 's/-dev//')-dev + +echo $line +echo "The new version for release will be : $NEW_VERSION" +echo "The next dev version after release will be: $NEXT_VERSION" +echo $line + +echo "Proceed to bumping the project version? (type 'y' for 'Yes')" +unset ANSWER +read ANSWER +if [ "${ANSWER}" != "y" ]; +then + echo "Your answer was '${ANSWER}'" + exit 1 +fi + +echo """ +Bumping versions of all crates to $NEW_VERSION + +Bumping versions of the following NPMs: + - cohort_sdk_client $NEW_VERSION + - packages/cohort_sdk_js $NEW_VERSION +""" + +currentDir=$(pwd) +cd cohort_sdk_client +npm version $NEW_VERSION +cd $currentDir +cd packages/cohort_sdk_js +npm version $NEW_VERSION +cd $currentDir +git add --all +git commit -a -m "chore(npm): Release npm $NEW_VERSION" --no-verify + +# This will update version in Cargo.toml files and in dependencies, then commit +cargo release --workspace --no-confirm --no-tag --no-publish --no-push -x $NEW_VERSION + +returnStatus=$(($?+0)) + +if [ $returnStatus -ne 0 ]; +then + echo "Exiting with build error" + exit $returnStatus +fi + +echo $line +echo "Tagging repostiory" +git tag -a -m "Release ${NEW_VERSION}" "v${NEW_VERSION}" +echo "" + +echo $line +echo "Bumping development versions to $NEXT_VERSION" +echo "" + +currentDir=$(pwd) +cd cohort_sdk_client +npm version $NEXT_VERSION +cd $currentDir +cd packages/cohort_sdk_js +npm version $NEXT_VERSION +cd $currentDir +git add --all +git commit -a -m "chore(npm): Release $NEXT_VERSION" --no-verify + +# This will update version in Cargo.toml files and in dependencies, then commit +cargo release --workspace --no-confirm --no-tag --no-publish --no-push -x $NEXT_VERSION + +echo "" + +git log --oneline -5 + +echo """ +$line +Done. Please review all changes and manually push to remote. +(To undo changes use 'git rebase -i ' and 'git tag -d ') +$line +"""