diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11b53bb710..b9391ee879 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -263,9 +263,10 @@ jobs:
     environment:
       # Disable incremental compilation to avoid overhead. We are not preserving these files anyway.
       CARGO_INCREMENTAL: "0"
-      # Disable full debug symbol generation to speed up CI build
-      # "1" means line tables only, which is useful for panic tracebacks.
-      RUSTFLAGS: "-C debuginfo=1"
+      # - Disable full debug symbol generation to speed up CI build
+      #   "1" means line tables only, which is useful for panic tracebacks.
+      # - Enable tokio-console
+      RUSTFLAGS: "-C debuginfo=1 --cfg tokio_unstable"
       # https://github.com/rust-lang/cargo/issues/10280
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
       # The `2xlarge` resource class that we use has 32GB RAM but also 16 CPUs. This means we have 2GB RAM per core on
@@ -282,8 +283,8 @@ jobs:
           name: Check benches compile
           command: cargo check --workspace --benches
       - run:
-          name: Check object store + exporter support + HEAP profiling compiles
-          command: cargo check --no-default-features --features="aws,gcp,azure,heappy,pprof"
+          name: Check extra features (like prod image)
+          command: cargo check --no-default-features --features="aws,gcp,azure,jemalloc_replacing_malloc,tokio_console,pprof"
       - run:
           # Validate that the data generator compiles (in the same way as it does in release builds)
           name: Check iox_data_generator compiles
diff --git a/Cargo.lock b/Cargo.lock
index 62eb1d6fab..67093a6fc5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5151,9 +5151,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.20.1"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
+checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/backoff/Cargo.toml b/backoff/Cargo.toml
index 1d1690ab6b..fbc98e7cbe 100644
--- a/backoff/Cargo.toml
+++ b/backoff/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-tokio = { version = "1.20", features = ["macros", "time"] }
+tokio = { version = "1.21", features = ["macros", "time"] }
 observability_deps = { path = "../observability_deps" }
 rand = "0.8"
 snafu = "0.7"
diff --git a/cache_system/Cargo.toml b/cache_system/Cargo.toml
index e78277c12c..a2ce9991b6 100644
--- a/cache_system/Cargo.toml
+++ b/cache_system/Cargo.toml
@@ -11,7 +11,7 @@ metric = { path = "../metric" }
 observability_deps = { path = "../observability_deps" }
 parking_lot = { version = "0.12", features = ["arc_lock"] }
 pdatastructs = { version = "0.7", default-features = false, features = ["fixedbitset"] }
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
 tokio-util = { version = "0.7.3" }
 trace = { path = "../trace"}
 workspace-hack = { path = "../workspace-hack"}
diff --git a/client_util/Cargo.toml b/client_util/Cargo.toml
index cab7eb699c..09a7ce2a22 100644
--- a/client_util/Cargo.toml
+++ b/client_util/Cargo.toml
@@ -13,4 +13,4 @@ tower = "0.4"
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread"] }
diff --git a/compactor/Cargo.toml b/compactor/Cargo.toml
index d7365d8d73..6740da2040 100644
--- a/compactor/Cargo.toml
+++ b/compactor/Cargo.toml
@@ -23,7 +23,7 @@ schema = { path = "../schema" }
 snafu = "0.7"
 thiserror = "1.0"
 iox_time = { path = "../iox_time" }
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
 tokio-util = { version = "0.7.3" }
 uuid = { version = "1", features = ["v4"] }
 workspace-hack = { path = "../workspace-hack"}
diff --git a/datafusion_util/Cargo.toml b/datafusion_util/Cargo.toml
index 83d7395061..aa63385cb6 100644
--- a/datafusion_util/Cargo.toml
+++ b/datafusion_util/Cargo.toml
@@ -11,7 +11,7 @@ datafusion = { path = "../datafusion" }
 futures = "0.3"
 observability_deps = { path = "../observability_deps" }
 pin-project = "1.0"
-tokio = { version = "1.20", features = ["parking_lot", "sync"] }
+tokio = { version = "1.21", features = ["parking_lot", "sync"] }
 tokio-stream = "0.1"
 workspace-hack = { path = "../workspace-hack"}
 
diff --git a/executor/Cargo.toml b/executor/Cargo.toml
index 932c16504a..eb887b93e9 100644
--- a/executor/Cargo.toml
+++ b/executor/Cargo.toml
@@ -8,7 +8,7 @@ futures = "0.3"
 observability_deps = { path = "../observability_deps" }
 parking_lot = "0.12"
 pin-project = "1.0"
-tokio = { version = "1.20" }
+tokio = { version = "1.21" }
 tokio-util = { version = "0.7.3" }
 workspace-hack = { path = "../workspace-hack"}
 
diff --git a/executor/src/lib.rs b/executor/src/lib.rs
index 75a4c930b4..c6ad2efcb0 100644
--- a/executor/src/lib.rs
+++ b/executor/src/lib.rs
@@ -197,7 +197,7 @@ impl DedicatedExecutor {
                 }
 
                 // Wait for all tasks to finish
-                join.write().await;
+                let _guard = join.write().await;
 
                 // signal shutdown, but it's OK if the other side is gone
                 tx_shutdown.send(()).ok();
diff --git a/influxdb2_client/Cargo.toml b/influxdb2_client/Cargo.toml
index 65ed1e977e..e33dc9caf6 100644
--- a/influxdb2_client/Cargo.toml
+++ b/influxdb2_client/Cargo.toml
@@ -18,5 +18,5 @@ uuid = { version = "1", features = ["v4"] }
 mockito = "0.31"
 once_cell = { version = "1.14.0", features = ["parking_lot"] }
 parking_lot = "0.12"
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
 test_helpers = { path = "../test_helpers" }
diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml
index f30dc60015..927f2edb03 100644
--- a/influxdb_iox/Cargo.toml
+++ b/influxdb_iox/Cargo.toml
@@ -58,7 +58,7 @@ serde_json = "1.0.83"
 snafu = "0.7"
 thiserror = "1.0.34"
 tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
-tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 tokio-util = { version = "0.7.3" }
 tonic = "0.8"
diff --git a/influxdb_iox_client/Cargo.toml b/influxdb_iox_client/Cargo.toml
index 508587f045..6040347beb 100644
--- a/influxdb_iox_client/Cargo.toml
+++ b/influxdb_iox_client/Cargo.toml
@@ -30,4 +30,4 @@ thiserror = "1.0.34"
 tonic = { version = "0.8" }
 
 [dev-dependencies] # In alphabetical order
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread"] }
diff --git a/ingester/Cargo.toml b/ingester/Cargo.toml
index 0880628a20..fa7ad85946 100644
--- a/ingester/Cargo.toml
+++ b/ingester/Cargo.toml
@@ -36,7 +36,7 @@ schema = { path = "../schema" }
 snafu = "0.7"
 thiserror = "1.0"
 iox_time = { path = "../iox_time" }
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
 tonic = { version = "0.8" }
 tracker = { path = "../tracker" }
 uuid = { version = "1", features = ["v4"] }
diff --git a/iox_catalog/Cargo.toml b/iox_catalog/Cargo.toml
index 5fa4f8b5d2..1d369d643a 100644
--- a/iox_catalog/Cargo.toml
+++ b/iox_catalog/Cargo.toml
@@ -16,7 +16,7 @@ snafu = "0.7"
 sqlx = { version = "0.6", features = [ "runtime-tokio-rustls" , "postgres", "uuid" ] }
 sqlx-hotswap-pool = { path = "../sqlx-hotswap-pool" }
 thiserror = "1.0.34"
-tokio = { version = "1.20", features = ["io-util", "macros", "parking_lot", "rt-multi-thread", "time"] }
+tokio = { version = "1.21", features = ["io-util", "macros", "parking_lot", "rt-multi-thread", "time"] }
 uuid = { version = "1", features = ["v4"] }
 workspace-hack = { path = "../workspace-hack"}
 
diff --git a/iox_data_generator/Cargo.toml b/iox_data_generator/Cargo.toml
index 682ee7b740..80f9c8da4e 100644
--- a/iox_data_generator/Cargo.toml
+++ b/iox_data_generator/Cargo.toml
@@ -19,7 +19,7 @@ regex = "1.6"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.83"
 snafu = "0.7"
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
 toml = "0.5.9"
 tracing = "0.1"
 tracing-subscriber = "0.3"
diff --git a/iox_query/Cargo.toml b/iox_query/Cargo.toml
index 345ce5715a..8d8d99dc3d 100644
--- a/iox_query/Cargo.toml
+++ b/iox_query/Cargo.toml
@@ -31,7 +31,7 @@ parking_lot = "0.12"
 query_functions = { path = "../query_functions"}
 schema = { path = "../schema" }
 snafu = "0.7"
-tokio = { version = "1.20", features = ["macros", "parking_lot"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot"] }
 tokio-stream = "0.1"
 trace = { path = "../trace" }
 predicate = { path = "../predicate" }
diff --git a/iox_time/Cargo.toml b/iox_time/Cargo.toml
index 2bdd24e4ee..30a4f22fa7 100644
--- a/iox_time/Cargo.toml
+++ b/iox_time/Cargo.toml
@@ -7,7 +7,7 @@ description = "Time functionality for IOx"
 [dependencies]
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
 parking_lot = "0.12"
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
diff --git a/ioxd_common/Cargo.toml b/ioxd_common/Cargo.toml
index 14442d7a4f..21271565ed 100644
--- a/ioxd_common/Cargo.toml
+++ b/ioxd_common/Cargo.toml
@@ -43,7 +43,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.83"
 serde_urlencoded = "0.7.0"
 snafu = "0.7"
-tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 tokio-util = { version = "0.7.3" }
 tonic = "0.8"
diff --git a/ioxd_querier/Cargo.toml b/ioxd_querier/Cargo.toml
index a66d13ffb2..22353c2caa 100644
--- a/ioxd_querier/Cargo.toml
+++ b/ioxd_querier/Cargo.toml
@@ -26,7 +26,7 @@ arrow-flight = "21.0.0"
 async-trait = "0.1"
 hyper = "0.14"
 thiserror = "1.0.34"
-tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tonic = "0.8"
 workspace-hack = { path = "../workspace-hack"}
 parquet_file = { version = "0.1.0", path = "../parquet_file" }
diff --git a/ioxd_router/Cargo.toml b/ioxd_router/Cargo.toml
index d5c04f2e2e..015639cd65 100644
--- a/ioxd_router/Cargo.toml
+++ b/ioxd_router/Cargo.toml
@@ -24,6 +24,6 @@ async-trait = "0.1"
 hashbrown = "0.12"
 hyper = "0.14"
 thiserror = "1.0.34"
-tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-util = { version = "0.7.3" }
 workspace-hack = { path = "../workspace-hack"}
diff --git a/object_store_metrics/Cargo.toml b/object_store_metrics/Cargo.toml
index 399d729026..b21cf26a4c 100644
--- a/object_store_metrics/Cargo.toml
+++ b/object_store_metrics/Cargo.toml
@@ -12,10 +12,10 @@ iox_time = { version = "0.1.0", path = "../iox_time" }
 metric = { version = "0.1.0", path = "../metric" }
 object_store = "0.4.0"
 pin-project = "1.0.12"
-tokio = { version = "1.20", features = ["io-util"] }
+tokio = { version = "1.21", features = ["io-util"] }
 workspace-hack = { path = "../workspace-hack" }
 
 [dev-dependencies] # In alphabetical order
 dotenvy = "0.15.1"
 snafu = "0.7"
-tokio = { version = "1.20", features = ["macros", "io-util"] }
+tokio = { version = "1.21", features = ["macros", "io-util"] }
diff --git a/parquet_file/Cargo.toml b/parquet_file/Cargo.toml
index cf3f0d2ba9..8474cad3c4 100644
--- a/parquet_file/Cargo.toml
+++ b/parquet_file/Cargo.toml
@@ -25,7 +25,7 @@ prost = "0.11"
 schema = { path = "../schema" }
 snafu = "0.7"
 thrift = "0.13"
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt", "rt-multi-thread", "sync"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt", "rt-multi-thread", "sync"] }
 uuid = { version = "1", features = ["v4"] }
 zstd = "0.11"
 workspace-hack = { path = "../workspace-hack"}
diff --git a/querier/Cargo.toml b/querier/Cargo.toml
index 22ced8726c..4396e78562 100644
--- a/querier/Cargo.toml
+++ b/querier/Cargo.toml
@@ -34,7 +34,7 @@ sharder = { path = "../sharder" }
 snafu = "0.7"
 thiserror = "1.0"
 iox_time = { path = "../iox_time" }
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
 tokio-util = { version = "0.7.3" }
 tonic = { version = "0.8" }
 trace = { path = "../trace" }
diff --git a/query_functions/Cargo.toml b/query_functions/Cargo.toml
index 6e8d479907..11cdf3da62 100644
--- a/query_functions/Cargo.toml
+++ b/query_functions/Cargo.toml
@@ -19,5 +19,5 @@ snafu = "0.7"
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
-tokio = { version = "1.20", features = ["macros", "parking_lot"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot"] }
 datafusion_util = { path = "../datafusion_util" }
diff --git a/query_tests/Cargo.toml b/query_tests/Cargo.toml
index d40860b1a7..1c9fffbed3 100644
--- a/query_tests/Cargo.toml
+++ b/query_tests/Cargo.toml
@@ -27,7 +27,7 @@ once_cell = { version = "1.14.0", features = ["parking_lot"] }
 predicate = { path = "../predicate" }
 schema = { path = "../schema" }
 sharder = { path = "../sharder" }
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }
 querier = { path = "../querier" }
 iox_query = { path = "../iox_query" }
 workspace-hack = { path = "../workspace-hack"}
diff --git a/service_grpc_flight/Cargo.toml b/service_grpc_flight/Cargo.toml
index 9bafc53c8c..abd3dfebfd 100644
--- a/service_grpc_flight/Cargo.toml
+++ b/service_grpc_flight/Cargo.toml
@@ -28,7 +28,7 @@ prost = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.83"
 snafu = "0.7"
-tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tonic = "0.8"
 workspace-hack = { path = "../workspace-hack"}
 
diff --git a/service_grpc_influxrpc/Cargo.toml b/service_grpc_influxrpc/Cargo.toml
index 54d59cc651..5dac8ce16f 100644
--- a/service_grpc_influxrpc/Cargo.toml
+++ b/service_grpc_influxrpc/Cargo.toml
@@ -28,7 +28,7 @@ regex = "1.6.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.83"
 snafu = "0.7"
-tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 tonic = "0.8"
 workspace-hack = { path = "../workspace-hack"}
diff --git a/sqlx-hotswap-pool/Cargo.toml b/sqlx-hotswap-pool/Cargo.toml
index 3cfe7f263f..93f45a0982 100644
--- a/sqlx-hotswap-pool/Cargo.toml
+++ b/sqlx-hotswap-pool/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 [dependencies]
 sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "postgres", "json", "tls"] }
 either = "1.7.0"
-tokio = { version = "1.20", features = ["rt-multi-thread", "macros", "parking_lot"] }
+tokio = { version = "1.21", features = ["rt-multi-thread", "macros", "parking_lot"] }
 futures = "0.3"
 workspace-hack = { path = "../workspace-hack"}
 
diff --git a/test_helpers_end_to_end/Cargo.toml b/test_helpers_end_to_end/Cargo.toml
index df44056a0a..ba84efc008 100644
--- a/test_helpers_end_to_end/Cargo.toml
+++ b/test_helpers_end_to_end/Cargo.toml
@@ -24,7 +24,7 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus
 sqlx = { version = "0.6", features = [ "runtime-tokio-rustls" , "postgres", "uuid" ] }
 tempfile = "3.1.0"
 test_helpers = { path = "../test_helpers", features = ["future_timeout"] }
-tokio = { version = "1.20", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-util = "0.7"
 tonic = "0.8"
 workspace-hack = { path = "../workspace-hack"}
diff --git a/trace_exporters/Cargo.toml b/trace_exporters/Cargo.toml
index d22c37e303..f3c1064782 100644
--- a/trace_exporters/Cargo.toml
+++ b/trace_exporters/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3"
 observability_deps = { path = "../observability_deps" }
 snafu = "0.7"
 thrift = { version = "0.13.0" }
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt", "sync"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt", "sync"] }
 trace = { path = "../trace" }
 workspace-hack = { path = "../workspace-hack"}
 
diff --git a/tracker/Cargo.toml b/tracker/Cargo.toml
index 3cdc047688..1e533a0b3f 100644
--- a/tracker/Cargo.toml
+++ b/tracker/Cargo.toml
@@ -15,11 +15,11 @@ observability_deps = { path = "../observability_deps" }
 parking_lot = "0.12"
 pin-project = "1.0"
 iox_time = { path = "../iox_time" }
-tokio = { version = "1.20", features = ["macros", "parking_lot", "sync", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "sync", "time"] }
 tokio-util = { version = "0.7.3" }
 trace = { path = "../trace"}
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
 # Need the multi-threaded executor for testing
-tokio = { version = "1.20", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }
+tokio = { version = "1.21", features = ["macros", "parking_lot", "rt-multi-thread", "time"] }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index f8d7a96eb8..2307b731d1 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -62,7 +62,7 @@ sha2 = { version = "0.10", features = ["std"] }
 smallvec = { version = "1", default-features = false, features = ["union"] }
 sqlx = { version = "0.6", features = ["_rt-tokio", "json", "macros", "migrate", "postgres", "runtime-tokio-rustls", "sqlx-macros", "tls", "uuid"] }
 sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "base64", "crc", "dirs", "hkdf", "hmac", "json", "md-5", "migrate", "postgres", "rand", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "serde", "serde_json", "sha-1", "sha2", "tokio-stream", "uuid", "webpki-roots", "whoami"] }
-tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros", "tracing"] }
+tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "time", "tokio-macros", "tracing"] }
 tokio-stream = { version = "0.1", features = ["fs", "net", "time"] }
 tokio-util = { version = "0.7", features = ["codec", "tracing"] }
 tonic = { version = "0.8", features = ["async-trait", "axum", "channel", "codegen", "h2", "hyper", "hyper-timeout", "prost", "prost-derive", "prost1", "tokio", "tower", "tracing-futures", "transport"] }
@@ -121,7 +121,7 @@ smallvec = { version = "1", default-features = false, features = ["union"] }
 sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "base64", "crc", "dirs", "hkdf", "hmac", "json", "md-5", "migrate", "postgres", "rand", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "serde", "serde_json", "sha-1", "sha2", "tokio-stream", "uuid", "webpki-roots", "whoami"] }
 sqlx-macros = { version = "0.6", default-features = false, features = ["_rt-tokio", "json", "migrate", "postgres", "runtime-tokio-rustls", "serde_json", "sha2", "uuid"] }
 syn = { version = "1", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
-tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros", "tracing"] }
+tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "time", "tokio-macros", "tracing"] }
 tokio-stream = { version = "0.1", features = ["fs", "net", "time"] }
 tonic-build = { version = "0.8", features = ["prost", "prost-build", "transport"] }
 uuid = { version = "1", features = ["private_getrandom", "rng", "std", "v4"] }
@@ -163,7 +163,7 @@ once_cell = { version = "1", default-features = false, features = ["unstable"] }
 scopeguard = { version = "1", features = ["use_std"] }
 tokio = { version = "1", default-features = false, features = ["winapi"] }
 tokio-util = { version = "0.7", default-features = false, features = ["io"] }
-winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
+winapi = { version = "0.3", default-features = false, features = ["accctrl", "aclapi", "activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
 windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] }
 
 [target.x86_64-pc-windows-msvc.build-dependencies]
@@ -171,7 +171,7 @@ getrandom = { version = "0.2", default-features = false, features = ["std"] }
 once_cell = { version = "1", default-features = false, features = ["unstable"] }
 scopeguard = { version = "1", features = ["use_std"] }
 tokio = { version = "1", default-features = false, features = ["winapi"] }
-winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
+winapi = { version = "0.3", default-features = false, features = ["accctrl", "aclapi", "activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
 windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] }
 
 ### END HAKARI SECTION
diff --git a/write_buffer/Cargo.toml b/write_buffer/Cargo.toml
index 49290df9cd..39a62375ab 100644
--- a/write_buffer/Cargo.toml
+++ b/write_buffer/Cargo.toml
@@ -24,7 +24,7 @@ pin-project = "1.0"
 prost = "0.11"
 rskafka = { git = "https://github.com/influxdata/rskafka.git", rev="59295beeae2106c2536008065e171dd88fd1c64e", default-features = false, features = ["compression-snappy", "transport-socks5"] }
 schema = { path = "../schema" }
-tokio = { version = "1.20", features = ["fs", "macros", "parking_lot", "rt", "sync", "time"] }
+tokio = { version = "1.21", features = ["fs", "macros", "parking_lot", "rt", "sync", "time"] }
 tokio-util = "0.7.3"
 trace = { path = "../trace" }
 trace_http = { path = "../trace_http" }