From 2b7bac66e7c57a53982c1d02053b13f8bd48986c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 04:29:36 +0000 Subject: [PATCH 1/2] Bump tokio from 1.38.0 to 1.39.2 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.38.0 to 1.39.2. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.0...tokio-1.39.2) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- tremor-api/Cargo.toml | 2 +- tremor-cli/Cargo.toml | 2 +- tremor-codec/Cargo.toml | 2 +- tremor-connectors-aws/Cargo.toml | 2 +- tremor-connectors-azure/Cargo.toml | 2 +- tremor-connectors-gcp/Cargo.toml | 4 ++-- tremor-connectors-otel/Cargo.toml | 4 ++-- tremor-connectors/Cargo.toml | 4 ++-- tremor-pipeline/Cargo.toml | 2 +- tremor-system/Cargo.toml | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c225cbbf5a..60f0b76832 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3972,13 +3972,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6839,21 +6840,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot 0.12.2", "pin-project-lite 0.2.14", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6868,9 +6868,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index d145165345..ced7fdec57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ tremor-system = { path = "tremor-system", version = "0.13.0-rc.29" } tremor-value = { path = "tremor-value", version = "0.13.0-rc.29" } tremor-archive = { path = "tremor-archive", version = "0.13.0-rc.29" } -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } tokio-stream = "0.1" anyhow = "1" async-trait = "0.1" diff --git a/tremor-api/Cargo.toml b/tremor-api/Cargo.toml index 040c434181..941c0dfe33 100644 --- a/tremor-api/Cargo.toml +++ b/tremor-api/Cargo.toml @@ -14,7 +14,7 @@ log = "0.4" serde = "1" serde_yaml = "0.9" simd-json = "0.13" -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } # we don't need sessions or cookies or shitty logging middleware tide = { version = "0.16", default-features = false, features = ["h1-server"] } tremor-pipeline = { version = "0.13.0-rc.29", path = "../tremor-pipeline" } diff --git a/tremor-cli/Cargo.toml b/tremor-cli/Cargo.toml index 0e048239e5..9ce7ff9fce 100644 --- a/tremor-cli/Cargo.toml +++ b/tremor-cli/Cargo.toml @@ -22,7 +22,7 @@ matches = "0.1" pretty_assertions = "1.4" [dependencies] -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } anyhow = "1" clap = { version = "4", features = ["color", "derive"] } clap_complete = "4" diff --git a/tremor-codec/Cargo.toml b/tremor-codec/Cargo.toml index 44950e29d7..974faaf248 100644 --- a/tremor-codec/Cargo.toml +++ b/tremor-codec/Cargo.toml @@ -14,7 +14,7 @@ version = "0.13.0-rc.29" tremor-value = { version = "0.13.0-rc.29", path = "../tremor-value" } tremor-common = { version = "0.13.0-rc.29", path = "../tremor-common" } tremor-config = { version = "0.13.0-rc.29", path = "../tremor-config" } -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } async-trait = "0.1" error-chain = "0.12" futures = "0.3" diff --git a/tremor-connectors-aws/Cargo.toml b/tremor-connectors-aws/Cargo.toml index ba6df43917..8fbc42ed05 100644 --- a/tremor-connectors-aws/Cargo.toml +++ b/tremor-connectors-aws/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", default-features = false, features = ["derive"] } anyhow = { version = "1", default-features = false } async-channel = { version = "2", default-features = false } thiserror = { version = "1", default-features = false } -tokio = { version = "1.38", default-features = false } +tokio = { version = "1.39", default-features = false } log = { version = "0.4", default-features = false } simd-json = { version = "0.13", default-features = false } value-trait = { version = "0.8", default-features = false } diff --git a/tremor-connectors-azure/Cargo.toml b/tremor-connectors-azure/Cargo.toml index ad515240f4..0ccf8c410f 100644 --- a/tremor-connectors-azure/Cargo.toml +++ b/tremor-connectors-azure/Cargo.toml @@ -27,7 +27,7 @@ anyhow = "1.0.83" async-trait = "0.1.81" url = "2.5.2" reqwest = { version = "0.12.4", default-features = false, features = ["json"] } -tokio = "1.37.0" +tokio = "1.39.2" log = "0.4.21" tremor-script = { version = "0.13.0-rc.29", path = "../tremor-script" } bytes = "1.6.1" diff --git a/tremor-connectors-gcp/Cargo.toml b/tremor-connectors-gcp/Cargo.toml index 340243bdde..d71dd64282 100644 --- a/tremor-connectors-gcp/Cargo.toml +++ b/tremor-connectors-gcp/Cargo.toml @@ -35,7 +35,7 @@ googapis = { version = "0.6", default-features = true, features = [ gouth = { version = "0.2", default-features = true } prost = { version = "0.9.0", default-features = true } prost-types = { version = "0.9.0", default-features = true } -tokio = { version = "1.38", default-features = true } +tokio = { version = "1.39", default-features = true } tonic = { version = "0.6.1", default-features = true, features = [ "transport", "tls", @@ -66,7 +66,7 @@ hyper = { version = "0.14", default-features = true, features = [ "http2", "runtime", ] } -tokio = { version = "1.38", default-features = true } +tokio = { version = "1.39", default-features = true } value-trait = { version = "0.8" } test-case = { version = "3", default-features = true } anyhow = { version = "1" } diff --git a/tremor-connectors-otel/Cargo.toml b/tremor-connectors-otel/Cargo.toml index 7a7db796bf..86da69f948 100644 --- a/tremor-connectors-otel/Cargo.toml +++ b/tremor-connectors-otel/Cargo.toml @@ -25,7 +25,7 @@ log = { version = "0.4", default-features = true } serde = { version = "1.0", default-features = true, features = ["derive"] } thiserror = { version = "1", default-features = true } # value-trait = { version = "0.8", default-features = true } -tokio = { version = "1.38", default-features = false } +tokio = { version = "1.39", default-features = false } simd-json = { version = "0.13", default-features = true } # opentelemetry @@ -45,7 +45,7 @@ async-channel = { version = "1.9", default-features = false } hex = { version = "0.4", default-features = false, features = ["alloc", "std"] } [dev-dependencies] -tokio = { version = "1.38", default-features = true } +tokio = { version = "1.39", default-features = true } proptest = "1.5" test-case = "3" diff --git a/tremor-connectors/Cargo.toml b/tremor-connectors/Cargo.toml index f8a47d9674..bd5e1ef1bf 100644 --- a/tremor-connectors/Cargo.toml +++ b/tremor-connectors/Cargo.toml @@ -17,7 +17,7 @@ tremor-script = { path = "../tremor-script", version = "0.13.0-rc.29" } tremor-value = { path = "../tremor-value", version = "0.13.0-rc.29" } tremor-interceptor = { path = "../tremor-interceptor", version = "0.13.0-rc.29" } tremor-system = { path = "../tremor-system", version = "0.13.0-rc.29" } -tokio = { version = "1.38", default-features = false } +tokio = { version = "1.39", default-features = false } beef = { version = "0.5", default-features = false } value-trait = { version = "0.8", default-features = false } futures = { version = "0.3.30", default-features = false, features = ["std"] } @@ -165,7 +165,7 @@ tempfile = { version = "3.8", default-features = false } env_logger = "0.11" tremor-connectors-test-helpers = { path = "../tremor-connectors-test-helpers", version = "0.13.0-rc.29" } tide = { version = "0.16", default-features = false } # TODO remove tide from TestHttpServer -tokio = { version = "1.38", default-features = false, features = [ +tokio = { version = "1.39", default-features = false, features = [ "full", "test-util", ] } diff --git a/tremor-pipeline/Cargo.toml b/tremor-pipeline/Cargo.toml index fbf7780ac5..5df79ed313 100644 --- a/tremor-pipeline/Cargo.toml +++ b/tremor-pipeline/Cargo.toml @@ -38,7 +38,7 @@ fenster = { version = "0.1.1" } criterion = "0.5" tempfile = "3.8" xz2 = "0.1" -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } [features] bert = ["rust-bert"] diff --git a/tremor-system/Cargo.toml b/tremor-system/Cargo.toml index 99bb586679..01e679907b 100644 --- a/tremor-system/Cargo.toml +++ b/tremor-system/Cargo.toml @@ -12,7 +12,7 @@ authors = ["The Tremor Team"] tremor-common = { path = "../tremor-common", version = "0.13.0-rc.29" } tremor-script = { path = "../tremor-script", version = "0.13.0-rc.29" } -tokio = { version = "1.38", default-features = false } +tokio = { version = "1.39", default-features = false } anyhow = { version = "1.0", default-features = true } log = { version = "0.4", default-features = false } serde = { version = "1.0", default-features = false } From 904c80e9c769fd33df7860579d3a42bbb1f39bae Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Sun, 11 Aug 2024 01:01:45 +0200 Subject: [PATCH 2/2] Try using docker compose Signed-off-by: Heinz N. Gies --- .github/workflows/integration.yaml | 4 ++-- Makefile | 8 ++++---- README.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index fe8f10e573..b092cb2fb6 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -34,8 +34,8 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov - - name: Print docker-compose version - run: docker-compose --version + - name: Print docker compose version + run: docker compose --version - name: run ${{ matrix.kind }} tests run: cargo llvm-cov run -p tremor-cli --lcov --output-path lcov.txt -- test --timeout 300 ${{ matrix.kind }} tremor-cli/tests --excludes tcp-reuseport diff --git a/Makefile b/Makefile index b49e5eeabe..ea797721f1 100644 --- a/Makefile +++ b/Makefile @@ -43,12 +43,12 @@ help: ############################################################################### image: - docker-compose build + docker compose build demo: image - -docker-compose -f demo/demo.yaml rm -fsv - -docker-compose -f demo/demo.yaml up - -docker-compose -f demo/demo.yaml rm -fsv + -docker compose -f demo/demo.yaml rm -fsv + -docker compose -f demo/demo.yaml up + -docker compose -f demo/demo.yaml rm -fsv it-clean: -find tremor-cli/tests -name '*.log' | xargs rm diff --git a/README.md b/README.md index 3eddf5acb7..c2e7e2c803 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ We publish our images with a set of different tags as explained below ### Building the Docker Image -Tremor runs in a docker image. If you wish to build a local image, clone this repository, and either run `make image` or run `docker-compose build`. Both will create an image called `tremorproject/tremor:latest`. +Tremor runs in a docker image. If you wish to build a local image, clone this repository, and either run `make image` or run `docker compose build`. Both will create an image called `tremorproject/tremor:latest`. Note that since the image is building tremor in release mode it requires some serious resources. We recommend allowing docker to use at least **12 but better 16 gigabytes of memory** and as many cores as there are to spare. Depending on the system building, the image can take up to an hour.