Skip to content

Commit 5dc28ab

Browse files
committed
Align with naming conventions
1 parent d0b8589 commit 5dc28ab

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class Request : public opentelemetry::ext::http::client::Request
102102
compression_ = compression;
103103
}
104104

105-
void EnableLogging(bool needs_to_log) noexcept override { needs_to_log_ = needs_to_log; }
105+
void EnableLogging(bool is_log_enabled) noexcept override { is_log_enabled_ = is_log_enabled; }
106106

107107
public:
108108
opentelemetry::ext::http::client::Method method_;
@@ -113,7 +113,7 @@ class Request : public opentelemetry::ext::http::client::Request
113113
std::chrono::milliseconds timeout_ms_{5000}; // ms
114114
opentelemetry::ext::http::client::Compression compression_{
115115
opentelemetry::ext::http::client::Compression::kNone};
116-
bool needs_to_log_{false};
116+
bool is_log_enabled_{false};
117117
};
118118

119119
class Response : public opentelemetry::ext::http::client::Response

ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class HttpOperation
159159
bool is_raw_response = false,
160160
std::chrono::milliseconds http_conn_timeout = default_http_conn_timeout,
161161
bool reuse_connection = false,
162-
bool needs_to_log = false);
162+
bool is_log_enabled = false);
163163

164164
/**
165165
* Destroy CURL instance
@@ -307,7 +307,7 @@ class HttpOperation
307307

308308
const opentelemetry::ext::http::client::Compression &compression_;
309309

310-
const bool needs_to_log_;
310+
const bool is_log_enabled_;
311311

312312
// Processed response headers and body
313313
long response_code_;

ext/include/opentelemetry/ext/http/client/http_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ class Request
245245

246246
virtual void SetCompression(const Compression &compression) noexcept = 0;
247247

248-
virtual void EnableLogging(bool needs_to_log) noexcept = 0;
248+
virtual void EnableLogging(bool is_log_enabled) noexcept = 0;
249249

250250
virtual ~Request() = default;
251251
};

ext/src/http/client/curl/http_client_curl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void Session::SendRequest(
119119
curl_operation_.reset(new HttpOperation(
120120
http_request_->method_, url, http_request_->ssl_options_, callback_ptr,
121121
http_request_->headers_, http_request_->body_, http_request_->compression_, false,
122-
http_request_->timeout_ms_, reuse_connection, http_request_->needs_to_log_));
122+
http_request_->timeout_ms_, reuse_connection, http_request_->is_log_enabled_));
123123
bool success =
124124
CURLE_OK == curl_operation_->SendAsync(this, [this, callback](HttpOperation &operation) {
125125
if (operation.WasAborted())

ext/src/http/client/curl/http_operation_curl.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ HttpOperation::HttpOperation(opentelemetry::ext::http::client::Method method,
263263
bool is_raw_response,
264264
std::chrono::milliseconds http_conn_timeout,
265265
bool reuse_connection,
266-
bool needs_to_log)
266+
bool is_log_enabled)
267267
: is_aborted_(false),
268268
is_finished_(false),
269269
is_cleaned_(false),
@@ -283,7 +283,7 @@ HttpOperation::HttpOperation(opentelemetry::ext::http::client::Method method,
283283
request_nwrite_(0),
284284
session_state_(opentelemetry::ext::http::client::SessionState::Created),
285285
compression_(compression),
286-
needs_to_log_(needs_to_log),
286+
is_log_enabled_(is_log_enabled),
287287
response_code_(0)
288288
{
289289
/* get a curl handle */
@@ -658,7 +658,7 @@ CURLcode HttpOperation::Setup()
658658
return rc;
659659
}
660660
#else
661-
rc = SetCurlLongOption(CURLOPT_VERBOSE, static_cast<long>(needs_to_log_ || kEnableCurlLogging));
661+
rc = SetCurlLongOption(CURLOPT_VERBOSE, static_cast<long>(is_log_enabled_ || kEnableCurlLogging));
662662
if (rc != CURLE_OK)
663663
{
664664
return rc;

test_common/include/opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class Request : public opentelemetry::ext::http::client::Request
6969
compression_ = compression;
7070
}
7171

72-
void EnableLogging(bool needs_to_log) noexcept override { needs_to_log_ = needs_to_log; }
72+
void EnableLogging(bool is_log_enabled) noexcept override { is_log_enabled_ = is_log_enabled; }
7373

7474
public:
7575
opentelemetry::ext::http::client::Method method_;
@@ -80,7 +80,7 @@ class Request : public opentelemetry::ext::http::client::Request
8080
std::chrono::milliseconds timeout_ms_{5000}; // ms
8181
opentelemetry::ext::http::client::Compression compression_{
8282
opentelemetry::ext::http::client::Compression::kNone};
83-
bool needs_to_log_{false};
83+
bool is_log_enabled_{false};
8484
};
8585

8686
class Response : public opentelemetry::ext::http::client::Response

0 commit comments

Comments
 (0)