Cbor release and feature ID tracking (#3582)

sbaluja · web-flow · commit c3135720b956 · 2025-10-13T18:44:52.000-04:00
* Fix CryptoBuffer bug with Cbor code gen

* Fix timestamp bug with Cbor code gen

* Feature ID tracking for CBOR

Removed magic strings "smithy-protocol" and "rpc-v2-cbor" and placed into Aws::Http::SMITHY_PROTOCOL_HEADER &amp; Aws::RPC_V2_CBOR

* Protocol selection priority update

* Updated protocol tests

* user agent metric mapping for CBOR

* User agent test for CBOR
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/EC2ProtocolClient.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/EC2ProtocolClient.cpp
@@ -157,6 +157,7 @@ void EC2ProtocolClient::init(const EC2Protocol::EC2ProtocolClientConfiguration&
 
 void EC2ProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-json-protocol/source/JsonProtocolClient.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-json-protocol/source/JsonProtocolClient.cpp
@@ -150,6 +150,7 @@ void JsonProtocolClient::init(const JsonProtocol::JsonProtocolClientConfiguratio
 
 void JsonProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-json-rpc-10/source/JSONRPC10Client.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-json-rpc-10/source/JSONRPC10Client.cpp
@@ -143,6 +143,7 @@ void JSONRPC10Client::init(const JSONRPC10::JSONRPC10ClientConfiguration& config
 
 void JSONRPC10Client::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-protocol-mock/source/ProtocolMockClient.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-protocol-mock/source/ProtocolMockClient.cpp
@@ -138,6 +138,7 @@ void ProtocolMockClient::init(const ProtocolMock::ProtocolMockClientConfiguratio
 
 void ProtocolMockClient::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-query-compatible-json-rpc-10/source/QueryCompatibleJSONRPC10Client.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-query-compatible-json-rpc-10/source/QueryCompatibleJSONRPC10Client.cpp
@@ -142,6 +142,7 @@ void QueryCompatibleJSONRPC10Client::init(const QueryCompatibleJSONRPC10::QueryC
 
 void QueryCompatibleJSONRPC10Client::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-query-protocol/source/QueryProtocolClient.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-query-protocol/source/QueryProtocolClient.cpp
@@ -166,6 +166,7 @@ void QueryProtocolClient::init(const QueryProtocol::QueryProtocolClientConfigura
 
 void QueryProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rest-json-protocol/source/RestJsonProtocolClient.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rest-json-protocol/source/RestJsonProtocolClient.cpp
@@ -200,6 +200,7 @@ void RestJsonProtocolClient::init(const RestJsonProtocol::RestJsonProtocolClient
 
 void RestJsonProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rest-xml-protocol/source/RestXmlProtocolClient.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rest-xml-protocol/source/RestXmlProtocolClient.cpp
@@ -200,6 +200,7 @@ void RestXmlProtocolClient::init(const RestXmlProtocol::RestXmlProtocolClientCon
 
 void RestXmlProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/RpcV2ProtocolClient.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/RpcV2ProtocolClient.cpp
@@ -143,6 +143,7 @@ void RpcV2ProtocolClient::init(const RpcV2Protocol::RpcV2ProtocolClientConfigura
 
 void RpcV2ProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
+  m_clientConfiguration.endpointOverride = endpoint;
   m_endpointProvider->OverrideEndpoint(endpoint);
 }
 
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/EmptyInputOutputRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/EmptyInputOutputRequest.cpp
@@ -27,8 +27,8 @@ Aws::String EmptyInputOutputRequest::SerializePayload() const {
 
 Aws::Http::HeaderValueCollection EmptyInputOutputRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
   headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   Aws::StringStream ss;
   if (m_requestIdHasBeenSet) {
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/Float16Request.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/Float16Request.cpp
@@ -16,7 +16,7 @@ Aws::String Float16Request::SerializePayload() const { return {}; }
 
 Aws::Http::HeaderValueCollection Float16Request::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   return headers;
 }
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/FractionalSecondsRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/FractionalSecondsRequest.cpp
@@ -16,7 +16,7 @@ Aws::String FractionalSecondsRequest::SerializePayload() const { return {}; }
 
 Aws::Http::HeaderValueCollection FractionalSecondsRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   return headers;
 }
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/GreetingWithErrorsRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/GreetingWithErrorsRequest.cpp
@@ -16,7 +16,7 @@ Aws::String GreetingWithErrorsRequest::SerializePayload() const { return {}; }
 
 Aws::Http::HeaderValueCollection GreetingWithErrorsRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   return headers;
 }
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/NoInputOutputRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/NoInputOutputRequest.cpp
@@ -16,7 +16,7 @@ Aws::String NoInputOutputRequest::SerializePayload() const { return {}; }
 
 Aws::Http::HeaderValueCollection NoInputOutputRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   return headers;
 }
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/OptionalInputOutputRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/OptionalInputOutputRequest.cpp
@@ -35,8 +35,8 @@ Aws::String OptionalInputOutputRequest::SerializePayload() const {
 
 Aws::Http::HeaderValueCollection OptionalInputOutputRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
   headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   Aws::StringStream ss;
   if (m_requestIdHasBeenSet) {
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RecursiveShapesRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RecursiveShapesRequest.cpp
@@ -35,8 +35,8 @@ Aws::String RecursiveShapesRequest::SerializePayload() const {
 
 Aws::Http::HeaderValueCollection RecursiveShapesRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
   headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   Aws::StringStream ss;
   if (m_requestIdHasBeenSet) {
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RpcV2CborDenseMapsRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RpcV2CborDenseMapsRequest.cpp
@@ -90,8 +90,8 @@ Aws::String RpcV2CborDenseMapsRequest::SerializePayload() const {
 
 Aws::Http::HeaderValueCollection RpcV2CborDenseMapsRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
   headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   Aws::StringStream ss;
   if (m_requestIdHasBeenSet) {
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RpcV2CborListsRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RpcV2CborListsRequest.cpp
@@ -89,7 +89,7 @@ Aws::String RpcV2CborListsRequest::SerializePayload() const {
     encoder.WriteArrayStart(m_timestampList.size());
     for (const auto& item_0 : m_timestampList) {
       encoder.WriteTag(1);  // 1 represents Epoch-based date/time. See https://www.rfc-editor.org/rfc/rfc8949.html#tags
-      encoder.WriteUInt(item_0.Millis());
+      encoder.WriteUInt(item_0.Seconds());
     }
   }
 
@@ -142,8 +142,8 @@ Aws::String RpcV2CborListsRequest::SerializePayload() const {
 
 Aws::Http::HeaderValueCollection RpcV2CborListsRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
   headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   Aws::StringStream ss;
   if (m_requestIdHasBeenSet) {
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RpcV2CborListsResult.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/RpcV2CborListsResult.cpp
@@ -692,7 +692,7 @@ RpcV2CborListsResult& RpcV2CborListsResult::operator=(const Aws::AmazonWebServic
                                 ss_1 << Aws::String(reinterpret_cast<const char*>(val.value().ptr), val.value().len);
                               }
                             }
-                            m_blobList.push_back(ss_1.str());
+                            m_blobList.push_back(Aws::Utils::ByteBuffer(ss_1.str()));
                             ss_1.clear();
                           }
                         }
@@ -732,7 +732,7 @@ RpcV2CborListsResult& RpcV2CborListsResult::operator=(const Aws::AmazonWebServic
                               ss_1 << Aws::String(reinterpret_cast<const char*>(val.value().ptr), val.value().len);
                             }
                           }
-                          m_blobList.push_back(ss_1.str());
+                          m_blobList.push_back(Aws::Utils::ByteBuffer(ss_1.str()));
                           ss_1.clear();
                         }
                       }
@@ -1453,7 +1453,7 @@ RpcV2CborListsResult& RpcV2CborListsResult::operator=(const Aws::AmazonWebServic
                               ss_1 << Aws::String(reinterpret_cast<const char*>(val.value().ptr), val.value().len);
                             }
                           }
-                          m_blobList.push_back(ss_1.str());
+                          m_blobList.push_back(Aws::Utils::ByteBuffer(ss_1.str()));
                           ss_1.clear();
                         }
                       }
@@ -1493,7 +1493,7 @@ RpcV2CborListsResult& RpcV2CborListsResult::operator=(const Aws::AmazonWebServic
                             ss_1 << Aws::String(reinterpret_cast<const char*>(val.value().ptr), val.value().len);
                           }
                         }
-                        m_blobList.push_back(ss_1.str());
+                        m_blobList.push_back(Aws::Utils::ByteBuffer(ss_1.str()));
                         ss_1.clear();
                       }
                     }
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/SimpleScalarPropertiesRequest.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/SimpleScalarPropertiesRequest.cpp
@@ -108,8 +108,8 @@ Aws::String SimpleScalarPropertiesRequest::SerializePayload() const {
 
 Aws::Http::HeaderValueCollection SimpleScalarPropertiesRequest::GetRequestSpecificHeaders() const {
   Aws::Http::HeaderValueCollection headers;
-  headers.emplace("smithy-protocol", "rpc-v2-cbor");
   headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);
+  headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
   headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);
   Aws::StringStream ss;
   if (m_requestIdHasBeenSet) {
diff --git a/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/SimpleScalarPropertiesResult.cpp b/generated/protocol-tests/test-clients/aws-cpp-sdk-rpcv2protocol/source/model/SimpleScalarPropertiesResult.cpp
@@ -199,7 +199,7 @@ SimpleScalarPropertiesResult& SimpleScalarPropertiesResult::operator=(
                         ss << Aws::String(reinterpret_cast<const char*>(val.value().ptr), val.value().len);
                       }
                     }
-                    m_blobValue = ss.str();
+                    m_blobValue = Aws::Utils::ByteBuffer(ss.str());
                     ss.clear();
                   }
                 }
@@ -421,7 +421,7 @@ SimpleScalarPropertiesResult& SimpleScalarPropertiesResult::operator=(
                       ss << Aws::String(reinterpret_cast<const char*>(val.value().ptr), val.value().len);
                     }
                   }
-                  m_blobValue = ss.str();
+                  m_blobValue = Aws::Utils::ByteBuffer(ss.str());
                   ss.clear();
                 }
               }
diff --git a/src/aws-cpp-sdk-core/include/aws/core/AmazonSerializableWebServiceRequest.h b/src/aws-cpp-sdk-core/include/aws/core/AmazonSerializableWebServiceRequest.h
@@ -21,6 +21,7 @@ namespace Aws
     static const char AMZN_XML_CONTENT_TYPE[]              = "application/xml";
     static const char AMZN_EVENTSTREAM_CONTENT_TYPE[]      = "application/vnd.amazon.eventstream";
     static const char CBOR_CONTENT_TYPE[]                  = "application/cbor";
+    static const char RPC_V2_CBOR[]                        = "rpc-v2-cbor";
 
     /**
      * High-level abstraction over AWS requests. GetBody() calls SerializePayload() and uses a stringbuf under the hood.
diff --git a/src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h b/src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h
@@ -42,6 +42,7 @@ enum class UserAgentFeature {
   CREDENTIALS_SSO,
   CREDENTIALS_SSO_LEGACY,
   CREDENTIALS_PROFILE_SOURCE_PROFILE,
+  PROTOCOL_RPC_V2_CBOR,
 };
 
 class AWS_CORE_API UserAgent {
diff --git a/src/aws-cpp-sdk-core/include/aws/core/http/HttpRequest.h b/src/aws-cpp-sdk-core/include/aws/core/http/HttpRequest.h
@@ -59,6 +59,7 @@ namespace Aws
         extern AWS_CORE_API const char AWS_TRAILER_HEADER[];
         extern AWS_CORE_API const char SDK_INVOCATION_ID_HEADER[];
         extern AWS_CORE_API const char SDK_REQUEST_HEADER[];
+        extern AWS_CORE_API const char SMITHY_PROTOCOL_HEADER[];
         extern AWS_CORE_API const char X_AMZN_TRACE_ID_HEADER[];
         extern AWS_CORE_API const char CHUNKED_VALUE[];
         extern AWS_CORE_API const char AWS_CHUNKED_VALUE[];
diff --git a/src/aws-cpp-sdk-core/source/client/AWSClient.cpp b/src/aws-cpp-sdk-core/source/client/AWSClient.cpp
@@ -927,6 +927,11 @@ void AWSClient::BuildHttpRequest(const Aws::AmazonWebServiceRequest& request, co
         }
     }
 
+    if (httpRequest->HasHeader(Aws::Http::SMITHY_PROTOCOL_HEADER))
+    {
+        request.AddUserAgentFeature(Aws::Client::UserAgentFeature::PROTOCOL_RPC_V2_CBOR);
+    }
+
     // Pass along handlers for processing data sent/received in bytes
     httpRequest->SetHeadersReceivedEventHandler(request.GetHeadersReceivedEventHandler());
     httpRequest->SetDataReceivedEventHandler(request.GetDataReceivedEventHandler());
diff --git a/src/aws-cpp-sdk-core/source/client/UserAgent.cpp b/src/aws-cpp-sdk-core/source/client/UserAgent.cpp
@@ -52,6 +52,7 @@ const std::pair<UserAgentFeature, const char*> BUSINESS_METRIC_MAPPING[] = {
     {UserAgentFeature::CREDENTIALS_SSO, "s"},
     {UserAgentFeature::CREDENTIALS_SSO_LEGACY, "u"},
     {UserAgentFeature::CREDENTIALS_PROFILE_SOURCE_PROFILE, "p"},
+    {UserAgentFeature::PROTOCOL_RPC_V2_CBOR, "M"},
 };
 
 const std::pair<const char*, UserAgentFeature> RETRY_FEATURE_MAPPING[] = {
diff --git a/src/aws-cpp-sdk-core/source/http/HttpRequest.cpp b/src/aws-cpp-sdk-core/source/http/HttpRequest.cpp
@@ -37,6 +37,7 @@ namespace Aws
         const char AWS_TRAILER_HEADER[] = "x-amz-trailer";
         const char SDK_INVOCATION_ID_HEADER[] = "amz-sdk-invocation-id";
         const char SDK_REQUEST_HEADER[] = "amz-sdk-request";
+        const char SMITHY_PROTOCOL_HEADER[] = "smithy-protocol";
         const char CHUNKED_VALUE[] = "chunked";
         const char AWS_CHUNKED_VALUE[] = "aws-chunked";
         const char X_AMZN_TRACE_ID_HEADER[] = "X-Amzn-Trace-Id";
diff --git a/tests/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp b/tests/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp
@@ -24,6 +24,7 @@
 #include <aws/core/utils/logging/LogMacros.h>
 #include <aws/core/client/AWSErrorMarshaller.h>
 #include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/AmazonSerializableWebServiceRequest.h>
 
 
 using namespace Aws;
@@ -519,6 +520,30 @@ TEST_F(AWSClientTestSuite, TestRecursionDetection)
         mockHttpClient->Reset();
     }
 }
+
+TEST_F(AWSClientTestSuite, TestCborUserAgent)
+{
+    HeaderValueCollection responseHeaders;
+    AmazonWebServiceRequestMock request;
+    request.SetAdditionalCustomHeaderValue(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);
+    QueueMockResponse(HttpResponseCode::OK, responseHeaders);
+    auto outcome = client->MakeRequest(request);
+
+    auto lastRequest = mockHttpClient->GetMostRecentHttpRequest();
+    EXPECT_TRUE(lastRequest.HasUserAgent());
+    const auto& userAgent = lastRequest.GetUserAgent();
+    EXPECT_TRUE(!userAgent.empty());
+
+    const auto userAgentParsed = Aws::Utils::StringUtils::Split(userAgent, ' ');
+
+    EXPECT_TRUE(!Aws::Client::UserAgent::BusinessMetricForFeature(UserAgentFeature::PROTOCOL_RPC_V2_CBOR).empty());
+    // Check for CBOR protocol business metric (M) in user agent
+    auto businessMetrics = std::find_if(userAgentParsed.begin(), userAgentParsed.end(),
+        [](const Aws::String& value) { return value.find("m/") != Aws::String::npos && value.find(Aws::Client::UserAgent::BusinessMetricForFeature(UserAgentFeature::PROTOCOL_RPC_V2_CBOR)) != Aws::String::npos; });
+
+    EXPECT_TRUE(businessMetrics != userAgentParsed.end());
+
+}
 using namespace Aws::Utils::Xml;
 TEST_F(XMLClientTestSuite, TestErrorInBodyOfResponse)
 {
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Metadata.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Metadata.java
@@ -17,12 +17,12 @@
 @Data
 public class Metadata {
     private static List<String> supportedProtocols = ImmutableList.of(
+            "smithy-rpc-v2-cbor",
             "json",
             "rest-json",
             "rest-xml",
             "query",
-            "ec2",
-            "smithy-rpc-v2-cbor"
+            "ec2"
     );
 
     private String apiVersion;
@@ -72,6 +72,11 @@ public String findFirstSupportedProtocol() {
             return protocol;
         }
 
+        //We're releasing CBOR so current services (only arc-region-switch) need to opt into the new protocol priority
+        if (serviceFullName != null && serviceFullName.equalsIgnoreCase("ARC - Region switch")){
+            return "json";
+        }
+
         return protocols.stream().filter(supportedProtocols::contains)
                 .min(Comparator.comparingInt(protocolName -> supportedProtocols.indexOf(protocolName)))
                 .orElseThrow(() -> new RuntimeException(String.format("No supported protocol found for %s", serviceFullName)));
diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java
@@ -122,15 +122,15 @@ protected SdkFileEntry generateModelSourceFile(ServiceModel serviceModel, Map.En
                     HashMap<String, String> headersMap = new HashMap<>(10);
                     headersMap.put("Aws::Http::CONTENT_TYPE_HEADER", "Aws::AMZN_EVENTSTREAM_CONTENT_TYPE");
                     headersMap.put("Aws::Http::ACCEPT_HEADER", "Aws::AMZN_EVENTSTREAM_CONTENT_TYPE");
-                    headersMap.put("\"smithy-protocol\"", "\"rpc-v2-cbor\"");
+                    headersMap.put("Aws::Http::SMITHY_PROTOCOL_HEADER", "Aws::RPC_V2_CBOR");
                     context.put("requestSpecificHeaders", headersMap);
                 }
                 template = velocityEngine.getTemplate("/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm", StandardCharsets.UTF_8.name());
             }
             else if (shape.isRequest()) {
                 Map<String, String> cborSpecificHeaders = new HashMap<>();
                 cborSpecificHeaders.put("Aws::Http::ACCEPT_HEADER", "Aws::CBOR_CONTENT_TYPE");
-                cborSpecificHeaders.put("\"smithy-protocol\"", "\"rpc-v2-cbor\"");
+                cborSpecificHeaders.put("Aws::Http::SMITHY_PROTOCOL_HEADER", "Aws::RPC_V2_CBOR");
                 if(shape.hasMembers()){
                     cborSpecificHeaders.put("Aws::Http::CONTENT_TYPE_HEADER", "Aws::CBOR_CONTENT_TYPE");
                 }
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeListValue.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeListValue.vm
@@ -70,7 +70,7 @@ if(peekType_${recursionDepth}.has_value()){
                     ss_${recursionDepth} << Aws::String(reinterpret_cast<const char*>(${containerVar}.value().ptr), ${containerVar}.value().len);
                 }
             }
-            ${value}.push_back(ss_${recursionDepth}.str());
+            ${value}.push_back(Aws::Utils::ByteBuffer(ss_${recursionDepth}.str()));
             ss_${recursionDepth}.clear();
         }
     }
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeMapValue.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeMapValue.vm
@@ -73,7 +73,7 @@ if(peekType_${recursionDepth}){
                     ss_${recursionDepth} << Aws::String(reinterpret_cast<const char*>(${containerVar}.value().ptr), ${containerVar}.value().len);
                 }
             }
-            ${value}[keyStr_${recursionDepth}] = ss_${recursionDepth}.str();
+            ${value}[keyStr_${recursionDepth}] = Aws::Utils::ByteBuffer(ss_${recursionDepth}.str());
             ss_${recursionDepth}.clear();
         }
     }
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeValue.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeValue.vm
@@ -69,7 +69,7 @@ if (peekType.has_value()) {
                 ss << Aws::String(reinterpret_cast<const char*>(${containerVar}.value().ptr), ${containerVar}.value().len);
             }
         }
-        ${memberVarName} = ss.str();
+        ${memberVarName} = Aws::Utils::ByteBuffer(ss.str());
         ss.clear();
     }
 }
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborEncodeValue.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborEncodeValue.vm

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ void EC2ProtocolClient::init(const EC2Protocol::EC2ProtocolClientConfiguration&`
`157`	`157`
`158`	`158`	`void EC2ProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {`
`159`	`159`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`160`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`160`	`161`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`161`	`162`	`}`
`162`	`163`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ void JsonProtocolClient::init(const JsonProtocol::JsonProtocolClientConfiguratio`
`150`	`150`
`151`	`151`	`void JsonProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {`
`152`	`152`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`153`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`153`	`154`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`154`	`155`	`}`
`155`	`156`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ void JSONRPC10Client::init(const JSONRPC10::JSONRPC10ClientConfiguration& config`
`143`	`143`
`144`	`144`	`void JSONRPC10Client::OverrideEndpoint(const Aws::String& endpoint) {`
`145`	`145`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`146`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`146`	`147`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`147`	`148`	`}`
`148`	`149`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ void ProtocolMockClient::init(const ProtocolMock::ProtocolMockClientConfiguratio`
`138`	`138`
`139`	`139`	`void ProtocolMockClient::OverrideEndpoint(const Aws::String& endpoint) {`
`140`	`140`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`141`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`141`	`142`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`142`	`143`	`}`
`143`	`144`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ void QueryCompatibleJSONRPC10Client::init(const QueryCompatibleJSONRPC10::QueryC`
`142`	`142`
`143`	`143`	`void QueryCompatibleJSONRPC10Client::OverrideEndpoint(const Aws::String& endpoint) {`
`144`	`144`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`145`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`145`	`146`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`146`	`147`	`}`
`147`	`148`
Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ void QueryProtocolClient::init(const QueryProtocol::QueryProtocolClientConfigura`
`166`	`166`
`167`	`167`	`void QueryProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {`
`168`	`168`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`169`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`169`	`170`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`170`	`171`	`}`
`171`	`172`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ void RestJsonProtocolClient::init(const RestJsonProtocol::RestJsonProtocolClient`
`200`	`200`
`201`	`201`	`void RestJsonProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {`
`202`	`202`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`203`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`203`	`204`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`204`	`205`	`}`
`205`	`206`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ void RestXmlProtocolClient::init(const RestXmlProtocol::RestXmlProtocolClientCon`
`200`	`200`
`201`	`201`	`void RestXmlProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {`
`202`	`202`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`203`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`203`	`204`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`204`	`205`	`}`
`205`	`206`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ void RpcV2ProtocolClient::init(const RpcV2Protocol::RpcV2ProtocolClientConfigura`
`143`	`143`
`144`	`144`	`void RpcV2ProtocolClient::OverrideEndpoint(const Aws::String& endpoint) {`
`145`	`145`	`AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);`
	`146`	`+ m_clientConfiguration.endpointOverride = endpoint;`
`146`	`147`	`m_endpointProvider->OverrideEndpoint(endpoint);`
`147`	`148`	`}`
`148`	`149`