From c921c18f8af61107a29689422503bd262864d6c7 Mon Sep 17 00:00:00 2001 From: Kemal Hadimli Date: Wed, 18 Dec 2024 21:58:56 +0000 Subject: [PATCH 1/2] fix: OpenTelemetry schema URL panic --- serve/opentelemetry.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/serve/opentelemetry.go b/serve/opentelemetry.go index 4e5b777c2f..2f9649ac82 100644 --- a/serve/opentelemetry.go +++ b/serve/opentelemetry.go @@ -28,8 +28,7 @@ import ( func newResource(p *plugin.Plugin) *resource.Resource { r, err := resource.Merge( resource.Default(), - resource.NewWithAttributes( - semconv.SchemaURL, + resource.NewSchemaless( semconv.ServiceName("cloudquery-"+p.Name()), semconv.ServiceVersion(p.Version()), ), From 9c51fe6183dc3c438044e8e31941e21d6fc9bf89 Mon Sep 17 00:00:00 2001 From: Kemal Hadimli Date: Wed, 18 Dec 2024 22:08:44 +0000 Subject: [PATCH 2/2] Make sure we always have a schema URL --- serve/opentelemetry.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/serve/opentelemetry.go b/serve/opentelemetry.go index 2f9649ac82..9ce8d1f73c 100644 --- a/serve/opentelemetry.go +++ b/serve/opentelemetry.go @@ -26,9 +26,15 @@ import ( // newResource returns a resource describing this application. func newResource(p *plugin.Plugin) *resource.Resource { + def := resource.Default() + schemaURL := def.SchemaURL() + if schemaURL == "" { + schemaURL = semconv.SchemaURL + } r, err := resource.Merge( - resource.Default(), - resource.NewSchemaless( + def, + resource.NewWithAttributes( + schemaURL, semconv.ServiceName("cloudquery-"+p.Name()), semconv.ServiceVersion(p.Version()), ),