Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load('ext://helm_resource', 'helm_resource', 'helm_repo')
docker_build(
ref='timberio/vector',
context='.',
build_args={'RUST_VERSION': '1.69.0'},
build_args={'RUST_VERSION': '1.70.0'},
dockerfile='tilt/Dockerfile'
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@ impl<T> TrackedFuture<T> {
where
F: Future<Output = T> + Send + 'static,
{
let wrapped = async move { fut.await };

Self {
polled_once: false,
fut: spawn(wrapped.boxed()),
fut: spawn(fut.boxed()),
}
}

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.69.0"
channel = "1.70.0"
profile = "default"
9 changes: 3 additions & 6 deletions src/sinks/util/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ impl TowerRequestSettings {
S::Future: Send + 'static,
{
let policy = self.retry_policy(retry_logic.clone());
let settings = self.clone();

// Build services
let open = OpenGauge::new();
Expand All @@ -368,16 +367,14 @@ impl TowerRequestSettings {
// Build individual service
ServiceBuilder::new()
.layer(AdaptiveConcurrencyLimitLayer::new(
settings.concurrency,
settings.adaptive_concurrency,
self.concurrency,
self.adaptive_concurrency,
retry_logic.clone(),
))
.service(
health_config.build(
health_logic.clone(),
ServiceBuilder::new()
.timeout(settings.timeout)
.service(inner),
ServiceBuilder::new().timeout(self.timeout).service(inner),
open.clone(),
endpoint,
), // NOTE: there is a version conflict for crate `tracing` between `tracing_tower` crate
Expand Down