From 57155a72acd5ae877874680db0e6109964c63335 Mon Sep 17 00:00:00 2001
From: Jakub Sobon <mumak@google.com>
Date: Sat, 16 Jul 2022 21:26:07 +0000
Subject: [PATCH 1/2] Fix construction order of Envoy::Logger::Context.

Signed-off-by: Jakub Sobon <mumak@google.com>
---
 .azure-pipelines/pipelines.yml | 18 ++++++++++++++++++
 source/client/service_impl.h   |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml
index 5df0012b3..5b2802e32 100644
--- a/.azure-pipelines/pipelines.yml
+++ b/.azure-pipelines/pipelines.yml
@@ -61,6 +61,23 @@ stages:
       parameters:
         ciTarget: $(CI_TARGET)
 
+- stage: test_gcc
+  dependsOn: ["check"]
+  pool: "x64-large"
+  jobs:
+  - job: test_gcc
+    displayName: "do_ci.sh"
+    strategy:
+      maxParallel: 1
+      matrix:
+        test_gcc:
+          CI_TARGET: "test_gcc"
+    timeoutInMinutes: 120
+    steps:
+    - template: bazel.yml
+      parameters:
+        ciTarget: $(CI_TARGET)
+
 - stage: sanitizers
   dependsOn: ["test"]
   pool: "x64-large"
@@ -102,6 +119,7 @@ stages:
 - stage: release
   dependsOn:
   - "clang_tidy"
+  - "test_gcc"
   - "sanitizers"
   - "coverage"
   condition: eq(variables['PostSubmit'], true)
diff --git a/source/client/service_impl.h b/source/client/service_impl.h
index 21dd7241d..a12d47565 100644
--- a/source/client/service_impl.h
+++ b/source/client/service_impl.h
@@ -55,10 +55,10 @@ class ServiceImpl final : public nighthawk::client::NighthawkService::Service,
   void writeResponse(const nighthawk::client::ExecutionResponse& response);
   grpc::Status finishGrpcStream(const bool success, absl::string_view description = "");
 
+  Envoy::Thread::MutexBasicLockable log_lock_;
   std::unique_ptr<Envoy::Logger::Context> logging_context_;
   std::shared_ptr<Envoy::ProcessWide> process_wide_;
   Envoy::Event::RealTimeSystem time_system_; // NO_CHECK_FORMAT(real_time)
-  Envoy::Thread::MutexBasicLockable log_lock_;
   grpc::ServerReaderWriter<nighthawk::client::ExecutionResponse,
                            nighthawk::client::ExecutionRequest>* stream_;
   std::future<void> future_;

From e809649337d3bc282c9a3cb5e7adbae55ab5344c Mon Sep 17 00:00:00 2001
From: Jakub Sobon <mumak@google.com>
Date: Sat, 16 Jul 2022 21:46:25 +0000
Subject: [PATCH 2/2] Fixing the order in RequestSourceServiceImpl as well.

Signed-off-by: Jakub Sobon <mumak@google.com>
---
 source/client/service_impl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/client/service_impl.h b/source/client/service_impl.h
index a12d47565..dd79cc776 100644
--- a/source/client/service_impl.h
+++ b/source/client/service_impl.h
@@ -95,8 +95,8 @@ class RequestSourceServiceImpl final
                                nighthawk::request_source::RequestStreamRequest>* stream) override;
 
 private:
-  std::unique_ptr<Envoy::Logger::Context> logging_context_;
   Envoy::Thread::MutexBasicLockable log_lock_;
+  std::unique_ptr<Envoy::Logger::Context> logging_context_;
   RequestSourcePtr createStaticEmptyRequestSource(const uint32_t amount);
 };