Rename module skywalking_proto to proto.

src/lib.rs

@@ -25,8 +25,8 @@ pub mod logging;
 #[cfg_attr(docsrs, doc(cfg(feature = "management")))]
 pub mod management;
 pub mod metrics;
+pub mod proto;
 pub mod reporter;
-pub mod skywalking_proto;
 pub mod trace;
 
 pub use error::{Error, Result};

src/logging/record.rs

@@ -18,7 +18,7 @@
 
 use crate::{
     common::system_time::{fetch_time, TimePeriod},
-    skywalking_proto::v3::{
+    proto::v3::{
         log_data_body::Content, JsonLog, KeyStringValuePair, LogData, LogDataBody, LogTags,
         TextLog, TraceContext, YamlLog,
     },

src/management/instance.rs

@@ -16,7 +16,7 @@
 
 //! Skywalking report instance properties items.
 
-use crate::skywalking_proto::v3::{InstanceProperties, KeyStringValuePair};
+use crate::proto::v3::{InstanceProperties, KeyStringValuePair};
 use once_cell::sync::Lazy;
 use std::{collections::HashMap, process};
 use systemstat::{IpAddr, Platform, System};

src/management/manager.rs

@@ -93,7 +93,7 @@ impl Manager {
 
     fn reporter_keep_alive(reporter: &Arc<DynReport>, service_name: String, instance_name: String) {
         reporter.report(CollectItem::Ping(Box::new(
-            crate::skywalking_proto::v3::InstancePingPkg {
+            crate::proto::v3::InstancePingPkg {
                 service: service_name,
                 service_instance: instance_name,
                 layer: Default::default(),

src/metrics/meter.rs

@@ -19,7 +19,7 @@
 use crate::{
     common::system_time::{fetch_time, TimePeriod},
     metrics::metricer::Metricer,
-    skywalking_proto::v3::{
+    proto::v3::{
         meter_data::Metric, Label, MeterBucketValue, MeterData, MeterHistogram, MeterSingleValue,
     },
 };

src/reporter/grpc.rs

@@ -17,15 +17,15 @@
 //! Grpc implementation of [Report].
 
 #[cfg(feature = "management")]
-use crate::skywalking_proto::v3::management_service_client::ManagementServiceClient;
+use crate::proto::v3::management_service_client::ManagementServiceClient;
 use crate::{
-    reporter::{CollectItem, Report},
-    skywalking_proto::v3::{
+    proto::v3::{
         log_report_service_client::LogReportServiceClient,
         meter_report_service_client::MeterReportServiceClient,
         trace_segment_report_service_client::TraceSegmentReportServiceClient, LogData, MeterData,
         SegmentObject,
     },
+    reporter::{CollectItem, Report},
 };
 use futures_core::Stream;
 use futures_util::future::{try_join_all, TryJoinAll};

src/reporter/mod.rs

@@ -20,8 +20,8 @@ pub mod grpc;
 pub mod print;
 
 #[cfg(feature = "management")]
-use crate::skywalking_proto::v3::{InstancePingPkg, InstanceProperties};
-use crate::skywalking_proto::v3::{LogData, MeterData, SegmentObject};
+use crate::proto::v3::{InstancePingPkg, InstanceProperties};
+use crate::proto::v3::{LogData, MeterData, SegmentObject};
 use serde::{Deserialize, Serialize};
 use std::{ops::Deref, sync::Arc};
 use tokio::sync::OnceCell;

src/trace/span.rs

@@ -19,7 +19,7 @@
 
 use crate::{
     common::system_time::{fetch_time, TimePeriod},
-    skywalking_proto::v3::{SpanLayer, SpanObject, SpanType},
+    proto::v3::{SpanLayer, SpanObject, SpanType},
     trace::trace_context::SpanStack,
 };
 use std::{fmt::Formatter, mem::take, sync::Arc};

src/trace/trace_context.rs

@@ -24,9 +24,7 @@ use crate::{
         system_time::{fetch_time, TimePeriod},
     },
     error::LOCK_MSG,
-    skywalking_proto::v3::{
-        RefType, SegmentObject, SegmentReference, SpanLayer, SpanObject, SpanType,
-    },
+    proto::v3::{RefType, SegmentObject, SegmentReference, SpanLayer, SpanObject, SpanType},
     trace::{
         propagation::context::PropagationContext,
         span::Span,

tests/logging.rs

@@ -19,11 +19,11 @@ use skywalking::{
         logger::Logger,
         record::{LogRecord, RecordType},
     },
-    reporter::{CollectItem, Report},
-    skywalking_proto::v3::{
+    proto::v3::{
         log_data_body::Content, JsonLog, KeyStringValuePair, LogData, LogDataBody, LogTags,
         TextLog, TraceContext,
     },
+    reporter::{CollectItem, Report},
     trace::tracer::Tracer,
 };
 use std::{

tests/management.rs

@@ -16,8 +16,8 @@
 
 use skywalking::{
     management::{instance::Properties, manager::Manager},
+    proto::v3::{InstancePingPkg, InstanceProperties, KeyStringValuePair},
     reporter::{CollectItem, Report},
-    skywalking_proto::v3::{InstancePingPkg, InstanceProperties, KeyStringValuePair},
 };
 use std::{
     collections::LinkedList,

tests/metrics.rs

@@ -19,10 +19,10 @@ use skywalking::{
         meter::{Counter, Gauge, Histogram},
         metricer::Metricer,
     },
-    reporter::{CollectItem, Report},
-    skywalking_proto::v3::{
+    proto::v3::{
         meter_data::Metric, Label, MeterBucketValue, MeterData, MeterHistogram, MeterSingleValue,
     },
+    reporter::{CollectItem, Report},
 };
 use std::{
     collections::LinkedList,

tests/trace_context.rs

@@ -16,11 +16,11 @@
 
 use prost::Message;
 use skywalking::{
-    reporter::{print::PrintReporter, CollectItem, Report},
-    skywalking_proto::v3::{
+    proto::v3::{
         KeyStringValuePair, Log, RefType, SegmentObject, SegmentReference, SpanLayer, SpanObject,
         SpanType,
     },
+    reporter::{print::PrintReporter, CollectItem, Report},
     trace::{
         propagation::{decoder::decode_propagation, encoder::encode_propagation},
         tracer::Tracer,