Merge 2af0347 into 3e82d95

ydb-platform · Feb 5, 2024 · 72c3212 · 72c3212
2 parents 3e82d95 + 2af0347
commit 72c3212
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 267 deletions.
diff --git a/ydb/core/cms/json_proxy_proto.h b/ydb/core/cms/json_proxy_proto.h
@@ -76,16 +76,6 @@ class TJsonProxyProto : public TActorBootstrapped<TJsonProxyProto> {
                 return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TSchemeShardControls::descriptor(), ctx);
             else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTCMallocControls")
                 return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTCMallocControls::descriptor(), ctx);
-            else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls")
-                return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::descriptor(), ctx);
-            else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions")
-                return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::descriptor(), ctx);
-            else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions.TThrottlingOptions")
-                return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::TThrottlingOptions::descriptor(), ctx);
-            else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions.TSamplingOptions")
-                return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::TSamplingOptions::descriptor(), ctx);
-            else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TKeyValue")
-                return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TKeyValue::descriptor(), ctx);
         }
 
         ctx.Send(RequestEvent->Sender,

diff --git a/ydb/core/control/common_controls/tracing_control.cpp b/ydb/core/control/common_controls/tracing_control.cpp
diff --git a/ydb/core/control/common_controls/tracing_control.h b/ydb/core/control/common_controls/tracing_control.h
diff --git a/ydb/core/control/common_controls/ya.make b/ydb/core/control/common_controls/ya.make
diff --git a/ydb/core/control/immediate_control_board_sampler.h b/ydb/core/control/immediate_control_board_sampler.h
diff --git a/ydb/core/control/immediate_control_board_throttler.h b/ydb/core/control/immediate_control_board_throttler.h
diff --git a/ydb/core/control/ya.make b/ydb/core/control/ya.make
@@ -19,16 +19,10 @@ SRCS(
     immediate_control_board_impl.cpp
     immediate_control_board_impl.h
     immediate_control_board_wrapper.h
-    immediate_control_board_throttler.h
-    immediate_control_board_sampler.h
 )
 
 END()
 
-RECURSE(
-    common_controls
-)
-
 RECURSE_FOR_TESTS(
     ut
 )
diff --git a/ydb/core/grpc_services/grpc_request_proxy.cpp b/ydb/core/grpc_services/grpc_request_proxy.cpp
@@ -8,7 +8,6 @@
 #include <ydb/core/base/nameservice.h>
 #include <ydb/core/cms/console/configs_dispatcher.h>
 #include <ydb/core/cms/console/console.h>
-#include <ydb/core/control/common_controls/tracing_control.h>
 #include <ydb/core/grpc_services/counters/proxy_counters.h>
 #include <ydb/core/jaeger_tracing/sampling_throttling_control.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>

diff --git a/ydb/core/keyvalue/ya.make b/ydb/core/keyvalue/ya.make
@@ -45,7 +45,6 @@ PEERDIR(
     ydb/library/actors/protos
     ydb/core/base
     ydb/core/blobstorage/base
-    ydb/core/control/common_controls
     ydb/core/engine/minikql
     ydb/core/keyvalue/protos
     ydb/core/protos

diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
@@ -1245,61 +1245,11 @@ message TImmediateControlsConfig {
             DefaultValue: 8388608 }];
     }
 
-    message TTracingControls {
-        message TSamplingThrottlingOptions {
-            message TThrottlingOptions {
-                optional uint64 MaxRatePerMinute = 1 [(ControlOptions) = {
-                    Description: "Maximum amount of traced requests per minute",
-                    MinValue: 0,
-                    MaxValue: 300,
-                    DefaultValue: 0,
-                }];
-                optional uint64 MaxBurst = 2 [(ControlOptions) = {
-                    Description: "Maximum burst of traced events",
-                    MinValue: 0,
-                    MaxValue: 300,
-                    DefaultValue: 0,
-                }];
-            }
-
-            message TSamplingOptions {
-                optional uint64 PPM = 1 [(ControlOptions) = {
-                    Description: "Average amount of sampled requests per one million",
-                    MinValue: 0,
-                    MaxValue: 1000000,
-                    DefaultValue: 0,
-                }];
-                optional uint64 Level = 2 [(ControlOptions) = {
-                    Description: "Tracing level of sampled requests",
-                    MinValue: 1,
-                    MaxValue: 15,
-                    DefaultValue: 15,
-                }];
-            }
-
-            optional TSamplingOptions Sampling = 1;
-            optional TThrottlingOptions SampledThrottling = 2;
-            optional TThrottlingOptions ExternalThrottling = 3;
-        }
-
-        message TKeyValue {
-            optional TSamplingThrottlingOptions AcquireLock = 1;
-            optional TSamplingThrottlingOptions ExecuteTransaction = 2;
-            optional TSamplingThrottlingOptions Read = 3;
-            optional TSamplingThrottlingOptions ReadRange = 4;
-            optional TSamplingThrottlingOptions ListRange = 5;
-            optional TSamplingThrottlingOptions GetStorageChannelStatus = 6;
-        }
-
-        optional TKeyValue KeyValue = 1;
-    }
-
     optional TDataShardControls DataShardControls = 1;
     optional TTxLimitControls TxLimitControls = 2;
     optional TCoordinatorControls CoordinatorControls = 3;
     optional TSchemeShardControls SchemeShardControls = 4;
     optional TTCMallocControls TCMallocControls = 5;
-    optional TTracingControls TracingControls = 6;
 };
 
 message TMeteringConfig {