refactor:sdk日志单独打印

Author: chuntaojun

Cargo.toml

@@ -59,6 +59,8 @@ tonic = {version = "0.11.0"}
 
 # logging
 tracing = {version = "0.1.36"}
+tracing-appender = {version = "0.2.3"}
+tracing-subscriber = {version = "0.3", features = ["default"]}
 
 # crypto
 aes = {version = "0.7.4"}
@@ -69,7 +71,6 @@ rand = {version = "0.8.4"}
 rsa = {version = "0.9.6"}
 
 [dev-dependencies]
-tracing-subscriber = {version = "0.3", features = ["default"]}
 
 [[example]]
 name = "discover"

examples/config.rs

@@ -15,22 +15,19 @@
 
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
-use polaris_rust::{
-    config::{
-        api::{new_config_file_api_by_context, ConfigFileAPI},
-        req::{
-            CreateConfigFileRequest, PublishConfigFileRequest, UpdateConfigFileRequest,
-            UpsertAndPublishConfigFileRequest, WatchConfigFileRequest,
-        },
+use polaris_rust::{config::{
+    api::{new_config_file_api_by_context, ConfigFileAPI},
+    req::{
+        CreateConfigFileRequest, PublishConfigFileRequest, UpdateConfigFileRequest,
+        UpsertAndPublishConfigFileRequest, WatchConfigFileRequest,
     },
-    core::{
-        context::SDKContext,
-        model::{
-            config::{ConfigFile, ConfigFileRelease},
-            error::PolarisError,
-        },
+}, core::{
+    context::SDKContext,
+    model::{
+        config::{ConfigFile, ConfigFileRelease},
+        error::PolarisError,
     },
-};
+}, info};
 use tracing::level_filters::LevelFilter;
 
 #[tokio::main]
@@ -163,7 +160,7 @@ async fn main() -> Result<(), PolarisError> {
             group: "rust".to_string(),
             file: "rust.toml".to_string(),
             call_back: Arc::new(|event| {
-                tracing::info!("receive config change event: {:?}", event);
+                info!("receive config change event: {:?}", event);
             }),
         })
         .await;

examples/discover.rs

@@ -15,19 +15,16 @@
 
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
-use polaris_rust::{
-    core::{
-        context::SDKContext,
-        model::{error::PolarisError, naming::Location},
+use polaris_rust::{core::{
+    context::SDKContext,
+    model::{error::PolarisError, naming::Location},
+}, discovery::{
+    api::{new_consumer_api_by_context, new_provider_api_by_context, ConsumerAPI, ProviderAPI},
+    req::{
+        GetAllInstanceRequest, InstanceDeregisterRequest, InstanceRegisterRequest,
+        WatchInstanceRequest,
     },
-    discovery::{
-        api::{new_consumer_api_by_context, new_provider_api_by_context, ConsumerAPI, ProviderAPI},
-        req::{
-            GetAllInstanceRequest, InstanceDeregisterRequest, InstanceRegisterRequest,
-            WatchInstanceRequest,
-        },
-    },
-};
+}, error, info};
 use tracing::level_filters::LevelFilter;
 
 #[tokio::main]
@@ -48,7 +45,7 @@ async fn main() -> Result<(), PolarisError> {
 
     let sdk_context_ret = SDKContext::default();
     if sdk_context_ret.is_err() {
-        tracing::error!(
+        error!(
             "create sdk context fail: {}",
             sdk_context_ret.err().unwrap()
         );
@@ -61,7 +58,7 @@ async fn main() -> Result<(), PolarisError> {
 
     let provider_ret = new_provider_api_by_context(arc_ctx.clone());
     if provider_ret.is_err() {
-        tracing::error!("create provider fail: {}", provider_ret.err().unwrap());
+        error!("create provider fail: {}", provider_ret.err().unwrap());
         return Err(PolarisError::new(
             polaris_rust::core::model::error::ErrorCode::UnknownServerError,
             "".to_string(),
@@ -70,7 +67,7 @@ async fn main() -> Result<(), PolarisError> {
 
     let consumer_ret = new_consumer_api_by_context(arc_ctx);
     if consumer_ret.is_err() {
-        tracing::error!("create consumer fail: {}", consumer_ret.err().unwrap());
+        error!("create consumer fail: {}", consumer_ret.err().unwrap());
         return Err(PolarisError::new(
             polaris_rust::core::model::error::ErrorCode::UnknownServerError,
             "".to_string(),
@@ -80,7 +77,7 @@ async fn main() -> Result<(), PolarisError> {
     let provider = provider_ret.unwrap();
     let consumer = consumer_ret.unwrap();
 
-    tracing::info!(
+    info!(
         "create discovery api client cost: {:?}",
         start_time.elapsed()
     );
@@ -114,25 +111,25 @@ async fn main() -> Result<(), PolarisError> {
     let _ret = provider.register(req).await;
     match _ret {
         Err(err) => {
-            tracing::error!("register fail: {}", err.to_string());
+            error!("register fail: {}", err.to_string());
         }
         Ok(_) => {}
     }
 
-    tracing::info!("begin do watch service_instances change");
+    info!("begin do watch service_instances change");
     let watch_rsp = consumer
         .watch_instance(WatchInstanceRequest {
             namespace: "rust-demo".to_string(),
             service: "polaris-rust-provider".to_string(),
             call_back: Arc::new(|instances| {
-                tracing::info!("watch instance: {:?}", instances.instances);
+                info!("watch instance: {:?}", instances.instances);
             }),
         })
         .await;
 
     match watch_rsp {
         Err(err) => {
-            tracing::error!("watch instance fail: {}", err.to_string());
+            error!("watch instance fail: {}", err.to_string());
         }
         Ok(_) => {}
     }
@@ -148,10 +145,10 @@ async fn main() -> Result<(), PolarisError> {
 
     match instances_ret {
         Err(err) => {
-            tracing::error!("get all instance fail: {}", err.to_string());
+            error!("get all instance fail: {}", err.to_string());
         }
         Ok(instances) => {
-            tracing::info!("get all instance: {:?}", instances);
+            info!("get all instance: {:?}", instances);
         }
     }
 
@@ -173,7 +170,7 @@ async fn main() -> Result<(), PolarisError> {
     let _ret = provider.deregister(deregister_req).await;
     match _ret {
         Err(err) => {
-            tracing::error!("deregister fail: {}", err.to_string());
+            error!("deregister fail: {}", err.to_string());
         }
         Ok(_) => {}
     }

src/config/api.rs

@@ -15,16 +15,13 @@
 
 use std::sync::Arc;
 
-use crate::{
-    config::default::{DefaultConfigFileAPI, DefaultConfigGroupAPI},
-    core::{
-        context::SDKContext,
-        model::{
-            config::{ConfigFile, ConfigGroup},
-            error::PolarisError,
-        },
+use crate::{config::default::{DefaultConfigFileAPI, DefaultConfigGroupAPI}, core::{
+    context::SDKContext,
+    model::{
+        config::{ConfigFile, ConfigGroup},
+        error::PolarisError,
     },
-};
+}, info};
 
 use super::req::{
     CreateConfigFileRequest, GetConfigFileRequest, GetConfigGroupRequest, PublishConfigFileRequest,
@@ -36,7 +33,7 @@ use super::req::{
 pub fn new_config_file_api() -> Result<impl ConfigFileAPI, PolarisError> {
     let start_time = std::time::Instant::now();
     let context_ret = SDKContext::default();
-    tracing::info!("create sdk context cost: {:?}", start_time.elapsed());
+    info!("create sdk context cost: {:?}", start_time.elapsed());
     if context_ret.is_err() {
         return Err(context_ret.err().unwrap());
     }
@@ -88,7 +85,7 @@ where
 pub fn new_config_group_api() -> Result<impl ConfigGroupAPI, PolarisError> {
     let start_time = std::time::Instant::now();
     let context_ret = SDKContext::default();
-    tracing::info!("create sdk context cost: {:?}", start_time.elapsed());
+    info!("create sdk context cost: {:?}", start_time.elapsed());
     if context_ret.is_err() {
         return Err(context_ret.err().unwrap());
     }

src/core/config/config.rs

@@ -20,6 +20,7 @@ use crate::core::config::provider::ProviderConfig;
 use serde::Deserialize;
 use std::path::Path;
 use std::{env, fs, io};
+use crate::info;
 
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
@@ -38,7 +39,7 @@ pub fn load_default<'a>() -> Result<Configuration, io::Error> {
     }
     if env::var("POLARIS_RUST_CONFIG").is_ok() {
         let custom_conf_path = env::var("POLARIS_RUST_CONFIG").unwrap();
-        tracing::info!("load config from env: {}", custom_conf_path);
+        info!("load config from env: {}", custom_conf_path);
         return load(env::var("POLARIS_RUST_CONFIG").unwrap());
     }
     load(path)

src/core/context.rs

@@ -14,10 +14,12 @@
 // specific language governing permissions and limitations under the License.
 
 use std::sync::Arc;
-
+use tracing::log::{log, logger};
 use crate::core::config::config::{load_default, Configuration};
 use crate::core::engine::Engine;
+use crate::core::logger;
 use crate::core::model::error::{ErrorCode, PolarisError};
+use crate::info;
 
 pub struct SDKContext {
     pub conf: Arc<Configuration>,
@@ -59,7 +61,8 @@ impl SDKContext {
         let start_time = std::time::Instant::now();
         let cfg = Arc::new(cfg);
         let ret = Engine::new(cfg.clone());
-        tracing::info!("create engine cost: {:?}", start_time.elapsed());
+        info!("create engine cost: {:?}", start_time.elapsed());
+        info!("create engine cost: {:?}", start_time.elapsed());
         if ret.is_err() {
             return Err(ret.err().unwrap());
         }

src/core/flow.rs

@@ -93,7 +93,7 @@ impl ClientFlow {
         };
         let ret = server_connector.report_client(req).await;
         if let Err(e) = ret {
-            tracing::error!("report client failed: {:?}", e);
+            crate::error!("report client failed: {:?}", e);
         }
     }