summaryrefslogtreecommitdiff
path: root/src/mongo/logv2
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/logv2')
-rw-r--r--src/mongo/logv2/SConscript1
-rw-r--r--src/mongo/logv2/bson_formatter.cpp5
-rw-r--r--src/mongo/logv2/json_formatter.cpp4
-rw-r--r--src/mongo/logv2/json_formatter.h4
-rw-r--r--src/mongo/logv2/log_detail.cpp3
-rw-r--r--src/mongo/logv2/log_detail.h4
-rw-r--r--src/mongo/logv2/logv2_test.cpp12
7 files changed, 20 insertions, 13 deletions
diff --git a/src/mongo/logv2/SConscript b/src/mongo/logv2/SConscript
index a324973bcba..2ceefd5b03c 100644
--- a/src/mongo/logv2/SConscript
+++ b/src/mongo/logv2/SConscript
@@ -14,6 +14,7 @@ env.CppUnitTest(
LIBDEPS=[
'$BUILD_DIR/mongo/base',
'$BUILD_DIR/mongo/db/auth/security_token',
+ '$BUILD_DIR/mongo/db/multitenancy_params',
]
)
diff --git a/src/mongo/logv2/bson_formatter.cpp b/src/mongo/logv2/bson_formatter.cpp
index 3d85fbbb5f8..edf69478e20 100644
--- a/src/mongo/logv2/bson_formatter.cpp
+++ b/src/mongo/logv2/bson_formatter.cpp
@@ -34,6 +34,7 @@
#include "mongo/bson/bsonobj.h"
#include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/db/tenant_id.h"
#include "mongo/logv2/attribute_storage.h"
#include "mongo/logv2/attributes.h"
#include "mongo/logv2/constants.h"
@@ -123,8 +124,8 @@ void BSONFormatter::operator()(boost::log::record_view const& rec, BSONObjBuilde
builder.append(constants::kComponentFieldName,
extract<LogComponent>(attributes::component(), rec).get().getNameForLog());
builder.append(constants::kIdFieldName, extract<int32_t>(attributes::id(), rec).get());
- if (auto ptr = extract<OID>(attributes::tenant(), rec).get_ptr()) {
- builder.append(constants::kTenantFieldName, *ptr);
+ if (auto ptr = extract<TenantId>(attributes::tenant(), rec).get_ptr()) {
+ builder.append(constants::kTenantFieldName, ptr->toString());
}
builder.append(constants::kContextFieldName,
extract<StringData>(attributes::threadName(), rec).get());
diff --git a/src/mongo/logv2/json_formatter.cpp b/src/mongo/logv2/json_formatter.cpp
index c19de341c2e..cbcfc85f121 100644
--- a/src/mongo/logv2/json_formatter.cpp
+++ b/src/mongo/logv2/json_formatter.cpp
@@ -217,7 +217,7 @@ void JSONFormatter::format(fmt::memory_buffer& buffer,
StringData message,
const TypeErasedAttributeStorage& attrs,
LogTag tags,
- const OID* tenant,
+ const TenantId* tenant,
LogTruncation truncation) const {
namespace c = constants;
static constexpr auto kFmt = JsonStringFormat::ExtendedRelaxedV2_0_0;
@@ -350,7 +350,7 @@ void JSONFormatter::operator()(boost::log::record_view const& rec,
extract<StringData>(attributes::message(), rec).get(),
extract<TypeErasedAttributeStorage>(attributes::attributes(), rec).get(),
extract<LogTag>(attributes::tags(), rec).get(),
- extract<OID>(attributes::tenant(), rec).get_ptr(),
+ extract<TenantId>(attributes::tenant(), rec).get_ptr(),
extract<LogTruncation>(attributes::truncation(), rec).get());
// Write final JSON object to output stream
diff --git a/src/mongo/logv2/json_formatter.h b/src/mongo/logv2/json_formatter.h
index 4a2edd15740..44d9b7ea66d 100644
--- a/src/mongo/logv2/json_formatter.h
+++ b/src/mongo/logv2/json_formatter.h
@@ -32,7 +32,7 @@
#include <boost/log/core/record_view.hpp>
#include <boost/log/utility/formatting_ostream_fwd.hpp>
-#include "mongo/bson/oid.h"
+#include "mongo/db/tenant_id.h"
#include "mongo/logv2/attribute_storage.h"
#include "mongo/logv2/constants.h"
#include "mongo/logv2/log_component.h"
@@ -59,7 +59,7 @@ public:
StringData message,
const TypeErasedAttributeStorage& attrs,
LogTag tags,
- const OID* tenant,
+ const TenantId* tenant,
LogTruncation truncation) const;
void operator()(boost::log::record_view const& rec, boost::log::formatting_ostream& strm) const;
diff --git a/src/mongo/logv2/log_detail.cpp b/src/mongo/logv2/log_detail.cpp
index 1a0f4edab3b..188ede8032a 100644
--- a/src/mongo/logv2/log_detail.cpp
+++ b/src/mongo/logv2/log_detail.cpp
@@ -33,6 +33,7 @@
#include <fmt/format.h>
+#include "mongo/db/tenant_id.h"
#include "mongo/logv2/attributes.h"
#include "mongo/logv2/log.h"
#include "mongo/logv2/log_domain.h"
@@ -178,7 +179,7 @@ void doLogImpl(int32_t id,
record.attribute_values().insert(
attributes::tenant(),
boost::log::attribute_value(
- new boost::log::attributes::attribute_value_impl<OID>(tenant.get())));
+ new boost::log::attributes::attribute_value_impl<TenantId>(tenant.get())));
}
}
diff --git a/src/mongo/logv2/log_detail.h b/src/mongo/logv2/log_detail.h
index 780d776c062..6f60ae10c74 100644
--- a/src/mongo/logv2/log_detail.h
+++ b/src/mongo/logv2/log_detail.h
@@ -32,8 +32,8 @@
#include <boost/optional.hpp>
#include "mongo/base/status.h"
-#include "mongo/bson/oid.h"
#include "mongo/bson/util/builder.h"
+#include "mongo/db/tenant_id.h"
#include "mongo/logv2/attribute_storage.h"
#include "mongo/logv2/log_attr.h"
#include "mongo/logv2/log_component.h"
@@ -44,7 +44,7 @@
namespace mongo {
namespace logv2::detail {
-using GetTenantIDFn = std::function<boost::optional<OID>()>;
+using GetTenantIDFn = std::function<boost::optional<TenantId>()>;
void setGetTenantIDCallback(GetTenantIDFn&& fn);
void doLogImpl(int32_t id,
diff --git a/src/mongo/logv2/logv2_test.cpp b/src/mongo/logv2/logv2_test.cpp
index fed5d05f2d1..7102e720203 100644
--- a/src/mongo/logv2/logv2_test.cpp
+++ b/src/mongo/logv2/logv2_test.cpp
@@ -41,6 +41,7 @@
#include "mongo/bson/json.h"
#include "mongo/bson/oid.h"
#include "mongo/db/auth/security_token.h"
+#include "mongo/db/tenant_id.h"
#include "mongo/logv2/bson_formatter.h"
#include "mongo/logv2/component_settings_filter.h"
#include "mongo/logv2/composite_backend.h"
@@ -79,6 +80,7 @@ using constants::kIdFieldName;
using constants::kMessageFieldName;
using constants::kSeverityFieldName;
using constants::kTagsFieldName;
+using constants::kTenantFieldName;
using constants::kTimestampFieldName;
struct TypeWithoutBSON {
@@ -361,7 +363,8 @@ class LogV2TypesTest : public LogV2Test {
public:
using LogV2Test::LogV2Test;
LogV2TypesTest() : LogV2Test() {
- detail::setGetTenantIDCallback([this]() -> boost::optional<OID> { return this->tenant; });
+ detail::setGetTenantIDCallback(
+ [this]() -> boost::optional<TenantId> { return this->tenant; });
}
~LogV2TypesTest() {
detail::setGetTenantIDCallback(nullptr);
@@ -374,16 +377,17 @@ public:
std::istringstream json_stream(json.back());
pt::ptree ptree;
pt::json_parser::read_json(json_stream, ptree);
- ASSERT_EQUALS(OID(ptree.get<std::string>("tenant")), OID(tenant));
+ ASSERT_EQUALS(ptree.get<std::string>(std::string(kTenantFieldName)), tenant.toString());
ASSERT_EQUALS(ptree.get<T>(std::string(kAttributesFieldName) + ".name"), expected);
}
auto lastBSONElement() {
- ASSERT_EQUALS(BSONObj(bson.back().data()).getField("tenant").OID(), tenant);
+ ASSERT_EQUALS(BSONObj(bson.back().data()).getField(kTenantFieldName).str(),
+ tenant.toString());
return BSONObj(bson.back().data()).getField(kAttributesFieldName).Obj().getField("name"_sd);
}
- OID tenant = OID::gen();
+ TenantId tenant = TenantId(OID::gen());
LineCapture text = makeLineCapture(PlainFormatter());
LineCapture json = makeLineCapture(JSONFormatter());
LineCapture bson = makeLineCapture(BSONFormatter());
View Lorry Controller Status