From 39e306ad28583d320d9fb70043e24c18fc8034ab Mon Sep 17 00:00:00 2001 From: Oliver Zhang Date: Thu, 16 Jul 2020 02:10:29 +0000 Subject: [PATCH 1/4] fix tp constructor --- sdk/src/trace/tracer_provider.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/trace/tracer_provider.cc b/sdk/src/trace/tracer_provider.cc index 32144c4c6b..c96db461e4 100644 --- a/sdk/src/trace/tracer_provider.cc +++ b/sdk/src/trace/tracer_provider.cc @@ -7,7 +7,7 @@ namespace trace { TracerProvider::TracerProvider(std::shared_ptr processor, std::shared_ptr sampler) noexcept - : processor_{processor}, tracer_(new Tracer(std::move(processor))), sampler_(sampler) + : processor_{processor}, tracer_(new Tracer(std::move(processor)), sampler), sampler_(sampler) {} opentelemetry::nostd::shared_ptr TracerProvider::GetTracer( From ac1c001774a69adb7a615e815fb442f80fda8ec8 Mon Sep 17 00:00:00 2001 From: Oliver Zhang Date: Thu, 16 Jul 2020 02:17:54 +0000 Subject: [PATCH 2/4] fix --- sdk/src/trace/tracer_provider.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/trace/tracer_provider.cc b/sdk/src/trace/tracer_provider.cc index c96db461e4..8f05436b4c 100644 --- a/sdk/src/trace/tracer_provider.cc +++ b/sdk/src/trace/tracer_provider.cc @@ -7,7 +7,7 @@ namespace trace { TracerProvider::TracerProvider(std::shared_ptr processor, std::shared_ptr sampler) noexcept - : processor_{processor}, tracer_(new Tracer(std::move(processor)), sampler), sampler_(sampler) + : processor_{processor}, tracer_(new Tracer(std::move(processor), sampler)), sampler_(sampler) {} opentelemetry::nostd::shared_ptr TracerProvider::GetTracer( From a068bcb4e663d53826cd0cbf55ba1aab77f7d380 Mon Sep 17 00:00:00 2001 From: Oliver Zhang Date: Thu, 16 Jul 2020 02:21:37 +0000 Subject: [PATCH 3/4] add test --- sdk/test/trace/tracer_provider_test.cc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sdk/test/trace/tracer_provider_test.cc b/sdk/test/trace/tracer_provider_test.cc index 399ea6d453..28d54c19ba 100644 --- a/sdk/test/trace/tracer_provider_test.cc +++ b/sdk/test/trace/tracer_provider_test.cc @@ -12,10 +12,10 @@ TEST(TracerProvider, GetTracer) { std::shared_ptr processor(new SimpleSpanProcessor(nullptr)); - TracerProvider tf(processor); - auto t1 = tf.GetTracer("test"); - auto t2 = tf.GetTracer("test"); - auto t3 = tf.GetTracer("different", "1.0.0"); + TracerProvider tf1(processor); + auto t1 = tf1.GetTracer("test"); + auto t2 = tf1.GetTracer("test"); + auto t3 = tf1.GetTracer("different", "1.0.0"); ASSERT_NE(nullptr, t1); ASSERT_NE(nullptr, t2); ASSERT_NE(nullptr, t3); @@ -25,9 +25,14 @@ TEST(TracerProvider, GetTracer) ASSERT_EQ(t1, t3); // Should be an sdk::trace::Tracer with the processor attached. - auto sdkTracer = dynamic_cast(t1.get()); - ASSERT_NE(nullptr, sdkTracer); - ASSERT_EQ(processor, sdkTracer->GetProcessor()); + auto sdkTracer1 = dynamic_cast(t1.get()); + ASSERT_NE(nullptr, sdkTracer1); + ASSERT_EQ(processor, sdkTracer1->GetProcessor()); + ASSERT_EQ("AlwaysOnSampler", sdkTracer1->GetSampler()->GetDescription()); + + TracerProvider tf2(processor, std::make_shared()); + auto sdkTracer2 = dynamic_cast(tf2.GetTracer("test").get()); + ASSERT_EQ("AlwaysOffSampler", sdkTracer2->GetSampler()->GetDescription()); } TEST(TracerProvider, GetSampler) From e35dd2c4ede29e89842c50933e928f28f4493fb2 Mon Sep 17 00:00:00 2001 From: Oliver Zhang Date: Thu, 16 Jul 2020 15:12:03 +0000 Subject: [PATCH 4/4] change variable name --- sdk/test/trace/tracer_provider_test.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/test/trace/tracer_provider_test.cc b/sdk/test/trace/tracer_provider_test.cc index 28d54c19ba..dca3bc3607 100644 --- a/sdk/test/trace/tracer_provider_test.cc +++ b/sdk/test/trace/tracer_provider_test.cc @@ -12,10 +12,10 @@ TEST(TracerProvider, GetTracer) { std::shared_ptr processor(new SimpleSpanProcessor(nullptr)); - TracerProvider tf1(processor); - auto t1 = tf1.GetTracer("test"); - auto t2 = tf1.GetTracer("test"); - auto t3 = tf1.GetTracer("different", "1.0.0"); + TracerProvider tp1(processor); + auto t1 = tp1.GetTracer("test"); + auto t2 = tp1.GetTracer("test"); + auto t3 = tp1.GetTracer("different", "1.0.0"); ASSERT_NE(nullptr, t1); ASSERT_NE(nullptr, t2); ASSERT_NE(nullptr, t3); @@ -30,8 +30,8 @@ TEST(TracerProvider, GetTracer) ASSERT_EQ(processor, sdkTracer1->GetProcessor()); ASSERT_EQ("AlwaysOnSampler", sdkTracer1->GetSampler()->GetDescription()); - TracerProvider tf2(processor, std::make_shared()); - auto sdkTracer2 = dynamic_cast(tf2.GetTracer("test").get()); + TracerProvider tp2(processor, std::make_shared()); + auto sdkTracer2 = dynamic_cast(tp2.GetTracer("test").get()); ASSERT_EQ("AlwaysOffSampler", sdkTracer2->GetSampler()->GetDescription()); } @@ -40,9 +40,9 @@ TEST(TracerProvider, GetSampler) std::shared_ptr processor1(new SimpleSpanProcessor(nullptr)); // Create a TracerProvicer with a default AlwaysOnSampler. - TracerProvider tf1(processor1); - auto t1 = tf1.GetSampler(); - auto t2 = tf1.GetSampler(); + TracerProvider tp1(processor1); + auto t1 = tp1.GetSampler(); + auto t2 = tp1.GetSampler(); ASSERT_NE(nullptr, t1); ASSERT_NE(nullptr, t2); @@ -54,8 +54,8 @@ TEST(TracerProvider, GetSampler) // Create a TracerProvicer with a custom AlwaysOffSampler. std::shared_ptr processor2(new SimpleSpanProcessor(nullptr)); - TracerProvider tf2(processor2, std::make_shared()); - auto t3 = tf2.GetSampler(); + TracerProvider tp2(processor2, std::make_shared()); + auto t3 = tp2.GetSampler(); ASSERT_EQ("AlwaysOffSampler", t3->GetDescription()); }