From 7ede731d09a1db4f65cd37cf5369471825afbd0d Mon Sep 17 00:00:00 2001
From: Craig Pastro <siyopao@gmail.com>
Date: Sun, 31 May 2020 13:37:32 +0900
Subject: [PATCH 1/2]  Remove SpanID from sampling parameters

---
 src/api/trace/sampler.rs |  1 -
 src/sdk/trace/sampler.rs |  2 --
 src/sdk/trace/tracer.rs  | 13 ++-----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/api/trace/sampler.rs b/src/api/trace/sampler.rs
index f08160e4d3..831a429b00 100644
--- a/src/api/trace/sampler.rs
+++ b/src/api/trace/sampler.rs
@@ -49,7 +49,6 @@ pub trait Sampler: Send + Sync + std::fmt::Debug {
         &self,
         parent_context: Option<&api::SpanContext>,
         trace_id: api::TraceId,
-        span_id: api::SpanId,
         name: &str,
         span_kind: &api::SpanKind,
         attributes: &[api::KeyValue],
diff --git a/src/sdk/trace/sampler.rs b/src/sdk/trace/sampler.rs
index b3d1a881b9..affa719127 100644
--- a/src/sdk/trace/sampler.rs
+++ b/src/sdk/trace/sampler.rs
@@ -21,7 +21,6 @@ impl api::Sampler for Sampler {
         &self,
         parent_context: Option<&api::SpanContext>,
         trace_id: api::TraceId,
-        _span_id: api::SpanId,
         _name: &str,
         _span_kind: &api::SpanKind,
         _attributes: &[api::KeyValue],
@@ -128,7 +127,6 @@ mod tests {
                     .should_sample(
                         parent_context.as_ref(),
                         trace_id,
-                        api::SpanId::from_u64(1),
                         name,
                         &api::SpanKind::Internal,
                         &[],
diff --git a/src/sdk/trace/tracer.rs b/src/sdk/trace/tracer.rs
index d7faa90978..1d1cb1ad1c 100644
--- a/src/sdk/trace/tracer.rs
+++ b/src/sdk/trace/tracer.rs
@@ -46,22 +46,14 @@ impl Tracer {
         &self,
         parent_context: Option<&api::SpanContext>,
         trace_id: api::TraceId,
-        span_id: api::SpanId,
         name: &str,
         span_kind: &api::SpanKind,
         attributes: &[api::KeyValue],
         links: &[api::Link],
     ) -> Option<(u8, Vec<api::KeyValue>)> {
         let sampler = &self.provider.config().default_sampler;
-        let sampling_result = sampler.should_sample(
-            parent_context,
-            trace_id,
-            span_id,
-            name,
-            span_kind,
-            attributes,
-            links,
-        );
+        let sampling_result =
+            sampler.should_sample(parent_context, trace_id, name, span_kind, attributes, links);
 
         self.process_sampling_result(sampling_result, parent_context)
     }
@@ -182,7 +174,6 @@ impl api::Tracer for Tracer {
             self.make_sampling_decision(
                 parent_span_context.as_ref(),
                 trace_id,
-                span_id,
                 &builder.name,
                 &span_kind,
                 &attribute_options,

From 941ef900ea36dcb6cf22f9be48eae825d4ae7f49 Mon Sep 17 00:00:00 2001
From: Craig Pastro <siyopao@gmail.com>
Date: Mon, 1 Jun 2020 07:30:50 +0900
Subject: [PATCH 2/2] Fix trace bound according to clippy

---
 benches/trace.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benches/trace.rs b/benches/trace.rs
index c9ba99ff35..68091a55ff 100644
--- a/benches/trace.rs
+++ b/benches/trace.rs
@@ -64,7 +64,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     });
 }
 
-fn trace_benchmark_group<F: Fn(&sdk::Tracer) -> ()>(c: &mut Criterion, name: &str, f: F) {
+fn trace_benchmark_group<F: Fn(&sdk::Tracer)>(c: &mut Criterion, name: &str, f: F) {
     let mut group = c.benchmark_group(name);
 
     group.bench_function("always-sample", |b| {