Skip to content

[8.x] Bump deprecated tracing.apm settings to critical to be shown in the Upgrade assistent (#119677) #119731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elasticsearchmachine merged 1 commit into from
Jan 8, 2025
Merged

[8.x] Bump deprecated tracing.apm settings to critical to be shown in the Upgrade assistent (#119677) #119731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMAgentSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.Set;
import java.util.function.Function;

import static org.elasticsearch.common.settings.Setting.Property.DeprecatedWarning;
import static org.elasticsearch.common.settings.Setting.Property.Deprecated;
import static org.elasticsearch.common.settings.Setting.Property.NodeScope;
import static org.elasticsearch.common.settings.Setting.Property.OperatorDynamic;

Expand Down Expand Up @@ -250,7 +250,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
TELEMETRY_SETTING_PREFIX + "agent.",
LEGACY_TRACING_APM_SETTING_PREFIX + "agent.",
(namespace, qualifiedKey) -> qualifiedKey.startsWith(LEGACY_TRACING_APM_SETTING_PREFIX)
? concreteAgentSetting(namespace, qualifiedKey, NodeScope, OperatorDynamic, DeprecatedWarning)
? concreteAgentSetting(namespace, qualifiedKey, NodeScope, OperatorDynamic, Deprecated)
: concreteAgentSetting(namespace, qualifiedKey, NodeScope, OperatorDynamic)
);

Expand All @@ -262,7 +262,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
LEGACY_TRACING_APM_SETTING_PREFIX + "names.include",
OperatorDynamic,
NodeScope,
DeprecatedWarning
Deprecated
);

public static final Setting<List<String>> TELEMETRY_TRACING_NAMES_INCLUDE_SETTING = Setting.listSetting(
Expand All @@ -281,7 +281,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
LEGACY_TRACING_APM_SETTING_PREFIX + "names.exclude",
OperatorDynamic,
NodeScope,
DeprecatedWarning
Deprecated
);

public static final Setting<List<String>> TELEMETRY_TRACING_NAMES_EXCLUDE_SETTING = Setting.listSetting(
Expand Down Expand Up @@ -314,7 +314,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
),
OperatorDynamic,
NodeScope,
DeprecatedWarning
Deprecated
);

public static final Setting<List<String>> TELEMETRY_TRACING_SANITIZE_FIELD_NAMES = Setting.listSetting(
Expand All @@ -334,7 +334,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
false,
OperatorDynamic,
NodeScope,
DeprecatedWarning
Deprecated
);

public static final Setting<Boolean> TELEMETRY_TRACING_ENABLED_SETTING = Setting.boolSetting(
Expand All @@ -358,7 +358,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
public static final Setting<SecureString> TRACING_APM_SECRET_TOKEN_SETTING = SecureSetting.secureString(
LEGACY_TRACING_APM_SETTING_PREFIX + "secret_token",
null,
DeprecatedWarning
Deprecated
);

public static final Setting<SecureString> TELEMETRY_SECRET_TOKEN_SETTING = SecureSetting.secureString(
Expand All @@ -373,7 +373,7 @@ private static Setting<String> concreteAgentSetting(String namespace, String qua
public static final Setting<SecureString> TRACING_APM_API_KEY_SETTING = SecureSetting.secureString(
LEGACY_TRACING_APM_SETTING_PREFIX + "api_key",
null,
DeprecatedWarning
Deprecated
);

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