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

Jump to bottom

Fix output time in metrics OStream exporter #1346

Merged
merged 5 commits into from
Apr 28, 2022
Merged

Fix output time in metrics OStream exporter #1346

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c756645
Fix output time in metrics OStream exporter
ThomsonTan Apr 22, 2022
ca5ebe0
Switch to strftime
ThomsonTan Apr 23, 2022
c1c1916
Fix format
ThomsonTan Apr 23, 2022
0a778c9
Merge branch 'main' into FixOStreamExporter
ThomsonTan Apr 25, 2022
bff24d7
Merge branch 'main' into FixOStreamExporter
ThomsonTan Apr 28, 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
33 changes: 30 additions & 3 deletions exporters/ostream/src/metric_exporter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,34 @@ namespace
std::string timeToString(opentelemetry::common::SystemTimestamp time_stamp)
{
std::time_t epoch_time = std::chrono::system_clock::to_time_t(time_stamp);
return std::ctime(&epoch_time);

struct tm *tm_ptr = nullptr;
# if defined(_MSC_VER)
struct tm buf_tm;
if (!gmtime_s(&buf_tm, &epoch_time))
{
tm_ptr = &buf_tm;
}
# else
tm_ptr = std::gmtime(&epoch_time);
# endif

char buf[100];
char *date_str = nullptr;
if (tm_ptr == nullptr)
{
OTEL_INTERNAL_LOG_ERROR("[OStream Metric] gmtime failed for " << epoch_time);
}
else if (std::strftime(buf, sizeof(buf), "%c", tm_ptr) > 0)
{
date_str = buf;
}
else
{
OTEL_INTERNAL_LOG_ERROR("[OStream Metric] strftime failed for " << epoch_time);
}

return std::string{date_str};
}
} // namespace

Expand Down Expand Up @@ -68,8 +95,8 @@ void OStreamMetricExporter::printInstrumentationInfoMetricData(
for (const auto &record : info_metric.metric_data_)
{
sout_ << "\n start time\t: " << timeToString(record.start_ts)
<< " end time\t: " << timeToString(record.end_ts)
<< " description\t: " << record.instrument_descriptor.description_
<< "\n end time\t: " << timeToString(record.end_ts)
<< "\n description\t: " << record.instrument_descriptor.description_
<< "\n unit\t\t: " << record.instrument_descriptor.unit_;

for (const auto &pd : record.point_data_attr_)
Expand Down