From 3cb92501c165e477aa31b2fdb5091c941529e7d4 Mon Sep 17 00:00:00 2001 From: makeavish Date: Mon, 17 Jul 2023 01:34:04 +0530 Subject: [PATCH] fix: update usage collection to remove deprecated param Also add ResourceTagsMap to trace model --- exporter/clickhousetracesexporter/clickhouse_exporter.go | 1 + exporter/clickhousetracesexporter/schema-signoz.go | 1 + exporter/clickhousetracesexporter/writer.go | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/exporter/clickhousetracesexporter/clickhouse_exporter.go b/exporter/clickhousetracesexporter/clickhouse_exporter.go index 2f46a20e..20debdee 100644 --- a/exporter/clickhousetracesexporter/clickhouse_exporter.go +++ b/exporter/clickhousetracesexporter/clickhouse_exporter.go @@ -362,6 +362,7 @@ func newStructuredSpan(otelSpan ptrace.Span, ServiceName string, resource pcommo Kind: int8(otelSpan.Kind()), References: references, TagMap: tagMap, + ResourceTagsMap: resourceAttrs, StringTagMap: stringTagMap, NumberTagMap: numberTagMap, BoolTagMap: boolTagMap, diff --git a/exporter/clickhousetracesexporter/schema-signoz.go b/exporter/clickhousetracesexporter/schema-signoz.go index 5e710502..106cb179 100644 --- a/exporter/clickhousetracesexporter/schema-signoz.go +++ b/exporter/clickhousetracesexporter/schema-signoz.go @@ -46,6 +46,7 @@ type TraceModel struct { References references `json:"references,omitempty"` StatusCode int16 `json:"statusCode,omitempty"` TagMap map[string]string `json:"tagMap,omitempty"` + ResourceTagsMap map[string]string `json:"resourceTagsMap,omitempty"` StringTagMap map[string]string `json:"stringTagMap,omitempty"` NumberTagMap map[string]float64 `json:"numberTagMap,omitempty"` BoolTagMap map[string]bool `json:"boolTagMap,omitempty"` diff --git a/exporter/clickhousetracesexporter/writer.go b/exporter/clickhousetracesexporter/writer.go index ac386c5e..f8ea7e45 100644 --- a/exporter/clickhousetracesexporter/writer.go +++ b/exporter/clickhousetracesexporter/writer.go @@ -318,7 +318,7 @@ func (w *SpanWriter) writeTagBatch(batchSpans []*Span) error { ) if err != nil { logBatch := batchSpans[:int(math.Min(10, float64(len(batchSpans))))] - w.logger.Error("Could not write to span attributes table due to error: ", zap.Error(err),zap.Any("batch", logBatch)) + w.logger.Error("Could not write to span attributes table due to error: ", zap.Error(err), zap.Any("batch", logBatch)) return err } @@ -404,8 +404,10 @@ func (w *SpanWriter) writeModelBatch(batchSpans []*Span) error { metrics := map[string]usage.Metric{} for _, span := range batchSpans { var serialized []byte - + usageMap := span.TraceModel + usageMap.TagMap = map[string]string{} serialized, err = json.Marshal(span.TraceModel) + serializedUsage, err := json.Marshal(usageMap) if err != nil { return err @@ -417,7 +419,7 @@ func (w *SpanWriter) writeModelBatch(batchSpans []*Span) error { return err } - usage.AddMetric(metrics, *span.Tenant, 1, int64(len(serialized))) + usage.AddMetric(metrics, *span.Tenant, 1, int64(len(serializedUsage))) } start := time.Now()