mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-11 05:31:46 +02:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - The server emits OpenTelemetry spans so operators can trace agent work > - Each span needs a service version that identifies the code that produced it > - The current service version comes from a static environment value and can become stale after a rebuild > - This pull request records the built commit and resolves the service version from the build stamp, runtime Git, the environment, or an unknown fallback > - The benefit is trace data that identifies the correct built commit during development and deployment ## Linked Issues or Issue Description **What happened?** The server used a static `OTEL_SERVICE_VERSION` value for every OpenTelemetry span. Rebuilds could produce traces with an old commit value. **Expected behavior** The server should report the built commit when a build stamp exists. It should use runtime Git, the environment value, or `unknown` as fallback. **Steps to reproduce** 1. Set `OTEL_SERVICE_VERSION` to an old commit value. 2. Build the server at a different commit. 3. Start the server and inspect the OpenTelemetry service version. 4. Confirm that the built commit takes precedence over the old environment value. ## What Changed - Add a build script that writes the short Git commit to `dist/build-info.json`. - Resolve `service.version` from the build stamp, runtime Git, the environment, or `unknown`. - Log the resolved service version once during server startup. - Add tests for the resolution order and safe behavior without Git. - Document the resolution order in `doc/observability.md`. ## Verification - `pnpm --filter @paperclipai/server build` - `npx vitest run server/src/__tests__/service-version.test.ts` - `pnpm --filter @paperclipai/server typecheck` - Confirm that the build stamp contains the short commit. - Confirm that the stamp wins over the environment value. - Confirm that a build without Git exits successfully without a stamp. ## Risks The server now prefers the built commit over `OTEL_SERVICE_VERSION`. A build without Git uses the existing environment value or `unknown`. The change needs no schema migration and has a single-commit rollback path. ## Model Used OpenAI Codex, GPT-5, tool use and code execution. The runtime does not expose the context window size or reasoning mode. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
52 lines
1.8 KiB
TypeScript
52 lines
1.8 KiB
TypeScript
import { mkdtempSync, rmSync } from "node:fs";
|
|
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
|
|
import { describe, expect, it } from "vitest";
|
|
|
|
import { readGitCommit, resolveServiceVersion } from "../instrumentation.js";
|
|
|
|
describe("resolveServiceVersion", () => {
|
|
it("prefers the build stamp over every other source", () => {
|
|
expect(resolveServiceVersion("aaaaaaa", "bbbbbbb", "2026.5.0")).toBe("aaaaaaa");
|
|
});
|
|
|
|
it("uses the runtime git commit when no build stamp exists", () => {
|
|
expect(resolveServiceVersion(null, "bbbbbbb", "2026.5.0")).toBe("bbbbbbb");
|
|
});
|
|
|
|
it("uses OTEL_SERVICE_VERSION when no stamp and no git commit exist", () => {
|
|
expect(resolveServiceVersion(null, null, "2026.5.0")).toBe("2026.5.0");
|
|
});
|
|
|
|
it("falls back to 'unknown' when every source is absent", () => {
|
|
expect(resolveServiceVersion(null, null, undefined)).toBe("unknown");
|
|
});
|
|
|
|
it("treats an empty env value as absent", () => {
|
|
expect(resolveServiceVersion(null, null, "")).toBe("unknown");
|
|
});
|
|
});
|
|
|
|
describe("readGitCommit", () => {
|
|
it("resolves git from the module checkout, not the process launch directory", () => {
|
|
// This test needs reachable git metadata in the checkout that holds the
|
|
// module. Skip the assertion when the environment has no git.
|
|
const baseline = readGitCommit();
|
|
if (baseline === null) return;
|
|
|
|
const original = process.cwd();
|
|
const launchDir = mkdtempSync(join(tmpdir(), "paperclip-no-git-"));
|
|
try {
|
|
// Move the process into a directory with no repository. The lookup still
|
|
// returns the checkout commit, because it reads the module directory, not
|
|
// the launch directory.
|
|
process.chdir(launchDir);
|
|
expect(readGitCommit()).toBe(baseline);
|
|
} finally {
|
|
process.chdir(original);
|
|
rmSync(launchDir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
});
|