Skip to content

Commit afa5cdb

Browse files
authored
Rename AbstractSpan to HandleSpanObject. (#62)
1 parent 84fbd00 commit afa5cdb

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ thread or coroutine.
183183
```rust
184184
use skywalking::{
185185
trace::tracer::Tracer,
186-
trace::span::AbstractSpan,
186+
trace::span::HandleSpanObject,
187187
};
188188

189189
async fn handle(tracer: Tracer) {

dist-material/LICENSE

+7-5
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
277277
https://crates.io/crates/ppv-lite86/0.2.8 0.2.8 Apache-2.0 OR MIT
278278
https://crates.io/crates/prettyplease/0.1.0 0.1.0 Apache-2.0 OR MIT
279279
https://crates.io/crates/proc-macro-crate/0.1.4 0.1.4 Apache-2.0 OR MIT
280-
https://crates.io/crates/proc-macro2/1.0.32 1.0.32 Apache-2.0 OR MIT
281-
https://crates.io/crates/quote/1.0.0 1.0.0 Apache-2.0 OR MIT
280+
https://crates.io/crates/proc-macro2/1.0.52 1.0.52 Apache-2.0 OR MIT
281+
https://crates.io/crates/quote/1.0.26 1.0.26 Apache-2.0 OR MIT
282282
https://crates.io/crates/rand/0.4.1 0.4.1 Apache-2.0 OR MIT
283283
https://crates.io/crates/rand/0.8.0 0.8.0 Apache-2.0 OR MIT
284284
https://crates.io/crates/rand_chacha/0.3.0 0.3.0 Apache-2.0 OR MIT
@@ -288,22 +288,24 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
288288
https://crates.io/crates/regex-syntax/0.6.25 0.6.25 Apache-2.0 OR MIT
289289
https://crates.io/crates/remove_dir_all/0.5.0 0.5.0 Apache-2.0 OR MIT
290290
https://crates.io/crates/scopeguard/1.1.0 1.1.0 Apache-2.0 OR MIT
291-
https://crates.io/crates/serde/1.0.143 1.0.143 Apache-2.0 OR MIT
292-
https://crates.io/crates/serde_derive/1.0.143 1.0.143 Apache-2.0 OR MIT
291+
https://crates.io/crates/serde/1.0.157 1.0.157 Apache-2.0 OR MIT
292+
https://crates.io/crates/serde_derive/1.0.157 1.0.157 Apache-2.0 OR MIT
293293
https://crates.io/crates/serde_json/1.0.0 1.0.0 Apache-2.0 OR MIT
294294
https://crates.io/crates/signal-hook-registry/1.1.1 1.1.1 Apache-2.0 OR MIT
295295
https://crates.io/crates/smallvec/1.6.1 1.6.1 Apache-2.0 OR MIT
296296
https://crates.io/crates/socket2/0.3.17 0.3.17 Apache-2.0 OR MIT
297297
https://crates.io/crates/socket2/0.4.4 0.4.4 Apache-2.0 OR MIT
298298
https://crates.io/crates/structopt/0.3.0 0.3.0 Apache-2.0 OR MIT
299299
https://crates.io/crates/structopt-derive/0.3.0 0.3.0 Apache-2.0 OR MIT
300-
https://crates.io/crates/syn/1.0.90 1.0.90 Apache-2.0 OR MIT
300+
https://crates.io/crates/syn/1.0.85 1.0.85 Apache-2.0 OR MIT
301+
https://crates.io/crates/syn/2.0.0 2.0.0 Apache-2.0 OR MIT
301302
https://crates.io/crates/tempfile/3.0.2 3.0.2 Apache-2.0 OR MIT
302303
https://crates.io/crates/thiserror/1.0.32 1.0.32 Apache-2.0 OR MIT
303304
https://crates.io/crates/thiserror-impl/1.0.32 1.0.32 Apache-2.0 OR MIT
304305
https://crates.io/crates/time/0.3.9 0.3.9 Apache-2.0 OR MIT
305306
https://crates.io/crates/tokio-io-timeout/1.0.1 1.0.1 Apache-2.0 OR MIT
306307
https://crates.io/crates/toml/0.5.2 0.5.2 Apache-2.0 OR MIT
308+
https://crates.io/crates/unicode-ident/1.0.0 1.0.0 Apache-2.0 OR MIT
307309
https://crates.io/crates/unicode-segmentation/1.2.0 1.2.0 Apache-2.0 OR MIT
308310
https://crates.io/crates/unicode-width/0.1.4 0.1.4 Apache-2.0 OR MIT
309311
https://crates.io/crates/unicode-xid/0.2.0 0.2.0 Apache-2.0 OR MIT

src/logging/record.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::{
2323
TextLog, TraceContext, YamlLog,
2424
},
2525
trace::{
26-
span::{AbstractSpan, Span},
26+
span::{HandleSpanObject, Span},
2727
trace_context::TracingContext,
2828
},
2929
};

src/trace/span.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ use std::{
3131
sync::{Arc, Weak},
3232
};
3333

34-
/// [AbstractSpan] contains methods handle [SpanObject].
35-
pub trait AbstractSpan {
34+
/// [HandleSpanObject] contains methods to handle [SpanObject].
35+
pub trait HandleSpanObject {
3636
/// Get immutable span object reference.
3737
fn span_object(&self) -> &SpanObject;
3838

@@ -199,7 +199,7 @@ impl Drop for Span {
199199
}
200200
}
201201

202-
impl AbstractSpan for Span {
202+
impl HandleSpanObject for Span {
203203
#[inline]
204204
fn span_object(&self) -> &SpanObject {
205205
self.obj.as_ref().unwrap()
@@ -249,7 +249,7 @@ impl Drop for AsyncSpan {
249249
}
250250
}
251251

252-
impl AbstractSpan for AsyncSpan {
252+
impl HandleSpanObject for AsyncSpan {
253253
#[inline]
254254
fn span_object(&self) -> &SpanObject {
255255
self.obj.as_ref().unwrap()

src/trace/trace_context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::{
2828
proto::v3::{RefType, SegmentObject, SegmentReference, SpanLayer, SpanObject, SpanType},
2929
trace::{
3030
propagation::context::PropagationContext,
31-
span::{AbstractSpan, Span},
31+
span::{HandleSpanObject, Span},
3232
tracer::{Tracer, WeakTracer},
3333
},
3434
};

tests/logging.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use skywalking::{
2424
TextLog, TraceContext,
2525
},
2626
reporter::{CollectItem, Report},
27-
trace::{span::AbstractSpan, tracer::Tracer},
27+
trace::{span::HandleSpanObject, tracer::Tracer},
2828
};
2929
use std::{
3030
collections::LinkedList,

tests/trace_context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use skywalking::{
2323
reporter::{print::PrintReporter, CollectItem, Report},
2424
trace::{
2525
propagation::{decoder::decode_propagation, encoder::encode_propagation},
26-
span::AbstractSpan,
26+
span::HandleSpanObject,
2727
tracer::Tracer,
2828
},
2929
};

0 commit comments

Comments
 (0)