remove truncationSuffix from input plugin

Author: TravisStark

plugins/inputs/logfile/constants/constants.go

@@ -9,7 +9,4 @@ const (
 
 	// PerEventHeaderBytes is the bytes required for metadata for each log event
 	PerEventHeaderBytes = 200
-
-	// DefaultTruncateSuffix is the suffix added to truncated log messages
-	DefaultTruncateSuffix = "[Truncated...]"
 )

plugins/inputs/logfile/fileconfig.go

@@ -152,9 +152,6 @@ func (config *FileConfig) init() error {
 	if config.MaxEventSize == 0 {
 		config.MaxEventSize = constants.DefaultMaxEventSize - constants.PerEventHeaderBytes
 	}
-	if config.TruncateSuffix == "" {
-		config.TruncateSuffix = constants.DefaultTruncateSuffix
-	}
 	if config.RetentionInDays == 0 {
 		config.RetentionInDays = -1
 	}

plugins/inputs/logfile/logfile.go

@@ -266,7 +266,6 @@ func (t *LogFile) FindLogSrc() []logs.LogSrc {
 				fileconfig.timestampFromLogLine,
 				fileconfig.Enc,
 				fileconfig.MaxEventSize,
-				fileconfig.TruncateSuffix,
 				fileconfig.RetentionInDays,
 				fileconfig.BackpressureMode,
 			)

plugins/inputs/logfile/tailersrc.go

@@ -70,7 +70,6 @@ type tailerSrc struct {
 	timestampFn     func(string) (time.Time, string)
 	enc             encoding.Encoding
 	maxEventSize    int
-	truncateSuffix  string
 	retentionInDays int
 
 	outputFn           func(logs.LogEvent)
@@ -98,7 +97,6 @@ func NewTailerSrc(
 	timestampFn func(string) (time.Time, string),
 	enc encoding.Encoding,
 	maxEventSize int,
-	truncateSuffix string,
 	retentionInDays int,
 	backpressureMode logscommon.BackpressureMode,
 ) *tailerSrc {
@@ -116,7 +114,6 @@ func NewTailerSrc(
 		timestampFn:        timestampFn,
 		enc:                enc,
 		maxEventSize:       maxEventSize,
-		truncateSuffix:     truncateSuffix,
 		retentionInDays:    retentionInDays,
 		backpressureFdDrop: !autoRemoval && backpressureMode == logscommon.LogBackpressureModeFDRelease,
 		done:               make(chan struct{}),

plugins/inputs/logfile/tailersrc_test.go

@@ -83,7 +83,6 @@ func TestTailerSrc(t *testing.T) {
 		parseRFC3339Timestamp,
 		nil, // encoding
 		constants.DefaultMaxEventSize,
-		constants.DefaultTruncateSuffix,
 		1,
 		"",
 	)
@@ -194,7 +193,6 @@ func TestEventDoneCallback(t *testing.T) {
 		parseRFC3339Timestamp,
 		nil, // encoding
 		constants.DefaultMaxEventSize,
-		constants.DefaultTruncateSuffix,
 		1,
 		"",
 	)
@@ -425,7 +423,6 @@ func setupTailer(t *testing.T, multiLineFn func(string) bool, maxEventSize int,
 		parseRFC3339Timestamp,
 		nil, // encoding
 		maxEventSize,
-		constants.DefaultTruncateSuffix,
 		1,
 		backpressureDrop,
 	)

plugins/outputs/cloudwatchlogs/internal/pusher/batch.go

@@ -30,7 +30,7 @@ const (
 	// A batch of log events in a single request cannot span more than 24 hours. Otherwise, the operation fails.
 	batchTimeRangeLimit = 24 * time.Hour
 	// Suffix to indicate that a message has been truncated
-	truncationSuffix = constants.DefaultTruncateSuffix
+	defaultTruncationSuffix = "[Truncated...]"
 )
 
 // validateAndTruncateMessage ensures events don't exceed limit before we send to CloudWatch
@@ -42,7 +42,7 @@ func validateAndTruncateMessage(message string) string {
 	}
 
 	// Truncate the message and add a suffix to indicate truncation
-	truncatedMessage := message[:maxMessageSize-len(truncationSuffix)] + truncationSuffix
+	truncatedMessage := message[:maxMessageSize-len(defaultTruncationSuffix)] + defaultTruncationSuffix
 	return truncatedMessage
 }
 

plugins/outputs/cloudwatchlogs/internal/pusher/batch_test.go

@@ -230,7 +230,7 @@ func TestEventValidation_Over1MB(t *testing.T) {
 	event := newStatefulLogEvent(time.Now(), oversizeMessage, nil, nil)
 	// The total length should still be maxMessageSize
 	assert.Equal(t, maxMessageSize, len(event.message))
-	assert.Equal(t, oversizeMessage[:maxMessageSize-len(truncationSuffix)]+truncationSuffix, event.message)
+	assert.Equal(t, oversizeMessage[:maxMessageSize-len(defaultTruncationSuffix)]+defaultTruncationSuffix, event.message)
 }
 
 func TestEventValidation_Between256KBand1MB(t *testing.T) {
@@ -262,7 +262,7 @@ func TestValidateAndTruncateMessage(t *testing.T) {
 		{
 			name:           "Over limit",
 			input:          strings.Repeat("a", maxMessageSize+1000),
-			expectedOutput: strings.Repeat("a", maxMessageSize-len(truncationSuffix)) + truncationSuffix,
+			expectedOutput: strings.Repeat("a", maxMessageSize-len(defaultTruncationSuffix)) + defaultTruncationSuffix,
 		},
 	}