From 223fbcc5cf1e885987d2c9798b54ba5b7dfd0a4d Mon Sep 17 00:00:00 2001 From: Asra Ali Date: Wed, 8 Apr 2020 18:08:59 -0400 Subject: [PATCH 1/2] master fix Signed-off-by: Asra Ali --- docs/root/intro/version_history.rst | 1 + source/common/http/request_id_extension_impl.cc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/root/intro/version_history.rst b/docs/root/intro/version_history.rst index fc7dba8d2233a..b1c41d9dbf3ba 100644 --- a/docs/root/intro/version_history.rst +++ b/docs/root/intro/version_history.rst @@ -3,6 +3,7 @@ Version history 1.15.0 (Pending) ================ +* request_id_extension: fixed static initialization for noop request id extension. 1.14.0 (April 8, 2020) ====================== diff --git a/source/common/http/request_id_extension_impl.cc b/source/common/http/request_id_extension_impl.cc index 1e1e975c487f9..ed4022712fc09 100644 --- a/source/common/http/request_id_extension_impl.cc +++ b/source/common/http/request_id_extension_impl.cc @@ -45,8 +45,8 @@ RequestIDExtensionFactory::defaultInstance(Envoy::Runtime::RandomGenerator& rand } RequestIDExtensionSharedPtr RequestIDExtensionFactory::noopInstance() { - static RequestIDExtensionSharedPtr global = std::make_shared(); - return global; + MUTABLE_CONSTRUCT_ON_FIRST_USE(std::shared_ptr, + std::make_shared()); } } // namespace Http From 1d0de22051a9d673983a24ba4cf1f5065d0f5450 Mon Sep 17 00:00:00 2001 From: Asra Ali Date: Wed, 8 Apr 2020 18:16:59 -0400 Subject: [PATCH 2/2] fix version Signed-off-by: Asra Ali --- docs/root/intro/version_history.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/root/intro/version_history.rst b/docs/root/intro/version_history.rst index b1c41d9dbf3ba..862cb47cd223f 100644 --- a/docs/root/intro/version_history.rst +++ b/docs/root/intro/version_history.rst @@ -3,6 +3,9 @@ Version history 1.15.0 (Pending) ================ + +1.14.1 (April 8, 2020) +====================== * request_id_extension: fixed static initialization for noop request id extension. 1.14.0 (April 8, 2020)