From fe7acca930b53766d48bda27d1acab1411bac7e6 Mon Sep 17 00:00:00 2001 From: Hanna Yang Date: Tue, 16 Jul 2024 16:38:30 -0700 Subject: [PATCH] Revert "[processor/tailsampling] fix `InvertNotSampled` decision precedence when inside and sub policy (#33671)" This reverts commit e2fda0247061953ad75460e15ae543a72e3db4cf. --- processor/tailsamplingprocessor/internal/sampling/and.go | 4 ++-- processor/tailsamplingprocessor/internal/sampling/and_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/processor/tailsamplingprocessor/internal/sampling/and.go b/processor/tailsamplingprocessor/internal/sampling/and.go index b5779fb82c9d..ec2fc075deaf 100644 --- a/processor/tailsamplingprocessor/internal/sampling/and.go +++ b/processor/tailsamplingprocessor/internal/sampling/and.go @@ -30,14 +30,14 @@ func NewAnd( // Evaluate looks at the trace data and returns a corresponding SamplingDecision. func (c *And) Evaluate(ctx context.Context, traceID pcommon.TraceID, trace *TraceData) (Decision, error) { // The policy iterates over all sub-policies and returns Sampled if all sub-policies returned a Sampled Decision. - // If any subpolicy returns NotSampled or InvertNotSampled it returns that + // If any subpolicy returns NotSampled, it returns NotSampled Decision. for _, sub := range c.subpolicies { decision, err := sub.Evaluate(ctx, traceID, trace) if err != nil { return Unspecified, err } if decision == NotSampled || decision == InvertNotSampled { - return decision, nil + return NotSampled, nil } } diff --git a/processor/tailsamplingprocessor/internal/sampling/and_test.go b/processor/tailsamplingprocessor/internal/sampling/and_test.go index 6c68279cf183..89f62a955be6 100644 --- a/processor/tailsamplingprocessor/internal/sampling/and_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/and_test.go @@ -113,6 +113,6 @@ func TestAndEvaluatorStringInvertNotSampled(t *testing.T) { } decision, err := and.Evaluate(context.Background(), traceID, trace) require.NoError(t, err, "Failed to evaluate and policy: %v", err) - assert.Equal(t, decision, InvertNotSampled) + assert.Equal(t, decision, NotSampled) }