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

Fix session lock of OtlpHttpClient #1760

Merged
merged 5 commits into from
Nov 22, 2022
Merged

Fix session lock of OtlpHttpClient #1760

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d117d3a
Fix session lock of `OtlpHttpClient`
owent Nov 10, 2022
a4d7e7b
Merge branch 'main' into fix_1759
esigo Nov 10, 2022
76c234b
Merge branch 'main' into fix_1759
lalitb Nov 13, 2022
ff03a95
Merge branch 'main' into fix_1759
lalitb Nov 16, 2022
cff77ec
Merge branch 'main' into fix_1759
lalitb Nov 18, 2022
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
17 changes: 10 additions & 7 deletions exporters/otlp/src/otlp_http_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,16 +981,19 @@ void OtlpHttpClient::addSession(HttpSessionData &&session_data) noexcept
return;
}

opentelemetry::ext::http::client::Session *key = session_data.session.get();
ResponseHandler *handle = static_cast<ResponseHandler *>(session_data.event_handle.get());

handle->Bind(this, *key);
std::shared_ptr<opentelemetry::ext::http::client::Session> session = session_data.session;
std::shared_ptr<opentelemetry::ext::http::client::EventHandler> handle =
session_data.event_handle;
{
std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
static_cast<ResponseHandler *>(handle.get())->Bind(this, *session);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this statement needs to be under lock ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's not necessary, but I think ResponseHandler::Bind and inserting element into running_sessions_ below should work together logically.


HttpSessionData &store_session_data = running_sessions_[key];
store_session_data = std::move(session_data);
HttpSessionData &store_session_data = running_sessions_[session.get()];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious , why can't we just use session_data.session.get() instead of session.get() for indexing here?

Copy link
Member Author

@owent owent Nov 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's same here.

store_session_data = std::move(session_data);
}

// Send request after the session is added
key->SendRequest(store_session_data.event_handle);
session->SendRequest(handle);
}

bool OtlpHttpClient::cleanupGCSessions() noexcept
Expand Down