Skip to content

Commit 71aa9a4

Browse files
merge: include current usage review fixes in Claude accounting
2 parents bd0418b + a07b895 commit 71aa9a4

2 files changed

Lines changed: 21 additions & 10 deletions

File tree

‎apps/server/src/usage/UsageService.test.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import * as Fiber from "effect/Fiber";
1717
import * as Layer from "effect/Layer";
1818
import * as Scheduler from "effect/Scheduler";
1919
import * as Schema from "effect/Schema";
20+
import * as Tracer from "effect/Tracer";
21+
2022
import * as TestClock from "effect/testing/TestClock";
2123
import { HttpClient, HttpClientResponse } from "effect/unstable/http";
2224

@@ -334,8 +336,20 @@ describe("UsageService", () => {
334336
"example-model": { inputCostPerMillionTokens: 2, outputCostPerMillionTokens: 8 },
335337
},
336338
});
337-
const second = yield* service.readSummary(WINDOW).pipe(Effect.forkChild);
338-
yield* Effect.yieldNow;
339+
const secondScanStarted = yield* Deferred.make<void>();
340+
const tracer = Tracer.make({
341+
span: (options) => {
342+
const span = new Tracer.NativeSpan(options);
343+
if (span.name === "UsageService.scanSummary") {
344+
Deferred.doneUnsafe(secondScanStarted, Effect.void);
345+
}
346+
return span;
347+
},
348+
});
349+
const second = yield* service
350+
.readSummary(WINDOW)
351+
.pipe(Effect.withTracer(tracer), Effect.forkChild);
352+
yield* Deferred.await(secondScanStarted);
339353
yield* Deferred.succeed(releaseRates, undefined);
340354

341355
const original = yield* Fiber.join(first);

‎packages/contracts/src/rpc.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,14 +582,11 @@ const WsServerGetUsageSummaryRpc = Rpc.make(WS_METHODS.serverGetUsageSummary, {
582582
error: Schema.Union([EnvironmentAuthorizationError, UsageReadError]),
583583
});
584584

585-
export const WsServerGetUsageThreadBreakdownRpc = Rpc.make(
586-
WS_METHODS.serverGetUsageThreadBreakdown,
587-
{
588-
payload: UsageThreadBreakdownInput,
589-
success: UsageThreadBreakdown,
590-
error: Schema.Union([EnvironmentAuthorizationError, UsageReadError]),
591-
},
592-
);
585+
const WsServerGetUsageThreadBreakdownRpc = Rpc.make(WS_METHODS.serverGetUsageThreadBreakdown, {
586+
payload: UsageThreadBreakdownInput,
587+
success: UsageThreadBreakdown,
588+
error: Schema.Union([EnvironmentAuthorizationError, UsageReadError]),
589+
});
593590

594591
/**
595592
* Refetches the model rate table ahead of its daily TTL, so a model released

0 commit comments

Comments
 (0)