Add container id for otel/Datadog (#5357)

rilldata · Jul 31, 2024 · c345ac3 · c345ac3
1 parent 964ef7a
commit c345ac3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/runtime/pkg/observability/observability.go b/runtime/pkg/observability/observability.go
@@ -52,13 +52,14 @@ func Start(ctx context.Context, logger *zap.Logger, opts *Options) (ShutdownFunc
 	}))
 
 	// Create resource representing the currently running service
-	res, err := resource.Merge(
-		resource.Default(),
-		resource.NewWithAttributes(
-			semconv.SchemaURL,
+	res, err := resource.New(ctx,
+		resource.WithContainer(),
+		resource.WithSchemaURL(semconv.SchemaURL),
+		resource.WithAttributes(
 			semconv.ServiceName(opts.ServiceName),
 			semconv.ServiceVersion(opts.ServiceVersion),
 		),
+		resource.WithFromEnv(),
 	)
 	if err != nil {
 		return nil, err