Merge branch 'master' into child-workflow

uber-go · Jan 12, 2018 · 1a1a30b · 1a1a30b
2 parents c028229 + c943d2a
commit 1a1a30b
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/internal/internal_event_handlers.go b/internal/internal_event_handlers.go
@@ -437,6 +437,18 @@ func (weh *workflowExecutionEventHandlerImpl) ProcessEvent(
 	if event == nil {
 		return nil, errors.New("nil event provided")
 	}
+	defer func() {
+		if p := recover(); p != nil {
+			weh.metricsScope.Counter(metrics.DecisionTaskPanicCounter).Inc(1)
+			topLine := fmt.Sprintf("process event for %s [panic]:", weh.workflowInfo.TaskListName)
+			st := getStackTraceRaw(topLine, 7, 0)
+			weh.logger.Error("ProcessEvent panic.",
+				zap.String("PanicError", fmt.Sprintf("%v", p)),
+				zap.String("PanicStack", st))
+
+			weh.Complete(nil, newPanicError(p, st))
+		}
+	}()
 
 	weh.isReplay = isReplay
 	traceLog(func() {