diff --git a/deps/rabbit/docs/rabbitmqctl.8 b/deps/rabbit/docs/rabbitmqctl.8 index 6063df03b142..4265ce6f21d9 100644 --- a/deps/rabbit/docs/rabbitmqctl.8 +++ b/deps/rabbit/docs/rabbitmqctl.8 @@ -2086,7 +2086,7 @@ Enables a feature flag on the target node. .Pp Example: .Sp -.Dl rabbitmqctl enable_feature_flag stream_queue +.Dl rabbitmqctl enable_feature_flag restart_streams .Pp You can also enable all feature flags by specifying "all": .Sp diff --git a/deps/rabbit/src/rabbit_amqqueue.erl b/deps/rabbit/src/rabbit_amqqueue.erl index d3a3e59000a8..24cafadffe5a 100644 --- a/deps/rabbit/src/rabbit_amqqueue.erl +++ b/deps/rabbit/src/rabbit_amqqueue.erl @@ -217,24 +217,16 @@ declare(QueueName = #resource{virtual_host = VHost}, Durable, AutoDelete, Args, Owner, ActingUser, Node) -> ok = check_declare_arguments(QueueName, Args), Type = get_queue_type(Args), - case rabbit_queue_type:is_enabled(Type) of - true -> - Q = amqqueue:new(QueueName, - none, - Durable, - AutoDelete, - Owner, - Args, - VHost, - #{user => ActingUser}, - Type), - rabbit_queue_type:declare(Q, Node); - false -> - {protocol_error, internal_error, - "Cannot declare a queue '~ts' of type '~ts' on node '~ts': " - "the corresponding feature flag is disabled", - [rabbit_misc:rs(QueueName), Type, Node]} - end. + Q = amqqueue:new(QueueName, + none, + Durable, + AutoDelete, + Owner, + Args, + VHost, + #{user => ActingUser}, + Type), + rabbit_queue_type:declare(Q, Node). get_queue_type(Args) -> case rabbit_misc:table_lookup(Args, <<"x-queue-type">>) of diff --git a/deps/rabbit/src/rabbit_classic_queue.erl b/deps/rabbit/src/rabbit_classic_queue.erl index 123f18749f4e..f90ff9d4a596 100644 --- a/deps/rabbit/src/rabbit_classic_queue.erl +++ b/deps/rabbit/src/rabbit_classic_queue.erl @@ -23,7 +23,6 @@ -export_type([state/0]). -export([ - is_enabled/0, is_compatible/3, declare/2, delete/4, @@ -59,8 +58,6 @@ send_drained/3, send_credit_reply/3]). -is_enabled() -> true. - -spec is_compatible(boolean(), boolean(), boolean()) -> boolean(). is_compatible(_, _, _) -> true. diff --git a/deps/rabbit/src/rabbit_core_ff.erl b/deps/rabbit/src/rabbit_core_ff.erl index 8cd06f24b5bb..dfd256aa6364 100644 --- a/deps/rabbit/src/rabbit_core_ff.erl +++ b/deps/rabbit/src/rabbit_core_ff.erl @@ -25,7 +25,6 @@ {stream_queue, #{desc => "Support queues of type `stream`", doc_url => "https://www.rabbitmq.com/stream.html", - %%TODO remove compatibility code stability => required, depends_on => [quorum_queue] }}). diff --git a/deps/rabbit/src/rabbit_queue_type.erl b/deps/rabbit/src/rabbit_queue_type.erl index 51ee4d74dbcc..118b9381cdec 100644 --- a/deps/rabbit/src/rabbit_queue_type.erl +++ b/deps/rabbit/src/rabbit_queue_type.erl @@ -15,7 +15,6 @@ discover/1, feature_flag_name/1, default/0, - is_enabled/1, is_compatible/4, declare/2, delete/4, @@ -116,8 +115,6 @@ actions/0, settle_op/0]). --callback is_enabled() -> boolean(). - -callback is_compatible(Durable :: boolean(), Exclusive :: boolean(), AutoDelete :: boolean()) -> @@ -237,17 +234,12 @@ feature_flag_name(_) -> default() -> rabbit_classic_queue. -%% is a specific queue type implementation enabled --spec is_enabled(module()) -> boolean(). -is_enabled(Type) -> - Type:is_enabled(). - -spec is_compatible(module(), boolean(), boolean(), boolean()) -> boolean(). is_compatible(Type, Durable, Exclusive, AutoDelete) -> Type:is_compatible(Durable, Exclusive, AutoDelete). --spec declare(amqqueue:amqqueue(), node()) -> +-spec declare(amqqueue:amqqueue(), node() | {'ignore_location', node()}) -> {'new' | 'existing' | 'owner_died', amqqueue:amqqueue()} | {'absent', amqqueue:amqqueue(), rabbit_amqqueue:absent_reason()} | {protocol_error, Type :: atom(), Reason :: string(), Args :: term()} | diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl index 727010b49a75..a150fc2249fc 100644 --- a/deps/rabbit/src/rabbit_quorum_queue.erl +++ b/deps/rabbit/src/rabbit_quorum_queue.erl @@ -61,8 +61,7 @@ notify_decorators/3, spawn_notify_decorators/3]). --export([is_enabled/0, - is_compatible/3, +-export([is_compatible/3, declare/2, is_stateful/0]). @@ -113,10 +112,6 @@ %%----------- rabbit_queue_type --------------------------------------------- --spec is_enabled() -> boolean(). -is_enabled() -> - true. - -spec is_compatible(boolean(), boolean(), boolean()) -> boolean(). is_compatible(_Durable = true, _Exclusive = false, diff --git a/deps/rabbit/src/rabbit_stream_queue.erl b/deps/rabbit/src/rabbit_stream_queue.erl index 846cccd7855a..136b042ddd64 100644 --- a/deps/rabbit/src/rabbit_stream_queue.erl +++ b/deps/rabbit/src/rabbit_stream_queue.erl @@ -9,8 +9,7 @@ -behaviour(rabbit_queue_type). --export([is_enabled/0, - is_compatible/3, +-export([is_compatible/3, declare/2, delete/4, purge/1, @@ -90,10 +89,6 @@ -type client() :: #stream_client{}. --spec is_enabled() -> boolean(). -is_enabled() -> - rabbit_feature_flags:is_enabled(stream_queue). - -spec is_compatible(boolean(), boolean(), boolean()) -> boolean(). is_compatible(_Durable = true, _Exclusive = false, diff --git a/deps/rabbit/test/dead_lettering_SUITE.erl b/deps/rabbit/test/dead_lettering_SUITE.erl index 69d0a487d98a..533ca6780c00 100644 --- a/deps/rabbit/test/dead_lettering_SUITE.erl +++ b/deps/rabbit/test/dead_lettering_SUITE.erl @@ -141,13 +141,7 @@ init_per_group(at_least_once, Config) -> 1, QueueArgs1, {<<"x-overflow">>, longstr, <<"reject-publish">>}), - Config1 = rabbit_ct_helpers:set_config(Config, {queue_args, QueueArgs}), - case rabbit_ct_broker_helpers:enable_feature_flag(Config1, stream_queue) of - ok -> - Config1; - Skip -> - Skip - end; + rabbit_ct_helpers:set_config(Config, {queue_args, QueueArgs}); _ -> Config end; diff --git a/deps/rabbit/test/queue_parallel_SUITE.erl b/deps/rabbit/test/queue_parallel_SUITE.erl index 4e47d763c6e6..0ce25e5b18c5 100644 --- a/deps/rabbit/test/queue_parallel_SUITE.erl +++ b/deps/rabbit/test/queue_parallel_SUITE.erl @@ -119,16 +119,11 @@ init_per_group(mirrored_queue, Config) -> {queue_durable, true}]), rabbit_ct_helpers:run_steps(Config1, []); init_per_group(stream_queue, Config) -> - case rabbit_ct_broker_helpers:enable_feature_flag(Config, stream_queue) of - ok -> - rabbit_ct_helpers:set_config( - Config, - [{queue_args, [{<<"x-queue-type">>, longstr, <<"stream">>}]}, - {consumer_args, [{<<"x-stream-offset">>, long, 0}]}, - {queue_durable, true}]); - Skip -> - Skip - end; + rabbit_ct_helpers:set_config( + Config, + [{queue_args, [{<<"x-queue-type">>, longstr, <<"stream">>}]}, + {consumer_args, [{<<"x-stream-offset">>, long, 0}]}, + {queue_durable, true}]); init_per_group(Group, Config0) -> case lists:member({group, Group}, all()) of true -> diff --git a/deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl b/deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl index 5fc5a2400a00..ef9657adf269 100644 --- a/deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl +++ b/deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl @@ -98,10 +98,7 @@ init_per_group(Group, Config, NodesCount) -> rabbit_ct_broker_helpers:setup_steps()), ok = rpc(Config2, 0, application, set_env, [rabbit, channel_tick_interval, 100]), - case rabbit_ct_broker_helpers:enable_feature_flag(Config2, stream_queue) of - ok -> Config2; - Skip -> Skip - end. + Config2. end_per_group(_, Config) -> rabbit_ct_helpers:run_steps(Config, diff --git a/deps/rabbit/test/unicode_SUITE.erl b/deps/rabbit/test/unicode_SUITE.erl index 67b4f2ed848f..65088e613961 100644 --- a/deps/rabbit/test/unicode_SUITE.erl +++ b/deps/rabbit/test/unicode_SUITE.erl @@ -86,7 +86,6 @@ queue(Config, QName0, Args) -> ok. stream(Config) -> - ok = rabbit_ct_broker_helpers:enable_feature_flag(Config, stream_queue), Server = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), ConsumerTag = QName0 = atom_to_binary(?FUNCTION_NAME), QName = <>, diff --git a/deps/rabbitmq_amqp1_0/test/system_SUITE.erl b/deps/rabbitmq_amqp1_0/test/system_SUITE.erl index fbd5f841a538..a98737ec2a54 100644 --- a/deps/rabbitmq_amqp1_0/test/system_SUITE.erl +++ b/deps/rabbitmq_amqp1_0/test/system_SUITE.erl @@ -189,18 +189,6 @@ redelivery(Config) -> ]). routing(Config) -> - - StreamQT = - case rabbit_ct_broker_helpers:enable_feature_flag(Config, stream_queue) of - ok -> - <<"stream">>; - _ -> - %% if the feature flag could not be enabled we run the stream - %% routing test using a classc quue instead - ct:pal("stream feature flag could not be enabled" - "running stream tests against classic"), - <<"classic">> - end, Ch = rabbit_ct_client_helpers:open_channel(Config, 0), amqp_channel:call(Ch, #'queue.declare'{queue = <<"transient_q">>, durable = false}), @@ -211,10 +199,10 @@ routing(Config) -> arguments = [{<<"x-queue-type">>, longstr, <<"quorum">>}]}), amqp_channel:call(Ch, #'queue.declare'{queue = <<"stream_q">>, durable = true, - arguments = [{<<"x-queue-type">>, longstr, StreamQT}]}), + arguments = [{<<"x-queue-type">>, longstr, <<"stream">>}]}), amqp_channel:call(Ch, #'queue.declare'{queue = <<"stream_q2">>, durable = true, - arguments = [{<<"x-queue-type">>, longstr, StreamQT}]}), + arguments = [{<<"x-queue-type">>, longstr, <<"stream">>}]}), amqp_channel:call(Ch, #'queue.declare'{queue = <<"autodel_q">>, auto_delete = true}), run(Config, [ diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex index 71061de66df4..f47dcd1262c6 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex @@ -26,33 +26,12 @@ defmodule RabbitMQ.CLI.Ctl.Commands.AddVhostCommand do default_queue_type: default_qt }) do meta = %{description: desc, tags: parse_tags(tags), default_queue_type: default_qt} - # check if the respective feature flag is enabled - case default_qt do - "quorum" -> - FeatureFlags.assert_feature_flag_enabled(node_name, :quorum_queue, fn -> - :rabbit_misc.rpc_call(node_name, :rabbit_vhost, :add, [ - vhost, - meta, - Helpers.cli_acting_user() - ]) - end) - - "stream" -> - FeatureFlags.assert_feature_flag_enabled(node_name, :stream_queue, fn -> - :rabbit_misc.rpc_call(node_name, :rabbit_vhost, :add, [ - vhost, - meta, - Helpers.cli_acting_user() - ]) - end) - - _ -> - :rabbit_misc.rpc_call(node_name, :rabbit_vhost, :add, [ - vhost, - meta, - Helpers.cli_acting_user() - ]) - end + + :rabbit_misc.rpc_call(node_name, :rabbit_vhost, :add, [ + vhost, + meta, + Helpers.cli_acting_user() + ]) end def run([vhost], %{node: node_name, description: desc, tags: tags}) do diff --git a/deps/rabbitmq_management/test/clustering_SUITE.erl b/deps/rabbitmq_management/test/clustering_SUITE.erl index a48b1617c854..30e93a502049 100644 --- a/deps/rabbitmq_management/test/clustering_SUITE.erl +++ b/deps/rabbitmq_management/test/clustering_SUITE.erl @@ -253,15 +253,11 @@ queue_on_other_node(Config) -> ok. queue_with_multiple_consumers(Config) -> - ok = rabbit_ct_broker_helpers:enable_feature_flag(Config, stream_queue), - %% this may not be supported in mixed mode - _ = rabbit_ct_broker_helpers:enable_feature_flag(Config, classic_queue_type_delivery_support), {ok, Chan} = amqp_connection:open_channel(?config(conn, Config)), Q = <<"multi-consumer-queue1">>, _ = queue_declare(Chan, Q), _ = wait_for_queue(Config, "/queues/%2F/multi-consumer-queue1"), - Conn = rabbit_ct_client_helpers:open_unmanaged_connection(Config, 1), {ok, Chan2} = amqp_connection:open_channel(Conn), consume(Chan, Q), diff --git a/deps/rabbitmq_mqtt/src/rabbit_mqtt_qos0_queue.erl b/deps/rabbitmq_mqtt/src/rabbit_mqtt_qos0_queue.erl index deb0eff622de..34bb1644ba7c 100644 --- a/deps/rabbitmq_mqtt/src/rabbit_mqtt_qos0_queue.erl +++ b/deps/rabbitmq_mqtt/src/rabbit_mqtt_qos0_queue.erl @@ -28,7 +28,6 @@ declare/2, delete/4, deliver/2, - is_enabled/0, is_compatible/3, is_recoverable/1, recover/2, @@ -134,11 +133,6 @@ deliver(Qs, #delivery{message = BasicMessage, delegate:invoke_no_result(Pids, {gen_server, cast, [Msg]}), {[], Actions}. --spec is_enabled() -> - boolean(). -is_enabled() -> - true. - -spec is_compatible(boolean(), boolean(), boolean()) -> boolean(). is_compatible(_Durable = true, _Exclusive = true, _AutoDelete = false) -> diff --git a/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_quorum.py b/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_quorum.py index 40e380a691d0..9c6e8a79e54e 100644 --- a/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_quorum.py +++ b/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_quorum.py @@ -44,20 +44,10 @@ def test_quorum_queue(self): routing_key=queueName, body='Hello World!') - # could we declare a quorum queue? - quorum_queue_supported = True - if len(self.listener.errors) > 0: - pattern = re.compile(r"feature flag is disabled", re.MULTILINE) - for error in self.listener.errors: - if pattern.search(error['message']) != None: - quorum_queue_supported = False - break - - if quorum_queue_supported: - # check if we receive the message from the STOMP subscription - self.assertTrue(self.listener.wait_for_complete_countdown(), "initial message not received") - self.assertEqual(1, len(self.listener.messages)) - self.conn.disconnect() + # check if we receive the message from the STOMP subscription + self.assertTrue(self.listener.wait_for_complete_countdown(), "initial message not received") + self.assertEqual(1, len(self.listener.messages)) + self.conn.disconnect() connection.close() @@ -66,4 +56,4 @@ def test_quorum_queue(self): modules = [ __name__ ] - test_runner.run_unittests(modules) \ No newline at end of file + test_runner.run_unittests(modules) diff --git a/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_stream.py b/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_stream.py index 193aa3e89fa0..be8d72148e0b 100644 --- a/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_stream.py +++ b/deps/rabbitmq_stomp/test/python_SUITE_data/src/x_queue_type_stream.py @@ -47,20 +47,10 @@ def test_stream_queue(self): routing_key=queueName, body='Hello World!') - # could we declare a stream queue? - stream_queue_supported = True - if len(self.listener.errors) > 0: - pattern = re.compile(r"feature flag is disabled", re.MULTILINE) - for error in self.listener.errors: - if pattern.search(error['message']) != None: - stream_queue_supported = False - break - - if stream_queue_supported: - # check if we receive the message from the STOMP subscription - self.assertTrue(self.listener.wait(5), "initial message not received") - self.assertEqual(1, len(self.listener.messages)) - self.conn.disconnect() + # check if we receive the message from the STOMP subscription + self.assertTrue(self.listener.wait(5), "initial message not received") + self.assertEqual(1, len(self.listener.messages)) + self.conn.disconnect() connection.close() diff --git a/deps/rabbitmq_stream/src/rabbit_stream.erl b/deps/rabbitmq_stream/src/rabbit_stream.erl index 316a1bf3bccd..40c612bc8d83 100644 --- a/deps/rabbitmq_stream/src/rabbit_stream.erl +++ b/deps/rabbitmq_stream/src/rabbit_stream.erl @@ -39,23 +39,12 @@ -include("rabbit_stream_metrics.hrl"). start(_Type, _Args) -> - case rabbit_feature_flags:is_enabled(stream_queue) of - true -> - rabbit_stream_metrics:init(), - rabbit_global_counters:init([{protocol, stream}], - ?PROTOCOL_COUNTERS), - rabbit_global_counters:init([{protocol, stream}, - {queue_type, ?STREAM_QUEUE_TYPE}]), - rabbit_stream_sup:start_link(); - false -> - rabbit_log:warning("Unable to start the stream plugin. The stream_queue " - "feature flag is disabled. " - ++ "Enable stream_queue feature flag then disable " - "and re-enable the rabbitmq_stream plugin. ", - "See https://www.rabbitmq.com/feature-flags.html " - "to learn more"), - {ok, self()} - end. + rabbit_stream_metrics:init(), + rabbit_global_counters:init([{protocol, stream}], + ?PROTOCOL_COUNTERS), + rabbit_global_counters:init([{protocol, stream}, + {queue_type, ?STREAM_QUEUE_TYPE}]), + rabbit_stream_sup:start_link(). tls_host() -> case application:get_env(rabbitmq_stream, advertised_tls_host, diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl index b44cd0b961be..5b98e3763727 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl @@ -22,12 +22,7 @@ -include_lib("rabbit_common/include/rabbit.hrl"). dispatcher() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{"/stream/connections/:vhost/:connection/consumers", ?MODULE, []}]; - false -> - [] - end. + [{"/stream/connections/:vhost/:connection/consumers", ?MODULE, []}]. web_ui() -> []. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_mgmt.erl index 22483391a7b4..a52457840e9a 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_mgmt.erl @@ -24,12 +24,7 @@ -include_lib("rabbit_common/include/rabbit.hrl"). dispatcher() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{"/stream/connections/:vhost/:connection", ?MODULE, []}]; - false -> - [] - end. + [{"/stream/connections/:vhost/:connection", ?MODULE, []}]. web_ui() -> []. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl index 4858223ea83c..7ffc9f6a6fd0 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl @@ -22,13 +22,7 @@ -include_lib("rabbit_common/include/rabbit.hrl"). dispatcher() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{"/stream/connections/:vhost/:connection/publishers", ?MODULE, - []}]; - false -> - [] - end. + [{"/stream/connections/:vhost/:connection/publishers", ?MODULE, []}]. web_ui() -> []. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connections_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connections_mgmt.erl index 477d889ba4cb..d047deaf3e8f 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connections_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connections_mgmt.erl @@ -19,27 +19,10 @@ -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). dispatcher() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{"/stream/connections", ?MODULE, []}]; - false -> - [] - end. + [{"/stream/connections", ?MODULE, []}]. web_ui() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{javascript, <<"stream.js">>}]; - false -> - rabbit_log:warning("Unable to show the stream management plugin. " - "The stream_queue feature flag is disabled. " - ++ "Enable stream_queue feature flag then disable " - "and re-enable the rabbitmq_stream_management " - "plugin. ", - "See https://www.rabbitmq.com/feature-flags.html " - "to learn more"), - [] - end. + [{javascript, <<"stream.js">>}]. %%-------------------------------------------------------------------- diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl index c0207a1208e3..8c79f1eb011f 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl @@ -21,12 +21,7 @@ -include_lib("amqp_client/include/amqp_client.hrl"). dispatcher() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{"/stream/connections/:vhost", ?MODULE, []}]; - false -> - [] - end. + [{"/stream/connections/:vhost", ?MODULE, []}]. web_ui() -> []. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_consumers_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_consumers_mgmt.erl index d0284e12a3a8..3101afbff486 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_consumers_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_consumers_mgmt.erl @@ -21,13 +21,8 @@ -include_lib("rabbit_common/include/rabbit.hrl"). dispatcher() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{"/stream/consumers", ?MODULE, []}, - {"/stream/consumers/:vhost", ?MODULE, []}]; - false -> - [] - end. + [{"/stream/consumers", ?MODULE, []}, + {"/stream/consumers/:vhost", ?MODULE, []}]. web_ui() -> []. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_management_utils.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_management_utils.erl index dd52a7bc9647..7d59638894a0 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_management_utils.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_management_utils.erl @@ -9,8 +9,7 @@ -export([keep_stream_connections/1, keep_tracked_stream_connections/1, - is_stream_connection/1, - is_feature_flag_enabled/0]). + is_stream_connection/1]). -include_lib("rabbit_common/include/rabbit.hrl"). @@ -32,6 +31,3 @@ keep_tracked_stream_connections(Connections) -> false end, Connections). - -is_feature_flag_enabled() -> - rabbit_feature_flags:is_enabled(stream_queue). diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_publishers_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_publishers_mgmt.erl index 6d878462f272..02d4c1da13e2 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_publishers_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_publishers_mgmt.erl @@ -21,14 +21,9 @@ -include_lib("rabbit_common/include/rabbit.hrl"). dispatcher() -> - case rabbit_stream_management_utils:is_feature_flag_enabled() of - true -> - [{"/stream/publishers", ?MODULE, []}, - {"/stream/publishers/:vhost", ?MODULE, []}, - {"/stream/publishers/:vhost/:queue", ?MODULE, []}]; - false -> - [] - end. + [{"/stream/publishers", ?MODULE, []}, + {"/stream/publishers/:vhost", ?MODULE, []}, + {"/stream/publishers/:vhost/:queue", ?MODULE, []}]. web_ui() -> [].