open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1181 from DataDog/landerson/sampling-variable 

Rename Rule Based Sampling properties
This commit is contained in:
Laplie Anderson 2020-01-16 13:17:39 -05:00 committed by GitHub
parent 64ed09d76c e24d04e3a5
commit 70c874b135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dd-trace-api/src/main/java/datadog/trace/api/Config.java
View File

@ -65,8 +65,8 @@ public class Config {
public static final String TRACE_CLASSES_EXCLUDE = "trace.classes.exclude";
public static final String TRACE_SAMPLING_SERVICE_RULES = "trace.sampling.service.rules";
public static final String TRACE_SAMPLING_OPERATION_RULES = "trace.sampling.operation.rules";
public static final String TRACE_SAMPLING_DEFAULT_RATE = "trace.sampling.default.rate";
public static final String TRACE_SAMPLING_RATE_LIMIT = "trace.sampling.rate.limit";
public static final String TRACE_SAMPLE_RATE = "trace.sample.rate";
public static final String TRACE_RATE_LIMIT = "trace.rate.limit";
public static final String TRACE_REPORT_HOSTNAME = "trace.report-hostname";
public static final String HEADER_TAGS = "trace.header.tags";
public static final String HTTP_SERVER_ERROR_STATUSES = "http.server.error.statuses";
@ -149,7 +149,7 @@ public class Config {
private static final String DEFAULT_TRACE_METHODS = null;
public static final boolean DEFAULT_TRACE_ANALYTICS_ENABLED = false;
public static final float DEFAULT_ANALYTICS_SAMPLE_RATE = 1.0f;
public static final double DEFAULT_TRACE_SAMPLING_RATE_LIMIT = 100;
public static final double DEFAULT_TRACE_RATE_LIMIT = 100;
public enum PropagationStyle {
DATADOG,
@ -222,8 +222,8 @@ public class Config {
@Getter private final Map<String, String> traceSamplingServiceRules;
@Getter private final Map<String, String> traceSamplingOperationRules;
@Getter private final Double traceSamplingDefaultRate;
@Getter private final Double traceSamplingRateLimit;
@Getter private final Double traceSampleRate;
@Getter private final Double traceRateLimit;
// Values from an optionally provided properties file
private static Properties propertiesFromConfigFile;
@ -349,10 +349,8 @@ public class Config {
traceSamplingServiceRules = getMapSettingFromEnvironment(TRACE_SAMPLING_SERVICE_RULES, null);
traceSamplingOperationRules =
getMapSettingFromEnvironment(TRACE_SAMPLING_OPERATION_RULES, null);
traceSamplingDefaultRate = getDoubleSettingFromEnvironment(TRACE_SAMPLING_DEFAULT_RATE, null);
traceSamplingRateLimit =
getDoubleSettingFromEnvironment(
TRACE_SAMPLING_RATE_LIMIT, DEFAULT_TRACE_SAMPLING_RATE_LIMIT);
traceSampleRate = getDoubleSettingFromEnvironment(TRACE_SAMPLE_RATE, null);
traceRateLimit = getDoubleSettingFromEnvironment(TRACE_RATE_LIMIT, DEFAULT_TRACE_RATE_LIMIT);
log.debug("New instance: {}", this);
}
@ -484,12 +482,8 @@ public class Config {
traceSamplingOperationRules =
getPropertyMapValue(
properties, TRACE_SAMPLING_OPERATION_RULES, parent.traceSamplingOperationRules);
traceSamplingDefaultRate =
getPropertyDoubleValue(
properties, TRACE_SAMPLING_DEFAULT_RATE, parent.traceSamplingDefaultRate);
traceSamplingRateLimit =
getPropertyDoubleValue(
properties, TRACE_SAMPLING_RATE_LIMIT, parent.traceSamplingRateLimit);
traceSampleRate = getPropertyDoubleValue(properties, TRACE_SAMPLE_RATE, parent.traceSampleRate);
traceRateLimit = getPropertyDoubleValue(properties, TRACE_RATE_LIMIT, parent.traceRateLimit);
log.debug("New instance: {}", this);
}

20
dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
View File

@ -40,11 +40,11 @@ import static datadog.trace.api.Config.SPAN_TAGS
import static datadog.trace.api.Config.SPLIT_BY_TAGS
import static datadog.trace.api.Config.TRACE_AGENT_PORT
import static datadog.trace.api.Config.TRACE_ENABLED
import static datadog.trace.api.Config.TRACE_RATE_LIMIT
import static datadog.trace.api.Config.TRACE_REPORT_HOSTNAME
import static datadog.trace.api.Config.TRACE_RESOLVER_ENABLED
import static datadog.trace.api.Config.TRACE_SAMPLING_DEFAULT_RATE
import static datadog.trace.api.Config.TRACE_SAMPLE_RATE
import static datadog.trace.api.Config.TRACE_SAMPLING_OPERATION_RULES
import static datadog.trace.api.Config.TRACE_SAMPLING_RATE_LIMIT
import static datadog.trace.api.Config.TRACE_SAMPLING_SERVICE_RULES
import static datadog.trace.api.Config.WRITER_TYPE
@ -151,8 +151,8 @@ class ConfigTest extends DDSpecification {
prop.setProperty(HEALTH_METRICS_STATSD_PORT, "654")
prop.setProperty(TRACE_SAMPLING_SERVICE_RULES, "a:1")
prop.setProperty(TRACE_SAMPLING_OPERATION_RULES, "b:1")
prop.setProperty(TRACE_SAMPLING_DEFAULT_RATE, ".5")
prop.setProperty(TRACE_SAMPLING_RATE_LIMIT, "200")
prop.setProperty(TRACE_SAMPLE_RATE, ".5")
prop.setProperty(TRACE_RATE_LIMIT, "200")
when:
Config config = Config.get(prop)
@ -191,8 +191,8 @@ class ConfigTest extends DDSpecification {
config.healthMetricsStatsdPort == 654
config.traceSamplingServiceRules == [a: "1"]
config.traceSamplingOperationRules == [b: "1"]
config.traceSamplingDefaultRate == 0.5
config.traceSamplingRateLimit == 200
config.traceSampleRate == 0.5
config.traceRateLimit == 200
}
def "specify overrides via system properties"() {
@ -232,8 +232,8 @@ class ConfigTest extends DDSpecification {
System.setProperty(PREFIX + HEALTH_METRICS_STATSD_PORT, "654")
System.setProperty(PREFIX + TRACE_SAMPLING_SERVICE_RULES, "a:1")
System.setProperty(PREFIX + TRACE_SAMPLING_OPERATION_RULES, "b:1")
System.setProperty(PREFIX + TRACE_SAMPLING_DEFAULT_RATE, ".5")
System.setProperty(PREFIX + TRACE_SAMPLING_RATE_LIMIT, "200")
System.setProperty(PREFIX + TRACE_SAMPLE_RATE, ".5")
System.setProperty(PREFIX + TRACE_RATE_LIMIT, "200")
when:
Config config = new Config()
@ -272,8 +272,8 @@ class ConfigTest extends DDSpecification {
config.healthMetricsStatsdPort == 654
config.traceSamplingServiceRules == [a: "1"]
config.traceSamplingOperationRules == [b: "1"]
config.traceSamplingDefaultRate == 0.5
config.traceSamplingRateLimit == 200
config.traceSampleRate == 0.5
config.traceRateLimit == 200
}
def "specify overrides via env vars"() {

6
dd-trace-ot/src/main/java/datadog/trace/common/sampling/Sampler.java
View File

@ -27,15 +27,15 @@ public interface Sampler {
if ((serviceRules != null && !serviceRules.isEmpty())
|| (operationRules != null && !operationRules.isEmpty())
|| config.getTraceSamplingDefaultRate() != null) {
|| config.getTraceSampleRate() != null) {
try {
sampler =
RuleBasedSampler.build(
serviceRules,
operationRules,
config.getTraceSamplingDefaultRate(),
config.getTraceSamplingRateLimit());
config.getTraceSampleRate(),
config.getTraceRateLimit());
} catch (final IllegalArgumentException e) {
log.error("Invalid sampler configuration. Using AllSampler", e);
sampler = new AllSampler();

14
dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RuleBasedSamplingTest.groovy
View File

@ -8,9 +8,9 @@ import datadog.trace.common.sampling.RuleBasedSampler
import datadog.trace.common.sampling.Sampler
import datadog.trace.util.test.DDSpecification
import static datadog.trace.api.Config.TRACE_SAMPLING_DEFAULT_RATE
import static datadog.trace.api.Config.TRACE_RATE_LIMIT
import static datadog.trace.api.Config.TRACE_SAMPLE_RATE
import static datadog.trace.api.Config.TRACE_SAMPLING_OPERATION_RULES
import static datadog.trace.api.Config.TRACE_SAMPLING_RATE_LIMIT
import static datadog.trace.api.Config.TRACE_SAMPLING_SERVICE_RULES
import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_DROP
import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP
@ -27,7 +27,7 @@ class RuleBasedSamplingTest extends DDSpecification {
def "Rule Based Sampler is not created when just rate limit set"() {
when:
Properties properties = new Properties()
properties.setProperty(TRACE_SAMPLING_RATE_LIMIT, "50")
properties.setProperty(TRACE_RATE_LIMIT, "50")
Sampler sampler = Sampler.Builder.forConfig(properties)
then:
@ -46,11 +46,11 @@ class RuleBasedSamplingTest extends DDSpecification {
}
if (defaultRate != null) {
properties.setProperty(TRACE_SAMPLING_DEFAULT_RATE, defaultRate)
properties.setProperty(TRACE_SAMPLE_RATE, defaultRate)
}
if (rateLimit != null) {
properties.setProperty(TRACE_SAMPLING_RATE_LIMIT, rateLimit)
properties.setProperty(TRACE_RATE_LIMIT, rateLimit)
}
when:
@ -139,7 +139,7 @@ class RuleBasedSamplingTest extends DDSpecification {
when:
Properties properties = new Properties()
properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:1")
properties.setProperty(TRACE_SAMPLING_RATE_LIMIT, "1")
properties.setProperty(TRACE_RATE_LIMIT, "1")
Sampler sampler = Sampler.Builder.forConfig(properties)
DDSpan span1 = SpanFactory.newSpanOf("service", "bar")
@ -165,7 +165,7 @@ class RuleBasedSamplingTest extends DDSpecification {
when:
Properties properties = new Properties()
properties.setProperty(TRACE_SAMPLING_SERVICE_RULES, "service:1,foo:1")
properties.setProperty(TRACE_SAMPLING_RATE_LIMIT, "1")
properties.setProperty(TRACE_RATE_LIMIT, "1")
Sampler sampler = Sampler.Builder.forConfig(properties)
DDSpan span1 = SpanFactory.newSpanOf("service", "bar")