Skip to content

Resolve test_tracer data race #871

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Resolve test_tracer data race #871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions test/test_integration_tracer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,26 @@ class test_span : public couchbase::tracing::request_span

void add_tag(const std::string& name, std::uint64_t value) override
{
const std::scoped_lock lock(mutex_);
int_tags_[name] = value;
}

void add_tag(const std::string& name, const std::string& value) override
{
const std::scoped_lock lock(mutex_);
string_tags_[name] = value;
}

void end() override
{
const std::scoped_lock lock(mutex_);
duration_ = std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::steady_clock::now() - start_);
}

void add_child_span(const std::shared_ptr<test_span>& child)
{
const std::scoped_lock lock(child_spans_lock_);
const std::scoped_lock lock(mutex_);

const auto child_span_name = child->name();
if (child_spans_.count(child_span_name) == 0) {
Expand All @@ -70,38 +73,42 @@ class test_span : public couchbase::tracing::request_span
child_spans_[child_span_name].emplace_back(child);
}

auto child_spans() -> std::map<std::string, std::vector<std::weak_ptr<test_span>>>
[[nodiscard]] auto child_spans() -> std::map<std::string, std::vector<std::weak_ptr<test_span>>>
{
const std::shared_lock lock(child_spans_lock_);
const std::scoped_lock lock(mutex_);
return child_spans_;
}

auto child_spans(const std::string& name) -> std::vector<std::weak_ptr<test_span>>
[[nodiscard]] auto child_spans(const std::string& name) -> std::vector<std::weak_ptr<test_span>>
{
const std::shared_lock lock(child_spans_lock_);
const std::scoped_lock lock(mutex_);
if (child_spans_.count(name) == 0) {
return {};
}
return child_spans_.at(name);
}

auto string_tags() -> std::map<std::string, std::string>
[[nodiscard]] auto string_tags() -> std::map<std::string, std::string>
{
const std::scoped_lock lock(mutex_);
return string_tags_;
}

auto int_tags() -> std::map<std::string, std::uint64_t>
[[nodiscard]] auto int_tags() -> std::map<std::string, std::uint64_t>
{
const std::scoped_lock lock(mutex_);
return int_tags_;
}

auto duration() const -> std::chrono::nanoseconds
[[nodiscard]] auto duration() -> std::chrono::nanoseconds
{
const std::scoped_lock lock(mutex_);
return duration_;
}

auto start() const -> std::chrono::time_point<std::chrono::steady_clock>
[[nodiscard]] auto start() -> std::chrono::time_point<std::chrono::steady_clock>
{
const std::scoped_lock lock(mutex_);
return start_;
}

Expand All @@ -117,7 +124,7 @@ class test_span : public couchbase::tracing::request_span
std::map<std::string, std::string> string_tags_;
std::map<std::string, std::uint64_t> int_tags_;
std::map<std::string, std::vector<std::weak_ptr<test_span>>> child_spans_{};
std::shared_mutex child_spans_lock_{};
std::mutex mutex_{};
};

class test_tracer : public couchbase::tracing::request_tracer
Expand Down
Loading