Add missing string value length limits

SigNoz · Dec 28, 2024 · ea32c2e · ea32c2e
1 parent 9756822
commit ea32c2e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/exporter/clickhouselogsexporter/exporter.go b/exporter/clickhouselogsexporter/exporter.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/ClickHouse/clickhouse-go/v2"
 	driver "github.com/ClickHouse/clickhouse-go/v2/lib/driver"
+	"github.com/SigNoz/signoz-otel-collector/internal/common"
 	"github.com/SigNoz/signoz-otel-collector/usage"
 	"github.com/SigNoz/signoz-otel-collector/utils"
 	"github.com/SigNoz/signoz-otel-collector/utils/fingerprint"
@@ -680,6 +681,16 @@ func (e *clickhouseLogsExporter) addAttrsToTagStatement(
 ) error {
 	unixMilli := (time.Now().UnixMilli() / 3600000) * 3600000
 	for i, v := range attrs.StringKeys {
+		if len(v) > common.MaxAttributeKeyLength {
+			e.logger.Debug("attribute key length exceeds the limit", zap.String("key", v))
+			continue
+		}
+
+		if len(attrs.StringValues[i]) > common.MaxAttributeValueLength {
+			e.logger.Debug("attribute value length exceeds the limit", zap.String("key", v))
+			continue
+		}
+
 		key := utils.MakeKeyForAttributeKeys(v, tagType, utils.TagDataTypeString)
 		if _, ok := shouldSkipKeys[key]; ok {
 			e.logger.Debug("key has been skipped", zap.String("key", key))

diff --git a/exporter/clickhousetracesexporter/writerV3.go b/exporter/clickhousetracesexporter/writerV3.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
+	"github.com/SigNoz/signoz-otel-collector/internal/common"
 	"github.com/SigNoz/signoz-otel-collector/usage"
 	"github.com/SigNoz/signoz-otel-collector/utils"
 	"github.com/jellydator/ttlcache/v3"
@@ -214,6 +215,16 @@ func (w *SpanWriter) writeTagBatchV3(ctx context.Context, batchSpans []*SpanV3)
 			v2Key := utils.MakeKeyForAttributeKeys(spanAttribute.Key, utils.TagType(spanAttribute.TagType), utils.TagDataType(spanAttribute.DataType))
 			unixMilli := (int64(span.StartTimeUnixNano/1e6) / 3600000) * 3600000
 
+			if len(spanAttribute.Key) > common.MaxAttributeKeyLength {
+				w.logger.Debug("attribute key length exceeds the limit", zap.String("key", spanAttribute.Key))
+				continue
+			}
+
+			if len(spanAttribute.StringValue) > common.MaxAttributeValueLength {
+				w.logger.Debug("attribute value length exceeds the limit", zap.String("key", spanAttribute.Key))
+				continue
+			}
+
 			if spanAttribute.DataType == "string" {
 
 				if _, ok := shouldSkipKeys[v2Key]; !ok {

diff --git a/internal/common/attribute_limits.go b/internal/common/attribute_limits.go
@@ -0,0 +1,6 @@
+package common
+
+const (
+	MaxAttributeKeyLength   = 32
+	MaxAttributeValueLength = 256
+)