Skip to content

Commit 699aed6

Browse files
committed
perf(server): project lookups trace one span instead of three
ProjectEnrichmentService.peek, request and requestLane are cache reads and a queue offer. PR sync reads each linked project about once a minute, and each call wrote a span for each of them next to getAvailable's own.
1 parent 92470c5 commit 699aed6

2 files changed

Lines changed: 68 additions & 34 deletions

File tree

‎apps/server/src/project/ProjectEnrichmentService.test.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import * as Layer from "effect/Layer";
66
import * as Logger from "effect/Logger";
77
import * as PubSub from "effect/PubSub";
88
import * as Ref from "effect/Ref";
9+
import * as Tracer from "effect/Tracer";
910
import { TestClock } from "effect/testing";
1011

1112
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
@@ -486,3 +487,33 @@ it.effect(
486487
}).pipe(Effect.provide(layer(layerMetadata)));
487488
}),
488489
);
490+
491+
it.effect("traces a lookup as one span rather than one per cache read", () =>
492+
Effect.gen(function* () {
493+
const service = yield* ProjectEnrichment.ProjectEnrichmentService;
494+
const names: Array<string> = [];
495+
const tracer = Tracer.make({
496+
span: (options) => {
497+
names.push(options.name);
498+
return new Tracer.NativeSpan(options);
499+
},
500+
});
501+
502+
yield* service.getAvailable("/repo").pipe(Effect.withTracer(tracer));
503+
504+
assert.deepEqual(names, ["ProjectEnrichmentService.getAvailable"]);
505+
}).pipe(
506+
Effect.provide(
507+
layer(
508+
Layer.merge(
509+
Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
510+
resolve: (workspaceRoot) => Effect.succeed(identity(workspaceRoot)),
511+
}),
512+
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
513+
resolvePath: () => Effect.succeed(null),
514+
}),
515+
),
516+
),
517+
),
518+
),
519+
);

‎apps/server/src/project/ProjectEnrichmentService.ts‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,10 @@ export const make = Effect.fn("ProjectEnrichmentService.make")(function* (
224224
{ concurrency: "unbounded", discard: true },
225225
);
226226

227-
const requestLane = Effect.fn("ProjectEnrichmentService.requestLane")(function* (
227+
// peek, request and requestLane are cache reads and a queue offer. Only
228+
// getAvailable, their caller, is traced: PR sync reads every linked project
229+
// about once a minute, and three spans each per call filled the trace.
230+
const requestLane = Effect.fnUntraced(function* (
228231
lane: EnrichmentWorkLane,
229232
workspaceRoot: string,
230233
field: "repositoryIdentity" | "faviconPath",
@@ -239,40 +242,40 @@ export const make = Effect.fn("ProjectEnrichmentService.make")(function* (
239242
}
240243
});
241244

242-
const peek: ProjectEnrichmentService["Service"]["peek"] = Effect.fn(
243-
"ProjectEnrichmentService.peek",
244-
)(function* (workspaceRoot) {
245-
const [repositoryIdentity, faviconPath] = yield* Effect.all(
246-
[
247-
Cache.getSuccess(repositoryIdentityCache, workspaceRoot),
248-
Cache.getSuccess(faviconCache, workspaceRoot),
249-
] as const,
250-
{ concurrency: "unbounded" },
251-
);
252-
return {
253-
repositoryIdentity: availableValue(repositoryIdentity),
254-
faviconPath: availableValue(faviconPath),
255-
repositoryIdentityResolved: isSuccessfullyResolved(repositoryIdentity),
256-
};
257-
});
245+
const peek: ProjectEnrichmentService["Service"]["peek"] = Effect.fnUntraced(
246+
function* (workspaceRoot) {
247+
const [repositoryIdentity, faviconPath] = yield* Effect.all(
248+
[
249+
Cache.getSuccess(repositoryIdentityCache, workspaceRoot),
250+
Cache.getSuccess(faviconCache, workspaceRoot),
251+
] as const,
252+
{ concurrency: "unbounded" },
253+
);
254+
return {
255+
repositoryIdentity: availableValue(repositoryIdentity),
256+
faviconPath: availableValue(faviconPath),
257+
repositoryIdentityResolved: isSuccessfullyResolved(repositoryIdentity),
258+
};
259+
},
260+
);
258261

259-
const request: ProjectEnrichmentService["Service"]["request"] = Effect.fn(
260-
"ProjectEnrichmentService.request",
261-
)(function* (workspaceRoot) {
262-
const [hasRepositoryIdentity, hasFaviconPath] = yield* Effect.all(
263-
[Cache.has(repositoryIdentityCache, workspaceRoot), Cache.has(faviconCache, workspaceRoot)],
264-
{ concurrency: "unbounded" },
265-
);
266-
yield* Effect.all(
267-
[
268-
hasRepositoryIdentity
269-
? Effect.void
270-
: requestLane(repositoryIdentityLane, workspaceRoot, "repositoryIdentity"),
271-
hasFaviconPath ? Effect.void : requestLane(faviconLane, workspaceRoot, "faviconPath"),
272-
],
273-
{ concurrency: "unbounded", discard: true },
274-
);
275-
});
262+
const request: ProjectEnrichmentService["Service"]["request"] = Effect.fnUntraced(
263+
function* (workspaceRoot) {
264+
const [hasRepositoryIdentity, hasFaviconPath] = yield* Effect.all(
265+
[Cache.has(repositoryIdentityCache, workspaceRoot), Cache.has(faviconCache, workspaceRoot)],
266+
{ concurrency: "unbounded" },
267+
);
268+
yield* Effect.all(
269+
[
270+
hasRepositoryIdentity
271+
? Effect.void
272+
: requestLane(repositoryIdentityLane, workspaceRoot, "repositoryIdentity"),
273+
hasFaviconPath ? Effect.void : requestLane(faviconLane, workspaceRoot, "faviconPath"),
274+
],
275+
{ concurrency: "unbounded", discard: true },
276+
);
277+
},
278+
);
276279

277280
const getAvailable: ProjectEnrichmentService["Service"]["getAvailable"] = Effect.fn(
278281
"ProjectEnrichmentService.getAvailable",

0 commit comments

Comments
 (0)