Skip to content

fix TracerProvider constructor #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reyang merged 5 commits into from
Jul 20, 2020
Merged

fix TracerProvider constructor #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39e306a
fix tp constructor
Jul 16, 2020
ac1c001
fix
Jul 16, 2020
a068bcb
add test
Jul 16, 2020
e35dd2c
change variable name
Jul 16, 2020
1824847
Merge remote-tracking branch 'upstream/master' into tracerprovider-fix
Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/src/trace/tracer_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace trace
{
TracerProvider::TracerProvider(std::shared_ptr<SpanProcessor> processor,
std::shared_ptr<Sampler> 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<opentelemetry::trace::Tracer> TracerProvider::GetTracer(
Expand Down
29 changes: 17 additions & 12 deletions sdk/test/trace/tracer_provider_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ TEST(TracerProvider, GetTracer)
{
std::shared_ptr<SpanProcessor> 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 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);
Expand All @@ -25,19 +25,24 @@ TEST(TracerProvider, GetTracer)
ASSERT_EQ(t1, t3);

// Should be an sdk::trace::Tracer with the processor attached.
auto sdkTracer = dynamic_cast<Tracer *>(t1.get());
ASSERT_NE(nullptr, sdkTracer);
ASSERT_EQ(processor, sdkTracer->GetProcessor());
auto sdkTracer1 = dynamic_cast<Tracer *>(t1.get());
Comment thread
ziqizh marked this conversation as resolved.
ASSERT_NE(nullptr, sdkTracer1);
ASSERT_EQ(processor, sdkTracer1->GetProcessor());
ASSERT_EQ("AlwaysOnSampler", sdkTracer1->GetSampler()->GetDescription());

TracerProvider tp2(processor, std::make_shared<AlwaysOffSampler>());
auto sdkTracer2 = dynamic_cast<Tracer *>(tp2.GetTracer("test").get());
ASSERT_EQ("AlwaysOffSampler", sdkTracer2->GetSampler()->GetDescription());
}

TEST(TracerProvider, GetSampler)
{
std::shared_ptr<SpanProcessor> 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);

Expand All @@ -49,8 +54,8 @@ TEST(TracerProvider, GetSampler)

// Create a TracerProvicer with a custom AlwaysOffSampler.
std::shared_ptr<SpanProcessor> processor2(new SimpleSpanProcessor(nullptr));
TracerProvider tf2(processor2, std::make_shared<AlwaysOffSampler>());
auto t3 = tf2.GetSampler();
TracerProvider tp2(processor2, std::make_shared<AlwaysOffSampler>());
auto t3 = tp2.GetSampler();

ASSERT_EQ("AlwaysOffSampler", t3->GetDescription());
}