Merge b760321 into 1f60fc8

Author: evanevanevanevannnn

ydb/core/base/events.h

@@ -184,6 +184,7 @@ struct TKikimrEvents : TEvents {
         ES_INCREMENTAL_RESTORE_SCAN = 4261,
         ES_FEATURE_FLAGS = 4262,
         ES_PRIORITY_QUEUE = 4263,
+        ES_SOLOMON_PROVIDER = 4264,
     };
 };
 

ydb/core/fq/libs/actors/run_actor.cpp

@@ -1980,7 +1980,7 @@ class TRunActor : public NActors::TActorBootstrapped<TRunActor> {
         {
             auto solomonConfig = gatewaysConfig.GetSolomon();
             auto solomonGateway = NYql::CreateSolomonGateway(solomonConfig);
-            dataProvidersInit.push_back(GetSolomonDataProviderInitializer(solomonGateway, false));
+            dataProvidersInit.push_back(GetSolomonDataProviderInitializer(solomonGateway, Params.CredentialsFactory, false));
         }
 
         SessionId = TStringBuilder()

ydb/core/fq/libs/init/init.cpp

@@ -45,7 +45,7 @@
 #include <ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.h>
 #include <ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.h>
 #include <ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h>
-#include <ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h>
+#include <ydb/library/yql/providers/solomon/actors/dq_solomon_write_actor.h>
 #include <ydb/library/yql/providers/common/http_gateway/yql_http_default_retry_policy.h>
 
 

ydb/core/fq/libs/init/ya.make

@@ -52,7 +52,7 @@ PEERDIR(
     ydb/library/yql/providers/s3/actors
     ydb/library/yql/providers/s3/proto
     ydb/library/yql/providers/s3/provider
-    ydb/library/yql/providers/solomon/async_io
+    ydb/library/yql/providers/solomon/actors
     ydb/library/yql/providers/solomon/gateway
     ydb/library/yql/providers/solomon/proto
     ydb/library/yql/providers/solomon/provider

ydb/core/fq/libs/test_connection/test_monitoring.cpp

@@ -9,7 +9,7 @@
 #include <yql/essentials/providers/common/structured_token/yql_token_builder.h>
 #include <yql/essentials/utils/url_builder.h>
 
-#include <ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h>
+#include <ydb/library/yql/providers/solomon/actors/dq_solomon_write_actor.h>
 #include <ydb/library/yql/utils/actors/http_sender_actor.h>
 
 #include <ydb/library/actors/core/actor_bootstrapped.h>

ydb/core/fq/libs/test_connection/ya.make

@@ -18,7 +18,7 @@ PEERDIR(
     ydb/core/fq/libs/control_plane_storage
     ydb/core/fq/libs/test_connection/events
     ydb/library/yql/providers/pq/cm_client
-    ydb/library/yql/providers/solomon/async_io
+    ydb/library/yql/providers/solomon/actors
 )
 
 YQL_LAST_ABI_VERSION()

ydb/core/kqp/compute_actor/kqp_compute_actor.cpp

@@ -12,7 +12,7 @@
 #include <ydb/library/yql/providers/generic/actors/yql_generic_provider_factories.h>
 #include <ydb/library/formats/arrow/protos/ssa.pb.h>
 #include <ydb/library/yql/dq/proto/dq_tasks.pb.h>
-#include <ydb/library/yql/providers/solomon/async_io/dq_solomon_read_actor.h>
+#include <ydb/library/yql/providers/solomon/actors/dq_solomon_read_actor.h>
 
 
 namespace NKikimr {

ydb/core/kqp/compute_actor/ya.make

@@ -27,7 +27,7 @@ PEERDIR(
     ydb/library/yql/dq/actors/compute
     ydb/library/yql/providers/generic/actors
     ydb/library/yql/providers/s3/actors_factory
-    ydb/library/yql/providers/solomon/async_io
+    ydb/library/yql/providers/solomon/actors
     yql/essentials/public/issue
 )
 

ydb/library/yql/providers/dq/metrics/ya.make

@@ -11,7 +11,7 @@ SRCS(
 
 PEERDIR(
     ydb/library/actors/core
-    ydb/library/yql/providers/solomon/async_io
+    ydb/library/yql/providers/solomon/actors
 )
 
 YQL_LAST_ABI_VERSION()

ydb/library/yql/providers/solomon/async_io/metrics_encoder.cpp renamed to ydb/library/yql/providers/solomon/actors/dq_solomon_actors_util.cpp

@@ -1,8 +1,8 @@
-#include "metrics_encoder.h"
-
-#include <yql/essentials/public/udf/udf_data_type.h>
+#include "dq_solomon_actors_util.h"
 
+#include <library/cpp/monlib/encode/json/json.h>
 #include <util/datetime/base.h>
+#include <yql/essentials/public/udf/udf_data_type.h>
 
 using namespace NYql;
 
@@ -96,11 +96,12 @@ void EncodeSensorValue(
             Y_ENSURE(false, "Bad type for sensor " << scheme.GetDataTypeId());
     }
 }
-}
+
+} // namespace
 
 namespace NYql::NDq {
 
-TMetricsEncoder::TMetricsEncoder(const NSo::NProto::TDqSolomonShardScheme& scheme, bool useCloudFormat)
+    TMetricsEncoder::TMetricsEncoder(const NSo::NProto::TDqSolomonShardScheme& scheme, bool useCloudFormat)
     : Scheme(scheme)
     , UseCloudFormat(useCloudFormat)
 {
@@ -154,4 +155,4 @@ TString TMetricsEncoder::Encode() {
     return res;
 }
 
-}
+} // namespace NYql::NDq

ydb/library/yql/providers/solomon/async_io/metrics_encoder.h renamed to ydb/library/yql/providers/solomon/actors/dq_solomon_actors_util.h

@@ -1,16 +1,15 @@
 #pragma once
 
-#include <ydb/library/yql/utils/actors/http_sender.h>
-
+#include <library/cpp/monlib/encode/encoder.h>
+#include <ydb/library/yql/providers/solomon/proto/dq_solomon_shard.pb.h>
 #include <yql/essentials/public/udf/udf_value.h>
 
-#include <library/cpp/monlib/encode/json/json.h>
-
-#include <util/stream/str.h>
-
-
 namespace NYql::NDq {
 
+struct TDqSolomonReadParams {
+    NSo::NProto::TDqSolomonSource Source;
+};
+
 class TMetricsEncoder {
 public:
     explicit TMetricsEncoder(const NSo::NProto::TDqSolomonShardScheme& scheme, bool cloudFormat);
@@ -28,4 +27,4 @@ class TMetricsEncoder {
     bool UseCloudFormat;
 };
 
-}
+} // namespace NYql::NDq