Merge remote-tracking branch 'upstream/main' into remove_active_hc_ru…

…ntime_flag

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

OWNERS.md

@@ -78,7 +78,7 @@ without further review.
 * Otto van der Schaaf ([oschaaf](https://github.com/oschaaf)) (oschaaf@redhat.com)
 * Tim Walsh ([twghu](https://github.com/twghu)) (twalsh@redhat.com)
 * Pradeep Rao ([pradeepcrao](https://github.com/pradeepcrao)) (pcrao@google.com)
-* Kateryna Nezdolii ([nezdolik](https://github.com/nezdolik)) (nezdolik@spotify.com)
+* Kateryna Nezdolii ([nezdolik](https://github.com/nezdolik)) (kateryna.nezdolii@gmail.com)
 * Boteng Yao ([botengyao](https://github.com/botengyao)) (boteng@google.com)
 * Kevin Baichoo ([KBaichoo](https://github.com/KBaichoo)) (kbaichoo@google.com)
 * Tianyu Xia ([tyxia](https://github.com/tyxia)) (tyxia@google.com)

changelogs/current.yaml

@@ -23,6 +23,9 @@ removed_config_or_runtime:
 - area: active health check
   change: |
     Removed ``envoy.reloadable_features.keep_endpoint_active_hc_status_on_locality_update`` runtime flag and legacy code paths.
+- area: http1
+  change: |
+    Removed ``envoy.reloadable_features.http1_allow_codec_error_response_after_1xx_headers`` runtime flag and legacy code paths.
 - area: overload manager
   change: |
     removed ``envoy.reloadable_features.overload_manager_error_unknown_action`` and legacy code paths.

docs/root/faq/configuration/sni.rst

@@ -19,6 +19,8 @@ The following is a YAML example of the above requirement.
     socket_address: { address: 127.0.0.1, port_value: 1234 }
   listener_filters:
   - name: "envoy.filters.listener.tls_inspector"
+    typed_config:
+      "@type": type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   filter_chains:
   - filter_chain_match:
       server_names: ["example.com", "www.example.com"]

examples/ext_authz/Dockerfile-opa

@@ -1 +1 @@
-FROM openpolicyagent/opa:0.60.0-istio@sha256:242a2dbe29b668b524daae8446fb00518ab95a46215bbc17d8b80b2d28370841
+FROM openpolicyagent/opa:0.61.0-istio@sha256:5ee86eb43bbe8a80e24d4d218a7fd568e5e5c1a782f20aa03a5643cad307034f

examples/opentelemetry/Dockerfile-opentelemetry

@@ -1,7 +1,7 @@
-FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 as otelc_curl
+FROM alpine:3.19@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b as otelc_curl
 RUN apk --update add curl
 
-FROM otel/opentelemetry-collector:latest@sha256:92f6e2efd014152bee26f8324e3a511980b512a36d8793d3fee708715caaa6c0
+FROM otel/opentelemetry-collector:latest@sha256:2cfa5eb469eaf226c1fd62e6e3d38f94a8550951f49136fef3c78f38c211415e
 
 COPY --from=otelc_curl / /
 

examples/shared/python/aiohttp/requirements.txt

@@ -4,83 +4,83 @@
 #
 #    pip-compile --allow-unsafe --generate-hashes requirements.in
 #
-aiohttp==3.9.1 \
-    --hash=sha256:02ab6006ec3c3463b528374c4cdce86434e7b89ad355e7bf29e2f16b46c7dd6f \
-    --hash=sha256:04fa38875e53eb7e354ece1607b1d2fdee2d175ea4e4d745f6ec9f751fe20c7c \
-    --hash=sha256:0b0a6a36ed7e164c6df1e18ee47afbd1990ce47cb428739d6c99aaabfaf1b3af \
-    --hash=sha256:0d406b01a9f5a7e232d1b0d161b40c05275ffbcbd772dc18c1d5a570961a1ca4 \
-    --hash=sha256:0e49b08eafa4f5707ecfb321ab9592717a319e37938e301d462f79b4e860c32a \
-    --hash=sha256:0e7ba7ff228c0d9a2cd66194e90f2bca6e0abca810b786901a569c0de082f489 \
-    --hash=sha256:11cb254e397a82efb1805d12561e80124928e04e9c4483587ce7390b3866d213 \
-    --hash=sha256:11ff168d752cb41e8492817e10fb4f85828f6a0142b9726a30c27c35a1835f01 \
-    --hash=sha256:176df045597e674fa950bf5ae536be85699e04cea68fa3a616cf75e413737eb5 \
-    --hash=sha256:219a16763dc0294842188ac8a12262b5671817042b35d45e44fd0a697d8c8361 \
-    --hash=sha256:22698f01ff5653fe66d16ffb7658f582a0ac084d7da1323e39fd9eab326a1f26 \
-    --hash=sha256:237533179d9747080bcaad4d02083ce295c0d2eab3e9e8ce103411a4312991a0 \
-    --hash=sha256:289ba9ae8e88d0ba16062ecf02dd730b34186ea3b1e7489046fc338bdc3361c4 \
-    --hash=sha256:2c59e0076ea31c08553e868cec02d22191c086f00b44610f8ab7363a11a5d9d8 \
-    --hash=sha256:2c9376e2b09895c8ca8b95362283365eb5c03bdc8428ade80a864160605715f1 \
-    --hash=sha256:3135713c5562731ee18f58d3ad1bf41e1d8883eb68b363f2ffde5b2ea4b84cc7 \
-    --hash=sha256:3b9c7426923bb7bd66d409da46c41e3fb40f5caf679da624439b9eba92043fa6 \
-    --hash=sha256:3c0266cd6f005e99f3f51e583012de2778e65af6b73860038b968a0a8888487a \
-    --hash=sha256:41473de252e1797c2d2293804e389a6d6986ef37cbb4a25208de537ae32141dd \
-    --hash=sha256:4831df72b053b1eed31eb00a2e1aff6896fb4485301d4ccb208cac264b648db4 \
-    --hash=sha256:49f0c1b3c2842556e5de35f122fc0f0b721334ceb6e78c3719693364d4af8499 \
-    --hash=sha256:4b4c452d0190c5a820d3f5c0f3cd8a28ace48c54053e24da9d6041bf81113183 \
-    --hash=sha256:4ee8caa925aebc1e64e98432d78ea8de67b2272252b0a931d2ac3bd876ad5544 \
-    --hash=sha256:500f1c59906cd142d452074f3811614be04819a38ae2b3239a48b82649c08821 \
-    --hash=sha256:5216b6082c624b55cfe79af5d538e499cd5f5b976820eac31951fb4325974501 \
-    --hash=sha256:54311eb54f3a0c45efb9ed0d0a8f43d1bc6060d773f6973efd90037a51cd0a3f \
-    --hash=sha256:54631fb69a6e44b2ba522f7c22a6fb2667a02fd97d636048478db2fd8c4e98fe \
-    --hash=sha256:565760d6812b8d78d416c3c7cfdf5362fbe0d0d25b82fed75d0d29e18d7fc30f \
-    --hash=sha256:598db66eaf2e04aa0c8900a63b0101fdc5e6b8a7ddd805c56d86efb54eb66672 \
-    --hash=sha256:5c4fa235d534b3547184831c624c0b7c1e262cd1de847d95085ec94c16fddcd5 \
-    --hash=sha256:69985d50a2b6f709412d944ffb2e97d0be154ea90600b7a921f95a87d6f108a2 \
-    --hash=sha256:69da0f3ed3496808e8cbc5123a866c41c12c15baaaead96d256477edf168eb57 \
-    --hash=sha256:6c93b7c2e52061f0925c3382d5cb8980e40f91c989563d3d32ca280069fd6a87 \
-    --hash=sha256:70907533db712f7aa791effb38efa96f044ce3d4e850e2d7691abd759f4f0ae0 \
-    --hash=sha256:81b77f868814346662c96ab36b875d7814ebf82340d3284a31681085c051320f \
-    --hash=sha256:82eefaf1a996060602f3cc1112d93ba8b201dbf5d8fd9611227de2003dddb3b7 \
-    --hash=sha256:85c3e3c9cb1d480e0b9a64c658cd66b3cfb8e721636ab8b0e746e2d79a7a9eed \
-    --hash=sha256:8a22a34bc594d9d24621091d1b91511001a7eea91d6652ea495ce06e27381f70 \
-    --hash=sha256:8cef8710fb849d97c533f259103f09bac167a008d7131d7b2b0e3a33269185c0 \
-    --hash=sha256:8d44e7bf06b0c0a70a20f9100af9fcfd7f6d9d3913e37754c12d424179b4e48f \
-    --hash=sha256:8d7f98fde213f74561be1d6d3fa353656197f75d4edfbb3d94c9eb9b0fc47f5d \
-    --hash=sha256:8d8e4450e7fe24d86e86b23cc209e0023177b6d59502e33807b732d2deb6975f \
-    --hash=sha256:8fc49a87ac269d4529da45871e2ffb6874e87779c3d0e2ccd813c0899221239d \
-    --hash=sha256:90ec72d231169b4b8d6085be13023ece8fa9b1bb495e4398d847e25218e0f431 \
-    --hash=sha256:91c742ca59045dce7ba76cab6e223e41d2c70d79e82c284a96411f8645e2afff \
-    --hash=sha256:9b05d33ff8e6b269e30a7957bd3244ffbce2a7a35a81b81c382629b80af1a8bf \
-    --hash=sha256:9b05d5cbe9dafcdc733262c3a99ccf63d2f7ce02543620d2bd8db4d4f7a22f83 \
-    --hash=sha256:9c5857612c9813796960c00767645cb5da815af16dafb32d70c72a8390bbf690 \
-    --hash=sha256:a34086c5cc285be878622e0a6ab897a986a6e8bf5b67ecb377015f06ed316587 \
-    --hash=sha256:ab221850108a4a063c5b8a70f00dd7a1975e5a1713f87f4ab26a46e5feac5a0e \
-    --hash=sha256:b796b44111f0cab6bbf66214186e44734b5baab949cb5fb56154142a92989aeb \
-    --hash=sha256:b8c3a67eb87394386847d188996920f33b01b32155f0a94f36ca0e0c635bf3e3 \
-    --hash=sha256:bcb6532b9814ea7c5a6a3299747c49de30e84472fa72821b07f5a9818bce0f66 \
-    --hash=sha256:bcc0ea8d5b74a41b621ad4a13d96c36079c81628ccc0b30cfb1603e3dfa3a014 \
-    --hash=sha256:bea94403a21eb94c93386d559bce297381609153e418a3ffc7d6bf772f59cc35 \
-    --hash=sha256:bff7e2811814fa2271be95ab6e84c9436d027a0e59665de60edf44e529a42c1f \
-    --hash=sha256:c72444d17777865734aa1a4d167794c34b63e5883abb90356a0364a28904e6c0 \
-    --hash=sha256:c7b5d5d64e2a14e35a9240b33b89389e0035e6de8dbb7ffa50d10d8b65c57449 \
-    --hash=sha256:c7e939f1ae428a86e4abbb9a7c4732bf4706048818dfd979e5e2839ce0159f23 \
-    --hash=sha256:c88a15f272a0ad3d7773cf3a37cc7b7d077cbfc8e331675cf1346e849d97a4e5 \
-    --hash=sha256:c9110c06eaaac7e1f5562caf481f18ccf8f6fdf4c3323feab28a93d34cc646bd \
-    --hash=sha256:ca7ca5abfbfe8d39e653870fbe8d7710be7a857f8a8386fc9de1aae2e02ce7e4 \
-    --hash=sha256:cae4c0c2ca800c793cae07ef3d40794625471040a87e1ba392039639ad61ab5b \
-    --hash=sha256:cdefe289681507187e375a5064c7599f52c40343a8701761c802c1853a504558 \
-    --hash=sha256:cf2a0ac0615842b849f40c4d7f304986a242f1e68286dbf3bd7a835e4f83acfd \
-    --hash=sha256:cfeadf42840c1e870dc2042a232a8748e75a36b52d78968cda6736de55582766 \
-    --hash=sha256:d737e69d193dac7296365a6dcb73bbbf53bb760ab25a3727716bbd42022e8d7a \
-    --hash=sha256:d7481f581251bb5558ba9f635db70908819caa221fc79ee52a7f58392778c636 \
-    --hash=sha256:df9cf74b9bc03d586fc53ba470828d7b77ce51b0582d1d0b5b2fb673c0baa32d \
-    --hash=sha256:e1f80197f8b0b846a8d5cf7b7ec6084493950d0882cc5537fb7b96a69e3c8590 \
-    --hash=sha256:ecca113f19d5e74048c001934045a2b9368d77b0b17691d905af18bd1c21275e \
-    --hash=sha256:ee2527134f95e106cc1653e9ac78846f3a2ec1004cf20ef4e02038035a74544d \
-    --hash=sha256:f27fdaadce22f2ef950fc10dcdf8048407c3b42b73779e48a4e76b3c35bca26c \
-    --hash=sha256:f694dc8a6a3112059258a725a4ebe9acac5fe62f11c77ac4dcf896edfa78ca28 \
-    --hash=sha256:f800164276eec54e0af5c99feb9494c295118fc10a11b997bbb1348ba1a52065 \
-    --hash=sha256:ffcd828e37dc219a72c9012ec44ad2e7e3066bec6ff3aaa19e7d435dbf4032ca
+aiohttp==3.9.2 \
+    --hash=sha256:00a9abcea793c81e7f8778ca195a1714a64f6d7436c4c0bb168ad2a212627000 \
+    --hash=sha256:04fd8ffd2be73d42bcf55fd78cde7958eeee6d4d8f73c3846b7cba491ecdb570 \
+    --hash=sha256:07205ae0015e05c78b3288c1517afa000823a678a41594b3fdc870878d645305 \
+    --hash=sha256:07be2be7071723c3509ab5c08108d3a74f2181d4964e869f2504aaab68f8d3e8 \
+    --hash=sha256:0b500c5ad9c07639d48615a770f49618130e61be36608fc9bc2d9bae31732b8f \
+    --hash=sha256:0e4ee4df741670560b1bc393672035418bf9063718fee05e1796bf867e995fad \
+    --hash=sha256:103daf41ff3b53ba6fa09ad410793e2e76c9d0269151812e5aba4b9dd674a7e8 \
+    --hash=sha256:114da29f39eccd71b93a0fcacff178749a5c3559009b4a4498c2c173a6d74dff \
+    --hash=sha256:122468f6fee5fcbe67cb07014a08c195b3d4c41ff71e7b5160a7bcc41d585a5f \
+    --hash=sha256:1543e7fb00214fb4ccead42e6a7d86f3bb7c34751ec7c605cca7388e525fd0b4 \
+    --hash=sha256:158564d0d1020e0d3fe919a81d97aadad35171e13e7b425b244ad4337fc6793a \
+    --hash=sha256:16a967685907003765855999af11a79b24e70b34dc710f77a38d21cd9fc4f5fe \
+    --hash=sha256:186e94570433a004e05f31f632726ae0f2c9dee4762a9ce915769ce9c0a23d89 \
+    --hash=sha256:193cc1ccd69d819562cc7f345c815a6fc51d223b2ef22f23c1a0f67a88de9a72 \
+    --hash=sha256:1956e3ac376b1711c1533266dec4efd485f821d84c13ce1217d53e42c9e65f08 \
+    --hash=sha256:1c45e4e815ac6af3b72ca2bde9b608d2571737bb1e2d42299fc1ffdf60f6f9a1 \
+    --hash=sha256:200dc0246f0cb5405c80d18ac905c8350179c063ea1587580e3335bfc243ba6a \
+    --hash=sha256:2dec87a556f300d3211decf018bfd263424f0690fcca00de94a837949fbcea02 \
+    --hash=sha256:328918a6c2835861ff7afa8c6d2c70c35fdaf996205d5932351bdd952f33fa2f \
+    --hash=sha256:3cc158466f6a980a6095ee55174d1de5730ad7dec251be655d9a6a9dd7ea1ff9 \
+    --hash=sha256:3d8d962b439a859b3ded9a1e111a4615357b01620a546bc601f25b0211f2da81 \
+    --hash=sha256:3e1a800f988ce7c4917f34096f81585a73dbf65b5c39618b37926b1238cf9bc4 \
+    --hash=sha256:3f17999ae3927d8a9a823a1283b201344a0627272f92d4f3e3a4efe276972fe8 \
+    --hash=sha256:4112d8ba61fbd0abd5d43a9cb312214565b446d926e282a6d7da3f5a5aa71d36 \
+    --hash=sha256:4bd9d5b989d57b41e4ff56ab250c5ddf259f32db17159cce630fd543376bd96b \
+    --hash=sha256:4c189b64bd6d9a403a1a3f86a3ab3acbc3dc41a68f73a268a4f683f89a4dec1f \
+    --hash=sha256:4deae2c165a5db1ed97df2868ef31ca3cc999988812e82386d22937d9d6fed52 \
+    --hash=sha256:5264d7327c9464786f74e4ec9342afbbb6ee70dfbb2ec9e3dfce7a54c8043aa3 \
+    --hash=sha256:5422cd9a4a00f24c7244e1b15aa9b87935c85fb6a00c8ac9b2527b38627a9211 \
+    --hash=sha256:54287bcb74d21715ac8382e9de146d9442b5f133d9babb7e5d9e453faadd005e \
+    --hash=sha256:54ec82f45d57c9a65a1ead3953b51c704f9587440e6682f689da97f3e8defa35 \
+    --hash=sha256:5bb3d05569aa83011fcb346b5266e00b04180105fcacc63743fc2e4a1862a891 \
+    --hash=sha256:61c47ab8ef629793c086378b1df93d18438612d3ed60dca76c3422f4fbafa792 \
+    --hash=sha256:68bbee9e17d66f17bb0010aa15a22c6eb28583edcc8b3212e2b8e3f77f3ebe2a \
+    --hash=sha256:6aaa6f99256dd1b5756a50891a20f0d252bd7bdb0854c5d440edab4495c9f973 \
+    --hash=sha256:6f4cdba12539215aaecf3c310ce9d067b0081a0795dd8a8805fdb67a65c0572a \
+    --hash=sha256:6fa3ee92cd441d5c2d07ca88d7a9cef50f7ec975f0117cd0c62018022a184308 \
+    --hash=sha256:772fbe371788e61c58d6d3d904268e48a594ba866804d08c995ad71b144f94cb \
+    --hash=sha256:7a75307ffe31329928a8d47eae0692192327c599113d41b278d4c12b54e1bd11 \
+    --hash=sha256:7a9825fdd64ecac5c670234d80bb52bdcaa4139d1f839165f548208b3779c6c6 \
+    --hash=sha256:7d579dcd5d82a86a46f725458418458fa43686f6a7b252f2966d359033ffc8ab \
+    --hash=sha256:8008d0f451d66140a5aa1c17e3eedc9d56e14207568cd42072c9d6b92bf19b52 \
+    --hash=sha256:84e843b33d5460a5c501c05539809ff3aee07436296ff9fbc4d327e32aa3a326 \
+    --hash=sha256:8a7876f794523123bca6d44bfecd89c9fec9ec897a25f3dd202ee7fc5c6525b7 \
+    --hash=sha256:8ceb658afd12b27552597cf9a65d9807d58aef45adbb58616cdd5ad4c258c39e \
+    --hash=sha256:972b63d589ff8f305463593050a31b5ce91638918da38139b9d8deaba9e0fed7 \
+    --hash=sha256:9a87aa0b13bbee025faa59fa58861303c2b064b9855d4c0e45ec70182bbeba1b \
+    --hash=sha256:a1c3a4d0ab2f75f22ec80bca62385db2e8810ee12efa8c9e92efea45c1849133 \
+    --hash=sha256:a27d8c70ad87bcfce2e97488652075a9bdd5b70093f50b10ae051dfe5e6baf37 \
+    --hash=sha256:aa906b9bdfd4a7972dd0628dbbd6413d2062df5b431194486a78f0d2ae87bd55 \
+    --hash=sha256:abeb813a18eb387f0d835ef51f88568540ad0325807a77a6e501fed4610f864e \
+    --hash=sha256:ae0a1e638cffc3ec4d4784b8b4fd1cf28968febc4bd2718ffa25b99b96a741bd \
+    --hash=sha256:b0ad0a5e86ce73f5368a164c10ada10504bf91869c05ab75d982c6048217fbf7 \
+    --hash=sha256:b141753be581fab842a25cb319f79536d19c2a51995d7d8b29ee290169868eab \
+    --hash=sha256:b65e861f4bebfb660f7f0f40fa3eb9f2ab9af10647d05dac824390e7af8f75b7 \
+    --hash=sha256:b9f1cb839b621f84a5b006848e336cf1496688059d2408e617af33e3470ba204 \
+    --hash=sha256:bc71f748e12284312f140eaa6599a520389273174b42c345d13c7e07792f4f57 \
+    --hash=sha256:bda42eb410be91b349fb4ee3a23a30ee301c391e503996a638d05659d76ea4c2 \
+    --hash=sha256:c07327b368745b1ce2393ae9e1aafed7073d9199e1dcba14e035cc646c7941bf \
+    --hash=sha256:c4ad4241b52bb2eb7a4d2bde060d31c2b255b8c6597dd8deac2f039168d14fd7 \
+    --hash=sha256:c8534e7d69bb8e8d134fe2be9890d1b863518582f30c9874ed7ed12e48abe3c4 \
+    --hash=sha256:cc7d6502c23a0ec109687bf31909b3fb7b196faf198f8cff68c81b49eb316ea9 \
+    --hash=sha256:cc91d07280d7d169f3a0f9179d8babd0ee05c79d4d891447629ff0d7d8089ec2 \
+    --hash=sha256:cfee9287778399fdef6f8a11c9e425e1cb13cc9920fd3a3df8f122500978292b \
+    --hash=sha256:d22a0931848b8c7a023c695fa2057c6aaac19085f257d48baa24455e67df97ec \
+    --hash=sha256:d23fba734e3dd7b1d679b9473129cd52e4ec0e65a4512b488981a56420e708db \
+    --hash=sha256:d43302a30ba1166325974858e6ef31727a23bdd12db40e725bec0f759abce505 \
+    --hash=sha256:d52d20832ac1560f4510d68e7ba8befbc801a2b77df12bd0cd2bcf3b049e52a4 \
+    --hash=sha256:da1346cd0ccb395f0ed16b113ebb626fa43b7b07fd7344fce33e7a4f04a8897a \
+    --hash=sha256:e2cc0d04688b9f4a7854c56c18aa7af9e5b0a87a28f934e2e596ba7e14783192 \
+    --hash=sha256:ea510718a41b95c236c992b89fdfc3d04cc7ca60281f93aaada497c2b4e05c46 \
+    --hash=sha256:eaa9256de26ea0334ffa25f1913ae15a51e35c529a1ed9af8e6286dd44312554 \
+    --hash=sha256:edd4f1af2253f227ae311ab3d403d0c506c9b4410c7fc8d9573dec6d9740369f \
+    --hash=sha256:ee2661a3f5b529f4fc8a8ffee9f736ae054adfb353a0d2f78218be90617194b3 \
+    --hash=sha256:f31df6a32217a34ae2f813b152a6f348154f948c83213b690e59d9e84020925c \
+    --hash=sha256:fa6904088e6642609981f919ba775838ebf7df7fe64998b1a954fb411ffb4663
     # via -r requirements.in
 aiosignal==1.3.1 \
     --hash=sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc \

examples/zipkin/Dockerfile-zipkin

@@ -1 +1 @@
-FROM openzipkin/zipkin:latest@sha256:10e093129ba95507dd62c1318056fa373e0fdce6398c0f1e0887face7098df7a
+FROM openzipkin/zipkin:latest@sha256:24164b3a36fccf3459fdef8fac9fd86cdf88a2f43666705163ce1a419b240623

mobile/library/cc/BUILD

@@ -107,7 +107,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//library/common:envoy_main_interface_lib_no_stamp",
+        "//library/common:engine_lib_no_stamp",
         "//library/common/api:c_types",
         "//library/common/data:utility_lib",
         "//library/common/extensions/key_value/platform:config",

mobile/library/cc/bridge_utility.h

@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include "headers.h"
+#include "library/cc/headers.h"
 #include "library/common/types/c_types.h"
 
 namespace Envoy {

mobile/library/cc/engine.cc

@@ -1,16 +1,15 @@
 #include "engine.h"
 
-#include "library/common/data/utility.h"
 #include "library/common/engine.h"
 #include "library/common/types/c_types.h"
 
 namespace Envoy {
 namespace Platform {
 
-Engine::Engine(::Envoy::Engine* engine) : engine_(engine), terminated_(false) {}
+Engine::Engine(::Envoy::Engine* engine) : engine_(engine) {}
 
 Engine::~Engine() {
-  if (!terminated_) {
+  if (!engine_->isTerminated()) {
     terminate();
   }
 }
@@ -23,26 +22,9 @@ StreamClientSharedPtr Engine::streamClient() {
   return std::make_shared<StreamClient>(shared_from_this());
 }
 
-std::string Engine::dumpStats() {
-  envoy_data data;
-  if (engine_->dumpStats(&data) == ENVOY_FAILURE) {
-    return "";
-  }
-  const std::string to_return = Data::Utility::copyToString(data);
-  release_envoy_data(data);
-
-  return to_return;
-}
+std::string Engine::dumpStats() { return engine_->dumpStats(); }
 
-envoy_status_t Engine::terminate() {
-  if (terminated_) {
-    IS_ENVOY_BUG("attempted to double terminate engine");
-    return ENVOY_FAILURE;
-  }
-  envoy_status_t ret = engine_->terminate();
-  terminated_ = true;
-  return ret;
-}
+envoy_status_t Engine::terminate() { return engine_->terminate(); }
 
 } // namespace Platform
 } // namespace Envoy

mobile/library/cc/engine.h

@@ -2,9 +2,9 @@
 
 #include <functional>
 
+#include "library/cc/log_level.h"
+#include "library/cc/stream_client.h"
 #include "library/common/types/c_types.h"
-#include "log_level.h"
-#include "stream_client.h"
 
 namespace Envoy {
 class Engine;
@@ -37,7 +37,6 @@ class Engine : public std::enable_shared_from_this<Engine> {
 
   Envoy::Engine* engine_;
   StreamClientSharedPtr stream_client_;
-  bool terminated_;
 };
 
 using EngineSharedPtr = std::shared_ptr<Engine>;

mobile/library/cc/engine_builder.h

@@ -13,12 +13,12 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/optional.h"
 #include "direct_response_testing.h"
-#include "engine.h"
-#include "engine_callbacks.h"
-#include "key_value_store.h"
+#include "library/cc/engine.h"
+#include "library/cc/engine_callbacks.h"
+#include "library/cc/key_value_store.h"
+#include "library/cc/log_level.h"
+#include "library/cc/string_accessor.h"
 #include "library/common/types/matcher_data.h"
-#include "log_level.h"
-#include "string_accessor.h"
 
 namespace Envoy {
 namespace Platform {

mobile/library/cc/engine_callbacks.cc

@@ -1,4 +1,4 @@
-#include "engine_callbacks.h"
+#include "library/cc/engine_callbacks.h"
 
 namespace Envoy {
 namespace Platform {

mobile/library/cc/engine_callbacks.h

@@ -3,7 +3,7 @@
 #include <functional>
 #include <memory>
 
-#include "engine.h"
+#include "library/cc/engine.h"
 #include "library/common/types/c_types.h"
 
 namespace Envoy {

mobile/library/cc/headers.cc

@@ -1,4 +1,4 @@
-#include "headers.h"
+#include "library/cc/headers.h"
 
 namespace Envoy {
 namespace Platform {

mobile/library/cc/headers_builder.cc

@@ -1,4 +1,4 @@
-#include "headers_builder.h"
+#include "library/cc/headers_builder.h"
 
 namespace Envoy {
 namespace Platform {

mobile/library/cc/request_headers.cc

@@ -1,4 +1,4 @@
-#include "request_headers.h"
+#include "library/cc/request_headers.h"
 
 namespace Envoy {
 namespace Platform {

mobile/library/cc/request_headers.h

@@ -3,10 +3,10 @@
 #include <optional>
 
 #include "absl/types/optional.h"
-#include "headers.h"
-#include "request_headers_builder.h"
-#include "request_method.h"
-#include "retry_policy.h"
+#include "library/cc/headers.h"
+#include "library/cc/request_headers_builder.h"
+#include "library/cc/request_method.h"
+#include "library/cc/retry_policy.h"
 
 namespace Envoy {
 namespace Platform {

mobile/library/cc/request_headers_builder.h

@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "headers_builder.h"
-#include "request_headers.h"
-#include "request_method.h"
+#include "library/cc/headers_builder.h"
+#include "library/cc/request_headers.h"
+#include "library/cc/request_method.h"
 #include "retry_policy.h"
 
 namespace Envoy {

mobile/library/cc/request_trailers.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "request_trailers_builder.h"
-#include "trailers.h"
+#include "library/cc/request_trailers_builder.h"
+#include "library/cc/trailers.h"
 
 namespace Envoy {
 namespace Platform {