Skip to content

revert: 290cc2780482318e6c7aa44b70063ad5eb19b361 #229

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
dmehala merged 2 commits into from
Aug 13, 2025
Merged

revert: 290cc2780482318e6c7aa44b70063ad5eb19b361 #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3186f0
revert: 290cc2780482318e6c7aa44b70063ad5eb19b361
dmehala Aug 4, 2025
33901b9
Merge branch 'main' into dmehala/fix-curl-http-concurrency
dmehala Aug 12, 2025
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
3 changes: 1 addition & 2 deletions src/datadog/curl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
#include <chrono>
#include <condition_variable>
#include <cstddef>
#include <iterator>
#include <list>
#include <memory>
#include <mutex>
#include <system_error>
#include <unordered_map>
#include <unordered_set>

#include "json.hpp"
#include "string_util.h"

namespace datadog {
Expand Down Expand Up @@ -428,7 +428,6 @@ void CurlImpl::drain(std::chrono::steady_clock::time_point deadline) {
});

log_on_error(curl_.multi_wakeup(multi_handle_));
clear_requests();
}

std::size_t CurlImpl::on_read_header(char *data, std::size_t,
Expand Down
2 changes: 0 additions & 2 deletions src/datadog/curl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#include <string>
#include <thread>

#include "json.hpp"

namespace datadog {
namespace tracing {

Expand Down
25 changes: 0 additions & 25 deletions test/test_curl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,31 +156,6 @@ const auto ignore = [](auto &&...) {};

using namespace std::chrono_literals;

CURL_TEST("API") {
const auto clock = default_clock;
const auto logger = std::make_shared<MockLogger>();
SingleRequestMockCurlLibrary library;
const auto client = std::make_shared<Curl>(logger, clock, library);

SECTION("drain remove requests in-flight") {
/// Prevent to process the request.
library.on_multi_perform = [] { return CURLM_OK; };

const HTTPClient::URL url = {"http", "whatever", ""};

const auto result = client->post(url, ignore, "whatever", ignore, ignore,
clock().tick + 60min);

REQUIRE(result);
REQUIRE(library.created_handles_.size() == 1);
REQUIRE(library.destroyed_handles_.size() == 0);

client->drain(clock().tick + 1s);
CHECK(library.created_handles_.size() == 1);
CHECK(library.destroyed_handles_.size() == 1);
}
}

CURL_TEST("parse response headers and body") {
const auto clock = default_clock;
const auto logger = std::make_shared<MockLogger>();
Expand Down