Skip to content

Commit ab0e5af

Browse files
satweensatween
committed
RUM-9899: Ignore sample priority in metrics in case if not set
1 parent 98c606c commit ab0e5af

File tree

34 files changed

+359
-79
lines changed

34 files changed

+359
-79
lines changed

‎features/dd-sdk-android-trace-api/api/dd-sdk-android-trace-api.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public final class com/datadog/android/trace/api/DatadogTracingConstants$Tags {
5151
public final class com/datadog/android/trace/api/DatadogTracingConstants$TracerConfig {
5252
public static final field INSTANCE Lcom/datadog/android/trace/api/DatadogTracingConstants$TracerConfig;
5353
public static final field PARTIAL_FLUSH_MIN_SPANS Ljava/lang/String;
54+
public static final field PRIORITY_SAMPLING Ljava/lang/String;
5455
public static final field PROPAGATION_STYLE_EXTRACT Ljava/lang/String;
5556
public static final field PROPAGATION_STYLE_INJECT Ljava/lang/String;
5657
public static final field SERVICE_NAME Ljava/lang/String;

‎features/dd-sdk-android-trace-internal/api/dd-sdk-android-trace-internal.api

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ public final class com/datadog/trace/api/DynamicConfig {
301301
public static fun create (Lcom/datadog/android/trace/internal/compat/function/BiFunction;)Lcom/datadog/trace/api/DynamicConfig$Builder;
302302
public fun current ()Lcom/datadog/trace/api/DynamicConfig$Builder;
303303
public fun initial ()Lcom/datadog/trace/api/DynamicConfig$Builder;
304-
public fun resetTraceConfig ()V
305304
public fun toString ()Ljava/lang/String;
306305
}
307306

@@ -1638,6 +1637,7 @@ public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/
16381637

16391638
public abstract interface class com/datadog/trace/bootstrap/instrumentation/api/AgentSpan$Context {
16401639
public abstract fun baggageItems ()Ljava/lang/Iterable;
1640+
public abstract fun getInstanceSamplingPriority ()I
16411641
public abstract fun getPathwayContext ()Lcom/datadog/trace/bootstrap/instrumentation/api/PathwayContext;
16421642
public abstract fun getSamplingPriority ()I
16431643
public abstract fun getSpanId ()J
@@ -1801,6 +1801,7 @@ public final class com/datadog/trace/bootstrap/instrumentation/api/AgentTracer$N
18011801
public fun getFastlyClientIp ()Ljava/lang/String;
18021802
public fun getForwarded ()Ljava/lang/String;
18031803
public fun getForwardedFor ()Ljava/lang/String;
1804+
public fun getInstanceSamplingPriority ()I
18041805
public fun getPathwayContext ()Lcom/datadog/trace/bootstrap/instrumentation/api/PathwayContext;
18051806
public fun getSamplingPriority ()I
18061807
public fun getSpanId ()J
@@ -2128,6 +2129,7 @@ public class com/datadog/trace/bootstrap/instrumentation/api/TagContext : com/da
21282129
public fun getFastlyClientIp ()Ljava/lang/String;
21292130
public fun getForwarded ()Ljava/lang/String;
21302131
public fun getForwardedFor ()Ljava/lang/String;
2132+
public fun getInstanceSamplingPriority ()I
21312133
public final fun getOrigin ()Ljava/lang/CharSequence;
21322134
public fun getPathwayContext ()Lcom/datadog/trace/bootstrap/instrumentation/api/PathwayContext;
21332135
public fun getPropagationStyle ()Lcom/datadog/trace/api/TracePropagationStyle;
@@ -2445,19 +2447,6 @@ public final class com/datadog/trace/common/sampling/SamplingRule$TraceSamplingR
24452447
public fun matches (Lcom/datadog/trace/core/CoreSpan;)Z
24462448
}
24472449

2448-
public abstract interface class com/datadog/trace/common/sampling/SingleSpanSampler {
2449-
public abstract fun setSamplingPriority (Lcom/datadog/trace/core/CoreSpan;)Z
2450-
}
2451-
2452-
public final class com/datadog/trace/common/sampling/SingleSpanSampler$Builder {
2453-
public static fun forConfig (Lcom/datadog/trace/api/Config;)Lcom/datadog/trace/common/sampling/SingleSpanSampler;
2454-
}
2455-
2456-
public final class com/datadog/trace/common/sampling/SingleSpanSampler$RuleBasedSingleSpanSampler : com/datadog/trace/common/sampling/SingleSpanSampler {
2457-
public fun <init> (Lcom/datadog/trace/common/sampling/SpanSamplingRules;)V
2458-
public fun setSamplingPriority (Lcom/datadog/trace/core/CoreSpan;)Z
2459-
}
2460-
24612450
public class com/datadog/trace/common/sampling/SpanSamplingRules {
24622451
public static final field EMPTY Lcom/datadog/trace/common/sampling/SpanSamplingRules;
24632452
public fun <init> (Ljava/util/List;)V
@@ -2875,6 +2864,7 @@ public class com/datadog/trace/core/DDSpanContext : com/datadog/trace/api/gatewa
28752864
public fun getEndToEndStartTime ()J
28762865
public fun getErrorFlag ()Z
28772866
public fun getHttpStatusCode ()S
2867+
public fun getInstanceSamplingPriority ()I
28782868
public fun getOperationName ()Ljava/lang/CharSequence;
28792869
public fun getOrigin ()Ljava/lang/CharSequence;
28802870
public fun getParentId ()J

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/api/interceptor/MutableSpan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface MutableSpan {
2727
MutableSpan setResourceName(final CharSequence resourceName);
2828

2929
@Nullable
30-
Integer getSamplingPriority();
30+
Integer getTraceSamplingPriority();
3131

3232
/**
3333
* @param newPriority

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ interface Context {
179179
* @return The trace sampling priority of the span's trace, or {@link PrioritySampling#UNSET} if
180180
* no priority has been set.
181181
*/
182-
int getSamplingPriority();
182+
int getTraceSamplingPriority();
183183

184184
Iterable<Map.Entry<String, String>> baggageItems();
185185

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public AgentSpan setSamplingPriority(int newPriority, int samplingMechanism) {
287287
}
288288

289289
@Override
290-
public Integer getSamplingPriority() {
290+
public Integer getTraceSamplingPriority() {
291291
return (int) PrioritySampling.UNSET;
292292
}
293293

@@ -521,7 +521,7 @@ public AgentTrace getTrace() {
521521
}
522522

523523
@Override
524-
public int getSamplingPriority() {
524+
public int getTraceSamplingPriority() {
525525
return PrioritySampling.UNSET;
526526
}
527527

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/SpanLink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static SpanLink from(AgentSpan.Context context) {
4444
*/
4545
public static SpanLink from(
4646
AgentSpan.Context context, byte traceFlags, String traceState, Attributes attributes) {
47-
if (context.getSamplingPriority() > 0) {
47+
if (context.getTraceSamplingPriority() > 0) {
4848
traceFlags = (byte) (traceFlags | SAMPLED_FLAG);
4949
}
5050
return new SpanLink(

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/bootstrap/instrumentation/api/TagContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public final Map<String, String> getTags() {
170170
}
171171

172172
@Override
173-
public final int getSamplingPriority() {
173+
public final int getTraceSamplingPriority() {
174174
return samplingPriority;
175175
}
176176

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/core/CoreSpan.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,4 @@ T setSamplingPriority(
8585
T setMetric(CharSequence name, double value);
8686

8787
T setFlag(CharSequence name, boolean value);
88-
89-
int samplingPriority();
9088
}

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/core/CoreTracer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ private DDSpanContext buildSpanContext() {
988988
final ExtractedContext extractedContext = (ExtractedContext) parentContext;
989989
traceId = extractedContext.getTraceId();
990990
parentSpanId = extractedContext.getSpanId();
991-
samplingPriority = extractedContext.getSamplingPriority();
991+
samplingPriority = extractedContext.getTraceSamplingPriority();
992992
endToEndStartTime = extractedContext.getEndToEndStartTime();
993993
propagationTags = extractedContext.getPropagationTags();
994994
} else if (parentContext != null) {
@@ -997,7 +997,7 @@ private DDSpanContext buildSpanContext() {
997997
? idGenerationStrategy.generateTraceId()
998998
: parentContext.getTraceId();
999999
parentSpanId = parentContext.getSpanId();
1000-
samplingPriority = parentContext.getSamplingPriority();
1000+
samplingPriority = parentContext.getTraceSamplingPriority();
10011001
endToEndStartTime = 0;
10021002
propagationTags = propagationTagsFactory.empty();
10031003
} else {

‎features/dd-sdk-android-trace-internal/src/main/java/com/datadog/trace/core/DDSpan.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ public final DDSpan setResourceName(final CharSequence resourceName, byte priori
552552

553553
@Override
554554
public boolean eligibleForDropping() {
555-
int samplingPriority = context.getSamplingPriority();
555+
int samplingPriority = context.getTraceSamplingPriority();
556556
return samplingPriority == USER_DROP || samplingPriority == SAMPLER_DROP;
557557
}
558558

@@ -569,7 +569,7 @@ public Integer forceSamplingDecision() {
569569
if (rootSpan == null) {
570570
return null;
571571
}
572-
return rootSpan.getSamplingPriority();
572+
return rootSpan.getTraceSamplingPriority();
573573
}
574574

575575
@Deprecated
@@ -674,18 +674,18 @@ public byte getResourceNamePriority() {
674674
}
675675

676676
@Override
677-
public Integer getSamplingPriority() {
678-
final int samplingPriority = context.getSamplingPriority();
677+
@Nullable
678+
public Integer getTraceSamplingPriority() {
679+
final int samplingPriority = context.getTraceSamplingPriority();
679680
if (samplingPriority == PrioritySampling.UNSET) {
680681
return null;
681682
} else {
682683
return samplingPriority;
683684
}
684685
}
685686

686-
@Override
687-
public int samplingPriority() {
688-
return context.getSamplingPriority();
687+
public int getSpanSamplingPriority() {
688+
return context.getSpanSamplingPriority();
689689
}
690690

691691
@Override

0 commit comments

Comments
 (0)