Merge pull request #6332 from cloudflare/ketan/dyworker-startup

ketanhwr · web-flow · commit bc0bc2a73c2b · 2026-03-16T23:53:33.000+05:30
Skip logging script startup exceptions for dynamic workers
diff --git a/.opencode/package.json b/.opencode/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@opencode-ai/plugin": "1.2.26"
+    "@opencode-ai/plugin": "1.2.27"
   }
 }
diff --git a/src/workerd/io/worker.c++ b/src/workerd/io/worker.c++
@@ -314,11 +314,11 @@ void reportStartupError(kj::StringPtr id,
               span.addLog(kj::systemPreciseCalendarClock().now(), "exception"_kjc,
                   kj::ConstString(
                       kj::str("script startup threw exception", id, description, trace)));
-              KJ_LOG(ERROR, "script startup threw exception", id, description, trace);
               if (isDynamicWorker) {
                 // Rethrow the tunneled JSG exception so it converts back to a JS Error.
                 kj::throwFatalException(kj::cp(KJ_ASSERT_NONNULL(permanentException)));
               } else {
+                KJ_LOG(ERROR, "script startup threw exception", id, description, trace);
                 KJ_FAIL_REQUIRE("script startup threw exception");
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -314,11 +314,11 @@ void reportStartupError(kj::StringPtr id,`
`314`	`314`	`span.addLog(kj::systemPreciseCalendarClock().now(), "exception"_kjc,`
`315`	`315`	`kj::ConstString(`
`316`	`316`	`kj::str("script startup threw exception", id, description, trace)));`
`317`		`- KJ_LOG(ERROR, "script startup threw exception", id, description, trace);`
`318`	`317`	`if (isDynamicWorker) {`
`319`	`318`	`// Rethrow the tunneled JSG exception so it converts back to a JS Error.`
`320`	`319`	`kj::throwFatalException(kj::cp(KJ_ASSERT_NONNULL(permanentException)));`
`321`	`320`	`} else {`
	`321`	`+ KJ_LOG(ERROR, "script startup threw exception", id, description, trace);`
`322`	`322`	`KJ_FAIL_REQUIRE("script startup threw exception");`
`323`	`323`	`}`
`324`	`324`	`}`