diff --git a/sdk/include/opentelemetry/sdk/trace/sampler.h b/sdk/include/opentelemetry/sdk/trace/sampler.h index 2308ae7080..5fe12de26b 100644 --- a/sdk/include/opentelemetry/sdk/trace/sampler.h +++ b/sdk/include/opentelemetry/sdk/trace/sampler.h @@ -24,9 +24,9 @@ enum class Decision { // IsRecording() == false, span will not be recorded and all events and attributes will be // dropped. - NOT_RECORD, + DROP, // IsRecording() == true, but Sampled flag MUST NOT be set. - RECORD, + RECORD_ONLY, // IsRecording() == true AND Sampled flag` MUST be set. RECORD_AND_SAMPLE }; diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h b/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h index 894b8ed598..dbce35d8da 100644 --- a/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h +++ b/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h @@ -10,14 +10,14 @@ namespace trace namespace trace_api = opentelemetry::trace; /** - * The always off sampler always returns NOT_RECORD, effectively disabling + * The always off sampler always returns DROP, effectively disabling * tracing functionality. */ class AlwaysOffSampler : public Sampler { public: /** - * @return Returns NOT_RECORD always + * @return Returns DROP always */ SamplingResult ShouldSample(const trace_api::SpanContext * /*parent_context*/, trace_api::TraceId /*trace_id*/, @@ -25,7 +25,7 @@ class AlwaysOffSampler : public Sampler trace_api::SpanKind /*span_kind*/, const trace_api::KeyValueIterable & /*attributes*/) noexcept override { - return {Decision::NOT_RECORD, nullptr}; + return {Decision::DROP, nullptr}; } /** diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/parent_or_else.h b/sdk/include/opentelemetry/sdk/trace/samplers/parent_or_else.h index ce16f7e9c6..c6b6e1255b 100644 --- a/sdk/include/opentelemetry/sdk/trace/samplers/parent_or_else.h +++ b/sdk/include/opentelemetry/sdk/trace/samplers/parent_or_else.h @@ -20,7 +20,7 @@ class ParentOrElseSampler : public Sampler explicit ParentOrElseSampler(std::shared_ptr delegate_sampler) noexcept; /** The decision either respects the parent span's sampling decision or delegates to * delegateSampler for root spans - * @return Returns NOT_RECORD always + * @return Returns DROP always */ SamplingResult ShouldSample(const trace_api::SpanContext *parent_context, trace_api::TraceId trace_id, diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/probability.h b/sdk/include/opentelemetry/sdk/trace/samplers/probability.h index 9ad8e7f0ea..cda0db4e51 100644 --- a/sdk/include/opentelemetry/sdk/trace/samplers/probability.h +++ b/sdk/include/opentelemetry/sdk/trace/samplers/probability.h @@ -24,7 +24,7 @@ class ProbabilitySampler : public Sampler explicit ProbabilitySampler(double probability); /** - * @return Returns either RECORD_AND_SAMPLE or NOT_RECORD based on current + * @return Returns either RECORD_AND_SAMPLE or DROP based on current * sampler configuration and provided parent_context / tracer_id. tracer_id * is used as a pseudorandom value in conjunction with the predefined * threshold to determine whether this trace should be sampled diff --git a/sdk/src/trace/samplers/parent_or_else.cc b/sdk/src/trace/samplers/parent_or_else.cc index 29026a0167..e61bc38b2c 100644 --- a/sdk/src/trace/samplers/parent_or_else.cc +++ b/sdk/src/trace/samplers/parent_or_else.cc @@ -29,7 +29,7 @@ SamplingResult ParentOrElseSampler::ShouldSample( return {Decision::RECORD_AND_SAMPLE, nullptr}; } - return {Decision::NOT_RECORD, nullptr}; + return {Decision::DROP, nullptr}; } nostd::string_view ParentOrElseSampler::GetDescription() const noexcept diff --git a/sdk/src/trace/samplers/probability.cc b/sdk/src/trace/samplers/probability.cc index 0fd45644e4..9462fc5572 100644 --- a/sdk/src/trace/samplers/probability.cc +++ b/sdk/src/trace/samplers/probability.cc @@ -98,19 +98,19 @@ SamplingResult ProbabilitySampler::ShouldSample( } else { - return {Decision::NOT_RECORD, nullptr}; + return {Decision::DROP, nullptr}; } } if (threshold_ == 0) - return {Decision::NOT_RECORD, nullptr}; + return {Decision::DROP, nullptr}; if (CalculateThresholdFromBuffer(trace_id) <= threshold_) { return {Decision::RECORD_AND_SAMPLE, nullptr}; } - return {Decision::NOT_RECORD, nullptr}; + return {Decision::DROP, nullptr}; } nostd::string_view ProbabilitySampler::GetDescription() const noexcept diff --git a/sdk/src/trace/tracer.cc b/sdk/src/trace/tracer.cc index 8c7e2a4b59..60b00f191c 100644 --- a/sdk/src/trace/tracer.cc +++ b/sdk/src/trace/tracer.cc @@ -52,7 +52,7 @@ nostd::shared_ptr Tracer::StartSpan( // TODO: replace nullptr with parent context in span context auto sampling_result = sampler_->ShouldSample(nullptr, trace_api::TraceId(), name, options.kind, attributes); - if (sampling_result.decision == Decision::NOT_RECORD) + if (sampling_result.decision == Decision::DROP) { auto span = nostd::shared_ptr{ new (std::nothrow) trace_api::NoopSpan{this->shared_from_this()}}; diff --git a/sdk/test/trace/always_off_sampler_test.cc b/sdk/test/trace/always_off_sampler_test.cc index f987185c2b..28a6c5fb3c 100644 --- a/sdk/test/trace/always_off_sampler_test.cc +++ b/sdk/test/trace/always_off_sampler_test.cc @@ -19,7 +19,7 @@ TEST(AlwaysOffSampler, ShouldSample) auto sampling_result = sampler.ShouldSample(nullptr, trace_id, "", span_kind, view); - ASSERT_EQ(Decision::NOT_RECORD, sampling_result.decision); + ASSERT_EQ(Decision::DROP, sampling_result.decision); ASSERT_EQ(nullptr, sampling_result.attributes); } diff --git a/sdk/test/trace/parent_or_else_sampler_test.cc b/sdk/test/trace/parent_or_else_sampler_test.cc index 7e376fd91e..cf7a208aa8 100644 --- a/sdk/test/trace/parent_or_else_sampler_test.cc +++ b/sdk/test/trace/parent_or_else_sampler_test.cc @@ -29,7 +29,7 @@ TEST(ParentOrElseSampler, ShouldSample) auto sampling_result = sampler_off.ShouldSample(nullptr, trace_id, "", span_kind, view); auto sampling_result2 = sampler_on.ShouldSample(nullptr, trace_id, "", span_kind, view); - ASSERT_EQ(Decision::NOT_RECORD, sampling_result.decision); + ASSERT_EQ(Decision::DROP, sampling_result.decision); ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result2.decision); // Case 2: Parent exists and SampledFlag is true @@ -40,7 +40,7 @@ TEST(ParentOrElseSampler, ShouldSample) // Case 3: Parent exists and SampledFlag is false auto sampling_result4 = sampler_on.ShouldSample(&parent_context_nonsampled, trace_id, "", span_kind, view); - ASSERT_EQ(Decision::NOT_RECORD, sampling_result4.decision); + ASSERT_EQ(Decision::DROP, sampling_result4.decision); } TEST(ParentOrElseSampler, GetDescription) diff --git a/sdk/test/trace/probability_sampler_test.cc b/sdk/test/trace/probability_sampler_test.cc index cd4815aa46..6e617db3b1 100644 --- a/sdk/test/trace/probability_sampler_test.cc +++ b/sdk/test/trace/probability_sampler_test.cc @@ -75,7 +75,7 @@ TEST(ProbabilitySampler, ShouldSampleWithoutContext) sampling_result = s1.ShouldSample(nullptr, valid_trace_id, "", span_kind, view); - ASSERT_EQ(Decision::NOT_RECORD, sampling_result.decision); + ASSERT_EQ(Decision::DROP, sampling_result.decision); ASSERT_EQ(nullptr, sampling_result.attributes); ProbabilitySampler s2(0.50000001); @@ -89,7 +89,7 @@ TEST(ProbabilitySampler, ShouldSampleWithoutContext) sampling_result = s3.ShouldSample(nullptr, valid_trace_id, "", span_kind, view); - ASSERT_EQ(Decision::NOT_RECORD, sampling_result.decision); + ASSERT_EQ(Decision::DROP, sampling_result.decision); ASSERT_EQ(nullptr, sampling_result.attributes); ProbabilitySampler s4(0.50000000); @@ -117,7 +117,7 @@ TEST(ProbabilitySampler, ShouldSampleWithContext) auto sampling_result = s1.ShouldSample(&c1, trace_id, "", span_kind, view); - ASSERT_EQ(Decision::NOT_RECORD, sampling_result.decision); + ASSERT_EQ(Decision::DROP, sampling_result.decision); ASSERT_EQ(nullptr, sampling_result.attributes); sampling_result = s1.ShouldSample(&c2, trace_id, "", span_kind, view); diff --git a/sdk/test/trace/tracer_test.cc b/sdk/test/trace/tracer_test.cc index ce46c862bb..498d22e6fc 100644 --- a/sdk/test/trace/tracer_test.cc +++ b/sdk/test/trace/tracer_test.cc @@ -156,7 +156,7 @@ TEST(Tracer, StartSpanSampleOff) tracer_off->StartSpan("span 2")->End(); // The span doesn't write any span data because the sampling decision is alway - // NOT_RECORD. + // DROP. ASSERT_EQ(0, spans_received->size()); }