Add more fields to calculation, remove logger, keep a metric for the ratio for monitoring

Author: timl3136

internal/internal_event_handlers.go

@@ -44,7 +44,7 @@ import (
 
 const (
 	queryResultSizeLimit        = 2000000 // 2MB
-	historySizeEstimationBuffer = 384     // 384B
+	historySizeEstimationBuffer = 400     // 400B for common fields in history event
 )
 
 // Make sure that interfaces are implemented
@@ -1394,6 +1394,12 @@ func (weh *workflowExecutionEventHandlerImpl) estimateHistorySize(event *m.Histo
 			sum += len(event.WorkflowExecutionStartedEventAttributes.ContinuedFailureDetails)
 			sum += len(event.WorkflowExecutionStartedEventAttributes.LastCompletionResult)
 			sum += len(event.WorkflowExecutionStartedEventAttributes.Memo.GetFields())
+			sum += len(event.WorkflowExecutionStartedEventAttributes.Header.GetFields())
+			sum += len(event.WorkflowExecutionStartedEventAttributes.SearchAttributes.GetIndexedFields())
+		}
+	case m.EventTypeWorkflowExecutionCompleted:
+		if event.WorkflowExecutionCompletedEventAttributes != nil {
+			sum += len(event.WorkflowExecutionCompletedEventAttributes.Result)
 		}
 	case m.EventTypeWorkflowExecutionSignaled:
 		if event.WorkflowExecutionSignaledEventAttributes != nil {

internal/internal_task_handlers.go

@@ -853,13 +853,6 @@ func (w *workflowExecutionContextImpl) ProcessWorkflowTask(workflowTask *workflo
 ProcessEvents:
 	for {
 		reorderedEvents, markers, binaryChecksum, err := reorderedHistory.NextDecisionEvents()
-		//w.workflowInfo.TotalHistoryBytes += int64(historySizeEstimation)
-		w.wth.logger.Info("Differences between history size estimation and actual size",
-			zap.Int64("HistorySizeEstimation", w.workflowInfo.TotalHistoryBytes),
-			zap.Int64("ActualHistorySize", w.workflowInfo.HistoryBytesServer),
-			zap.Int64("HistorySizeDiff", w.workflowInfo.TotalHistoryBytes-w.workflowInfo.HistoryBytesServer),
-			zap.Float64("DiffRatio", float64(w.workflowInfo.TotalHistoryBytes)/float64(w.workflowInfo.HistoryBytesServer)),
-			zap.String("workflowType", w.workflowInfo.WorkflowType.Name))
 		w.wth.metricsScope.GetTaggedScope("workflowtype", w.workflowInfo.WorkflowType.Name).Gauge("cadence-historysize-ratio").Update(float64(w.workflowInfo.TotalHistoryBytes) / float64(w.workflowInfo.HistoryBytesServer))
 		if err != nil {
 			return nil, err