Skip to content

Commit 2becb68

Browse files
authored
Bump deprecated tracing.apm settings to critical to be shown in the Upgrade assistent (#119677) (#119731)
1 parent b78cfd8 commit 2becb68

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMAgentSettings.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Set;
2828
import java.util.function.Function;
2929

30-
import static org.elasticsearch.common.settings.Setting.Property.DeprecatedWarning;
30+
import static org.elasticsearch.common.settings.Setting.Property.Deprecated;
3131
import static org.elasticsearch.common.settings.Setting.Property.NodeScope;
3232
import static org.elasticsearch.common.settings.Setting.Property.OperatorDynamic;
3333

@@ -250,7 +250,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
250250
TELEMETRY_SETTING_PREFIX + "agent.",
251251
LEGACY_TRACING_APM_SETTING_PREFIX + "agent.",
252252
(namespace, qualifiedKey) -> qualifiedKey.startsWith(LEGACY_TRACING_APM_SETTING_PREFIX)
253-
? concreteAgentSetting(namespace, qualifiedKey, NodeScope, OperatorDynamic, DeprecatedWarning)
253+
? concreteAgentSetting(namespace, qualifiedKey, NodeScope, OperatorDynamic, Deprecated)
254254
: concreteAgentSetting(namespace, qualifiedKey, NodeScope, OperatorDynamic)
255255
);
256256

@@ -262,7 +262,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
262262
LEGACY_TRACING_APM_SETTING_PREFIX + "names.include",
263263
OperatorDynamic,
264264
NodeScope,
265-
DeprecatedWarning
265+
Deprecated
266266
);
267267

268268
public static final Setting<List<String>> TELEMETRY_TRACING_NAMES_INCLUDE_SETTING = Setting.listSetting(
@@ -281,7 +281,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
281281
LEGACY_TRACING_APM_SETTING_PREFIX + "names.exclude",
282282
OperatorDynamic,
283283
NodeScope,
284-
DeprecatedWarning
284+
Deprecated
285285
);
286286

287287
public static final Setting<List<String>> TELEMETRY_TRACING_NAMES_EXCLUDE_SETTING = Setting.listSetting(
@@ -314,7 +314,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
314314
),
315315
OperatorDynamic,
316316
NodeScope,
317-
DeprecatedWarning
317+
Deprecated
318318
);
319319

320320
public static final Setting<List<String>> TELEMETRY_TRACING_SANITIZE_FIELD_NAMES = Setting.listSetting(
@@ -334,7 +334,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
334334
false,
335335
OperatorDynamic,
336336
NodeScope,
337-
DeprecatedWarning
337+
Deprecated
338338
);
339339

340340
public static final Setting<Boolean> TELEMETRY_TRACING_ENABLED_SETTING = Setting.boolSetting(
@@ -358,7 +358,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
358358
public static final Setting<SecureString> TRACING_APM_SECRET_TOKEN_SETTING = SecureSetting.secureString(
359359
LEGACY_TRACING_APM_SETTING_PREFIX + "secret_token",
360360
null,
361-
DeprecatedWarning
361+
Deprecated
362362
);
363363

364364
public static final Setting<SecureString> TELEMETRY_SECRET_TOKEN_SETTING = SecureSetting.secureString(
@@ -373,7 +373,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
373373
public static final Setting<SecureString> TRACING_APM_API_KEY_SETTING = SecureSetting.secureString(
374374
LEGACY_TRACING_APM_SETTING_PREFIX + "api_key",
375375
null,
376-
DeprecatedWarning
376+
Deprecated
377377
);
378378

379379
public static final Setting<SecureString> TELEMETRY_API_KEY_SETTING = SecureSetting.secureString(

0 commit comments

Comments
 (0)