From 7a831b34fdfff764c597bb9b741956e5181a8828 Mon Sep 17 00:00:00 2001 From: Phillip Carter Date: Fri, 22 Apr 2022 09:47:09 -0700 Subject: [PATCH 1/4] [docs] update resource initialization --- website_docs/manual.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/website_docs/manual.md b/website_docs/manual.md index f71161b3905..6b374a5a516 100644 --- a/website_docs/manual.md +++ b/website_docs/manual.md @@ -46,10 +46,13 @@ 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. + resource := resource.Merge( + resource.Default(), + resource.NewWithAttributes( + semconv.SchemaURL, + semconv.ServiceNameKey.String("ExampleService"), + ) ) return sdktrace.NewTracerProvider( From 094ea9f1dbaffb8486e04fc1288ee492f4de2721 Mon Sep 17 00:00:00 2001 From: Phillip Carter Date: Fri, 22 Apr 2022 09:48:41 -0700 Subject: [PATCH 2/4] Formatting --- website_docs/manual.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website_docs/manual.md b/website_docs/manual.md index 6b374a5a516..cf33b681ede 100644 --- a/website_docs/manual.md +++ b/website_docs/manual.md @@ -46,9 +46,9 @@ func newExporter(ctx context.Context) /* (someExporter.Exporter, error) */ { } func newTraceProvider(exp sdktrace.SpanExporter) *sdktrace.TracerProvider { - // Ensure default SDK resources and the required service name are set. + // Ensure default SDK resources and the required service name are set. resource := resource.Merge( - resource.Default(), + resource.Default(), resource.NewWithAttributes( semconv.SchemaURL, semconv.ServiceNameKey.String("ExampleService"), From 48c6dcaa4e617ab2ef77577b489ee3d021ba2381 Mon Sep 17 00:00:00 2001 From: Phillip Carter Date: Fri, 22 Apr 2022 17:46:12 -0700 Subject: [PATCH 3/4] [docs] handle error case in resource merge --- website_docs/manual.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/website_docs/manual.md b/website_docs/manual.md index cf33b681ede..527a87886c3 100644 --- a/website_docs/manual.md +++ b/website_docs/manual.md @@ -47,13 +47,17 @@ func newExporter(ctx context.Context) /* (someExporter.Exporter, error) */ { func newTraceProvider(exp sdktrace.SpanExporter) *sdktrace.TracerProvider { // Ensure default SDK resources and the required service name are set. - resource := resource.Merge( + 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), From f3402ce3c150da878aef6b67141f88ffcb92686a Mon Sep 17 00:00:00 2001 From: Phillip Carter Date: Fri, 22 Apr 2022 17:47:18 -0700 Subject: [PATCH 4/4] Update manual.md --- website_docs/manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_docs/manual.md b/website_docs/manual.md index 527a87886c3..6a04387ff7c 100644 --- a/website_docs/manual.md +++ b/website_docs/manual.md @@ -61,7 +61,7 @@ func newTraceProvider(exp sdktrace.SpanExporter) *sdktrace.TracerProvider { return sdktrace.NewTracerProvider( sdktrace.WithBatcher(exp), - sdktrace.WithResource(resource), + sdktrace.WithResource(r), ) }