@aztec/prover-client 0.0.1-commit.bf2612ae → 0.0.1-commit.c31f2472

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/dest/light/lightweight_checkpoint_builder.d.ts +5 -4
  2. package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -1
  3. package/dest/light/lightweight_checkpoint_builder.js +10 -7
  4. package/dest/mocks/fixtures.d.ts +1 -1
  5. package/dest/mocks/fixtures.d.ts.map +1 -1
  6. package/dest/mocks/fixtures.js +2 -1
  7. package/dest/orchestrator/orchestrator.d.ts +4 -2
  8. package/dest/orchestrator/orchestrator.d.ts.map +1 -1
  9. package/dest/orchestrator/orchestrator.js +65 -64
  10. package/dest/prover-client/prover-client.d.ts +1 -1
  11. package/dest/prover-client/prover-client.d.ts.map +1 -1
  12. package/dest/prover-client/prover-client.js +7 -4
  13. package/dest/proving_broker/broker_prover_facade.d.ts +4 -3
  14. package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
  15. package/dest/proving_broker/broker_prover_facade.js +3 -3
  16. package/dest/proving_broker/proving_agent.d.ts +4 -3
  17. package/dest/proving_broker/proving_agent.d.ts.map +1 -1
  18. package/dest/proving_broker/proving_agent.js +4 -4
  19. package/dest/proving_broker/proving_broker_instrumentation.d.ts +1 -1
  20. package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +1 -1
  21. package/dest/proving_broker/proving_broker_instrumentation.js +11 -7
  22. package/dest/proving_broker/proving_job_controller.d.ts +4 -3
  23. package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
  24. package/dest/proving_broker/proving_job_controller.js +6 -3
  25. package/package.json +15 -15
  26. package/src/light/lightweight_checkpoint_builder.ts +12 -2
  27. package/src/mocks/fixtures.ts +2 -1
  28. package/src/orchestrator/orchestrator.ts +66 -65
  29. package/src/prover-client/prover-client.ts +16 -5
  30. package/src/proving_broker/broker_prover_facade.ts +6 -3
  31. package/src/proving_broker/proving_agent.ts +5 -2
  32. package/src/proving_broker/proving_broker_instrumentation.ts +10 -6
  33. package/src/proving_broker/proving_job_controller.ts +9 -3
package/src/proving_broker/proving_broker_instrumentation.ts CHANGED
@@ -8,6 +8,7 @@ import {
8
8
  type ObservableResult,
9
9
  type TelemetryClient,
10
10
  type UpDownCounter,
11
+ createUpDownCounterWithDefault,
11
12
  } from '@aztec/telemetry-client';
12
13
 
13
14
  export type MonitorCallback = (proofType: ProvingRequestType) => number;
@@ -31,17 +32,20 @@ export class ProvingBrokerInstrumentation {
31
32
 
32
33
  this.activeJobs = meter.createObservableGauge(Metrics.PROVING_QUEUE_ACTIVE_JOBS);
33
34
 
34
- this.resolvedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_RESOLVED_JOBS);
35
+ const provingJobTypes = Object.values(ProvingRequestType).filter(v => typeof v === 'string');
36
+ const provingJobAttrs = { [Attributes.PROVING_JOB_TYPE]: provingJobTypes };
35
37
 
36
- this.rejectedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_REJECTED_JOBS);
38
+ this.resolvedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_RESOLVED_JOBS, provingJobAttrs);
37
39
 
38
- this.retriedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_RETRIED_JOBS);
40
+ this.rejectedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_REJECTED_JOBS, provingJobAttrs);
39
41
 
40
- this.timedOutJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_TIMED_OUT_JOBS);
42
+ this.retriedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_RETRIED_JOBS, provingJobAttrs);
41
43
 
42
- this.cachedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_CACHED_JOBS);
44
+ this.timedOutJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_TIMED_OUT_JOBS, provingJobAttrs);
43
45
 
44
- this.totalJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_TOTAL_JOBS);
46
+ this.cachedJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_CACHED_JOBS, provingJobAttrs);
47
+
48
+ this.totalJobs = createUpDownCounterWithDefault(meter, Metrics.PROVING_QUEUE_TOTAL_JOBS, provingJobAttrs);
45
49
 
46
50
  this.jobWait = meter.createHistogram(Metrics.PROVING_QUEUE_JOB_WAIT);
47
51
 
package/src/proving_broker/proving_job_controller.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { EpochNumber } from '@aztec/foundation/branded-types';
2
2
  import { randomBytes } from '@aztec/foundation/crypto/random';
3
3
  import { AbortError } from '@aztec/foundation/error';
4
- import { createLogger } from '@aztec/foundation/log';
4
+ import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
5
5
  import type {
6
6
  ProvingJobId,
7
7
  ProvingJobInputs,
@@ -21,6 +21,7 @@ export class ProvingJobController {
21
21
  private promise?: Promise<void>;
22
22
  private abortController = new AbortController();
23
23
  private result?: ProvingJobResultsMap[ProvingRequestType] | Error;
24
+ private log: Logger;
24
25
 
25
26
  constructor(
26
27
  private jobId: ProvingJobId,
@@ -29,8 +30,13 @@ export class ProvingJobController {
29
30
  private startedAt: number,
30
31
  private circuitProver: ServerCircuitProver,
31
32
  private onComplete: () => void,
32
- private log = createLogger('prover-client:proving-agent:job-controller-' + randomBytes(4).toString('hex')),
33
- ) {}
33
+ bindings?: LoggerBindings,
34
+ ) {
35
+ this.log = createLogger('prover-client:proving-agent:job-controller', {
36
+ instanceId: randomBytes(4).toString('hex'),
37
+ ...bindings,
38
+ });
39
+ }
34
40
 
35
41
  public start(): void {
36
42
  if (this.status !== ProvingJobControllerStatus.IDLE) {