From 94390aa85dff8e5a9fdc9d1c5d44190397f890fc Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Tue, 29 Mar 2022 14:51:21 +0200 Subject: [PATCH 01/16] don't panic when setting a provider to itself --- CHANGELOG.md | 4 ++ internal/global/state.go | 15 ++--- internal/global/state_test.go | 99 +++++++++++++++++++++------- metric/internal/global/state.go | 7 +- metric/internal/global/state_test.go | 14 ++-- 5 files changed, 97 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b3f8e9d74a..6345bb41015 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### Fixed + +- Don't panick anymore when setting a (Tracer|Meter)Provider or TextMapPropagator to itself (#2749) + ## [1.6.1] - 2022-03-28 ### Fixed diff --git a/internal/global/state.go b/internal/global/state.go index d6b3e900cd4..81f38082a7d 100644 --- a/internal/global/state.go +++ b/internal/global/state.go @@ -50,14 +50,12 @@ func SetTracerProvider(tp trace.TracerProvider) { delegateTraceOnce.Do(func() { current := TracerProvider() if current == tp { - // Setting the provider to the prior default is nonsense, panic. - // Panic is acceptable because we are likely still early in the - // process lifetime. - panic("invalid TracerProvider, the global instance cannot be reinstalled") + // Setting the provider to the prior default results in a noop. Return + // early. + return } else if def, ok := current.(*tracerProvider); ok { def.setDelegate(tp) } - }) globalTracer.Store(tracerProviderHolder{tp: tp}) } @@ -73,10 +71,9 @@ func SetTextMapPropagator(p propagation.TextMapPropagator) { // delegate to p. delegateTextMapPropagatorOnce.Do(func() { if current := TextMapPropagator(); current == p { - // Setting the provider to the prior default is nonsense, panic. - // Panic is acceptable because we are likely still early in the - // process lifetime. - panic("invalid TextMapPropagator, the global instance cannot be reinstalled") + // Setting the provider to the prior default results in a noop. Return + // early. + return } else if def, ok := current.(*textMapPropagator); ok { def.SetDelegate(p) } diff --git a/internal/global/state_test.go b/internal/global/state_test.go index 9e812083a13..99fc7141bfe 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -12,36 +12,91 @@ // See the License for the specific language governing permissions and // limitations under the License. -package global_test +package global import ( "testing" - "go.opentelemetry.io/otel/internal/global" + "go.opentelemetry.io/otel/propagation" + "go.opentelemetry.io/otel/trace" ) -func TestResetsOfGlobalsPanic(t *testing.T) { - global.ResetForTest() - tests := map[string]func(){ - "SetTextMapPropagator": func() { - global.SetTextMapPropagator(global.TextMapPropagator()) - }, - "SetTracerProvider": func() { - global.SetTracerProvider(global.TracerProvider()) - }, - } - - for name, test := range tests { - shouldPanic(t, name, test) - } +func TestSetTracerProvider(t *testing.T) { + t.Cleanup(ResetForTest) + + t.Run("Set With default is a noop", func(t *testing.T) { + ResetForTest() + SetTracerProvider(TracerProvider()) + + _, ok := TracerProvider().(*tracerProvider) + if !ok { + t.Error("Global Tracer Provider should be the default tracer provider") + return + } + }) + + t.Run("First Set() should replace the delegate", func(t *testing.T) { + ResetForTest() + + SetTracerProvider(trace.NewNoopTracerProvider()) + + _, ok := TracerProvider().(*tracerProvider) + if ok { + t.Error("Global Tracer Provider was not changed") + return + } + }) + + t.Run("Set() should delegate existing Tracer Providers", func(t *testing.T) { + ResetForTest() + + tp := TracerProvider() + SetTracerProvider(trace.NewNoopTracerProvider()) + + ntp := tp.(*tracerProvider) + + if ntp.delegate == nil { + t.Error("The delegated tracer providers should have a delegate") + } + }) } -func shouldPanic(t *testing.T, name string, f func()) { - defer func() { - if r := recover(); r == nil { - t.Errorf("calling %s with default global did not panic", name) +func TestSetTextMapPropagator(t *testing.T) { + t.Cleanup(ResetForTest) + + t.Run("Set With default is a noop", func(t *testing.T) { + ResetForTest() + SetTextMapPropagator(TextMapPropagator()) + + _, ok := TextMapPropagator().(*textMapPropagator) + if !ok { + t.Error("Global TextMap Propagator should be the default propagator") + return } - }() + }) - f() + t.Run("First Set() should replace the delegate", func(t *testing.T) { + ResetForTest() + + SetTextMapPropagator(propagation.TraceContext{}) + + _, ok := TextMapPropagator().(*textMapPropagator) + if ok { + t.Error("Global TextMap Propagator was not changed") + return + } + }) + + t.Run("Set() should delegate existing propagators", func(t *testing.T) { + ResetForTest() + + p := TextMapPropagator() + SetTextMapPropagator(propagation.TraceContext{}) + + np := p.(*textMapPropagator) + + if np.delegate == nil { + t.Error("The delegated TextMap propagators should have a delegate") + } + }) } diff --git a/metric/internal/global/state.go b/metric/internal/global/state.go index 29a67c5dbe4..f5126fc9c93 100644 --- a/metric/internal/global/state.go +++ b/metric/internal/global/state.go @@ -41,10 +41,9 @@ func SetMeterProvider(mp metric.MeterProvider) { delegateMeterOnce.Do(func() { current := MeterProvider() if current == mp { - // Setting the provider to the prior default is nonsense, panic. - // Panic is acceptable because we are likely still early in the - // process lifetime. - panic("invalid MeterProvider, the global instance cannot be reinstalled") + // Setting the provider to the prior default results in a noop. Return + // early. + return } else if def, ok := current.(*meterProvider); ok { def.setDelegate(mp) } diff --git a/metric/internal/global/state_test.go b/metric/internal/global/state_test.go index 69cb9b917d6..b3d48555c49 100644 --- a/metric/internal/global/state_test.go +++ b/metric/internal/global/state_test.go @@ -18,8 +18,6 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" - "go.opentelemetry.io/otel/metric/nonrecording" ) @@ -31,13 +29,15 @@ func resetGlobalMeterProvider() { func TestSetMeterProvider(t *testing.T) { t.Cleanup(resetGlobalMeterProvider) - t.Run("Set With default panics", func(t *testing.T) { + t.Run("Set With default is a noop", func(t *testing.T) { resetGlobalMeterProvider() + SetMeterProvider(MeterProvider()) - assert.Panics(t, func() { - SetMeterProvider(MeterProvider()) - }) - + _, ok := MeterProvider().(*meterProvider) + if !ok { + t.Error("Global Meter Provider should be the default meter provider") + return + } }) t.Run("First Set() should replace the delegate", func(t *testing.T) { From 677772edf7249e0561eef7020c15bad52dbcb368 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Wed, 30 Mar 2022 10:36:03 +0200 Subject: [PATCH 02/16] check for the presence of a delegate in all tests --- internal/global/state_test.go | 12 ++++++++++-- metric/internal/global/state_test.go | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index 99fc7141bfe..b81b448a6df 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -28,11 +28,15 @@ func TestSetTracerProvider(t *testing.T) { ResetForTest() SetTracerProvider(TracerProvider()) - _, ok := TracerProvider().(*tracerProvider) + tp, ok := TracerProvider().(*tracerProvider) if !ok { t.Error("Global Tracer Provider should be the default tracer provider") return } + + if tp.delegate != nil { + t.Error("tracer provider should not delegate when setting itself") + } }) t.Run("First Set() should replace the delegate", func(t *testing.T) { @@ -68,11 +72,15 @@ func TestSetTextMapPropagator(t *testing.T) { ResetForTest() SetTextMapPropagator(TextMapPropagator()) - _, ok := TextMapPropagator().(*textMapPropagator) + tmp, ok := TextMapPropagator().(*textMapPropagator) if !ok { t.Error("Global TextMap Propagator should be the default propagator") return } + + if tmp.delegate != nil { + t.Error("TextMap propagator should not delegate when setting itself") + } }) t.Run("First Set() should replace the delegate", func(t *testing.T) { diff --git a/metric/internal/global/state_test.go b/metric/internal/global/state_test.go index b3d48555c49..678eb3153f6 100644 --- a/metric/internal/global/state_test.go +++ b/metric/internal/global/state_test.go @@ -33,11 +33,15 @@ func TestSetMeterProvider(t *testing.T) { resetGlobalMeterProvider() SetMeterProvider(MeterProvider()) - _, ok := MeterProvider().(*meterProvider) + mp, ok := MeterProvider().(*meterProvider) if !ok { t.Error("Global Meter Provider should be the default meter provider") return } + + if mp.delegate != nil { + t.Error("meter provider should not delegate when setting itself") + } }) t.Run("First Set() should replace the delegate", func(t *testing.T) { From 4a58bff3afce08731c349a0cb49465d2490fbf9d Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Wed, 30 Mar 2022 10:37:24 +0200 Subject: [PATCH 03/16] use t.Fatal instead of t.Error --- internal/global/state_test.go | 16 ++++++++-------- metric/internal/global/state_test.go | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index b81b448a6df..5a9eb03afb9 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -30,12 +30,12 @@ func TestSetTracerProvider(t *testing.T) { tp, ok := TracerProvider().(*tracerProvider) if !ok { - t.Error("Global Tracer Provider should be the default tracer provider") + t.Fatal("Global Tracer Provider should be the default tracer provider") return } if tp.delegate != nil { - t.Error("tracer provider should not delegate when setting itself") + t.Fatal("tracer provider should not delegate when setting itself") } }) @@ -46,7 +46,7 @@ func TestSetTracerProvider(t *testing.T) { _, ok := TracerProvider().(*tracerProvider) if ok { - t.Error("Global Tracer Provider was not changed") + t.Fatal("Global Tracer Provider was not changed") return } }) @@ -60,7 +60,7 @@ func TestSetTracerProvider(t *testing.T) { ntp := tp.(*tracerProvider) if ntp.delegate == nil { - t.Error("The delegated tracer providers should have a delegate") + t.Fatal("The delegated tracer providers should have a delegate") } }) } @@ -74,12 +74,12 @@ func TestSetTextMapPropagator(t *testing.T) { tmp, ok := TextMapPropagator().(*textMapPropagator) if !ok { - t.Error("Global TextMap Propagator should be the default propagator") + t.Fatal("Global TextMap Propagator should be the default propagator") return } if tmp.delegate != nil { - t.Error("TextMap propagator should not delegate when setting itself") + t.Fatal("TextMap propagator should not delegate when setting itself") } }) @@ -90,7 +90,7 @@ func TestSetTextMapPropagator(t *testing.T) { _, ok := TextMapPropagator().(*textMapPropagator) if ok { - t.Error("Global TextMap Propagator was not changed") + t.Fatal("Global TextMap Propagator was not changed") return } }) @@ -104,7 +104,7 @@ func TestSetTextMapPropagator(t *testing.T) { np := p.(*textMapPropagator) if np.delegate == nil { - t.Error("The delegated TextMap propagators should have a delegate") + t.Fatal("The delegated TextMap propagators should have a delegate") } }) } diff --git a/metric/internal/global/state_test.go b/metric/internal/global/state_test.go index 678eb3153f6..9316bcb785e 100644 --- a/metric/internal/global/state_test.go +++ b/metric/internal/global/state_test.go @@ -35,12 +35,12 @@ func TestSetMeterProvider(t *testing.T) { mp, ok := MeterProvider().(*meterProvider) if !ok { - t.Error("Global Meter Provider should be the default meter provider") + t.Fatal("Global Meter Provider should be the default meter provider") return } if mp.delegate != nil { - t.Error("meter provider should not delegate when setting itself") + t.Fatal("meter provider should not delegate when setting itself") } }) @@ -51,7 +51,7 @@ func TestSetMeterProvider(t *testing.T) { _, ok := MeterProvider().(*meterProvider) if ok { - t.Error("Global Meter Provider was not changed") + t.Fatal("Global Meter Provider was not changed") return } }) @@ -66,7 +66,7 @@ func TestSetMeterProvider(t *testing.T) { dmp := mp.(*meterProvider) if dmp.delegate == nil { - t.Error("The delegated meter providers should have a delegate") + t.Fatal("The delegated meter providers should have a delegate") } }) } From 80e7e3389fe70c3b804438fb99ec1a3427d1a6ba Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Wed, 30 Mar 2022 14:00:49 +0200 Subject: [PATCH 04/16] remove unneeded return --- internal/global/state_test.go | 4 ---- metric/internal/global/state_test.go | 2 -- 2 files changed, 6 deletions(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index 5a9eb03afb9..ecca47b6a3c 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -31,7 +31,6 @@ func TestSetTracerProvider(t *testing.T) { tp, ok := TracerProvider().(*tracerProvider) if !ok { t.Fatal("Global Tracer Provider should be the default tracer provider") - return } if tp.delegate != nil { @@ -47,7 +46,6 @@ func TestSetTracerProvider(t *testing.T) { _, ok := TracerProvider().(*tracerProvider) if ok { t.Fatal("Global Tracer Provider was not changed") - return } }) @@ -75,7 +73,6 @@ func TestSetTextMapPropagator(t *testing.T) { tmp, ok := TextMapPropagator().(*textMapPropagator) if !ok { t.Fatal("Global TextMap Propagator should be the default propagator") - return } if tmp.delegate != nil { @@ -91,7 +88,6 @@ func TestSetTextMapPropagator(t *testing.T) { _, ok := TextMapPropagator().(*textMapPropagator) if ok { t.Fatal("Global TextMap Propagator was not changed") - return } }) diff --git a/metric/internal/global/state_test.go b/metric/internal/global/state_test.go index 9316bcb785e..235098b4841 100644 --- a/metric/internal/global/state_test.go +++ b/metric/internal/global/state_test.go @@ -36,7 +36,6 @@ func TestSetMeterProvider(t *testing.T) { mp, ok := MeterProvider().(*meterProvider) if !ok { t.Fatal("Global Meter Provider should be the default meter provider") - return } if mp.delegate != nil { @@ -52,7 +51,6 @@ func TestSetMeterProvider(t *testing.T) { _, ok := MeterProvider().(*meterProvider) if ok { t.Fatal("Global Meter Provider was not changed") - return } }) From c0c9e41a4cb1530c0952025c8274585d7a69e3a5 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Wed, 30 Mar 2022 17:47:06 +0200 Subject: [PATCH 05/16] Update CHANGELOG.md Co-authored-by: Tyler Yahn --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6b855d1b1e..20b727f052f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed -- Don't panic anymore when setting a (Tracer|Meter)Provider or TextMapPropagator to itself (#2749) +- Don't panic anymore when setting a global (Tracer|Meter)Provider or TextMapPropagator to itself. (#2749) ### Removed From b07ff587bbccc2de80395d17de72fec6fac49c27 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Wed, 30 Mar 2022 19:11:41 +0200 Subject: [PATCH 06/16] log errors when skipping providers --- internal/global/state.go | 9 +++++++++ metric/internal/global/state.go | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/internal/global/state.go b/internal/global/state.go index 81f38082a7d..8d164d41f65 100644 --- a/internal/global/state.go +++ b/internal/global/state.go @@ -15,6 +15,7 @@ package global // import "go.opentelemetry.io/otel/internal/global" import ( + "errors" "sync" "sync/atomic" @@ -52,6 +53,10 @@ func SetTracerProvider(tp trace.TracerProvider) { if current == tp { // Setting the provider to the prior default results in a noop. Return // early. + Error( + errors.New("no delegate configured in tracer provider"), + "Setting tracer provider to it's current value. No delegate will be configured", + ) return } else if def, ok := current.(*tracerProvider); ok { def.setDelegate(tp) @@ -73,6 +78,10 @@ func SetTextMapPropagator(p propagation.TextMapPropagator) { if current := TextMapPropagator(); current == p { // Setting the provider to the prior default results in a noop. Return // early. + Error( + errors.New("no delegate configured in text map propagator"), + "Setting text map propagator to it's current value. No delegate will be configured", + ) return } else if def, ok := current.(*textMapPropagator); ok { def.SetDelegate(p) diff --git a/metric/internal/global/state.go b/metric/internal/global/state.go index f5126fc9c93..4fe2df87806 100644 --- a/metric/internal/global/state.go +++ b/metric/internal/global/state.go @@ -15,9 +15,11 @@ package global // import "go.opentelemetry.io/otel/metric/internal/global" import ( + "errors" "sync" "sync/atomic" + "go.opentelemetry.io/otel/internal/global" "go.opentelemetry.io/otel/metric" ) @@ -43,6 +45,10 @@ func SetMeterProvider(mp metric.MeterProvider) { if current == mp { // Setting the provider to the prior default results in a noop. Return // early. + global.Error( + errors.New("no delegate configured in meter provider"), + "Setting meter provider to it's current value. No delegate will be configured", + ) return } else if def, ok := current.(*meterProvider); ok { def.setDelegate(mp) From 5dd2c12f48c50774d2366eb3d2d3ace76676a7d7 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Wed, 30 Mar 2022 20:38:22 +0200 Subject: [PATCH 07/16] check for current provider outside of the run once --- internal/global/state.go | 43 ++++++++++++++++++--------------- metric/internal/global/state.go | 22 +++++++++-------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/internal/global/state.go b/internal/global/state.go index 8d164d41f65..7a8fa952324 100644 --- a/internal/global/state.go +++ b/internal/global/state.go @@ -48,17 +48,19 @@ func TracerProvider() trace.TracerProvider { // SetTracerProvider is the internal implementation for global.SetTracerProvider. func SetTracerProvider(tp trace.TracerProvider) { + current := TracerProvider() + if current == tp { + // Setting the provider to the prior default results in a noop. Return + // early. + Error( + errors.New("no delegate configured in tracer provider"), + "Setting tracer provider to it's current value. No delegate will be configured", + ) + return + } + delegateTraceOnce.Do(func() { - current := TracerProvider() - if current == tp { - // Setting the provider to the prior default results in a noop. Return - // early. - Error( - errors.New("no delegate configured in tracer provider"), - "Setting tracer provider to it's current value. No delegate will be configured", - ) - return - } else if def, ok := current.(*tracerProvider); ok { + if def, ok := current.(*tracerProvider); ok { def.setDelegate(tp) } }) @@ -72,18 +74,21 @@ func TextMapPropagator() propagation.TextMapPropagator { // SetTextMapPropagator is the internal implementation for global.SetTextMapPropagator. func SetTextMapPropagator(p propagation.TextMapPropagator) { + current := TextMapPropagator() + if current == p { + // Setting the provider to the prior default results in a noop. Return + // early. + Error( + errors.New("no delegate configured in text map propagator"), + "Setting text map propagator to it's current value. No delegate will be configured", + ) + return + } + // For the textMapPropagator already returned by TextMapPropagator // delegate to p. delegateTextMapPropagatorOnce.Do(func() { - if current := TextMapPropagator(); current == p { - // Setting the provider to the prior default results in a noop. Return - // early. - Error( - errors.New("no delegate configured in text map propagator"), - "Setting text map propagator to it's current value. No delegate will be configured", - ) - return - } else if def, ok := current.(*textMapPropagator); ok { + if def, ok := current.(*textMapPropagator); ok { def.SetDelegate(p) } }) diff --git a/metric/internal/global/state.go b/metric/internal/global/state.go index 4fe2df87806..0f0f0b11730 100644 --- a/metric/internal/global/state.go +++ b/metric/internal/global/state.go @@ -40,17 +40,19 @@ func MeterProvider() metric.MeterProvider { // SetMeterProvider is the internal implementation for global.SetMeterProvider. func SetMeterProvider(mp metric.MeterProvider) { + current := MeterProvider() + if current == mp { + // Setting the provider to the prior default results in a noop. Return + // early. + global.Error( + errors.New("no delegate configured in meter provider"), + "Setting meter provider to it's current value. No delegate will be configured", + ) + return + } + delegateMeterOnce.Do(func() { - current := MeterProvider() - if current == mp { - // Setting the provider to the prior default results in a noop. Return - // early. - global.Error( - errors.New("no delegate configured in meter provider"), - "Setting meter provider to it's current value. No delegate will be configured", - ) - return - } else if def, ok := current.(*meterProvider); ok { + if def, ok := current.(*meterProvider); ok { def.setDelegate(mp) } }) From 3593fe8e0ab213a5dc6edcda634062c2b6a60894 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:12 +0200 Subject: [PATCH 08/16] Update internal/global/state_test.go Co-authored-by: Tyler Yahn --- internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index ddda4bc8eb5..b56e27d6b1d 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -68,7 +68,7 @@ func TestSetTextMapPropagator(t *testing.T) { tmp, ok := TextMapPropagator().(*textMapPropagator) if !ok { - t.Fatal("Global TextMap Propagator should be the default propagator") + t.Fatal("Global TextMapPropagator should be the default propagator") } if tmp.delegate != nil { From a47654fecebb14bb77e01a1765715da0bbc98421 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:17 +0200 Subject: [PATCH 09/16] Update internal/global/state_test.go Co-authored-by: Tyler Yahn --- internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index b56e27d6b1d..1da47881493 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -28,7 +28,7 @@ func TestSetTracerProvider(t *testing.T) { tp, ok := TracerProvider().(*tracerProvider) if !ok { - t.Fatal("Global Tracer Provider should be the default tracer provider") + t.Fatal("Global TracerProvider should be the default tracer provider") } if tp.delegate != nil { From 1cfcf5cd0eefc847be9e693ea53a8a3db9b39c11 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:23 +0200 Subject: [PATCH 10/16] Update internal/global/state_test.go Co-authored-by: Tyler Yahn --- internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index 1da47881493..d6cd102cbdd 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -43,7 +43,7 @@ func TestSetTracerProvider(t *testing.T) { _, ok := TracerProvider().(*tracerProvider) if ok { - t.Fatal("Global Tracer Provider was not changed") + t.Fatal("Global TracerProvider was not changed") } }) From 79e52d150e3b980b43d7f4a4f80e45b01524aafa Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:28 +0200 Subject: [PATCH 11/16] Update internal/global/state_test.go Co-authored-by: Tyler Yahn --- internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index d6cd102cbdd..83dd2fd319a 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -47,7 +47,7 @@ func TestSetTracerProvider(t *testing.T) { } }) - t.Run("Set() should delegate existing Tracer Providers", func(t *testing.T) { + t.Run("Set() should delegate existing TracerProviders", func(t *testing.T) { ResetForTest(t) tp := TracerProvider() From 623d77393272fb72201dbc43c446f84353231d70 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:34 +0200 Subject: [PATCH 12/16] Update internal/global/state_test.go Co-authored-by: Tyler Yahn --- internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index 83dd2fd319a..a9a57047f61 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -72,7 +72,7 @@ func TestSetTextMapPropagator(t *testing.T) { } if tmp.delegate != nil { - t.Fatal("TextMap propagator should not delegate when setting itself") + t.Fatal("TextMapPropagator should not delegate when setting itself") } }) From af64a7f94e0802f6a050f8f2619c4f7ea27e36bc Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:40 +0200 Subject: [PATCH 13/16] Update internal/global/state_test.go Co-authored-by: Tyler Yahn --- internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index a9a57047f61..32bb67b7ddc 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -83,7 +83,7 @@ func TestSetTextMapPropagator(t *testing.T) { _, ok := TextMapPropagator().(*textMapPropagator) if ok { - t.Fatal("Global TextMap Propagator was not changed") + t.Fatal("Global TextMapPropagator was not changed") } }) From 53ce75e65b19e380fb919b2efa87a9dd2d5abf1a Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:48 +0200 Subject: [PATCH 14/16] Update metric/internal/global/state_test.go Co-authored-by: Tyler Yahn --- metric/internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metric/internal/global/state_test.go b/metric/internal/global/state_test.go index 235098b4841..141bf5bd271 100644 --- a/metric/internal/global/state_test.go +++ b/metric/internal/global/state_test.go @@ -50,7 +50,7 @@ func TestSetMeterProvider(t *testing.T) { _, ok := MeterProvider().(*meterProvider) if ok { - t.Fatal("Global Meter Provider was not changed") + t.Fatal("Global MeterProvider was not changed") } }) From 604b0942c0f0cf5d2c2dc94ea607a08a4c611c73 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:53 +0200 Subject: [PATCH 15/16] Update metric/internal/global/state_test.go Co-authored-by: Tyler Yahn --- metric/internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metric/internal/global/state_test.go b/metric/internal/global/state_test.go index 141bf5bd271..bda1e57da19 100644 --- a/metric/internal/global/state_test.go +++ b/metric/internal/global/state_test.go @@ -35,7 +35,7 @@ func TestSetMeterProvider(t *testing.T) { mp, ok := MeterProvider().(*meterProvider) if !ok { - t.Fatal("Global Meter Provider should be the default meter provider") + t.Fatal("Global MeterProvider should be the default meter provider") } if mp.delegate != nil { From d7cfc987693a616f3e0682368671a67dfc2695f4 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 31 Mar 2022 19:27:59 +0200 Subject: [PATCH 16/16] Update internal/global/state_test.go Co-authored-by: Tyler Yahn --- internal/global/state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/global/state_test.go b/internal/global/state_test.go index 32bb67b7ddc..395f6c5e864 100644 --- a/internal/global/state_test.go +++ b/internal/global/state_test.go @@ -96,7 +96,7 @@ func TestSetTextMapPropagator(t *testing.T) { np := p.(*textMapPropagator) if np.delegate == nil { - t.Fatal("The delegated TextMap propagators should have a delegate") + t.Fatal("The delegated TextMapPropagators should have a delegate") } }) }