@forwardimpact/librpc 0.1.105 → 0.1.107

package/src/index.js

@@ -2,6 +2,7 @@ import grpc from "@grpc/grpc-js";
 
 import { createServiceConfig } from "@forwardimpact/libconfig";
 import { Tracer } from "@forwardimpact/libtelemetry/tracer.js";
+import { createDefaultRuntime } from "@forwardimpact/libutil/runtime";
 
 import { capitalizeFirstLetter } from "./base.js";
 import * as exports from "./generated/services/exports.js";
@@ -30,11 +31,17 @@ export const clients = exports.clients || {};
 export async function createTracer(serviceName) {
   const traceConfig = await createServiceConfig("trace");
   const { TraceClient } = clients;
-  const traceClient = new TraceClient(traceConfig);
+  // createTracer is a composition-root factory; it builds the production
+  // runtime as its DI root, threads it into the TraceClient (so the client's
+  // auth reads SERVICE_SECRET off the bag) and into the Tracer (and thus every
+  // Span) via its clock.
+  const runtime = createDefaultRuntime();
+  const traceClient = new TraceClient(traceConfig, runtime);
   return new Tracer({
     serviceName,
     traceClient,
     grpcMetadata: grpc.Metadata,
+    clock: runtime.clock,
   });
 }
 
@@ -60,6 +67,10 @@ export async function createClient(name, logger = null, tracer = null) {
   // Create config for the service
   const config = await createServiceConfig(name);
 
-  // Create and return the client instance with logger and tracer
-  return new ClientClass(config, logger, tracer);
+  // createClient is a composition-root factory; build the production runtime
+  // here and thread it so the client's auth reads SERVICE_SECRET off the bag.
+  const runtime = createDefaultRuntime();
+
+  // Create and return the client instance (runtime is the required 2nd arg)
+  return new ClientClass(config, runtime, logger, tracer);
 }

package/src/server.js

@@ -6,7 +6,6 @@ import {
   capitalizeFirstLetter,
 } from "./base.js";
 import { healthDefinition, createHealthHandlers } from "./health.js";
-import { createDefaultRuntime } from "@forwardimpact/libutil/runtime";
 
 /**
  * gRPC Server class using pre-compiled service definitions
@@ -21,29 +20,29 @@ export class Server extends Rpc {
    * Creates a gRPC server for a service
    * @param {object} service - Service instance with business logic
    * @param {object} config - Server configuration
-   * @param {object} [logger] - Optional logger instance
-   * @param {import("@forwardimpact/libtelemetry").Tracer} [tracer] - Optional tracer for distributed tracing
-   * @param {(serviceName: string, logger: object, tracer: object) => object} observerFn - Observer factory
-   * @param {() => {grpc: object}} grpcFn - gRPC factory
-   * @param {(serviceName: string) => object} authFn - Auth factory
-   * @param {import("@forwardimpact/libutil/runtime").Runtime} [runtime] - Optional runtime bag;
-   *   falls back to `createDefaultRuntime()` so existing service callers keep working.
+   * @param {object} options - Injected collaborators and optional factory overrides
+   * @param {object} [options.logger] - Optional logger instance
+   * @param {import("@forwardimpact/libtelemetry").Tracer} [options.tracer] - Optional tracer for distributed tracing
+   * @param {import("@forwardimpact/libutil/runtime").Runtime} options.runtime - Injected runtime bag
+   * @param {(serviceName: string, logger: object, tracer: object) => object} [options.observerFn] - Observer factory
+   * @param {() => {grpc: object}} [options.grpcFn] - gRPC factory
+   * @param {(serviceName: string) => object} [options.authFn] - Auth factory
    */
-  constructor(
-    service,
-    config,
-    logger = null,
-    tracer = null,
-    observerFn = createObserver,
-    grpcFn = createGrpc,
-    authFn = createAuth,
-    runtime = null,
-  ) {
+  constructor(service, config, options = {}) {
     if (!service) throw new Error("service is required");
-
-    super(config, logger, tracer, observerFn, grpcFn, authFn);
+    const {
+      logger = null,
+      tracer = null,
+      runtime,
+      observerFn = createObserver,
+      grpcFn = createGrpc,
+      authFn = createAuth,
+    } = options;
+    if (!runtime) throw new Error("runtime is required");
+
+    super(config, runtime, logger, tracer, observerFn, grpcFn, authFn);
     this.#service = service;
-    this.#runtime = runtime ?? createDefaultRuntime();
+    this.#runtime = runtime;
   }
 
   /** Starts the gRPC server */