@slates/provider-handler 1.0.0-rc.4 → 1.0.0-rc.7

package/src/index.ts

@@ -1,10 +1,46 @@
 import { badRequestError, preconditionFailedError, ServiceError } from '@lowerdeck/error';
-import { createSlatesProviderProtoHandler, SlatesParticipant } from '@slates/proto';
-import { Slate, SlateContext, SlateLogger, SlateLogListener } from '@slates/provider';
+import {
+  createSlatesProviderProtoHandler,
+  SLATES_PROTOCOL_VERSION,
+  type SlatesParticipant
+} from '@slates/proto';
+import {
+  runWithContext,
+  type Slate,
+  SlateContext,
+  SlateLogger,
+  type SlateLogListener
+} from '@slates/provider';
 import { getAction, getActionWithType, getAuthMethod, mapAction, mapAuthMethod } from './spec';
 import { State } from './state';
 import { toJsonSchema, validate } from './validation';
 
+let isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === 'object' && value !== null && !Array.isArray(value);
+
+let getObjectKeyCount = (value: unknown) =>
+  isRecord(value) ? Object.keys(value).length : undefined;
+
+let toErrorMetadata = (error: unknown) => {
+  if (error instanceof Error) {
+    return {
+      errorName: error.name,
+      errorMessage: error.message,
+      errorStack: error.stack
+    };
+  }
+
+  return {
+    errorValue: String(error)
+  };
+};
+
+let formatEntityLabel = (name: string, key: string) => `"${name}" (${key})`;
+let resolveTraceMessage = <ResultType>(
+  message: string | ((result: ResultType) => string),
+  result: ResultType
+) => (typeof message === 'function' ? message(result) : message);
+
 export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
   slate: Slate<ConfigType, AuthType>,
   listeners: SlateLogListener[]
@@ -15,10 +51,69 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
 
     let auth = new State<{ authenticationMethodId: string; output: AuthType } | null>(null);
     let config = new State<{ value: ConfigType } | null>(null);
-
     let session = new State<{ id: string; state: any } | null>(null);
 
     let logger = new SlateLogger(listeners);
+    let providerTrace = {
+      providerId: slate.spec.key,
+      providerName: slate.spec.name
+    };
+
+    let traceProviderCall = async <ResultType>(
+      trace: {
+        component: 'config' | 'auth' | 'action';
+        functionName: string;
+        message: string;
+        successMessage: string | ((result: ResultType) => string);
+        errorMessage?: string;
+        metadata?: Record<string, unknown>;
+        onSuccess?: (result: ResultType) => Record<string, unknown> | undefined;
+      },
+      handler: () => Promise<ResultType>
+    ): Promise<ResultType> => {
+      let startedAt = Date.now();
+
+      logger.info({
+        ...providerTrace,
+        ...trace.metadata,
+        component: trace.component,
+        functionName: trace.functionName,
+        phase: 'start',
+        message: trace.message
+      });
+
+      try {
+        let result = await handler();
+        let successMessage = resolveTraceMessage(trace.successMessage, result);
+
+        logger.info({
+          ...providerTrace,
+          ...trace.metadata,
+          ...(trace.onSuccess?.(result) ?? {}),
+          component: trace.component,
+          functionName: trace.functionName,
+          phase: 'success',
+          durationMs: Date.now() - startedAt,
+          message: successMessage
+        });
+
+        return result;
+      } catch (error) {
+        logger.error({
+          ...providerTrace,
+          ...trace.metadata,
+          ...toErrorMetadata(error),
+          component: trace.component,
+          functionName: trace.functionName,
+          phase: 'error',
+          durationMs: Date.now() - startedAt,
+          message:
+            trace.errorMessage ??
+            `${typeof trace.successMessage === 'string' ? trace.successMessage : trace.message} failed`
+        });
+        throw error;
+      }
+    };
 
     let getContextBasic = () => {
       let currentProtocol = protocol.get();
@@ -65,6 +160,15 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       };
     };
 
+    let getEmptyContext = () => new SlateContext({}, {}, {}, slate.spec as any, logger);
+    let withRequestTraces = <Result extends Record<string, any>>(
+      context: SlateContext<any, any, any>,
+      result: Result
+    ) => {
+      let requestTraces = context.getHttpTraces();
+      return requestTraces.length > 0 ? { ...result, requestTraces } : result;
+    };
+
     manager.onNotification('slates/hello', async ({ params }) => {
       protocol.set(params.protocol);
     });
@@ -133,15 +237,37 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         return { success: true, config: newConfig };
       }
 
-      let updatedConfig = await configChanged({
-        previousConfig: params.previousConfig as ConfigType | null,
-        newConfig
-      });
+      let context = getEmptyContext();
+      let updatedConfig = await traceProviderCall<{ config?: ConfigType } | undefined>(
+        {
+          component: 'config',
+          functionName: 'configChanged',
+          message: 'Running config change handler',
+          successMessage: 'Config change handler completed',
+          metadata: {
+            hasPreviousConfig: params.previousConfig !== null,
+            newConfigKeyCount: getObjectKeyCount(newConfig)
+          },
+          onSuccess: result => ({
+            returnedConfig: !!result?.config
+          })
+        },
+        () =>
+          runWithContext(context, async () =>
+            configChanged({
+              previousConfig: params.previousConfig as ConfigType | null,
+              newConfig
+            })
+          )
+      );
 
-      return { success: true, config: updatedConfig?.config ?? newConfig };
+      return withRequestTraces(context, {
+        success: true,
+        config: (updatedConfig?.config ?? newConfig) as Record<string, any>
+      });
     });
 
-    manager.onRequest('slates/config.get_default', async ({ params }) => {
+    manager.onRequest('slates/config.get_default', async () => {
       getContextBasic();
 
       let getDefaultConfig = slate.spec.config.handlers.getDefaultConfig;
@@ -149,21 +275,35 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         return { config: null };
       }
 
-      let defaultConfig = await getDefaultConfig();
-      return { config: defaultConfig };
+      let context = getEmptyContext();
+      let defaultConfig = await traceProviderCall<ConfigType>(
+        {
+          component: 'config',
+          functionName: 'getDefaultConfig',
+          message: 'Getting default config',
+          successMessage: 'Default config retrieved',
+          onSuccess: result => ({
+            configKeyCount: getObjectKeyCount(result)
+          })
+        },
+        () => runWithContext(context, async () => getDefaultConfig())
+      );
+      return withRequestTraces(context, {
+        config: (defaultConfig ?? null) as Record<string, any> | null
+      });
     });
 
-    manager.onRequest('slates/config.schema.get', async ({ params }) => {
+    manager.onRequest('slates/config.schema.get', async () => {
       getContextBasic();
 
       return { schema: toJsonSchema(slate.spec.configSchema) };
     });
 
-    manager.onRequest('slates/provider.identify', async ({ params }) => {
+    manager.onRequest('slates/provider.identify', async () => {
       getContextBasic();
 
       return {
-        protocol: 'slates@2026-01-01',
+        protocol: SLATES_PROTOCOL_VERSION,
         provider: {
           type: 'provider',
           id: slate.spec.key,
@@ -174,7 +314,7 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       };
     });
 
-    manager.onRequest('slates/auth.methods.list', async ({ params }) => {
+    manager.onRequest('slates/auth.methods.list', async () => {
       getContextBasic();
 
       return {
@@ -199,7 +339,25 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         return { input: null };
       }
 
-      return { input: await authMethod.getDefaultInput() };
+      let context = getEmptyContext();
+      let input = await traceProviderCall(
+        {
+          component: 'auth',
+          functionName: 'getDefaultInput',
+          message: 'Getting default authentication input',
+          successMessage: 'Default authentication input retrieved',
+          metadata: {
+            authenticationMethodId: params.authenticationMethodId,
+            authenticationMethodName: authMethod.name
+          },
+          onSuccess: result => ({
+            inputKeyCount: getObjectKeyCount(result)
+          })
+        },
+        () => runWithContext(context, () => authMethod.getDefaultInput!())
+      );
+
+      return withRequestTraces(context, { input });
     });
 
     manager.onRequest('slates/auth.input.changed', async ({ params }) => {
@@ -210,12 +368,36 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         return { success: true, input: params.newInput };
       }
 
-      let updatedInput = await authMethod.onInputChanged({
-        previousInput: params.previousInput as any | null,
-        newInput: params.newInput
-      });
+      let context = getEmptyContext();
+      let updatedInput = await traceProviderCall(
+        {
+          component: 'auth',
+          functionName: 'onInputChanged',
+          message: 'Running authentication input change handler',
+          successMessage: 'Authentication input change handler completed',
+          metadata: {
+            authenticationMethodId: params.authenticationMethodId,
+            authenticationMethodName: authMethod.name,
+            hasPreviousInput: params.previousInput !== null,
+            newInputKeyCount: getObjectKeyCount(params.newInput)
+          },
+          onSuccess: result => ({
+            returnedInput: !!result?.input
+          })
+        },
+        () =>
+          runWithContext(context, () =>
+            authMethod.onInputChanged!({
+              previousInput: params.previousInput as any | null,
+              newInput: params.newInput
+            })
+          )
+      );
 
-      return { success: true, input: updatedInput?.input ?? params.newInput };
+      return withRequestTraces(context, {
+        success: true,
+        input: updatedInput?.input ?? params.newInput
+      });
     });
 
     manager.onRequest('slates/auth.output.get', async ({ params }) => {
@@ -234,8 +416,25 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       }
 
       if ('getOutput' in authMethod) {
-        let outputRes = await authMethod.getOutput({ input });
-        return { output: outputRes.output };
+        let context = getEmptyContext();
+        let outputRes = await traceProviderCall(
+          {
+            component: 'auth',
+            functionName: 'getOutput',
+            message: 'Getting authentication output',
+            successMessage: 'Authentication output retrieved',
+            metadata: {
+              authenticationMethodId: params.authenticationMethodId,
+              authenticationMethodName: authMethod.name,
+              inputKeyCount: getObjectKeyCount(input)
+            },
+            onSuccess: result => ({
+              outputKeyCount: getObjectKeyCount(result.output)
+            })
+          },
+          () => runWithContext(context, () => authMethod.getOutput({ input }))
+        );
+        return withRequestTraces(context, { output: outputRes.output });
       }
 
       return { output: input as any };
@@ -246,20 +445,45 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       let authMethod = getAuthMethod(slate, params.authenticationMethodId);
 
       if ('handleCallback' in authMethod) {
-        let callbackRes = await authMethod.handleCallback({
-          code: params.code,
-          state: params.state,
-          redirectUri: params.redirectUri,
-          input: params.input,
-          clientId: params.clientId,
-          clientSecret: params.clientSecret,
-          scopes: params.scopes
-        });
+        let context = getEmptyContext();
+        let callbackRes = await traceProviderCall(
+          {
+            component: 'auth',
+            functionName: 'handleCallback',
+            message: 'Handling authentication callback',
+            successMessage: 'Authentication callback handled',
+            metadata: {
+              authenticationMethodId: params.authenticationMethodId,
+              authenticationMethodName: authMethod.name,
+              scopeCount: params.scopes.length,
+              hasCallbackState: !!params.callbackState
+            },
+            onSuccess: result => ({
+              outputKeyCount: getObjectKeyCount(result.output),
+              returnedInput: !!result.input,
+              returnedScopeCount: result.scopes?.length
+            })
+          },
+          () =>
+            runWithContext(context, () =>
+              authMethod.handleCallback({
+                code: params.code,
+                state: params.state,
+                redirectUri: params.redirectUri,
+                input: params.input,
+                clientId: params.clientId,
+                clientSecret: params.clientSecret,
+                scopes: params.scopes,
+                callbackState: params.callbackState || {}
+              })
+            )
+        );
 
-        return {
+        return withRequestTraces(context, {
           output: callbackRes.output,
-          input: callbackRes.input
-        };
+          input: callbackRes.input,
+          scopes: callbackRes.scopes
+        });
       }
 
       throw new ServiceError(
@@ -274,19 +498,42 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       let authMethod = getAuthMethod(slate, params.authenticationMethodId);
 
       if ('getAuthorizationUrl' in authMethod) {
-        let urlRes = await authMethod.getAuthorizationUrl({
-          redirectUri: params.redirectUri,
-          state: params.state,
-          input: params.input,
-          clientId: params.clientId,
-          clientSecret: params.clientSecret,
-          scopes: params.scopes
-        });
+        let context = getEmptyContext();
+        let urlRes = await traceProviderCall(
+          {
+            component: 'auth',
+            functionName: 'getAuthorizationUrl',
+            message: 'Getting authentication authorization URL',
+            successMessage: 'Authentication authorization URL retrieved',
+            metadata: {
+              authenticationMethodId: params.authenticationMethodId,
+              authenticationMethodName: authMethod.name,
+              scopeCount: params.scopes.length,
+              inputKeyCount: getObjectKeyCount(params.input)
+            },
+            onSuccess: result => ({
+              returnedInput: !!result.input,
+              hasCallbackState: !!result.callbackState
+            })
+          },
+          () =>
+            runWithContext(context, () =>
+              authMethod.getAuthorizationUrl({
+                redirectUri: params.redirectUri,
+                state: params.state,
+                input: params.input,
+                clientId: params.clientId,
+                clientSecret: params.clientSecret,
+                scopes: params.scopes
+              })
+            )
+        );
 
-        return {
+        return withRequestTraces(context, {
           authorizationUrl: urlRes.url,
-          input: urlRes.input
-        };
+          input: urlRes.input,
+          callbackState: urlRes.callbackState
+        });
       }
 
       throw new ServiceError(
@@ -301,15 +548,39 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       let authMethod = getAuthMethod(slate, params.authenticationMethodId);
 
       if (authMethod.getProfile) {
-        let profileRes = await authMethod.getProfile({
-          output: params.output as any,
-          input: params.input,
-          scopes: params.scopes
-        });
+        let context = getEmptyContext();
+        let profileRes = await traceProviderCall(
+          {
+            component: 'auth',
+            functionName: 'getProfile',
+            message: 'Getting authentication profile',
+            successMessage: 'Authentication profile retrieved',
+            metadata: {
+              authenticationMethodId: params.authenticationMethodId,
+              authenticationMethodName: authMethod.name,
+              scopeCount: params.scopes.length,
+              inputKeyCount: getObjectKeyCount(params.input),
+              outputKeyCount: getObjectKeyCount(params.output)
+            },
+            onSuccess: result => ({
+              profileKeyCount: getObjectKeyCount(result.profile)
+            })
+          },
+          () =>
+            runWithContext(
+              context,
+              () =>
+                authMethod.getProfile!({
+                  output: params.output as any,
+                  input: params.input,
+                  scopes: params.scopes
+                })!
+            )
+        );
 
-        return {
+        return withRequestTraces(context, {
           profile: profileRes.profile
-        };
+        });
       }
 
       throw new ServiceError(
@@ -324,18 +595,41 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       let authMethod = getAuthMethod(slate, params.authenticationMethodId);
 
       if ('handleTokenRefresh' in authMethod && authMethod.handleTokenRefresh) {
-        let refreshRes = await authMethod.handleTokenRefresh({
-          output: params.output as any,
-          input: params.input,
-          clientId: params.clientId,
-          clientSecret: params.clientSecret,
-          scopes: params.scopes
-        });
+        let context = getEmptyContext();
+        let refreshRes = await traceProviderCall(
+          {
+            component: 'auth',
+            functionName: 'handleTokenRefresh',
+            message: 'Refreshing authentication token',
+            successMessage: 'Authentication token refreshed',
+            metadata: {
+              authenticationMethodId: params.authenticationMethodId,
+              authenticationMethodName: authMethod.name,
+              scopeCount: params.scopes.length,
+              inputKeyCount: getObjectKeyCount(params.input),
+              outputKeyCount: getObjectKeyCount(params.output)
+            },
+            onSuccess: result => ({
+              refreshedOutputKeyCount: getObjectKeyCount(result.output),
+              returnedInput: !!result.input
+            })
+          },
+          () =>
+            runWithContext(context, () =>
+              authMethod.handleTokenRefresh!({
+                output: params.output as any,
+                input: params.input,
+                clientId: params.clientId,
+                clientSecret: params.clientSecret,
+                scopes: params.scopes
+              })
+            )
+        );
 
-        return {
+        return withRequestTraces(context, {
           output: refreshRes.output,
           input: refreshRes.input
-        };
+        });
       }
 
       throw new ServiceError(
@@ -345,7 +639,7 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
       );
     });
 
-    manager.onRequest('slates/actions.list', async ({ params }) => {
+    manager.onRequest('slates/actions.list', async () => {
       getContextBasic();
 
       return {
@@ -373,11 +667,30 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         `Invalid input for tool ID: ${params.actionId}`
       );
 
-      let res = await action.handleInvocation(
-        new SlateContext(ctx.config, input, ctx.auth?.output!, slate.spec, logger)
+      let context = new SlateContext(ctx.config, input, ctx.auth?.output!, slate.spec, logger);
+      let res = await traceProviderCall(
+        {
+          component: 'action',
+          functionName: 'handleInvocation',
+          message: `Starting tool ${formatEntityLabel(action.name, action.key)}`,
+          successMessage: `Completed tool ${formatEntityLabel(action.name, action.key)}`,
+          errorMessage: `Tool ${formatEntityLabel(action.name, action.key)} failed`,
+          metadata: {
+            actionId: action.key,
+            actionName: action.name,
+            actionType: action.type,
+            inputKeyCount: getObjectKeyCount(input)
+          },
+          onSuccess: result => ({
+            hasMessage: !!result.message,
+            actionResultMessage: result.message,
+            outputKeyCount: getObjectKeyCount(result.output)
+          })
+        },
+        () => runWithContext(context, () => action.handleInvocation(context))
       );
 
-      return { output: res.output, message: res.message };
+      return withRequestTraces(context, { output: res.output, message: res.message });
     });
 
     manager.onRequest('slates/action.trigger.map_event', async ({ params }) => {
@@ -391,11 +704,31 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         `Invalid event for trigger ID: ${params.actionId}`
       );
 
-      let res = await action.handleEvent(
-        new SlateContext(ctx.config, input, ctx.auth?.output!, slate.spec, logger)
+      let context = new SlateContext(ctx.config, input, ctx.auth?.output!, slate.spec, logger);
+      let res = await traceProviderCall(
+        {
+          component: 'action',
+          functionName: 'handleEvent',
+          message: `Mapping event for trigger ${formatEntityLabel(action.name, action.key)}`,
+          successMessage: result =>
+            `Mapped trigger event "${result.type}" for ${formatEntityLabel(action.name, action.key)}`,
+          errorMessage: `Trigger ${formatEntityLabel(action.name, action.key)} failed while mapping an event`,
+          metadata: {
+            actionId: action.key,
+            actionName: action.name,
+            actionType: action.type,
+            inputKeyCount: getObjectKeyCount(input)
+          },
+          onSuccess: result => ({
+            eventType: result.type,
+            hasEventId: !!result.id,
+            outputKeyCount: getObjectKeyCount(result.output)
+          })
+        },
+        () => runWithContext(context, () => action.handleEvent(context))
       );
 
-      return { id: res.id, type: res.type, output: res.output };
+      return withRequestTraces(context, { id: res.id, type: res.type, output: res.output });
     });
 
     manager.onRequest('slates/action.trigger.poll_events', async ({ params }) => {
@@ -410,17 +743,39 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         );
       }
 
-      let res = await action.pollEvents(
-        new SlateContext(
-          ctx.config,
-          { state: params.state },
-          ctx.auth?.output!,
-          slate.spec,
-          logger
-        )
+      let context = new SlateContext(
+        ctx.config,
+        { state: params.state },
+        ctx.auth?.output!,
+        slate.spec,
+        logger
+      );
+      let res = await traceProviderCall(
+        {
+          component: 'action',
+          functionName: 'pollEvents',
+          message: `Polling events for trigger ${formatEntityLabel(action.name, action.key)}`,
+          successMessage: result =>
+            `Polled ${result.inputs.length} event(s) for trigger ${formatEntityLabel(action.name, action.key)}`,
+          errorMessage: `Trigger ${formatEntityLabel(action.name, action.key)} failed while polling events`,
+          metadata: {
+            actionId: action.key,
+            actionName: action.name,
+            actionType: action.type,
+            hasPreviousState: params.state !== null
+          },
+          onSuccess: result => ({
+            inputCount: result.inputs.length,
+            hasUpdatedState: result.updatedState !== undefined
+          })
+        },
+        () => runWithContext(context, () => action.pollEvents!(context))
       );
 
-      return { inputs: res.inputs, updatedState: res.updatedState };
+      return withRequestTraces(context, {
+        inputs: res.inputs,
+        updatedState: res.updatedState
+      });
     });
 
     manager.onRequest('slates/action.trigger.webhook_handle', async ({ params }) => {
@@ -443,17 +798,41 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
           : null
       });
 
-      let res = await action.handleRequest(
-        new SlateContext(
-          ctx.config,
-          { request: req, state: params.state },
-          ctx.auth?.output!,
-          slate.spec,
-          logger
-        )
+      let context = new SlateContext(
+        ctx.config,
+        { request: req, state: params.state },
+        ctx.auth?.output!,
+        slate.spec,
+        logger
+      );
+      let res = await traceProviderCall(
+        {
+          component: 'action',
+          functionName: 'handleRequest',
+          message: `Handling webhook request for trigger ${formatEntityLabel(action.name, action.key)}`,
+          successMessage: result =>
+            `Received ${result.inputs.length} webhook event(s) for trigger ${formatEntityLabel(action.name, action.key)}`,
+          errorMessage: `Trigger ${formatEntityLabel(action.name, action.key)} failed while handling a webhook request`,
+          metadata: {
+            actionId: action.key,
+            actionName: action.name,
+            actionType: action.type,
+            requestMethod: params.method,
+            hasRequestBody: !!params.body,
+            hasPreviousState: params.state !== null
+          },
+          onSuccess: result => ({
+            inputCount: result.inputs.length,
+            hasUpdatedState: result.updatedState !== undefined
+          })
+        },
+        () => runWithContext(context, () => action.handleRequest!(context))
       );
 
-      return { inputs: res.inputs, updatedState: res.updatedState };
+      return withRequestTraces(context, {
+        inputs: res.inputs,
+        updatedState: res.updatedState
+      });
     });
 
     manager.onRequest('slates/action.trigger.webhook_register', async ({ params }) => {
@@ -468,17 +847,37 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         );
       }
 
-      let res = await action.autoRegisterWebhook(
-        new SlateContext(
-          ctx.config,
-          { webhookBaseUrl: params.webhookBaseUrl },
-          ctx.auth?.output!,
-          slate.spec,
-          logger
-        )
+      let context = new SlateContext(
+        ctx.config,
+        { webhookBaseUrl: params.webhookBaseUrl },
+        ctx.auth?.output!,
+        slate.spec,
+        logger
+      );
+      let res = await traceProviderCall(
+        {
+          component: 'action',
+          functionName: 'autoRegisterWebhook',
+          message: `Registering webhook for trigger ${formatEntityLabel(action.name, action.key)}`,
+          successMessage: `Registered webhook for trigger ${formatEntityLabel(action.name, action.key)}`,
+          errorMessage: `Trigger ${formatEntityLabel(action.name, action.key)} failed while registering a webhook`,
+          metadata: {
+            actionId: action.key,
+            actionName: action.name,
+            actionType: action.type
+          },
+          onSuccess: result => ({
+            hasRegistrationDetails: result.registrationDetails !== undefined,
+            hasState: result.state !== undefined
+          })
+        },
+        () => runWithContext(context, () => action.autoRegisterWebhook!(context))
       );
 
-      return { registrationDetails: res.registrationDetails, state: res.state };
+      return withRequestTraces(context, {
+        registrationDetails: res.registrationDetails,
+        state: res.state
+      });
     });
 
     manager.onRequest('slates/action.trigger.webhook_unregister', async ({ params }) => {
@@ -493,20 +892,35 @@ export let createProviderHandler = <ConfigType extends {}, AuthType extends {}>(
         );
       }
 
-      await action.autoUnregisterWebhook(
-        new SlateContext(
-          ctx.config,
-          {
-            webhookBaseUrl: params.webhookBaseUrl,
-            registrationDetails: params.registrationDetails,
-            state: params.state
-          },
-          ctx.auth?.output!,
-          slate.spec,
-          logger
-        )
+      let context = new SlateContext(
+        ctx.config,
+        {
+          webhookBaseUrl: params.webhookBaseUrl,
+          registrationDetails: params.registrationDetails,
+          state: params.state
+        },
+        ctx.auth?.output!,
+        slate.spec,
+        logger
+      );
+      await traceProviderCall(
+        {
+          component: 'action',
+          functionName: 'autoUnregisterWebhook',
+          message: `Unregistering webhook for trigger ${formatEntityLabel(action.name, action.key)}`,
+          successMessage: `Unregistered webhook for trigger ${formatEntityLabel(action.name, action.key)}`,
+          errorMessage: `Trigger ${formatEntityLabel(action.name, action.key)} failed while unregistering a webhook`,
+          metadata: {
+            actionId: action.key,
+            actionName: action.name,
+            actionType: action.type,
+            hasRegistrationDetails: params.registrationDetails !== null,
+            hasPreviousState: params.state !== null
+          }
+        },
+        () => runWithContext(context, () => action.autoUnregisterWebhook!(context))
       );
 
-      return {};
+      return withRequestTraces(context, {});
     });
   });