Skip to content

Commit 9e12105

Browse files
satweensatween
committed
RUM-9899: getting rid from deprecated & unused code (PropagationStyle)
1 parent 8032aba commit 9e12105

File tree

4 files changed

+68
-114
lines changed

4 files changed

+68
-114
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,6 @@ public class com/datadog/trace/api/Config {
834834
public fun getPrimaryTag ()Ljava/lang/String;
835835
public fun getPrioritySamplingForce ()Ljava/lang/String;
836836
public fun getProcessId ()Ljava/lang/Long;
837-
public fun getPropagationStylesToExtract ()Ljava/util/Set;
838-
public fun getPropagationStylesToInject ()Ljava/util/Set;
839837
public fun getRequestHeaderTags ()Ljava/util/Map;
840838
public fun getResponseHeaderTags ()Ljava/util/Map;
841839
public fun getRootContextServiceName ()Ljava/lang/String;
@@ -1250,17 +1248,6 @@ public final class com/datadog/trace/api/Platform$GC : java/lang/Enum {
12501248
public static fun values ()[Lcom/datadog/trace/api/Platform$GC;
12511249
}
12521250

1253-
public final class com/datadog/trace/api/PropagationStyle : java/lang/Enum {
1254-
public static final field B3 Lcom/datadog/trace/api/PropagationStyle;
1255-
public static final field DATADOG Lcom/datadog/trace/api/PropagationStyle;
1256-
public static final field HAYSTACK Lcom/datadog/trace/api/PropagationStyle;
1257-
public static final field XRAY Lcom/datadog/trace/api/PropagationStyle;
1258-
public fun getNewStyles ()Ljava/util/List;
1259-
public static fun valueOf (Ljava/lang/String;)Lcom/datadog/trace/api/PropagationStyle;
1260-
public static fun valueOfConfigName (Ljava/lang/String;)Lcom/datadog/trace/api/PropagationStyle;
1261-
public static fun values ()[Lcom/datadog/trace/api/PropagationStyle;
1262-
}
1263-
12641251
public abstract class com/datadog/trace/api/ResolverCacheConfig : java/lang/Enum {
12651252
public static final field LARGE Lcom/datadog/trace/api/ResolverCacheConfig;
12661253
public static final field LEGACY Lcom/datadog/trace/api/ResolverCacheConfig;

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

Lines changed: 67 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
11
package com.datadog.trace.api;
22

3-
import static com.datadog.trace.api.ConfigDefaults.*;
3+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_AGENT_HOST;
4+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_AGENT_TIMEOUT;
5+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_AGENT_WRITER_TYPE;
6+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_CLIENT_IP_ENABLED;
7+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_CLOCK_SYNC_PERIOD;
8+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_DATA_STREAMS_BUCKET_DURATION;
9+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_DATA_STREAMS_ENABLED;
10+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_DB_CLIENT_HOST_SPLIT_BY_HOST;
11+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE;
12+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX;
13+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_DB_DBM_PROPAGATION_MODE_MODE;
14+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_DOGSTATSD_START_DELAY;
15+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_ELASTICSEARCH_BODY_AND_PARAMS_ENABLED;
16+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_ELASTICSEARCH_BODY_ENABLED;
17+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_ELASTICSEARCH_PARAMS_ENABLED;
18+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_GRPC_CLIENT_ERROR_STATUSES;
19+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_GRPC_SERVER_ERROR_STATUSES;
20+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_HEALTH_METRICS_ENABLED;
21+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_HTTP_CLIENT_ERROR_STATUSES;
22+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN;
23+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING;
24+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_HTTP_SERVER_ERROR_STATUSES;
25+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_HTTP_SERVER_ROUTE_BASED_NAMING;
26+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_HTTP_SERVER_TAG_QUERY_STRING;
27+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_JAX_RS_EXCEPTION_AS_ERROR_ENABLED;
28+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_LOGS_INJECTION_ENABLED;
29+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_PARTIAL_FLUSH_MIN_SPANS;
30+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_PERF_METRICS_ENABLED;
31+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_PRIORITY_SAMPLING_ENABLED;
32+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_PRIORITY_SAMPLING_FORCE;
33+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED;
34+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_ENABLED;
35+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED;
36+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_MAX_PAYLOAD_SIZE;
37+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_POLL_INTERVAL_SECONDS;
38+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_TARGETS_KEY;
39+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_REMOTE_CONFIG_TARGETS_KEY_ID;
40+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_SCOPE_DEPTH_LIMIT;
41+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_SCOPE_ITERATION_KEEP_ALIVE;
42+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_SECURE_RANDOM;
43+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_SERVICE_NAME;
44+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME;
45+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_SITE;
46+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_SPARK_TASK_HISTOGRAM_ENABLED;
47+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_STARTUP_LOGS_ENABLED;
48+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_DEBUG_REQUESTS_ENABLED;
49+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED;
50+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL;
51+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL;
52+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED;
53+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TELEMETRY_METRICS_INTERVAL;
54+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED;
55+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_PORT;
56+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_V05_ENABLED;
57+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_ANALYTICS_ENABLED;
58+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_FLUSH_INTERVAL;
59+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_HTTP_RESOURCE_REMOVE_TRAILING_SLASH;
60+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_LONG_RUNNING_ENABLED;
61+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL;
62+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_PROPAGATION_EXTRACT_FIRST;
63+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_PROPAGATION_STYLE;
64+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RATE_LIMIT;
65+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_REPORT_HOSTNAME;
66+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RESOLVER_ENABLED;
67+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH;
68+
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_WRITER_BAGGAGE_INJECT;
469
import static com.datadog.trace.api.DDTags.INTERNAL_HOST_NAME;
570
import static com.datadog.trace.api.DDTags.LANGUAGE_TAG_KEY;
671
import static com.datadog.trace.api.DDTags.LANGUAGE_TAG_VALUE;
@@ -135,7 +200,6 @@
135200
import static com.datadog.trace.api.config.TracerConfig.AGENT_NAMED_PIPE;
136201
import static com.datadog.trace.api.config.TracerConfig.AGENT_PORT_LEGACY;
137202
import static com.datadog.trace.api.config.TracerConfig.AGENT_TIMEOUT;
138-
import static com.datadog.trace.api.config.TracerConfig.AGENT_UNIX_DOMAIN_SOCKET;
139203
import static com.datadog.trace.api.config.TracerConfig.BAGGAGE_MAPPING;
140204
import static com.datadog.trace.api.config.TracerConfig.CLIENT_IP_ENABLED;
141205
import static com.datadog.trace.api.config.TracerConfig.CLOCK_SYNC_PERIOD;
@@ -149,8 +213,6 @@
149213
import static com.datadog.trace.api.config.TracerConfig.PRIORITY_SAMPLING;
150214
import static com.datadog.trace.api.config.TracerConfig.PRIORITY_SAMPLING_FORCE;
151215
import static com.datadog.trace.api.config.TracerConfig.PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED;
152-
import static com.datadog.trace.api.config.TracerConfig.PROPAGATION_STYLE_EXTRACT;
153-
import static com.datadog.trace.api.config.TracerConfig.PROPAGATION_STYLE_INJECT;
154216
import static com.datadog.trace.api.config.TracerConfig.PROXY_NO_PROXY;
155217
import static com.datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS;
156218
import static com.datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS_COMMA_ALLOWED;
@@ -201,6 +263,7 @@
201263

202264
import androidx.annotation.NonNull;
203265

266+
import com.datadog.android.trace.internal.compat.function.Function;
204267
import com.datadog.trace.api.config.GeneralConfig;
205268
import com.datadog.trace.api.config.ProfilingConfig;
206269
import com.datadog.trace.api.config.TracerConfig;
@@ -229,7 +292,6 @@
229292
import java.util.Set;
230293
import java.util.SortedSet;
231294
import java.util.UUID;
232-
import com.datadog.android.trace.internal.compat.function.Function;
233295
import java.util.regex.Matcher;
234296
import java.util.regex.Pattern;
235297

@@ -339,8 +401,6 @@ static class HostNameHolder {
339401
private final int partialFlushMinSpans;
340402
private final boolean traceStrictWritesEnabled;
341403
private final boolean logExtractHeaderNames;
342-
private final Set<PropagationStyle> propagationStylesToExtract;
343-
private final Set<PropagationStyle> propagationStylesToInject;
344404
private final boolean tracePropagationStyleB3PaddingEnabled;
345405
private final Set<TracePropagationStyle> tracePropagationStylesToExtract;
346406
private final Set<TracePropagationStyle> tracePropagationStylesToInject;
@@ -787,19 +847,6 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
787847
tracePropagationStyleB3PaddingEnabled =
788848
isEnabled(true, TRACE_PROPAGATION_STYLE, ".b3.padding.enabled");
789849
{
790-
// The dd.propagation.style.(extract|inject) settings have been deprecated in
791-
// favor of dd.trace.propagation.style(|.extract|.inject) settings.
792-
// The different propagation settings when set will be applied in the following order of
793-
// precedence, and warnings will be logged for both deprecation and overrides.
794-
// * dd.trace.propagation.style.(extract|inject)
795-
// * dd.trace.propagation.style
796-
// * dd.propagation.style.(extract|inject)
797-
Set<PropagationStyle> deprecatedExtract =
798-
getSettingsSetFromEnvironment(
799-
PROPAGATION_STYLE_EXTRACT, PropagationStyle::valueOfConfigName, true);
800-
Set<PropagationStyle> deprecatedInject =
801-
getSettingsSetFromEnvironment(
802-
PROPAGATION_STYLE_INJECT, PropagationStyle::valueOfConfigName, true);
803850
Set<TracePropagationStyle> common =
804851
getSettingsSetFromEnvironment(
805852
TRACE_PROPAGATION_STYLE, TracePropagationStyle::valueOfDisplayName, false);
@@ -823,49 +870,15 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
823870
// Check if we should use the common setting for injection
824871
if (inject.isEmpty()) {
825872
inject = common;
826-
injectOrigin = TRACE_PROPAGATION_STYLE;
827873
} else if (!common.isEmpty()) {
828874
// The more specific settings will override the common setting, so log a warning
829875
logOverriddenSettingWarning(
830876
TRACE_PROPAGATION_STYLE, TRACE_PROPAGATION_STYLE_INJECT, inject);
831877
}
832-
// Check if we should use the deprecated setting for extraction
833-
if (extract.isEmpty()) {
834-
// If we don't have a new setting, we convert the deprecated one
835-
extract = convertSettingsSet(deprecatedExtract, PropagationStyle::getNewStyles);
836-
if (!extract.isEmpty()) {
837-
logDeprecatedConvertedSetting(
838-
PROPAGATION_STYLE_EXTRACT,
839-
deprecatedExtract,
840-
TRACE_PROPAGATION_STYLE_EXTRACT,
841-
extract);
842-
}
843-
} else if (!deprecatedExtract.isEmpty()) {
844-
// If we have a new setting, we log a warning
845-
logOverriddenDeprecatedSettingWarning(PROPAGATION_STYLE_EXTRACT, extractOrigin, extract);
846-
}
847-
// Check if we should use the deprecated setting for injection
848-
if (inject.isEmpty()) {
849-
// If we don't have a new setting, we convert the deprecated one
850-
inject = convertSettingsSet(deprecatedInject, PropagationStyle::getNewStyles);
851-
if (!inject.isEmpty()) {
852-
logDeprecatedConvertedSetting(
853-
PROPAGATION_STYLE_INJECT, deprecatedInject, TRACE_PROPAGATION_STYLE_INJECT, inject);
854-
}
855-
} else if (!deprecatedInject.isEmpty()) {
856-
// If we have a new setting, we log a warning
857-
logOverriddenDeprecatedSettingWarning(PROPAGATION_STYLE_INJECT, injectOrigin, inject);
858-
}
859878
// Now we can check if we should pick the default injection/extraction
860879
tracePropagationStylesToExtract =
861880
extract.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : extract;
862881
tracePropagationStylesToInject = inject.isEmpty() ? DEFAULT_TRACE_PROPAGATION_STYLE : inject;
863-
// These setting are here for backwards compatibility until they can be removed in a major
864-
// release of the tracer
865-
propagationStylesToExtract =
866-
deprecatedExtract.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedExtract;
867-
propagationStylesToInject =
868-
deprecatedInject.isEmpty() ? DEFAULT_PROPAGATION_STYLE : deprecatedInject;
869882
}
870883

871884
tracePropagationExtractFirst =
@@ -1345,16 +1358,6 @@ public boolean isLogExtractHeaderNames() {
13451358
return logExtractHeaderNames;
13461359
}
13471360

1348-
@Deprecated
1349-
public Set<PropagationStyle> getPropagationStylesToExtract() {
1350-
return propagationStylesToExtract;
1351-
}
1352-
1353-
@Deprecated
1354-
public Set<PropagationStyle> getPropagationStylesToInject() {
1355-
return propagationStylesToInject;
1356-
}
1357-
13581361
public boolean isTracePropagationStyleB3PaddingEnabled() {
13591362
return tracePropagationStyleB3PaddingEnabled;
13601363
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.util.BitSet;
88
import java.util.HashSet;
99
import java.util.LinkedHashSet;
10-
import java.util.List;
1110
import java.util.Set;
1211

1312
public final class ConfigDefaults {
@@ -67,10 +66,7 @@ public final class ConfigDefaults {
6766
static final int DEFAULT_SCOPE_ITERATION_KEEP_ALIVE = 30; // in seconds
6867
static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000;
6968
static final boolean DEFAULT_PROPAGATION_EXTRACT_LOG_HEADER_NAMES_ENABLED = false;
70-
static final Set<TracePropagationStyle> DEFAULT_TRACE_PROPAGATION_STYLE =
71-
new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT));
72-
static final Set<PropagationStyle> DEFAULT_PROPAGATION_STYLE =
73-
new LinkedHashSet<>(asList(PropagationStyle.DATADOG));
69+
static final Set<TracePropagationStyle> DEFAULT_TRACE_PROPAGATION_STYLE = new LinkedHashSet<>(asList(DATADOG, TRACECONTEXT));
7470
static final boolean DEFAULT_JMX_FETCH_ENABLED = true;
7571
static final boolean DEFAULT_TRACE_AGENT_V05_ENABLED = false;
7672

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)