From b1c8ea92dcb1c40874a6dff0fd70208b37ddb8e2 Mon Sep 17 00:00:00 2001
From: JinmingHu <jinmhu@microsoft.com>
Date: Thu, 29 Jul 2021 10:07:09 +0800
Subject: [PATCH] Change the order of some built-in policies and client
 policies (#2670)

---
 .../inc/azure/core/internal/http/pipeline.hpp         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sdk/core/azure-core/inc/azure/core/internal/http/pipeline.hpp b/sdk/core/azure-core/inc/azure/core/internal/http/pipeline.hpp
index ce6142465..3217ffc0c 100644
--- a/sdk/core/azure-core/inc/azure/core/internal/http/pipeline.hpp
+++ b/sdk/core/azure-core/inc/azure/core/internal/http/pipeline.hpp
@@ -94,11 +94,6 @@ namespace Azure { namespace Core { namespace Http { namespace _internal {
       {
         m_policies.emplace_back(policy->Clone());
       }
-      // client-options per call policies.
-      for (auto& policy : perCallClientPolicies)
-      {
-        m_policies.emplace_back(policy->Clone());
-      }
 
       // Request Id
       m_policies.emplace_back(
@@ -108,6 +103,12 @@ namespace Azure { namespace Core { namespace Http { namespace _internal {
           std::make_unique<Azure::Core::Http::Policies::_internal::TelemetryPolicy>(
               telemetryServiceName, telemetryServiceVersion, clientOptions.Telemetry));
 
+      // client-options per call policies.
+      for (auto& policy : perCallClientPolicies)
+      {
+        m_policies.emplace_back(policy->Clone());
+      }
+
       // Retry policy
       m_policies.emplace_back(std::make_unique<Azure::Core::Http::Policies::_internal::RetryPolicy>(
           clientOptions.Retry));