Skip to content

Commit 80b23e9

Browse files
committed
Merge remote-tracking branch 'origin/main' into t3/agent-readable-documents
2 parents 489aea5 + 03d1a90 commit 80b23e9

16 files changed

Lines changed: 188 additions & 9 deletions

File tree

‎apps/desktop/src/app/DesktopObservability.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { PRIMARY_LOCAL_ENVIRONMENT_ID } from "@t3tools/contracts";
22
import {
33
makeLocalFileTracer,
44
makeTraceSink,
5+
processServiceInstanceId,
56
type SignalExport,
67
} from "@t3tools/shared/observability";
78
import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -607,6 +608,7 @@ const layerTelemetry = Layer.unwrap(
607608
"service.namespace": "t3code",
608609
"service.runtime": "desktop",
609610
"service.mode": environment.isDevelopment ? "development" : "packaged",
611+
"service.instance.id": processServiceInstanceId(endpoints.resourceAttributes),
610612
...releaseResourceAttributes(
611613
environment.isDevelopment ? "dev" : releaseChannelOf(serviceVersion),
612614
endpoints.resourceAttributes,

‎apps/mobile/src/features/observability/tracing.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ it.effect("does not let OTLP serialization failures alter application effects",
2727
},
2828
{
2929
appVariant: "test",
30+
serviceInstanceId: "test-instance",
3031
serviceVersion: "1.2.3",
3132
},
3233
).pipe(Layer.provide(layerRemoteHttpClient(fetchFn)));

‎apps/mobile/src/features/observability/tracing.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export interface TracingConfig {
1212

1313
export interface TracingResource {
1414
readonly serviceVersion?: string;
15+
readonly serviceInstanceId: string;
1516
readonly appVariant: string;
1617
}
1718

@@ -39,13 +40,15 @@ export function layerFromConfig(config: TracingConfig | null, resource: TracingR
3940
serviceName: "t3code-mobile",
4041
serviceVersion: resource.serviceVersion,
4142
runtime: "react-native",
43+
serviceInstanceId: resource.serviceInstanceId,
4244
client: `mobile-${resource.appVariant}`,
4345
attributes: channel && releaseResourceAttributes(channel),
4446
});
4547
}
4648

4749
export const layer = layerFromConfig(resolveTracingConfig(), {
4850
serviceVersion: Constants.expoConfig?.version,
51+
serviceInstanceId: Constants.sessionId,
4952
appVariant:
5053
typeof Constants.expoConfig?.extra?.appVariant === "string"
5154
? Constants.expoConfig.extra.appVariant

‎apps/server/src/cloud/relayTracing.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
1+
import { processServiceInstanceId } from "@t3tools/shared/observability";
12
import * as RelayTracing from "@t3tools/shared/relayTracing";
3+
import * as Effect from "effect/Effect";
4+
import * as Layer from "effect/Layer";
25

6+
import * as ServerConfig from "../config.ts";
37
import { resolveRelayClientTracingConfig } from "./publicConfig.ts";
48

59
const relayClientTracingConfig = resolveRelayClientTracingConfig();
610

7-
export const layerHeadlessRelayClient = RelayTracing.layer(relayClientTracingConfig, {
11+
const relayLayer = (resource: Omit<RelayTracing.RelayClientTracingResource, "serviceInstanceId">) =>
12+
Layer.unwrap(
13+
Effect.map(ServerConfig.ServerConfig, (config) =>
14+
RelayTracing.layer(relayClientTracingConfig, {
15+
...resource,
16+
serviceInstanceId: processServiceInstanceId(config.otelEnvironment.resourceAttributes),
17+
}),
18+
),
19+
);
20+
21+
export const layerHeadlessRelayClient = relayLayer({
822
serviceName: "t3code-server",
923
runtime: "node",
1024
client: "headless-cli",
1125
});
1226

13-
export const layerServerRelayBroker = RelayTracing.layer(relayClientTracingConfig, {
27+
export const layerServerRelayBroker = relayLayer({
1428
serviceName: "t3code-server",
1529
runtime: "node",
1630
client: "environment-server",

‎apps/server/src/config.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ import * as Schema from "effect/Schema";
1010

1111
import type { OtlpEndpointSource } from "@t3tools/contracts";
1212
import { sweepStalePendingAttachments } from "./attachmentStore.ts";
13-
import { DEFAULT_SIGNAL_EXPORT, type SignalExport } from "@t3tools/shared/observability";
13+
import {
14+
DEFAULT_SIGNAL_EXPORT,
15+
processServiceInstanceId,
16+
type SignalExport,
17+
} from "@t3tools/shared/observability";
1418
import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
1519
import { type ReleaseChannel, releaseResourceAttributes } from "@t3tools/shared/releaseResource";
1620
import packageJson from "../package.json" with { type: "json" };
@@ -121,6 +125,7 @@ export const otlpResource = (
121125
"service.namespace": "t3code",
122126
"service.runtime": "t3-server",
123127
"t3code.server.managed_by": config.mode === "desktop" ? "desktop" : "standalone",
128+
"service.instance.id": processServiceInstanceId(config.otelEnvironment.resourceAttributes),
124129
...releaseResourceAttributes(telemetryChannel, config.otelEnvironment.resourceAttributes),
125130
"host.name": config.otelEnvironment.resourceAttributes["host.name"] || hostName,
126131
},

‎apps/server/src/serverLogger.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,21 @@ const printThroughConsole = (fields: object) =>
151151
});
152152

153153
describe("ServerLoggerLive", () => {
154+
it.effect("exports the operator's service instance id instead of a generated one", () =>
155+
Effect.gen(function* () {
156+
const { requests } = yield* logInSpanThrough({
157+
otlpLogsUrl: "https://collector.example.com/v1/logs",
158+
otelEnvironment: {
159+
...OtelEnvironment.none,
160+
resourceAttributes: { "service.instance.id": "pod-7" },
161+
},
162+
});
163+
164+
const body = requests.map((request) => request.body).join("\n");
165+
assert.include(body, '"key":"service.instance.id","value":{"stringValue":"pod-7"}');
166+
}),
167+
);
168+
154169
it.effect("exports a resource that names whether the desktop app launched the server", () =>
155170
Effect.gen(function* () {
156171
const { requests } = yield* logInSpanThrough({

‎apps/web/src/lib/runtime.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const layerRelayTracing = RelayTracing.layer(resolveRelayTracingConfig(), {
2222
serviceName: "t3code-web",
2323
serviceVersion: import.meta.env.APP_VERSION,
2424
runtime: "browser",
25+
serviceInstanceId: ClientTracer.serviceInstanceId,
2526
client: typeof window !== "undefined" && window.desktopBridge ? "desktop" : "web",
2627
}).pipe(Layer.provide(layerHttpClient));
2728

‎apps/web/src/observability/clientTracer.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import * as Layer from "effect/Layer";
22
import * as Tracer from "effect/Tracer";
33

4+
import { randomUUID } from "../lib/utils";
5+
6+
/** `service.instance.id` for this page load, shared by every resource the UI exports. */
7+
export const serviceInstanceId = randomUUID();
8+
49
let delegate: Tracer.Tracer | null = null;
510

611
export function setDelegate(next: Tracer.Tracer | null): void {

‎apps/web/src/observability/clientTracing.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const CLIENT_TRACING_RESOURCE = {
2626
serviceName: "t3code-web",
2727
attributes: {
2828
"service.namespace": "t3code",
29+
"service.instance.id": ClientTracer.serviceInstanceId,
2930
...releaseResourceAttributes(RELEASE_CHANNEL),
3031
"service.runtime": "t3-web",
3132
"t3code.client.surface": isElectron ? "desktop" : "web",

‎docs/operations/observability.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,10 @@ browser and the desktop window, since it is the same code, and `t3code.client.su
644644
or `web`. The server's `t3code.server.managed_by` is `desktop` when the desktop app launched it and
645645
`standalone` otherwise.
646646

647+
Every resource also carries a `service.instance.id`: random per process for the server and desktop,
648+
per page load for the UI, and the Expo session on mobile. A `service.instance.id` in
649+
`OTEL_RESOURCE_ATTRIBUTES` replaces the generated one on the server and desktop.
650+
647651
If the OTLP URLs are unset, local tracing still works, metrics stay in-process only, and logs stay
648652
on stdout only.
649653

0 commit comments

Comments
 (0)