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

Make internal name usage consistent with setting name.

This commit is contained in:
Tyler Benson 2019-02-08 10:26:40 -08:00
parent 625b1334f5
commit 2283040a5b
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class Config {
private static final boolean DEFAULT_PRIORITY_SAMPLING_ENABLED = true; private static final boolean DEFAULT_PRIORITY_SAMPLING_ENABLED = true;
private static final boolean DEFAULT_TRACE_RESOLVER_ENABLED = true; private static final boolean DEFAULT_TRACE_RESOLVER_ENABLED = true;
private static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false; private static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false;
private static final int DEFAULT_MAX_TRACE_SIZE_BEFORE_PARTIAL_FLUSH = 0; private static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 0;
private static final boolean DEFAULT_JMX_FETCH_ENABLED = false; private static final boolean DEFAULT_JMX_FETCH_ENABLED = false;
public static final int DEFAULT_JMX_FETCH_STATSD_PORT = 8125; public static final int DEFAULT_JMX_FETCH_STATSD_PORT = 8125;
@ -143,8 +143,7 @@ public class Config {
HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN); HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN);
partialFlushMinSpans = partialFlushMinSpans =
getIntegerSettingFromEnvironment( getIntegerSettingFromEnvironment(PARTIAL_FLUSH_MIN_SPANS, DEFAULT_PARTIAL_FLUSH_MIN_SPANS);
PARTIAL_FLUSH_MIN_SPANS, DEFAULT_MAX_TRACE_SIZE_BEFORE_PARTIAL_FLUSH);
runtimeContextFieldInjection = runtimeContextFieldInjection =
getBooleanSettingFromEnvironment( getBooleanSettingFromEnvironment(

15
dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
View File

@ -64,7 +64,7 @@ public class DDTracer implements io.opentracing.Tracer, Closeable, datadog.trace
private final Map<String, String> serviceNameMappings; private final Map<String, String> serviceNameMappings;
/** number of spans in a pending trace before they get flushed */ /** number of spans in a pending trace before they get flushed */
@Getter private final int maxTraceSizeBeforePartialFlush; @Getter private final int partialFlushMinSpans;
/** /**
* JVM shutdown callback, keeping a reference to it to remove this if DDTracer gets destroyed * JVM shutdown callback, keeping a reference to it to remove this if DDTracer gets destroyed
@ -178,7 +178,7 @@ public class DDTracer implements io.opentracing.Tracer, Closeable, datadog.trace
defaultSpanTags, defaultSpanTags,
serviceNameMappings, serviceNameMappings,
taggedHeaders, taggedHeaders,
defaultMaxTraceSizeBeforePartialFlush()); Config.get().getPartialFlushMinSpans());
} }
/** /**
@ -201,7 +201,7 @@ public class DDTracer implements io.opentracing.Tracer, Closeable, datadog.trace
defaultSpanTags, defaultSpanTags,
serviceNameMappings, serviceNameMappings,
taggedHeaders, taggedHeaders,
defaultMaxTraceSizeBeforePartialFlush()); Config.get().getPartialFlushMinSpans());
} }
public DDTracer( public DDTracer(
@ -212,7 +212,7 @@ public class DDTracer implements io.opentracing.Tracer, Closeable, datadog.trace
final Map<String, String> defaultSpanTags, final Map<String, String> defaultSpanTags,
final Map<String, String> serviceNameMappings, final Map<String, String> serviceNameMappings,
final Map<String, String> taggedHeaders, final Map<String, String> taggedHeaders,
final int maxTraceSizeBeforePartialFlush) { final int partialFlushMinSpans) {
assert runtimeTags != null; assert runtimeTags != null;
assert defaultSpanTags != null; assert defaultSpanTags != null;
assert serviceNameMappings != null; assert serviceNameMappings != null;
@ -225,7 +225,7 @@ public class DDTracer implements io.opentracing.Tracer, Closeable, datadog.trace
this.defaultSpanTags = defaultSpanTags; this.defaultSpanTags = defaultSpanTags;
this.runtimeTags = runtimeTags; this.runtimeTags = runtimeTags;
this.serviceNameMappings = serviceNameMappings; this.serviceNameMappings = serviceNameMappings;
this.maxTraceSizeBeforePartialFlush = maxTraceSizeBeforePartialFlush; this.partialFlushMinSpans = partialFlushMinSpans;
shutdownCallback = shutdownCallback =
new Thread() { new Thread() {
@ -446,11 +446,6 @@ public class DDTracer implements io.opentracing.Tracer, Closeable, datadog.trace
return Collections.unmodifiableMap(runtimeTags); return Collections.unmodifiableMap(runtimeTags);
} }
@Deprecated
private static int defaultMaxTraceSizeBeforePartialFlush() {
return Config.get().getPartialFlushMinSpans();
}
/** Spans are built using this builder */ /** Spans are built using this builder */
public class DDSpanBuilder implements SpanBuilder { public class DDSpanBuilder implements SpanBuilder {
private final ScopeManager scopeManager; private final ScopeManager scopeManager;

5
dd-trace-ot/src/main/java/datadog/opentracing/PendingTrace.java
View File

@ -199,10 +199,9 @@ public class PendingTrace extends ConcurrentLinkedDeque<DDSpan> {
if (count == 0) { if (count == 0) {
write(); write();
} else { } else {
if (tracer.getMaxTraceSizeBeforePartialFlush() > 0 if (tracer.getPartialFlushMinSpans() > 0 && size() > tracer.getPartialFlushMinSpans()) {
&& size() > tracer.getMaxTraceSizeBeforePartialFlush()) {
synchronized (this) { synchronized (this) {
if (size() > tracer.getMaxTraceSizeBeforePartialFlush()) { if (size() > tracer.getPartialFlushMinSpans()) {
final DDSpan rootSpan = getRootSpan(); final DDSpan rootSpan = getRootSpan();
final List<DDSpan> partialTrace = new ArrayList(size()); final List<DDSpan> partialTrace = new ArrayList(size());
final Iterator<DDSpan> it = iterator(); final Iterator<DDSpan> it = iterator();