Skip to content

Commit 65645ba

Browse files
committed
revert error changes to ConfigSetting; do this in separate PR
1 parent 92c787b commit 65645ba

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

internal-api/src/main/java/datadog/trace/api/ConfigSetting.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public final class ConfigSetting {
1212
public final Object value;
1313
public final ConfigOrigin origin;
1414
public final int seqId;
15-
public final boolean error;
1615

1716
public static final int DEFAULT_SEQ_ID = 1;
1817
private static final int ABSENT_SEQ_ID = 0;
@@ -22,24 +21,17 @@ public final class ConfigSetting {
2221
Arrays.asList("DD_API_KEY", "dd.api-key", "dd.profiling.api-key", "dd.profiling.apikey"));
2322

2423
public static ConfigSetting of(String key, Object value, ConfigOrigin origin) {
25-
return new ConfigSetting(key, value, origin, ABSENT_SEQ_ID, false);
24+
return new ConfigSetting(key, value, origin, ABSENT_SEQ_ID);
2625
}
2726

2827
public static ConfigSetting of(String key, Object value, ConfigOrigin origin, int seqId) {
29-
return new ConfigSetting(key, value, origin, seqId, false);
28+
return new ConfigSetting(key, value, origin, seqId);
3029
}
3130

32-
public static ConfigSetting of(
33-
String key, Object value, ConfigOrigin origin, int seqId, boolean error) {
34-
return new ConfigSetting(key, value, origin, seqId, error);
35-
}
36-
37-
private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId, boolean error) {
31+
private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId) {
3832
this.key = key;
3933
this.value = CONFIG_FILTER_LIST.contains(key) ? "<hidden>" : value;
4034
this.origin = origin;
41-
this.seqId = seqId;
42-
this.error = error;
4335
}
4436

4537
public String normalizedKey() {
@@ -118,8 +110,7 @@ public boolean equals(Object o) {
118110
return key.equals(that.key)
119111
&& Objects.equals(value, that.value)
120112
&& origin == that.origin
121-
&& seqId == that.seqId
122-
&& error == that.error;
113+
&& seqId == that.seqId;
123114
}
124115

125116
@Override
@@ -140,6 +131,5 @@ public String toString() {
140131
+ ", seqId="
141132
+ seqId
142133
+ '}';
143-
// whether to write errors
144134
}
145135
}

0 commit comments

Comments
 (0)