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

Fix missing ObservedTimestamp. #1985

Merged
merged 2 commits into from
Feb 15, 2023
+30 −8
Merged

Fix missing ObservedTimestamp. #1985

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
f39ffb3
Fix missing ObservedTimestamp.
owent Feb 15, 2023
469eb1c
Fix `MockLogRecordable`
owent Feb 15, 2023
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 sdk/src/logs/logger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ nostd::unique_ptr<opentelemetry::logs::LogRecord> Logger::CreateLogRecord() noex
}

auto recordable = context_->GetProcessor().MakeRecordable();

recordable->SetObservedTimestamp(std::chrono::system_clock::now());

if (include_trace_context_ &&
opentelemetry::context::RuntimeContext::GetCurrent().HasKey(opentelemetry::trace::kSpanKey))
{
Expand Down
35 changes: 27 additions & 8 deletions sdk/test/logs/logger_sdk_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#ifdef ENABLE_LOGS_PREVIEW

# include <chrono>
# include <string>

# include "opentelemetry/nostd/string_view.h"
Expand Down Expand Up @@ -43,7 +44,16 @@ class MockLogRecordable final : public opentelemetry::sdk::logs::Recordable
public:
void SetTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}

void SetObservedTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
void SetObservedTimestamp(
opentelemetry::common::SystemTimestamp observed_timestamp) noexcept override
{
observed_timestamp_ = observed_timestamp;
}

const opentelemetry::common::SystemTimestamp &GetObservedTimestamp() const noexcept
{
return observed_timestamp_;
}

opentelemetry::logs::Severity GetSeverity() const noexcept { return severity_; }

Expand Down Expand Up @@ -121,13 +131,14 @@ class MockLogRecordable final : public opentelemetry::sdk::logs::Recordable

void CopyFrom(const MockLogRecordable &other)
{
severity_ = other.severity_;
body_ = other.body_;
trace_id_ = other.trace_id_;
span_id_ = other.span_id_;
trace_flags_ = other.trace_flags_;
event_name_ = other.event_name_;
event_domain_ = other.event_domain_;
severity_ = other.severity_;
body_ = other.body_;
trace_id_ = other.trace_id_;
span_id_ = other.span_id_;
trace_flags_ = other.trace_flags_;
event_name_ = other.event_name_;
event_domain_ = other.event_domain_;
observed_timestamp_ = other.observed_timestamp_;
}

private:
Expand All @@ -138,6 +149,8 @@ class MockLogRecordable final : public opentelemetry::sdk::logs::Recordable
opentelemetry::trace::TraceFlags trace_flags_;
std::string event_name_;
std::string event_domain_;
opentelemetry::common::SystemTimestamp observed_timestamp_ =
std::chrono::system_clock::from_time_t(0);
};

class MockProcessor final : public LogRecordProcessor
Expand Down Expand Up @@ -196,6 +209,8 @@ TEST(LoggerSDK, LogToAProcessor)
}
opentelemetry::trace::Scope trace_scope{include_span};

auto now = std::chrono::system_clock::now();

auto sdk_logger = static_cast<opentelemetry::sdk::logs::Logger *>(logger.get());
ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetName(), "opentelelemtry_library");
ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetVersion(), "");
Expand Down Expand Up @@ -226,6 +241,10 @@ TEST(LoggerSDK, LogToAProcessor)
std::string span_id_text_in_span{span_id_in_span, sizeof(span_id_in_span)};
ASSERT_EQ(trace_id_text_in_logger, trace_id_text_in_span);
ASSERT_EQ(span_id_text_in_logger, span_id_text_in_span);

ASSERT_GE(
static_cast<std::chrono::system_clock::time_point>(shared_recordable->GetObservedTimestamp()),
now);
}

TEST(LoggerSDK, EventLog)
Expand Down