diff --git a/CHANGELOG.md b/CHANGELOG.md index ff6012d1a68..5fba9bd7b53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # Changelog ## Upcoming Breaking Changes -- The `--Xmetrics-block-timing-tracking-enabled` option has been renamed to `--metrics-block-timing-tracking-enabled` and enabled by default. The `--X` version will be removed in a future release. - The `/eth/v1/debug/beacon/states/:state_id` endpoint has been deprecated in favor of the v2 Altair endpoint `/eth/v2/debug/beacon/states/:state_id` - The `/eth/v1/beacon/blocks/:block_id` endpoint has been deprecated in favor of the v2 Altair endpoint `/eth/v2/beacon/blocks/:block_id` - The `/eth/v1/validator/blocks/:slot` endpoint has been deprecated in favor of the v2 Altair endpoint `/eth/v2/validator/blocks/:slot` @@ -16,6 +15,7 @@ For information on changes in released versions of Teku, see the [releases page] ### Breaking Changes - Removed references to beacon block methods `/eth2/beacon_chain/req/beacon_blocks_by_root` and `/eth2/beacon_chain/req/beacon_blocks_by_range`. +- `--Xmetrics-block-timing-tracking-enabled` option has been removed. The `--metrics-block-timing-tracking-enabled` option should be used instead (enabled by default). ### Additions and Improvements - Introduced [Doppelganger Detection feature](https://docs.teku.consensys.net/en/latest/HowTo/Doppelganger-Detection/) diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/MetricsOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/MetricsOptions.java index 376e58587cb..374ae4a0dfb 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/MetricsOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/MetricsOptions.java @@ -90,10 +90,7 @@ public class MetricsOptions { private int metricsPublicationInterval = MetricsConfig.DEFAULT_METRICS_PUBLICATION_INTERVAL; @Option( - names = { - "--metrics-block-timing-tracking-enabled", - "--Xmetrics-block-timing-tracking-enabled" - }, + names = {"--metrics-block-timing-tracking-enabled"}, showDefaultValue = Visibility.ALWAYS, paramLabel = "", description = "Whether block timing metrics are tracked and reported", diff --git a/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java b/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java index fd3ee7db40e..40cda994589 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java @@ -148,9 +148,6 @@ void helpShouldNotShowUnsupportedOptions() { beaconNodeCommand.parse(args); String str = getCommandLineOutput(); - // --Xmetrics-block-timing-tracking-enabled is being supported as an alias for the supported - // version because of the significant number of people using it - str = str.replace("--Xmetrics-block-timing-tracking-enabled", ""); assertThat(str).doesNotContain("--X"); }