Skip to content

Commit b616279

Browse files
authored
fix: OpenTelemetry schema URL panic (#2012)
`resource.Merge` returns an error only when schemas don't match.
1 parent 7360bd2 commit b616279

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

serve/opentelemetry.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ import (
2626

2727
// newResource returns a resource describing this application.
2828
func newResource(p *plugin.Plugin) *resource.Resource {
29+
def := resource.Default()
30+
schemaURL := def.SchemaURL()
31+
if schemaURL == "" {
32+
schemaURL = semconv.SchemaURL
33+
}
2934
r, err := resource.Merge(
30-
resource.Default(),
35+
def,
3136
resource.NewWithAttributes(
32-
semconv.SchemaURL,
37+
schemaURL,
3338
semconv.ServiceName("cloudquery-"+p.Name()),
3439
semconv.ServiceVersion(p.Version()),
3540
),

0 commit comments

Comments
 (0)