fix: update usage collection to remove deprecated param

Also add ResourceTagsMap to trace model
SigNoz · Jul 16, 2023 · 3cb9250 · 3cb9250
1 parent 8d74730
commit 3cb9250
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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()