diff --git a/source/extensions/filters/network/http_connection_manager/config.cc b/source/extensions/filters/network/http_connection_manager/config.cc index d548646277dd7..1bab8eb07ef81 100644 --- a/source/extensions/filters/network/http_connection_manager/config.cc +++ b/source/extensions/filters/network/http_connection_manager/config.cc @@ -469,18 +469,8 @@ HttpConnectionManagerConfig::HttpConnectionManagerConfig( // Listener level traffic direction overrides the operation name switch (context.direction()) { case envoy::config::core::v3::UNSPECIFIED: { - switch (tracing_config.hidden_envoy_deprecated_operation_name()) { - case envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager:: - Tracing::INGRESS: - tracing_operation_name = Tracing::OperationName::Ingress; - break; - case envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager:: - Tracing::EGRESS: - tracing_operation_name = Tracing::OperationName::Egress; - break; - default: - NOT_REACHED_GCOVR_EXCL_LINE; - } + // Continuing legacy behavior; if unspecified, we treat this as ingress. + tracing_operation_name = Tracing::OperationName::Ingress; break; } case envoy::config::core::v3::INBOUND: @@ -494,13 +484,6 @@ HttpConnectionManagerConfig::HttpConnectionManagerConfig( } Tracing::CustomTagMap custom_tags; - for (const std::string& header : - tracing_config.hidden_envoy_deprecated_request_headers_for_tags()) { - envoy::type::tracing::v3::CustomTag::Header headerTag; - headerTag.set_name(header); - custom_tags.emplace( - header, std::make_shared(header, headerTag)); - } for (const auto& tag : tracing_config.custom_tags()) { custom_tags.emplace(tag.tag(), Tracing::HttpTracerUtility::createCustomTag(tag)); } @@ -661,11 +644,7 @@ void HttpConnectionManagerConfig::processFilter( ENVOY_LOG(debug, " name: {}", filter_config_provider->name()); ENVOY_LOG(debug, " config: {}", MessageUtil::getJsonStringFromMessageOrError( - proto_config.has_typed_config() - ? static_cast(proto_config.typed_config()) - : static_cast( - proto_config.hidden_envoy_deprecated_config()), - true)); + static_cast(proto_config.typed_config()), true)); filter_factories.push_back(std::move(filter_config_provider)); } diff --git a/source/server/listener_manager_impl.cc b/source/server/listener_manager_impl.cc index dedebf1684a0a..30678ef23730a 100644 --- a/source/server/listener_manager_impl.cc +++ b/source/server/listener_manager_impl.cc @@ -87,10 +87,7 @@ std::vector ProdListenerComponentFactory::createNetwor ENVOY_LOG(debug, " name: {}", proto_config.name()); ENVOY_LOG(debug, " config: {}", MessageUtil::getJsonStringFromMessageOrError( - proto_config.has_typed_config() - ? static_cast(proto_config.typed_config()) - : static_cast( - proto_config.hidden_envoy_deprecated_config()))); + static_cast(proto_config.typed_config()))); // Now see if there is a factory that will accept the config. auto& factory = @@ -121,10 +118,7 @@ ProdListenerComponentFactory::createListenerFilterFactoryList_( ENVOY_LOG(debug, " name: {}", proto_config.name()); ENVOY_LOG(debug, " config: {}", MessageUtil::getJsonStringFromMessageOrError( - proto_config.has_typed_config() - ? static_cast(proto_config.typed_config()) - : static_cast( - proto_config.hidden_envoy_deprecated_config()))); + static_cast(proto_config.typed_config()))); // Now see if there is a factory that will accept the config. auto& factory = @@ -149,10 +143,7 @@ ProdListenerComponentFactory::createUdpListenerFilterFactoryList_( ENVOY_LOG(debug, " name: {}", proto_config.name()); ENVOY_LOG(debug, " config: {}", MessageUtil::getJsonStringFromMessageOrError( - proto_config.has_typed_config() - ? static_cast(proto_config.typed_config()) - : static_cast( - proto_config.hidden_envoy_deprecated_config()))); + static_cast(proto_config.typed_config()))); // Now see if there is a factory that will accept the config. auto& factory = diff --git a/test/extensions/filters/network/http_connection_manager/config_test.cc b/test/extensions/filters/network/http_connection_manager/config_test.cc index 8bd62d3564d4e..7436d47016abf 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_test.cc @@ -499,85 +499,6 @@ stat_prefix: router } } -TEST_F(HttpConnectionManagerConfigTest, DEPRECATED_FEATURE_TEST(RequestHeaderForTagsConfig)) { - TestDeprecatedV2Api _deprecated_v2_api; - const std::string yaml_string = R"EOF( -stat_prefix: router -route_config: - name: local_route -tracing: - request_headers_for_tags: - - foo - )EOF"; - HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string, false), - context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, http_tracer_manager_, - filter_config_provider_manager_); - - const Tracing::CustomTagMap& custom_tag_map = config.tracingConfig()->custom_tags_; - const Tracing::RequestHeaderCustomTag* foo = dynamic_cast( - custom_tag_map.find("foo")->second.get()); - EXPECT_NE(foo, nullptr); - EXPECT_EQ(foo->tag(), "foo"); -} - -TEST_F(HttpConnectionManagerConfigTest, - DEPRECATED_FEATURE_TEST(ListenerDirectionOutboundOverride)) { - TestDeprecatedV2Api _deprecated_v2_api; - const std::string yaml_string = R"EOF( -stat_prefix: router -route_config: - virtual_hosts: - - name: service - domains: - - "*" - routes: - - match: - prefix: "/" - route: - cluster: cluster -tracing: - operation_name: ingress -http_filters: -- name: envoy.filters.http.router - )EOF"; - - ON_CALL(context_, direction()).WillByDefault(Return(envoy::config::core::v3::OUTBOUND)); - HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string, false), - context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, http_tracer_manager_, - filter_config_provider_manager_); - EXPECT_EQ(Tracing::OperationName::Egress, config.tracingConfig()->operation_name_); -} - -TEST_F(HttpConnectionManagerConfigTest, DEPRECATED_FEATURE_TEST(ListenerDirectionInboundOverride)) { - TestDeprecatedV2Api _deprecated_v2_api; - const std::string yaml_string = R"EOF( -stat_prefix: router -route_config: - virtual_hosts: - - name: service - domains: - - "*" - routes: - - match: - prefix: "/" - route: - cluster: cluster -tracing: - operation_name: egress -http_filters: -- name: envoy.filters.http.router - )EOF"; - - ON_CALL(context_, direction()).WillByDefault(Return(envoy::config::core::v3::INBOUND)); - HttpConnectionManagerConfig config(parseHttpConnectionManagerFromYaml(yaml_string, false), - context_, date_provider_, route_config_provider_manager_, - scoped_routes_config_provider_manager_, http_tracer_manager_, - filter_config_provider_manager_); - EXPECT_EQ(Tracing::OperationName::Ingress, config.tracingConfig()->operation_name_); -} - TEST_F(HttpConnectionManagerConfigTest, SamplingDefault) { const std::string yaml_string = R"EOF( stat_prefix: ingress_http