Skip to content
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

Jump to bottom

Return Scope object instead of unique_ptr<Scope> from Tracer::WithActiveSpan() #788

Merged
merged 17 commits into from
May 25, 2021
Merged

Return Scope object instead of unique_ptr<Scope> from Tracer::WithActiveSpan() #788

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
48b34f5
return scope object instead of unique_ptr
lalitb May 23, 2021
9b463cd
fix tracer and format
lalitb May 23, 2021
c65d595
fix format
lalitb May 23, 2021
dd534c8
fix
lalitb May 23, 2021
28a6609
Merge branch 'main' into remove-scope-unique-ptr
lalitb May 23, 2021
c983f06
use scope object
lalitb May 23, 2021
4823711
Merge branch 'remove-scope-unique-ptr' of github.com:lalitb/opentelem…
lalitb May 23, 2021
6d06ce4
fix etw_tracer
lalitb May 23, 2021
b602a0b
fix etw test
lalitb May 23, 2021
ccf9637
fix etw tracer test
lalitb May 24, 2021
2a72766
fix
lalitb May 24, 2021
1422b6d
fix another test
lalitb May 24, 2021
f960cee
last fix for test :(
lalitb May 24, 2021
7d563be
Merge branch 'main' into remove-scope-unique-ptr
lalitb May 24, 2021
21241c7
Merge branch 'remove-scope-unique-ptr' of github.com:lalitb/opentelem…
lalitb May 23, 2021
024c9d2
Merge branch 'main' into remove-scope-unique-ptr
lalitb May 24, 2021
e29d3d2
Merge branch 'main' into remove-scope-unique-ptr
lalitb May 25, 2021
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
24 changes: 12 additions & 12 deletions exporters/etw/test/etw_tracer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ TEST(ETWTracer, TracerCheck)
};
EXPECT_NO_THROW(innerSpan->AddEvent(eventName3, event3));
std::this_thread::sleep_for (std::chrono::seconds(1));
innerSpan->End();
ThomsonTan marked this conversation as resolved.
Show resolved Hide resolved
EXPECT_NO_THROW(innerSpan->End());

}
outerSpan->End();
EXPECT_NO_THROW(outerSpan->End());

}
topSpan->End();
EXPECT_NO_THROW(topSpan->End());
}

EXPECT_NO_THROW(tracer->CloseWithMicroseconds(0));
Expand Down Expand Up @@ -168,11 +168,11 @@ TEST(ETWTracer, TracerCheckMinDecoration)
{
auto cSpan = tracer->StartSpan("C.min");
auto cScope = tracer->WithActiveSpan(cSpan);
cSpan->End();
EXPECT_NO_THROW(cSpan->End());
}
bSpan->End();
EXPECT_NO_THROW(bSpan->End());
}
aSpan->End();
EXPECT_NO_THROW(aSpan->End());
}
tracer->CloseWithMicroseconds(0);
}
Expand Down Expand Up @@ -219,11 +219,11 @@ TEST(ETWTracer, TracerCheckMaxDecoration)
{
auto cSpan = tracer->StartSpan("C.max");
auto cScope = tracer->WithActiveSpan(cSpan);
cSpan->End();
EXPECT_NO_THROW(cSpan->End());
}
bSpan->End();
EXPECT_NO_THROW(bSpan->End());
}
aSpan->End();
EXPECT_NO_THROW(aSpan->End());
}
tracer->CloseWithMicroseconds(0);
}
Expand Down Expand Up @@ -257,11 +257,11 @@ TEST(ETWTracer, TracerCheckMsgPack)
{"strKey", "someValue"}
};
cSpan->AddEvent(eventName, event);
cSpan->End();
EXPECT_NO_THROW(cSpan->End());
}
bSpan->End();
EXPECT_NO_THROW(bSpan->End());
}
aSpan->End();
EXPECT_NO_THROW(aSpan->End());
}
tracer->CloseWithMicroseconds(0);
}
Expand Down