Skip to content

Keep collector workers alive after request cancellation #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RhysSullivan merged 1 commit into from
Sep 28, 2026
Merged

Keep collector workers alive after request cancellation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 23 additions & 5 deletions src/services/AsyncIngestBun.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as BunWorker from "@effect/platform-bun/BunWorker"
import { Context, Duration, Effect, Exit, Layer, Scope } from "effect"
import { Duration, Effect, Exit, Layer, Scope } from "effect"
import * as RpcClient from "effect/unstable/rpc/RpcClient"
import type { RpcClientError } from "effect/unstable/rpc/RpcClientError"
import { RpcClientError } from "effect/unstable/rpc/RpcClientError"
import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization"
import type { WorkerError } from "effect/unstable/workers/WorkerError"
import { WorkerError } from "effect/unstable/workers/WorkerError"
import { IngestRpcs } from "./ingestRpc.ts"

import { AsyncIngest } from "./AsyncIngest.js"
Expand Down Expand Up @@ -39,14 +39,32 @@ export const AsyncIngestLive = Layer.effect(
// HTTP health wait for SQLite bootstrap. Managed readiness still verifies
// the worker through explicit ingest probes.
yield* Effect.forkScoped(getClient.pipe(Effect.ignore))
// Cancellation and payload errors belong to one request. Only a broken
// transport invalidates the worker shared by all ingest callers.
return {
ingestTraces: (input) =>
Effect.flatMap(getClient, ({ client, clientScope }) =>
client.ingestTraces(input).pipe(Effect.onError(() => Effect.andThen(Scope.close(clientScope, Exit.void), invalidateClient))),
client
.ingestTraces(input)
.pipe(
Effect.tapError((error) =>
error instanceof RpcClientError || error instanceof WorkerError
? Effect.andThen(Scope.close(clientScope, Exit.void), invalidateClient)
: Effect.void,
),
),
),
ingestLogs: (input) =>
Effect.flatMap(getClient, ({ client, clientScope }) =>
client.ingestLogs(input).pipe(Effect.onError(() => Effect.andThen(Scope.close(clientScope, Exit.void), invalidateClient))),
client
.ingestLogs(input)
.pipe(
Effect.tapError((error) =>
error instanceof RpcClientError || error instanceof WorkerError
? Effect.andThen(Scope.close(clientScope, Exit.void), invalidateClient)
: Effect.void,
),
),
),
}
}),
Expand Down
53 changes: 35 additions & 18 deletions src/services/TelemetryQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as BunWorker from "@effect/platform-bun/BunWorker"
import { Duration, Effect, Exit, Layer, Scope } from "effect"
import * as RpcClient from "effect/unstable/rpc/RpcClient"
import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization"
import type { WorkerError } from "effect/unstable/workers/WorkerError"
import type { RpcClientError } from "effect/unstable/rpc/RpcClientError"
import { WorkerError } from "effect/unstable/workers/WorkerError"
import { RpcClientError } from "effect/unstable/rpc/RpcClientError"
import { TelemetryStoreReadonly, type TelemetryStoreReader } from "./TelemetryStore.js"
import { QueryRpcs } from "./queryRpc.js"

Expand All @@ -16,28 +16,45 @@ const WorkerProtocol = RpcClient.layerProtocolWorker({ size: 1 }).pipe(
Layer.provide(BunWorker.layer(() => new Worker(new URL("./telemetryQueryWorker.ts", import.meta.url)))),
)

const query = <A>(getClient: Effect.Effect<QueryClientEntry, unknown>, invalidateClient: Effect.Effect<void>, method: QueryMethod, args: readonly unknown[] = []) =>
Effect.flatMap(getClient, ({ client, clientScope }) => client.query({ method, args }).pipe(
Effect.onError(() => Effect.andThen(Scope.close(clientScope, Exit.void), invalidateClient)),
)).pipe(
const query = <A>(
getClient: Effect.Effect<QueryClientEntry, unknown>,
invalidateClient: Effect.Effect<void>,
method: QueryMethod,
args: readonly unknown[] = [],
) =>
Effect.flatMap(getClient, ({ client, clientScope }) =>
client
.query({ method, args })
.pipe(
Effect.tapError((error) =>
error instanceof RpcClientError || error instanceof WorkerError
? Effect.andThen(Scope.close(clientScope, Exit.void), invalidateClient)
: Effect.void,
),
),
).pipe(
Effect.map((result) => result as A),
Effect.mapError((error) => error instanceof Error ? error : new Error(String(error))),
Effect.mapError((error) => (error instanceof Error ? error : new Error(String(error)))),
)

export const TelemetryQueryLive = Layer.effect(
TelemetryStoreReadonly,
Effect.gen(function*() {
Effect.gen(function* () {
const scope = yield* Scope.Scope
const [getClient, invalidateClient] = yield* Effect.cachedInvalidateWithTTL(Effect.gen(function*() {
const clientScope = yield* Scope.fork(scope, "sequential")
const protocolContext = yield* Layer.buildWithScope(WorkerProtocol, clientScope)
const client = yield* RpcClient.make(QueryRpcs).pipe(
Effect.provide(protocolContext),
Effect.provideService(Scope.Scope, clientScope),
)
return { client, clientScope }
}), Duration.infinity)
const run = <A>(method: QueryMethod, args: readonly unknown[] = []) => query<A>(getClient, invalidateClient, method, args)
const [getClient, invalidateClient] = yield* Effect.cachedInvalidateWithTTL(
Effect.gen(function* () {
const clientScope = yield* Scope.fork(scope, "sequential")
const protocolContext = yield* Layer.buildWithScope(WorkerProtocol, clientScope)
const client = yield* RpcClient.make(QueryRpcs).pipe(
Effect.provide(protocolContext),
Effect.provideService(Scope.Scope, clientScope),
)
return { client, clientScope }
}),
Duration.infinity,
)
const run = <A>(method: QueryMethod, args: readonly unknown[] = []) =>
query<A>(getClient, invalidateClient, method, args)
return TelemetryStoreReadonly.of({
listServices: run("listServices"),
listRecentTraces: (serviceName, options) => run("listRecentTraces", [serviceName, options]),
Expand Down
Loading