Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ Increment the:
* [CODE HEALTH] Fix clang-tidy performance enum size warnings
[#3923](https://github.com/open-telemetry/opentelemetry-cpp/pull/3923)

* [EXPORTER] Allow custom HttpClient in OTLP HTTP
[#3930](https://github.com/open-telemetry/opentelemetry-cpp/pull/3930)

Important changes:

* [BUILD] Revisit EventLogger deprecation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,14 @@ class OtlpHttpClient
*/
explicit OtlpHttpClient(OtlpHttpClientOptions &&options);

/**
* Create an OtlpHttpClient using the specified http client.
* @param options the Otlp http client options to be used for exporting
* @param http_client the http client to be used for exporting
*/
OtlpHttpClient(OtlpHttpClientOptions &&options,
std::shared_ptr<ext::http::client::HttpClient> http_client);

~OtlpHttpClient();
OtlpHttpClient(const OtlpHttpClient &) = delete;
OtlpHttpClient &operator=(const OtlpHttpClient &) = delete;
Expand Down Expand Up @@ -266,20 +274,6 @@ class OtlpHttpClient
*/
bool cleanupGCSessions() noexcept;

// For testing
friend class OtlpHttpExporterTestPeer;
friend class OtlpHttpLogRecordExporterTestPeer;
friend class OtlpHttpMetricExporterTestPeer;

/**
* Create an OtlpHttpClient using the specified http client.
* Only tests can call this constructor directly.
* @param options the Otlp http client options to be used for exporting
* @param http_client the http client to be used for exporting
*/
OtlpHttpClient(OtlpHttpClientOptions &&options,
std::shared_ptr<ext::http::client::HttpClient> http_client);

// Stores if this HTTP client had its Shutdown() method called
std::atomic<bool> is_shutdown_;

Expand Down
Loading