From b8e4241a32f2fc2a8b8f2c8ea2ca4be0b17aecc9 Mon Sep 17 00:00:00 2001 From: Phillip Carter Date: Mon, 25 Apr 2022 08:12:24 -0700 Subject: [PATCH] [docs] update resource initialization (#2844) * [docs] update resource initialization * Formatting * [docs] handle error case in resource merge * Update manual.md Co-authored-by: Chester Cheung Co-authored-by: Tyler Yahn --- website_docs/manual.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/website_docs/manual.md b/website_docs/manual.md index f71161b3905..6a04387ff7c 100644 --- a/website_docs/manual.md +++ b/website_docs/manual.md @@ -46,15 +46,22 @@ func newExporter(ctx context.Context) /* (someExporter.Exporter, error) */ { } func newTraceProvider(exp sdktrace.SpanExporter) *sdktrace.TracerProvider { - // The service.name attribute is required. - resource := resource.NewWithAttributes( - semconv.SchemaURL, - semconv.ServiceNameKey.String("ExampleService"), + // Ensure default SDK resources and the required service name are set. + r, err := resource.Merge( + resource.Default(), + resource.NewWithAttributes( + semconv.SchemaURL, + semconv.ServiceNameKey.String("ExampleService"), + ) ) + + if err != nil { + panic(err) + } return sdktrace.NewTracerProvider( sdktrace.WithBatcher(exp), - sdktrace.WithResource(resource), + sdktrace.WithResource(r), ) }