This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-rust.git
The following commit(s) were added to refs/heads/master by this push:
new 632766f Rename mod skywalking_proto to proto. (#59)
632766f is described below
commit 632766f5a2cb9f039a656920c44f10c45e6ddb25
Author: jmjoy <[email protected]>
AuthorDate: Tue May 23 00:20:22 2023 +0800
Rename mod skywalking_proto to proto. (#59)
---
src/lib.rs | 2 +-
src/logging/record.rs | 2 +-
src/management/instance.rs | 2 +-
src/management/manager.rs | 2 +-
src/metrics/meter.rs | 2 +-
src/{skywalking_proto => proto}/mod.rs | 0
src/{skywalking_proto => proto}/v3/mod.rs | 0
src/reporter/grpc.rs | 6 +++---
src/reporter/mod.rs | 4 ++--
src/trace/span.rs | 2 +-
src/trace/trace_context.rs | 4 +---
tests/logging.rs | 4 ++--
tests/management.rs | 2 +-
tests/metrics.rs | 4 ++--
tests/trace_context.rs | 4 ++--
15 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index 75e8a49..fe54e29 100644
--- a/src/lib.rs
+++ b/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};
diff --git a/src/logging/record.rs b/src/logging/record.rs
index 3a34872..53fbc13 100644
--- a/src/logging/record.rs
+++ b/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,
},
diff --git a/src/management/instance.rs b/src/management/instance.rs
index 7950a19..e766bfd 100644
--- a/src/management/instance.rs
+++ b/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};
diff --git a/src/management/manager.rs b/src/management/manager.rs
index 67f73c3..55ddaf2 100644
--- a/src/management/manager.rs
+++ b/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(),
diff --git a/src/metrics/meter.rs b/src/metrics/meter.rs
index 230735c..5a3a2ee 100644
--- a/src/metrics/meter.rs
+++ b/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,
},
};
diff --git a/src/skywalking_proto/mod.rs b/src/proto/mod.rs
similarity index 100%
rename from src/skywalking_proto/mod.rs
rename to src/proto/mod.rs
diff --git a/src/skywalking_proto/v3/mod.rs b/src/proto/v3/mod.rs
similarity index 100%
rename from src/skywalking_proto/v3/mod.rs
rename to src/proto/v3/mod.rs
diff --git a/src/reporter/grpc.rs b/src/reporter/grpc.rs
index 576adb7..5abb88f 100644
--- a/src/reporter/grpc.rs
+++ b/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};
diff --git a/src/reporter/mod.rs b/src/reporter/mod.rs
index 6d54f88..0b46662 100644
--- a/src/reporter/mod.rs
+++ b/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;
diff --git a/src/trace/span.rs b/src/trace/span.rs
index 100a528..8babae4 100644
--- a/src/trace/span.rs
+++ b/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};
diff --git a/src/trace/trace_context.rs b/src/trace/trace_context.rs
index 10b8dbe..4613b77 100644
--- a/src/trace/trace_context.rs
+++ b/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,
diff --git a/tests/logging.rs b/tests/logging.rs
index 53483d2..e3f9d36 100644
--- a/tests/logging.rs
+++ b/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::{
diff --git a/tests/management.rs b/tests/management.rs
index 681da8e..f07244d 100644
--- a/tests/management.rs
+++ b/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,
diff --git a/tests/metrics.rs b/tests/metrics.rs
index 43246ec..94446d0 100644
--- a/tests/metrics.rs
+++ b/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,
diff --git a/tests/trace_context.rs b/tests/trace_context.rs
index 4603ad9..6501922 100644
--- a/tests/trace_context.rs
+++ b/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,
