Skip to content

Commit 50ad5e7

Browse files
Anton3Anton3
committed
feat logging: improve LogCaptureFixture
* Parse text and tags from logs, accounting for escaping perfectly * Allow handy searching for logs * Allow mocking non-default loggers * Add `utils::encoding::TskvParser` 32120b023c37fa96399f5197931c011202112705
1 parent 38f66d7 commit 50ad5e7

File tree

33 files changed

+989
-178
lines changed

33 files changed

+989
-178
lines changed

‎.clang-tidy

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ Checks:
9797
,-readability-redundant-declaration\
9898
,-readability-uppercase-literal-suffix\
9999
,-readability-use-anyofallof\
100+
,-hicpp-use-emplace\
101+
,-modernize-use-emplace\
100102
"
101103

102104
WarningsAsErrors: '*'

‎.mapping.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,6 @@
750750
"core/include/userver/utils/impl/wait_token_storage.hpp":"taxi/uservices/userver/core/include/userver/utils/impl/wait_token_storage.hpp",
751751
"core/include/userver/utils/impl/wrapped_call.hpp":"taxi/uservices/userver/core/include/userver/utils/impl/wrapped_call.hpp",
752752
"core/include/userver/utils/impl/wrapped_call_base.hpp":"taxi/uservices/userver/core/include/userver/utils/impl/wrapped_call_base.hpp",
753-
"core/include/userver/utils/internal_tag_fwd.hpp":"taxi/uservices/userver/core/include/userver/utils/internal_tag_fwd.hpp",
754753
"core/include/userver/utils/lazy_shared_ptr.hpp":"taxi/uservices/userver/core/include/userver/utils/lazy_shared_ptr.hpp",
755754
"core/include/userver/utils/log.hpp":"taxi/uservices/userver/core/include/userver/utils/log.hpp",
756755
"core/include/userver/utils/periodic_task.hpp":"taxi/uservices/userver/core/include/userver/utils/periodic_task.hpp",
@@ -1531,7 +1530,6 @@
15311530
"core/src/utils/impl/wait_token_storage.cpp":"taxi/uservices/userver/core/src/utils/impl/wait_token_storage.cpp",
15321531
"core/src/utils/impl/wait_token_storage_test.cpp":"taxi/uservices/userver/core/src/utils/impl/wait_token_storage_test.cpp",
15331532
"core/src/utils/impl/wrapped_call_base.cpp":"taxi/uservices/userver/core/src/utils/impl/wrapped_call_base.cpp",
1534-
"core/src/utils/internal_tag.hpp":"taxi/uservices/userver/core/src/utils/internal_tag.hpp",
15351533
"core/src/utils/jemalloc.cpp":"taxi/uservices/userver/core/src/utils/jemalloc.cpp",
15361534
"core/src/utils/jemalloc.hpp":"taxi/uservices/userver/core/src/utils/jemalloc.hpp",
15371535
"core/src/utils/lazy_shared_ptr_test.cpp":"taxi/uservices/userver/core/src/utils/lazy_shared_ptr_test.cpp",
@@ -3670,6 +3668,8 @@
36703668
"universal/include/userver/utils/distances.hpp":"taxi/uservices/userver/universal/include/userver/utils/distances.hpp",
36713669
"universal/include/userver/utils/encoding/hex.hpp":"taxi/uservices/userver/universal/include/userver/utils/encoding/hex.hpp",
36723670
"universal/include/userver/utils/encoding/tskv.hpp":"taxi/uservices/userver/universal/include/userver/utils/encoding/tskv.hpp",
3671+
"universal/include/userver/utils/encoding/tskv_parser.hpp":"taxi/uservices/userver/universal/include/userver/utils/encoding/tskv_parser.hpp",
3672+
"universal/include/userver/utils/encoding/tskv_parser_read.hpp":"taxi/uservices/userver/universal/include/userver/utils/encoding/tskv_parser_read.hpp",
36733673
"universal/include/userver/utils/enumerate.hpp":"taxi/uservices/userver/universal/include/userver/utils/enumerate.hpp",
36743674
"universal/include/userver/utils/exception.hpp":"taxi/uservices/userver/universal/include/userver/utils/exception.hpp",
36753675
"universal/include/userver/utils/expected.hpp":"taxi/uservices/userver/universal/include/userver/utils/expected.hpp",
@@ -3684,13 +3684,13 @@
36843684
"universal/include/userver/utils/get_if.hpp":"taxi/uservices/userver/universal/include/userver/utils/get_if.hpp",
36853685
"universal/include/userver/utils/impl/boost_variadic_to_seq.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/boost_variadic_to_seq.hpp",
36863686
"universal/include/userver/utils/impl/disable_core_dumps.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/disable_core_dumps.hpp",
3687+
"universal/include/userver/utils/impl/internal_tag.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/internal_tag.hpp",
36873688
"universal/include/userver/utils/impl/internal_tag_fwd.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/internal_tag_fwd.hpp",
36883689
"universal/include/userver/utils/impl/intrusive_link_mode.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/intrusive_link_mode.hpp",
36893690
"universal/include/userver/utils/impl/projecting_view.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/projecting_view.hpp",
36903691
"universal/include/userver/utils/impl/source_location.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/source_location.hpp",
36913692
"universal/include/userver/utils/impl/static_registration.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/static_registration.hpp",
36923693
"universal/include/userver/utils/impl/transparent_hash.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/transparent_hash.hpp",
3693-
"universal/include/userver/utils/impl/weak_internal_tag.hpp":"taxi/uservices/userver/universal/include/userver/utils/impl/weak_internal_tag.hpp",
36943694
"universal/include/userver/utils/invariant_error.hpp":"taxi/uservices/userver/universal/include/userver/utils/invariant_error.hpp",
36953695
"universal/include/userver/utils/ip.hpp":"taxi/uservices/userver/universal/include/userver/utils/ip.hpp",
36963696
"universal/include/userver/utils/lazy_prvalue.hpp":"taxi/uservices/userver/universal/include/userver/utils/lazy_prvalue.hpp",
@@ -3952,6 +3952,8 @@
39523952
"universal/src/utils/encoding/hex.cpp":"taxi/uservices/userver/universal/src/utils/encoding/hex.cpp",
39533953
"universal/src/utils/encoding/hex_benchmark.cpp":"taxi/uservices/userver/universal/src/utils/encoding/hex_benchmark.cpp",
39543954
"universal/src/utils/encoding/hex_test.cpp":"taxi/uservices/userver/universal/src/utils/encoding/hex_test.cpp",
3955+
"universal/src/utils/encoding/tskv_parser.cpp":"taxi/uservices/userver/universal/src/utils/encoding/tskv_parser.cpp",
3956+
"universal/src/utils/encoding/tskv_parser_test.cpp":"taxi/uservices/userver/universal/src/utils/encoding/tskv_parser_test.cpp",
39553957
"universal/src/utils/encoding/tskv_test.cpp":"taxi/uservices/userver/universal/src/utils/encoding/tskv_test.cpp",
39563958
"universal/src/utils/encoding/tskv_testdata_bin.hpp":"taxi/uservices/userver/universal/src/utils/encoding/tskv_testdata_bin.hpp",
39573959
"universal/src/utils/enumerate_test.cpp":"taxi/uservices/userver/universal/src/utils/enumerate_test.cpp",
@@ -4047,6 +4049,7 @@
40474049
"universal/utest/src/utest/assert_macros_test.cpp":"taxi/uservices/userver/universal/utest/src/utest/assert_macros_test.cpp",
40484050
"universal/utest/src/utest/current_process_open_files.cpp":"taxi/uservices/userver/universal/utest/src/utest/current_process_open_files.cpp",
40494051
"universal/utest/src/utest/current_process_open_files_test.cpp":"taxi/uservices/userver/universal/utest/src/utest/current_process_open_files_test.cpp",
4052+
"universal/utest/src/utest/log_capture_fixture.cpp":"taxi/uservices/userver/universal/utest/src/utest/log_capture_fixture.cpp",
40504053
"universal/utest/src/utest/parameter_names_test.cpp":"taxi/uservices/userver/universal/utest/src/utest/parameter_names_test.cpp",
40514054
"ydb/CMakeLists.txt":"taxi/uservices/userver/ydb/CMakeLists.txt",
40524055
"ydb/functional_tests/CMakeLists.txt":"taxi/uservices/userver/ydb/functional_tests/CMakeLists.txt",

‎chaotic/integration_tests/tests/render/logging.cpp

+7-9
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,18 @@ using Logging = utest::LogCaptureFixture<>;
1313

1414
TEST_F(Logging, Object) {
1515
auto json = formats::json::MakeObject(
16-
"integer", 1, "boolean", true, "number", 1.1, "string", "foo",
16+
"integer", 1, "boolean", true, "number", 1.5, "string", "foo",
1717
"string-enum", "1", "object", formats::json::MakeObject(), "array",
1818
formats::json::MakeArray(1));
1919
auto obj = json.As<ns::ObjectTypes>();
2020

21-
LOG_INFO() << obj;
22-
ASSERT_THAT(
23-
ExtractRawLog(),
24-
testing::HasSubstr(
25-
"text={\"boolean\":true,\"integer\":1,\"number\":1.1,\"string\":"
26-
"\"foo\",\"object\":{},\"array\":[1],\"string-enum\":\"1\"}\n"));
21+
const auto obj_string = GetLogCapture().ToStringViaLogging(obj);
22+
EXPECT_EQ(obj_string,
23+
R"({"boolean":true,"integer":1,"number":1.5,"string":"foo",)"
24+
R"("object":{},"array":[1],"string-enum":"1"})");
2725

28-
LOG_INFO() << obj.string_enum;
29-
ASSERT_THAT(ExtractRawLog(), testing::HasSubstr("\ttext=1\n"));
26+
const auto enum_string = GetLogCapture().ToStringViaLogging(obj.string_enum);
27+
ASSERT_EQ(enum_string, "1");
3028
}
3129

3230
USERVER_NAMESPACE_END

‎core/include/userver/cache/cache_statistics.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <cstddef>
99

1010
#include <userver/cache/update_type.hpp>
11-
#include <userver/utils/internal_tag_fwd.hpp>
11+
#include <userver/utils/impl/internal_tag.hpp>
1212
#include <userver/utils/statistics/fwd.hpp>
1313
#include <userver/utils/statistics/rate_counter.hpp>
1414

@@ -62,7 +62,8 @@ class UpdateStatisticsScope final {
6262

6363
~UpdateStatisticsScope();
6464

65-
impl::UpdateState GetState(utils::InternalTag) const;
65+
// For internal use only
66+
impl::UpdateState GetState(utils::impl::InternalTag) const;
6667
/// @endcond
6768

6869
/// @brief Mark that the `Update` has finished with changes

‎core/include/userver/dynamic_config/updater/component.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <userver/dynamic_config/updates_sink/component.hpp>
2222
#include <userver/engine/mutex.hpp>
2323
#include <userver/utils/impl/transparent_hash.hpp>
24-
#include <userver/utils/internal_tag_fwd.hpp>
2524

2625
USERVER_NAMESPACE_BEGIN
2726

‎core/include/userver/dynamic_config/value.hpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <userver/formats/parse/common_containers.hpp>
99
#include <userver/formats/serialize/common_containers.hpp>
1010
#include <userver/utils/default_dict.hpp>
11+
#include <userver/utils/impl/internal_tag.hpp>
1112
#include <userver/utils/impl/transparent_hash.hpp>
12-
#include <userver/utils/internal_tag_fwd.hpp>
1313

1414
USERVER_NAMESPACE_BEGIN
1515

@@ -35,14 +35,16 @@ class DocsMap final {
3535
bool AreContentsEqual(const DocsMap& other) const;
3636

3737
/// @cond
38-
// For internal use only
38+
// For internal use only.
3939
// Set of configs expected to be used is automatically updated when
4040
// configs are retrieved with 'Get' method.
4141
void SetConfigsExpectedToBeUsed(
42-
utils::impl::TransparentSet<std::string> configs, utils::InternalTag);
42+
utils::impl::TransparentSet<std::string> configs,
43+
utils::impl::InternalTag);
4344

45+
// For internal use only.
4446
const utils::impl::TransparentSet<std::string>& GetConfigsExpectedToBeUsed(
45-
utils::InternalTag) const;
47+
utils::impl::InternalTag) const;
4648
/// @endcond
4749

4850
private:

‎core/include/userver/os_signals/processor.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <userver/concurrent/async_event_channel.hpp>
77
#include <userver/engine/task/task_processor_fwd.hpp>
88
#include <userver/os_signals/subscriber.hpp>
9-
#include <userver/utils/internal_tag_fwd.hpp>
9+
#include <userver/utils/impl/internal_tag.hpp>
1010

1111
USERVER_NAMESPACE_BEGIN
1212

@@ -64,7 +64,7 @@ class Processor final {
6464

6565
/// @cond
6666
// For internal use
67-
void Notify(int signum, utils::InternalTag);
67+
void Notify(int signum, utils::impl::InternalTag);
6868
/// @endcond
6969
private:
7070
concurrent::AsyncEventChannel<int> channel_;

‎core/include/userver/tracing/span.hpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <userver/logging/log_extra.hpp>
1111
#include <userver/tracing/scope_time.hpp>
1212
#include <userver/tracing/tracer_fwd.hpp>
13+
#include <userver/utils/impl/internal_tag.hpp>
1314
#include <userver/utils/impl/source_location.hpp>
14-
#include <userver/utils/internal_tag_fwd.hpp>
1515

1616
USERVER_NAMESPACE_BEGIN
1717

@@ -206,9 +206,11 @@ class Span final {
206206
std::chrono::system_clock::time_point GetStartSystemTime() const;
207207

208208
/// @cond
209-
void AddTags(const logging::LogExtra&, utils::InternalTag);
209+
// For internal use only.
210+
void AddTags(const logging::LogExtra&, utils::impl::InternalTag);
210211

211-
impl::TimeStorage& GetTimeStorage();
212+
// For internal use only.
213+
impl::TimeStorage& GetTimeStorage(utils::impl::InternalTag);
212214

213215
// For internal use only.
214216
void LogTo(logging::impl::TagWriter writer) const&;

‎core/include/userver/utils/internal_tag_fwd.hpp

-15
This file was deleted.

‎core/src/cache/cache_statistics.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <userver/utils/assert.hpp>
44
#include <userver/utils/datetime.hpp>
55
#include <userver/utils/statistics/writer.hpp>
6-
#include <utils/internal_tag.hpp>
76

87
USERVER_NAMESPACE_BEGIN
98

@@ -123,7 +122,8 @@ UpdateStatisticsScope::~UpdateStatisticsScope() {
123122
}
124123
}
125124

126-
impl::UpdateState UpdateStatisticsScope::GetState(utils::InternalTag) const {
125+
impl::UpdateState UpdateStatisticsScope::GetState(
126+
utils::impl::InternalTag) const {
127127
return state_;
128128
}
129129

‎core/src/cache/cache_update_trait_impl.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <dump/dump_locator.hpp>
2121
#include <userver/dump/factory.hpp>
2222
#include <userver/testsuite/testsuite_support.hpp>
23-
#include <utils/internal_tag.hpp>
2423

2524
USERVER_NAMESPACE_BEGIN
2625

@@ -403,7 +402,8 @@ void CacheUpdateTrait::Impl::DoUpdate(UpdateType update_type,
403402

404403
try {
405404
customized_trait_.Update(update_type, last_update_, now, stats);
406-
CheckUpdateState(stats.GetState(utils::InternalTag{}), update_type_str);
405+
CheckUpdateState(stats.GetState(utils::impl::InternalTag{}),
406+
update_type_str);
407407
} catch (const std::exception& e) {
408408
OnUpdateFailure(config);
409409
throw;

‎core/src/components/manager.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <userver/os_signals/component.hpp>
2424
#include <userver/utils/async.hpp>
2525
#include <userver/utils/distances.hpp>
26-
#include <utils/internal_tag.hpp>
2726

2827
USERVER_NAMESPACE_BEGIN
2928

@@ -233,7 +232,7 @@ void Manager::OnSignal(int signum) {
233232
std::shared_lock<std::shared_timed_mutex> lock(context_mutex_);
234233
if (components_cleared_) return;
235234
if (signal_processor_) {
236-
signal_processor_->Get().Notify(signum, utils::InternalTag{});
235+
signal_processor_->Get().Notify(signum, utils::impl::InternalTag{});
237236
}
238237
}
239238

‎core/src/dynamic_config/storage/component.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <userver/yaml_config/merge_schemas.hpp>
2727

2828
#include <dynamic_config/storage_data.hpp>
29-
#include <utils/internal_tag.hpp>
3029

3130
USERVER_NAMESPACE_BEGIN
3231

@@ -199,9 +198,9 @@ dynamic_config::impl::SnapshotData DynamicConfig::Impl::ParseConfig(
199198
void DynamicConfig::Impl::DoSetConfig(const dynamic_config::DocsMap& value) {
200199
auto config = ParseConfig(value);
201200

202-
if (!value.GetConfigsExpectedToBeUsed(utils::InternalTag{}).empty()) {
201+
if (!value.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{}).empty()) {
203202
LOG_INFO() << "Some configs expected to be used are actually not needed: "
204-
<< value.GetConfigsExpectedToBeUsed(utils::InternalTag{});
203+
<< value.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{});
205204
}
206205

207206
auto after_assign_hook = [&] {

‎core/src/dynamic_config/updater/component.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <userver/utils/fast_scope_guard.hpp>
1313
#include <userver/utils/string_to_duration.hpp>
1414
#include <userver/yaml_config/merge_schemas.hpp>
15-
#include <utils/internal_tag.hpp>
1615

1716
USERVER_NAMESPACE_BEGIN
1817

@@ -94,7 +93,8 @@ dynamic_config::DocsMap DynamicConfigClientUpdater::MergeDocsMap(
9493
const std::vector<std::string>& removed) {
9594
dynamic_config::DocsMap combined(std::move(update));
9695
combined.MergeMissing(current);
97-
combined.SetConfigsExpectedToBeUsed(docs_map_keys_, utils::InternalTag{});
96+
combined.SetConfigsExpectedToBeUsed(docs_map_keys_,
97+
utils::impl::InternalTag{});
9898
for (const auto& key : removed) {
9999
combined.Remove(key);
100100
}

‎core/src/dynamic_config/value.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <userver/formats/json/serialize.hpp>
88
#include <userver/formats/json/value_builder.hpp>
9-
#include <utils/internal_tag.hpp>
109

1110
USERVER_NAMESPACE_BEGIN
1211

@@ -83,12 +82,13 @@ bool DocsMap::AreContentsEqual(const DocsMap& other) const {
8382
}
8483

8584
void DocsMap::SetConfigsExpectedToBeUsed(
86-
utils::impl::TransparentSet<std::string> configs, utils::InternalTag) {
85+
utils::impl::TransparentSet<std::string> configs,
86+
utils::impl::InternalTag) {
8787
configs_to_be_used_ = std::move(configs);
8888
}
8989

9090
const utils::impl::TransparentSet<std::string>&
91-
DocsMap::GetConfigsExpectedToBeUsed(utils::InternalTag) const {
91+
DocsMap::GetConfigsExpectedToBeUsed(utils::impl::InternalTag) const {
9292
return configs_to_be_used_;
9393
}
9494

‎core/src/dynamic_config/value_test.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <userver/formats/json/value.hpp>
77
#include <userver/formats/json/value_builder.hpp>
88
#include <userver/formats/yaml/value.hpp>
9-
#include <utils/internal_tag.hpp>
109

1110
USERVER_NAMESPACE_BEGIN
1211

@@ -21,15 +20,15 @@ TEST(DocsMap, HasConfig) {
2120

2221
TEST(DocsMap, AreContentsEqualTrue) {
2322
dynamic_config::DocsMap docs_map1;
24-
docs_map1.SetConfigsExpectedToBeUsed({"a"}, utils::InternalTag{});
23+
docs_map1.SetConfigsExpectedToBeUsed({"a"}, utils::impl::InternalTag{});
2524
docs_map1.Parse(R"({"a": "a", "b": "b"})", false);
2625

2726
dynamic_config::DocsMap docs_map2;
28-
docs_map2.SetConfigsExpectedToBeUsed({"b"}, utils::InternalTag{});
27+
docs_map2.SetConfigsExpectedToBeUsed({"b"}, utils::impl::InternalTag{});
2928
docs_map2.Parse(R"({"b": "b", "a": "a"})", false);
3029

31-
EXPECT_NE(docs_map1.GetConfigsExpectedToBeUsed(utils::InternalTag{}),
32-
docs_map2.GetConfigsExpectedToBeUsed(utils::InternalTag{}));
30+
EXPECT_NE(docs_map1.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{}),
31+
docs_map2.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{}));
3332
EXPECT_TRUE(docs_map1.AreContentsEqual(docs_map2));
3433
}
3534

@@ -40,8 +39,8 @@ TEST(DocsMap, AreContentsEqualFalse) {
4039
dynamic_config::DocsMap docs_map2;
4140
docs_map2.Parse(R"({"a": "b", "b": "a"})", false);
4241

43-
EXPECT_EQ(docs_map1.GetConfigsExpectedToBeUsed(utils::InternalTag{}),
44-
docs_map2.GetConfigsExpectedToBeUsed(utils::InternalTag{}));
42+
EXPECT_EQ(docs_map1.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{}),
43+
docs_map2.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{}));
4544
EXPECT_FALSE(docs_map1.AreContentsEqual(docs_map2));
4645
}
4746

@@ -50,22 +49,23 @@ TEST(DocsMap, ConfigExpectedToBeUsedRemovedAfterGet) {
5049
utils::impl::TransparentSet<std::string> to_be_used = {"a", "b"};
5150
docs_map.SetConfigsExpectedToBeUsed(
5251
utils::impl::TransparentSet<std::string>(to_be_used),
53-
utils::InternalTag{});
52+
utils::impl::InternalTag{});
5453
docs_map.Parse(R"({"a": "a", "b": "b"})", false);
5554

56-
EXPECT_EQ(docs_map.GetConfigsExpectedToBeUsed(utils::InternalTag{}),
55+
EXPECT_EQ(docs_map.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{}),
5756
to_be_used);
5857

5958
(void)docs_map.Get("a");
6059

61-
EXPECT_EQ(docs_map.GetConfigsExpectedToBeUsed(utils::InternalTag{}),
60+
EXPECT_EQ(docs_map.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{}),
6261
utils::impl::TransparentSet<std::string>({"b"}));
6362

6463
dynamic_config::DocsMap docs_map_copy(docs_map);
6564
(void)docs_map_copy.Get("b");
6665

6766
EXPECT_TRUE(
68-
docs_map_copy.GetConfigsExpectedToBeUsed(utils::InternalTag{}).empty());
67+
docs_map_copy.GetConfigsExpectedToBeUsed(utils::impl::InternalTag{})
68+
.empty());
6969
}
7070

7171
TEST(DocsMap, Merge) {

‎core/src/os_signals/component.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include <userver/engine/task/task_base.hpp>
44

5-
#include <utils/internal_tag.hpp>
6-
75
USERVER_NAMESPACE_BEGIN
86

97
namespace os_signals {

0 commit comments

Comments
 (0)