Skip to content

Commit 3b53df3

Browse files
authored
Pass target and composition type back to composition scheduler (#8276)
1 parent e967f76 commit 3b53df3

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

deployment/grafana-dashboards/Schema-Service.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,9 +745,9 @@
745745
"uid": "PROM_DATASOURCE_UID"
746746
},
747747
"editorMode": "code",
748-
"expr": "sum(composition_worker_memory_used_bytes) by (instance)",
748+
"expr": "max(composition_worker_memory_used_bytes) by (target, type)",
749749
"instant": false,
750-
"legendFormat": "{{instance}}",
750+
"legendFormat": "{{target}} - {{type}}",
751751
"range": true,
752752
"refId": "A"
753753
}

packages/services/schema/src/composition-scheduler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export class CompositionScheduler {
145145
if (data.event === 'metric') {
146146
if (data.type === 'heapUsed') {
147147
compositionWorkerMemoryUsedBytes.set(
148-
{ target: workerState?.args.targetId, type: workerState?.args.data.type },
148+
{ target: data.target, type: data.type },
149149
data.value,
150150
);
151151
}

packages/services/schema/src/composition-worker.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ export type ErrorResultEvent = {
1717

1818
export type TrackMetricEvent = {
1919
event: 'metric';
20+
target: string | undefined;
21+
compositionType: CompositionEvent['data']['type'];
2022
} & {
2123
type: 'heapUsed';
2224
value: number;
@@ -45,6 +47,7 @@ export function createCompositionWorker(args: {
4547
messageId: message.id,
4648
event: message.event,
4749
});
50+
4851
logger.debug('processing message');
4952
const postResult = (result: CompositionResultEvent | ErrorResultEvent) => {
5053
args.port.postMessage(result);
@@ -55,6 +58,8 @@ export function createCompositionWorker(args: {
5558
event: 'metric',
5659
type: 'heapUsed',
5760
value: process.memoryUsage().heapUsed,
61+
target: message.targetId,
62+
compositionType: message.data.type,
5863
} satisfies TrackMetricEvent);
5964
}
6065
};

0 commit comments

Comments
 (0)