Skip payload logging for container skills

[changelog:changed]

lib/context.ts

@@ -25,7 +25,7 @@ import {
 } from "./handler/handler";
 import { createHttpClient } from "./http";
 import { debug } from "./log/console";
-import { initLogging, runtime } from "./log/util";
+import { initLogging, logPayload, runtime } from "./log/util";
 import { mapSubscription } from "./map";
 import {
 	PubSubCommandMessageClient,
@@ -243,6 +243,7 @@ export function createContext(
 			rt.skill.sha.slice(0, 7),
 			rt.node.version,
 		);
+		logPayload(context);
 	}
 	return context;
 }

lib/function.ts

@@ -30,6 +30,7 @@ import {
 	WebhookHandler,
 } from "./handler/handler";
 import { debug, error } from "./log";
+import { logPayload } from "./log/util";
 import { prepareStatus, StatusPublisher } from "./message";
 import {
 	CommandIncoming,
@@ -74,7 +75,6 @@ export async function processEvent(
 ): Promise<void> {
 	const context = factory(event, ctx) as EventContext<any> &
 		ContextualLifecycle;
-	debug(`Incoming event message: ${JSON.stringify(event, replacer)}`);
 	if (isSubscriptionIncoming(event)) {
 		debug(
 			`Invoking event handler '${context.name}' for tx '${event.subscription.tx}'`,
@@ -104,7 +104,6 @@ export async function processCommand(
 	factory: ContextFactory = createContext,
 ): Promise<void> {
 	const context = factory(event, ctx) as CommandContext & ContextualLifecycle;
-	debug(`Incoming command message: ${JSON.stringify(event, replacer)}`);
 	debug(`Invoking command handler '${context.name}'`);
 	try {
 		const result = await invokeHandler(loader, context);
@@ -134,7 +133,6 @@ export async function processWebhook(
 	factory: ContextFactory = createContext,
 ): Promise<void> {
 	const context = factory(event, ctx) as WebhookContext & ContextualLifecycle;
-	debug(`Incoming webhook message: ${JSON.stringify(event, replacer)}`);
 	debug(`Invoking webhook handler '${context.name}'`);
 	try {
 		const result = await invokeHandler(loader, context);

lib/log/util.ts

@@ -17,8 +17,14 @@
 import { createLogger } from "@atomist/skill-logging";
 
 import { Contextual } from "../handler/handler";
-import { handleErrorSync } from "../util";
-import { clearLogger, setLogger } from "./console";
+import {
+	isCommandIncoming,
+	isEventIncoming,
+	isSubscriptionIncoming,
+	isWebhookIncoming,
+} from "../payload";
+import { handleErrorSync, replacer } from "../util";
+import { clearLogger, debug, setLogger } from "./console";
 
 export function initLogging(
 	context: {
@@ -99,3 +105,26 @@ export function runtime(): {
 		},
 	};
 }
+
+export function logPayload(ctx: Contextual<any, any>): void {
+	// Exit early for container skills
+	if (
+		(ctx.skill as any).artifacts?.some(
+			a => a.__typename === "AtomistSkillDockerArtifact",
+		)
+	) {
+		return;
+	}
+
+	const payload = ctx.trigger;
+	let label;
+	if (isEventIncoming(payload) || isSubscriptionIncoming(payload)) {
+		label = "event";
+	} else if (isCommandIncoming(payload)) {
+		label = "command";
+	} else if (isWebhookIncoming(payload)) {
+		label = "webhook";
+	}
+
+	debug(`Incoming ${label} message: ${JSON.stringify(payload, replacer)}`);
+}