Skip to content

[EXPORTER] OTLP file: use thread-safe file/io #2675

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
marcalff merged 7 commits into from
Jun 8, 2024
Merged

[EXPORTER] OTLP file: use thread-safe file/io #2675

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11cca82
Use `fopen`, `fwrite`, `fflush` and `fclose` which are thread-safety.
owent May 21, 2024
acf7541
Add some macros to help to find problems.
owent May 23, 2024
53b7217
Merge branch 'main' into fix_tsan_for_otlp_file_exporter
owent May 24, 2024
ab4f2f7
Merge branch 'main' into fix_tsan_for_otlp_file_exporter
owent May 31, 2024
85758da
Append EOL before call Export of backend
owent May 31, 2024
51bf537
Merge branch 'main' into fix_tsan_for_otlp_file_exporter
marcalff May 31, 2024
93ec062
Merge branch 'main' into fix_tsan_for_otlp_file_exporter
owent Jun 7, 2024
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
Prev Previous commit
Next Next commit
Append EOL before call Export of backend
  • Loading branch information
@owent
owent committed May 31, 2024
commit 85758da8a89f648dd1c72e9d613f487ec49e688c
3 changes: 1 addition & 2 deletions exporters/otlp/src/otlp_file_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,6 @@ class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileSystemBackend : public OtlpFileAppender
}

fwrite(data.data(), 1, data.size(), out.get());
fputc('\n', out.get());

{
std::lock_guard<std::mutex> lock_guard{file_->file_lock};
Expand Down Expand Up @@ -1527,7 +1526,6 @@ class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileOstreamBackend : public OtlpFileAppende
void Export(nostd::string_view data, std::size_t /*record_count*/) override
{
os_.get().write(data.data(), data.size());
os_.get().write("\n", 1);
}

bool ForceFlush(std::chrono::microseconds /*timeout*/) noexcept override
Expand Down Expand Up @@ -1595,6 +1593,7 @@ opentelemetry::sdk::common::ExportResult OtlpFileClient::Export(

if (backend_)
{
post_body_json += '\n';
backend_->Export(post_body_json, record_count);
return ::opentelemetry::sdk::common::ExportResult::kSuccess;
}
Expand Down