Skip to content

Commit 5646dcb

Browse files
committed
fix(server): relay spans carry the operator's service instance id
Signed-off-by: Yordis Prieto <[email protected]>
1 parent 9e560c8 commit 5646dcb

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
11
import { processServiceInstanceId } from "@t3tools/shared/observability";
2+
import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
23
import * as RelayTracing from "@t3tools/shared/relayTracing";
4+
import * as Effect from "effect/Effect";
5+
import * as Layer from "effect/Layer";
36

47
import { resolveRelayClientTracingConfig } from "./publicConfig.ts";
58

69
const relayClientTracingConfig = resolveRelayClientTracingConfig();
710

8-
export const layerHeadlessRelayClient = RelayTracing.layer(relayClientTracingConfig, {
11+
const relayLayer = (resource: Omit<RelayTracing.RelayClientTracingResource, "serviceInstanceId">) =>
12+
Layer.unwrap(
13+
OtelEnvironment.load.pipe(
14+
Effect.map((otel) =>
15+
RelayTracing.layer(relayClientTracingConfig, {
16+
...resource,
17+
serviceInstanceId: processServiceInstanceId(otel.resourceAttributes),
18+
}),
19+
),
20+
),
21+
);
22+
23+
export const layerHeadlessRelayClient = relayLayer({
924
serviceName: "t3code-server",
1025
runtime: "node",
11-
serviceInstanceId: processServiceInstanceId(),
1226
client: "headless-cli",
1327
});
1428

15-
export const layerServerRelayBroker = RelayTracing.layer(relayClientTracingConfig, {
29+
export const layerServerRelayBroker = relayLayer({
1630
serviceName: "t3code-server",
1731
runtime: "node",
18-
serviceInstanceId: processServiceInstanceId(),
1932
client: "environment-server",
2033
component: "relay-broker",
2134
});

0 commit comments

Comments
 (0)