Skip to content

Commit e1f89b0

Browse files
adameatadameat
authored
get rid of sync http mon (#12637)
1 parent 426ac15 commit e1f89b0

File tree

17 files changed

+1046
-1236
lines changed

17 files changed

+1046
-1236
lines changed

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_run.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "blobstorage_pdisk_ut_base_test.h"
55

66
#include <ydb/core/base/appdata.h>
7-
#include <ydb/core/mon/sync_http_mon.h>
7+
#include <ydb/core/mon/mon.h>
88
#include <ydb/core/blobstorage/crypto/default.h>
99
#include <ydb/library/pdisk_io/aio.h>
1010
#include <ydb/core/util/random.h>
@@ -142,17 +142,21 @@ void Run(TVector<IActor*> tests, TTestRunConfig runCfg) {
142142

143143
if (IsMonitoringEnabled) {
144144
// Monitoring startup
145-
monitoring.Reset(new NActors::TSyncHttpMon({
145+
monitoring.Reset(new NActors::TMon({
146146
.Port = pm.GetPort(8081),
147147
.Title = "TestYard monitoring"
148148
}));
149149
appData.Mon = monitoring.Get();
150150

151151
monitoring->RegisterCountersPage("counters", "Counters", mainCounters);
152-
monitoring->Start();
153152
}
154153

155154
actorSystem1->Start();
155+
156+
if (IsMonitoringEnabled) {
157+
monitoring->Start(actorSystem1.Get());
158+
}
159+
156160
Sleep(TDuration::MilliSeconds(runCfg.BeforeTestSleepMs));
157161

158162
VERBOSE_COUT("Sending TEvBoot to test");

‎ydb/core/blobstorage/ut_vdisk/lib/astest.h

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <ydb/library/actors/core/executor_pool_basic.h>
77
#include <ydb/library/actors/core/executor_pool_io.h>
88
#include <ydb/library/actors/core/scheduler_basic.h>
9-
#include <ydb/core/mon/sync_http_mon.h>
9+
#include <ydb/core/mon/mon.h>
1010
#include <ydb/library/actors/interconnect/interconnect.h>
1111
#include <ydb/library/actors/protos/services_common.pb.h>
1212
#include <ydb/core/base/appdata.h>
@@ -82,6 +82,7 @@ inline void TTestWithActorSystem::Run(NActors::IActor *testActor) {
8282
NKikimrServices::EServiceKikimr_Name
8383
);
8484
TString explanation;
85+
logSettings->SetLevel(NLog::PRI_TRACE, NActorsServices::EServiceCommon::HTTP, explanation);
8586
//logSettings->SetLevel(NLog::PRI_INFO, NKikimrServices::BS_SKELETON, explanation);
8687
//logSettings->SetLevel(NLog::PRI_INFO, NKikimrServices::BS_HULLCOMP, explan
8788
NActors::TLoggerActor *loggerActor = new NActors::TLoggerActor(logSettings,
@@ -92,12 +93,6 @@ inline void TTestWithActorSystem::Run(NActors::IActor *testActor) {
9293
setup1->LocalServices.push_back(std::move(loggerActorPair));
9394
//////////////////////////////////////////////////////////////////////////////
9495

95-
///////////////////////// SETUP TEST ACTOR ///////////////////////////////////
96-
NActors::TActorId testActorId = NActors::TActorId(1, "test123");
97-
TActorSetupCmd testActorSetup(testActor, TMailboxType::Simple, 0);
98-
setup1->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(testActorId, std::move(testActorSetup)));
99-
//////////////////////////////////////////////////////////////////////////////
100-
10196
///////////////////////// TYPE REGISTRY //////////////////////////////////////
10297
TIntrusivePtr<NKikimr::NScheme::TTypeRegistry> typeRegistry(new NKikimr::NScheme::TKikimrTypeRegistry());
10398
//////////////////////////////////////////////////////////////////////////////
@@ -106,14 +101,13 @@ inline void TTestWithActorSystem::Run(NActors::IActor *testActor) {
106101
if (!MonPort) {
107102
MonPort = pm.GetPort(MonPort);
108103
}
109-
Monitoring.reset(new NActors::TSyncHttpMon({
104+
Monitoring.reset(new NActors::TMon({
110105
.Port = MonPort,
111106
.Title = "at"
112107
}));
113108
NMonitoring::TIndexMonPage *actorsMonPage = Monitoring->RegisterIndexPage("actors", "Actors");
114109
Y_UNUSED(actorsMonPage);
115110
Monitoring->RegisterCountersPage("counters", "Counters", Counters);
116-
Monitoring->Start();
117111
loggerActor->Log(Now(), NKikimr::NLog::PRI_NOTICE, NActorsServices::TEST, "Monitoring settings set up");
118112
//////////////////////////////////////////////////////////////////////////////
119113

@@ -126,11 +120,15 @@ inline void TTestWithActorSystem::Run(NActors::IActor *testActor) {
126120
ActorSystem1.reset(new TActorSystem(setup1, AppData.get(), logSettings));
127121
loggerActor->Log(Now(), NKikimr::NLog::PRI_NOTICE, NActorsServices::TEST, "Actor system created");
128122

129-
130123
ActorSystem1->Start();
131124
LOG_NOTICE(*ActorSystem1, NActorsServices::TEST, "Actor system started");
132125

126+
Monitoring->Start(ActorSystem1.get()).wait();
133127

128+
///////////////////////// SETUP TEST ACTOR ///////////////////////////////////
129+
NActors::TActorId testActorId = NActors::TActorId(1, "test123");
130+
ActorSystem1->RegisterLocalService(testActorId, ActorSystem1->Register(testActor, TMailboxType::Simple, 0));
131+
//////////////////////////////////////////////////////////////////////////////
134132

135133
DoneEvent.Wait();
136134
ActorSystem1->Stop();

‎ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <ydb/core/blobstorage/pdisk/blobstorage_pdisk.h>
1010
#include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.h>
1111

12-
#include <ydb/core/mon/sync_http_mon.h>
12+
#include <ydb/core/mon/mon.h>
1313
#include <ydb/core/scheme/scheme_type_registry.h>
1414

1515
#include <ydb/library/actors/core/executor_pool_basic.h>
@@ -368,13 +368,12 @@ void TConfiguration::Prepare(IVDiskSetup *vdiskSetup, bool newPDisks, bool runRe
368368
//////////////////////////////////////////////////////////////////////////////
369369

370370
///////////////////////// MONITORING SETTINGS /////////////////////////////////
371-
Monitoring.reset(new NActors::TSyncHttpMon({
371+
Monitoring.reset(new NActors::TMon({
372372
.Port = 8088,
373373
.Title = "at"
374374
}));
375375
NMonitoring::TIndexMonPage *actorsMonPage = Monitoring->RegisterIndexPage("actors", "Actors");
376376
Monitoring->RegisterCountersPage("counters", "Counters", Counters);
377-
Monitoring->Start();
378377
loggerActor->Log(Now(), NKikimr::NLog::PRI_NOTICE, NActorsServices::TEST, "Monitoring settings set up");
379378
//////////////////////////////////////////////////////////////////////////////
380379

@@ -391,6 +390,7 @@ void TConfiguration::Prepare(IVDiskSetup *vdiskSetup, bool newPDisks, bool runRe
391390
loggerActor->Log(Now(), NKikimr::NLog::PRI_NOTICE, NActorsServices::TEST, "Actor system created");
392391

393392
ActorSystem1->Start();
393+
Monitoring->Start(ActorSystem1.get());
394394
LOG_NOTICE(*ActorSystem1, NActorsServices::TEST, "Actor system started");
395395

396396
}

‎ydb/core/driver_lib/run/run.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
#include <ydb/core/grpc_services/grpc_request_proxy.h>
3636
#include <ydb/core/grpc_services/grpc_mon.h>
3737
#include <ydb/core/log_backend/log_backend.h>
38-
#include <ydb/core/mon/sync_http_mon.h>
39-
#include <ydb/core/mon/async_http_mon.h>
38+
#include <ydb/core/mon/mon.h>
4039
#include <ydb/core/mon/crossref.h>
4140
#include <ydb/core/mon_alloc/profiler.h>
4241

@@ -473,11 +472,7 @@ void TKikimrRunner::InitializeMonitoring(const TKikimrRunConfig& runConfig, bool
473472
if (ModuleFactories && ModuleFactories->MonitoringFactory) {
474473
Monitoring = ModuleFactories->MonitoringFactory(std::move(monConfig), appConfig);
475474
} else {
476-
if (appConfig.GetFeatureFlags().GetEnableAsyncHttpMon()) {
477-
Monitoring = new NActors::TAsyncHttpMon(std::move(monConfig));
478-
} else {
479-
Monitoring = new NActors::TSyncHttpMon(std::move(monConfig));
480-
}
475+
Monitoring = new NActors::TMon(std::move(monConfig));
481476
}
482477
if (Monitoring) {
483478
Monitoring->RegisterCountersPage("counters", "Counters", Counters);
@@ -1783,10 +1778,10 @@ void TKikimrRunner::KikimrStop(bool graceful) {
17831778
if (enableReleaseNodeNameOnGracefulShutdown) {
17841779
using namespace NKikimr::NNodeBroker;
17851780
using TEvent = TEvNodeBroker::TEvGracefulShutdownRequest;
1786-
1781+
17871782
const ui32 nodeId = ActorSystem->NodeId;
17881783
bool isDynamicNode = AppData->DynamicNameserviceConfig->MinDynamicNodeId <= nodeId;
1789-
1784+
17901785
if (isDynamicNode) {
17911786
NTabletPipe::TClientConfig pipeConfig;
17921787
pipeConfig.RetryPolicy = {.RetryLimitCount = 10};

‎ydb/core/http_proxy/ut/datastreams_fixture.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <ydb/core/http_proxy/http_req.h>
1818
#include <ydb/core/http_proxy/http_service.h>
1919
#include <ydb/core/http_proxy/metrics_actor.h>
20-
#include <ydb/core/mon/sync_http_mon.h>
20+
#include <ydb/core/mon/mon.h>
2121
#include <ydb/core/ymq/actor/auth_multi_factory.h>
2222

2323
#include <ydb/library/aclib/aclib.h>
@@ -839,15 +839,15 @@ class THttpProxyTestMock : public NUnitTest::TBaseFixture {
839839
MonPort = TPortManager().GetPort();
840840
Counters = new NMonitoring::TDynamicCounters();
841841

842-
Monitoring.Reset(new NActors::TSyncHttpMon({
842+
Monitoring.Reset(new NActors::TMon({
843843
.Port = MonPort,
844844
.Address = "127.0.0.1",
845845
.Threads = 3,
846846
.Title = "whatever",
847847
.Host = "127.0.0.1",
848848
}));
849849
Monitoring->RegisterCountersPage("counters", "Counters", Counters);
850-
Monitoring->Start();
850+
Monitoring->Start(ActorRuntime->GetAnyNodeActorSystem());
851851

852852
Sleep(TDuration::Seconds(1));
853853

0 commit comments

Comments
 (0)