Fix static shared_ptr in request id extension (#10713)

Signed-off-by: Asra Ali <[email protected]>
envoyproxy · Apr 8, 2020 · 3504d40 · 3504d40
1 parent de12027
commit 3504d40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.14.0
+1.14.1
diff --git a/docs/root/intro/version_history.rst b/docs/root/intro/version_history.rst
@@ -1,6 +1,10 @@
 Version history
 ---------------
 
+1.14.1 (April 8, 2020)
+======================
+* request_id_extension: fixed static initialization for noop request id extension.
+
 1.14.0 (April 8, 2020)
 ======================
 * access log: access logger extensions use the "envoy.access_loggers" name space. A mapping

diff --git 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<NoopRequestIDExtension>();
-  return global;
+  MUTABLE_CONSTRUCT_ON_FIRST_USE(std::shared_ptr<RequestIDExtension>,
+                                 std::make_shared<NoopRequestIDExtension>());
 }
 
 } // namespace Http