Add key to LoggerContext (#455)

Author: slinkydeveloper

packages/restate-sdk/src/endpoint/handlers/generic.ts

@@ -33,6 +33,7 @@ import {
 } from "../../logger.js";
 import * as vm from "./vm/sdk_shared_core_wasm_bindings.js";
 import { CompletablePromise } from "../../utils/completable_promise.js";
+import { HandlerKind } from "../../types/rpc.js";
 
 export interface Headers {
   [name: string]: string | string[] | undefined;
@@ -278,9 +279,9 @@ export class GenericHandler implements RestateHandler {
       LogSource.USER,
       new LoggerContext(
         input.invocation_id,
-        "",
         handler.component().name(),
         handler.name(),
+        handler.kind() === HandlerKind.SERVICE ? undefined : input.key,
         additionalContext
       ),
       () => !coreVm.is_processing()

packages/restate-sdk/src/logger.ts

@@ -115,26 +115,27 @@ function readRestateLogLevel(): RestateLogLevel {
 }
 
 export class LoggerContext {
-  readonly fqMethodName: string;
+  readonly invocationTarget: string;
 
   constructor(
     readonly invocationId: string,
-    packageName: string,
-    serviceName: string,
-    handlerName: string,
+    readonly serviceName: string,
+    readonly handlerName: string,
+    readonly key?: string,
     readonly additionalContext?: { [name: string]: string }
   ) {
-    this.fqMethodName = packageName
-      ? `${packageName}.${serviceName}/${handlerName}`
-      : `${serviceName}/${handlerName}`;
+    this.invocationTarget =
+      key === undefined || key.length === 0
+        ? `${serviceName}/${handlerName}`
+        : `${serviceName}/${key}/${handlerName}`;
   }
 }
 
 function formatLogPrefix(context?: LoggerContext): string {
   if (context === undefined) {
     return "[restate] ";
   }
-  let prefix = `[restate] [${context.fqMethodName}][${context.invocationId}]`;
+  let prefix = `[restate] [${context.invocationTarget}][${context.invocationId}]`;
   if (context.additionalContext !== undefined) {
     for (const [k, v] of Object.entries(context.additionalContext)) {
       prefix = prefix + `[${k}: ${v}]`;