Skip to content

json: remove envoy.reloadable_features.remove_legacy_json and legacy code paths #20282

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
yanavlasov merged 4 commits into from
Mar 10, 2022
Merged

json: remove envoy.reloadable_features.remove_legacy_json and legacy code paths #20282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8b3fc2
Decommission rapidjson use in Envoy and delete corresponding runtime …
yanavlasov Mar 10, 2022
ed9627a
Add extensions attribute
yanavlasov Mar 10, 2022
e7ebec8
Update rel notes
yanavlasov Mar 10, 2022
9d3d621
Restrict visibility to rapidjosn and remove unused alias
yanavlasov Mar 10, 2022
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
4 changes: 3 additions & 1 deletion bazel/external/rapidjson.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ cc_library(
hdrs = glob(["include/rapidjson/**/*.h"]),
defines = ["RAPIDJSON_HAS_STDSTRING=1"],
includes = ["include"],
visibility = ["//visibility:public"],
# rapidjson is only needed to build external dependency of the Zipkin tracer.
# For Envoy source code plese use source/common/json/json_loader.h
visibility = ["@io_opencensus_cpp//opencensus/exporters/trace/zipkin:__pkg__"],
)
4 changes: 0 additions & 4 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,10 +522,6 @@ def _com_github_tencent_rapidjson():
name = "com_github_tencent_rapidjson",
build_file = "@envoy//bazel/external:rapidjson.BUILD",
)
native.bind(
name = "rapidjson",
actual = "@com_github_tencent_rapidjson//:rapidjson",
)

def _com_github_nlohmann_json():
external_http_archive(
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,9 +537,9 @@ REPOSITORY_LOCATIONS_SPEC = dict(
sha256 = "a2faafbc402394df0fa94602df4b5e4befd734aad6bb55dfef46f62fcaf1090b",
strip_prefix = "rapidjson-{version}",
urls = ["https://github.com/Tencent/rapidjson/archive/{version}.tar.gz"],
# We're mostly using com_google_protobuf for JSON, but there are some extensions and hard to
# disentangle uses on the dataplane, e.g. header_formatter, Squash filter.
use_category = ["controlplane", "dataplane_core"],
use_category = ["observability_ext"],
# Rapidjson is used in the external dependency of zipkin tracer.
extensions = ["envoy.tracers.zipkin", "envoy.tracers.opencensus"],
release_date = "2019-12-03",
cpe = "cpe:2.3:a:tencent:rapidjson:*",
),
Expand Down
1 change: 1 addition & 0 deletions docs/root/version_history/current.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Removed Config or Runtime
* http: removed ``envoy.reloadable_features.allow_response_for_timeout`` and legacy code paths.
* http: removed ``envoy.reloadable_features.http2_consume_stream_refused_errors`` and legacy code paths.
* http: removed ``envoy.reloadable_features.internal_redirects_with_body`` and legacy code paths.
* json: removed ``envoy.reloadable_features.remove_legacy_json`` and legacy code paths.
* listener: removed ``envoy.reloadable_features.listener_reuse_port_default_enabled`` and legacy code paths.
* udp: removed ``envoy.reloadable_features.udp_per_event_loop_read_limit`` and legacy code paths.
* upstream: removed ``envoy.reloadable_features.health_check.graceful_goaway_handling`` and legacy code paths.
Expand Down
17 changes: 0 additions & 17 deletions source/common/json/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,6 @@ licenses(["notice"]) # Apache 2

envoy_package()

envoy_cc_library(
name = "json_internal_legacy_lib",
srcs = ["json_internal_legacy.cc"],
hdrs = ["json_internal_legacy.h"],
external_deps = [
"rapidjson",
],
deps = [
"//envoy/json:json_object_interface",
"//source/common/common:assert_lib",
"//source/common/common:hash_lib",
"//source/common/common:utility_lib",
"//source/common/protobuf:utility_lib",
],
)

envoy_cc_library(
name = "json_internal_lib",
srcs = ["json_internal.cc"],
Expand All @@ -45,7 +29,6 @@ envoy_cc_library(
srcs = ["json_loader.cc"],
hdrs = ["json_loader.h"],
deps = [
":json_internal_legacy_lib",
":json_internal_lib",
"//envoy/json:json_object_interface",
"//source/common/runtime:runtime_features_lib",
Expand Down
Loading