adding resource attributes to spans (#4016)

xoscar · web-flow · commit 195eb7af12b8 · 2024-09-11T14:37:27.000-06:00
diff --git a/server/traces/otel_converter.go b/server/traces/otel_converter.go
@@ -30,6 +30,11 @@ func FromOtelResourceSpans(resourceSpans []*v1.ResourceSpans) Trace {
 					// Add attributes from the resource
 					span.Attributes = append(span.Attributes, scopeSpans.Scope.Attributes...)
 				}
+
+				// Add attributes from the resource
+				if resource.Resource != nil {
+					span.Attributes = append(span.Attributes, resource.Resource.Attributes...)
+				}
 			}
 
 			flattenSpans = append(flattenSpans, scopeSpans.Spans...)

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ func FromOtelResourceSpans(resourceSpans []*v1.ResourceSpans) Trace {`
`30`	`30`	`// Add attributes from the resource`
`31`	`31`	`span.Attributes = append(span.Attributes, scopeSpans.Scope.Attributes...)`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ // Add attributes from the resource`
	`35`	`+ if resource.Resource != nil {`
	`36`	`+ span.Attributes = append(span.Attributes, resource.Resource.Attributes...)`
	`37`	`+ }`
`33`	`38`	`}`
`34`	`39`
`35`	`40`	`flattenSpans = append(flattenSpans, scopeSpans.Spans...)`