@@ -86,6 +86,7 @@ namespace {
86
86
const TInterconnectProxyCommon::TPtr Common;
87
87
const bool MergePerDataCenterCounters;
88
88
const bool MergePerPeerCounters;
89
+ const bool HasSessionCounters;
89
90
NMonitoring::TDynamicCounterPtr Counters;
90
91
NMonitoring::TDynamicCounterPtr PerSessionCounters;
91
92
NMonitoring::TDynamicCounterPtr PerDataCenterCounters;
@@ -102,6 +103,7 @@ namespace {
102
103
: Common(common)
103
104
, MergePerDataCenterCounters(common->Settings.MergePerDataCenterCounters)
104
105
, MergePerPeerCounters(common->Settings.MergePerPeerCounters)
106
+ , HasSessionCounters(!MergePerDataCenterCounters && !MergePerPeerCounters)
105
107
, Counters(common->MonCounters)
106
108
, AdaptiveCounters(MergePerDataCenterCounters
107
109
? PerDataCenterCounters :
@@ -248,7 +250,7 @@ namespace {
248
250
PerDataCenterCounters = Counters->GetSubgroup (" dataCenterId" , *DataCenterId);
249
251
}
250
252
251
- const bool updatePerSession = !PerSessionCounters || updatePerDataCenter;
253
+ const bool updatePerSession = HasSessionCounters && ( !PerSessionCounters || updatePerDataCenter) ;
252
254
if (updatePerSession) {
253
255
auto base = MergePerDataCenterCounters ? PerDataCenterCounters : Counters;
254
256
PerSessionCounters = base->GetSubgroup (" peer" , *HumanFriendlyPeerHostName);
@@ -263,12 +265,12 @@ namespace {
263
265
false ;
264
266
265
267
if (updatePerSession) {
266
- Connected = PerSessionCounters ->GetCounter (" Connected" );
267
- Disconnections = PerSessionCounters ->GetCounter (" Disconnections" , true );
268
- ClockSkewMicrosec = PerSessionCounters ->GetCounter (" ClockSkewMicrosec" );
269
- Traffic = PerSessionCounters ->GetCounter (" Traffic" , true );
270
- Events = PerSessionCounters ->GetCounter (" Events" , true );
271
- ScopeErrors = PerSessionCounters ->GetCounter (" ScopeErrors" , true );
268
+ Connected = AdaptiveCounters ->GetCounter (" Connected" );
269
+ Disconnections = AdaptiveCounters ->GetCounter (" Disconnections" , true );
270
+ ClockSkewMicrosec = AdaptiveCounters ->GetCounter (" ClockSkewMicrosec" );
271
+ Traffic = AdaptiveCounters ->GetCounter (" Traffic" , true );
272
+ Events = AdaptiveCounters ->GetCounter (" Events" , true );
273
+ ScopeErrors = AdaptiveCounters ->GetCounter (" ScopeErrors" , true );
272
274
273
275
for (const auto & [id, name] : Common->ChannelName ) {
274
276
OutputChannels.try_emplace (id, Counters->GetSubgroup (" channel" , name), Traffic, Events);
0 commit comments