init

- added S3_express_bucket tracking

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h

@@ -17,6 +17,8 @@ enum class UserAgentFeature {
   S3_TRANSFER,
   S3_CRYPTO_V1N,
   S3_CRYPTO_V2,
+  S3_EXPRESS_BUCKET,
+  S3_ACCESS_GRANTS,
   FLEXIBLE_CHECKSUMS_REQ_CRC32,
   FLEXIBLE_CHECKSUMS_REQ_CRC32C,
   FLEXIBLE_CHECKSUMS_REQ_CRC64,

src/aws-cpp-sdk-core/source/client/UserAgent.cpp

@@ -27,6 +27,8 @@ const std::pair<UserAgentFeature, const char*> BUSINESS_METRIC_MAPPING[] = {
     {UserAgentFeature::S3_TRANSFER, "G"},
     {UserAgentFeature::S3_CRYPTO_V1N, "H"},
     {UserAgentFeature::S3_CRYPTO_V2, "I"},
+    {UserAgentFeature::S3_EXPRESS_BUCKET, "J"},
+    {UserAgentFeature::S3_ACCESS_GRANTS, "K"},
     {UserAgentFeature::FLEXIBLE_CHECKSUMS_REQ_CRC32, "U"},
     {UserAgentFeature::FLEXIBLE_CHECKSUMS_REQ_CRC32C, "V"},
     {UserAgentFeature::FLEXIBLE_CHECKSUMS_REQ_CRC64, "W"},
@@ -207,6 +209,8 @@ const std::pair<const char*, UserAgentFeature> LEGACY_FEATURE_MAPPING[] = {
     {"ft/s3-transfer", UserAgentFeature::S3_TRANSFER},
     {"ft/S3CryptoV1n", UserAgentFeature::S3_CRYPTO_V1N},
     {"ft/S3CryptoV2", UserAgentFeature::S3_CRYPTO_V2},
+    {"ft/s3-express", UserAgentFeature::S3_EXPRESS_BUCKET},
+    {"ft/s3-access-grants", UserAgentFeature::S3_ACCESS_GRANTS},
 };
 }
 

src/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp

@@ -151,6 +151,9 @@ namespace Aws
                                                                     const Aws::Map<Aws::String, Aws::String>& metadata,
                                                                     const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context,
                                                                     const Aws::String& precalculatedChecksum) {
+          // Track S3 Express bucket usage
+          m_transferConfig.s3Client->AppendToUserAgent("ft/s3-express");
+          
           // destructor of FStream will close stream automatically (when out of scope), no need to call close explicitly
 #ifdef _MSC_VER
           auto wide = Aws::Utils::StringUtils::ToWString(fileName.c_str());
@@ -169,6 +172,9 @@ namespace Aws
                                                                     const Aws::Map<Aws::String, Aws::String>& metadata,
                                                                     const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context,
                                                                     const Aws::String& precalculatedChecksum) {
+          // Track S3 Express bucket usage
+          m_transferConfig.s3Client->AppendToUserAgent("ft/s3-express");
+          
           auto handle =
               CreateUploadFileHandle(fileStream.get(), bucketName, keyName, contentType, metadata, context, "", precalculatedChecksum);
           return SubmitUpload(handle, fileStream);
@@ -181,6 +187,9 @@ namespace Aws
                                                                       const Aws::String& writeToFile,
                                                                       const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context)
         {
+          // Track S3 Express bucket usage
+          m_transferConfig.s3Client->AppendToUserAgent("ft/s3-express");
+            
             auto handle = Aws::MakeShared<TransferHandle>(CLASS_TAG, bucketName, keyName, writeToStreamfn, writeToFile);
             handle->ApplyDownloadConfiguration(downloadConfig);
             handle->SetContext(context);
@@ -205,6 +214,9 @@ namespace Aws
                                                                       const Aws::String& writeToFile,
                                                                       const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context)
         {
+          // Track S3 Express bucket usage
+          m_transferConfig.s3Client->AppendToUserAgent("ft/s3-express");
+            
             auto handle = Aws::MakeShared<TransferHandle>(CLASS_TAG, bucketName, keyName, fileOffset, downloadBytes, writeToStreamfn, writeToFile);
             handle->ApplyDownloadConfiguration(downloadConfig);
             handle->SetContext(context);
@@ -226,6 +238,9 @@ namespace Aws
                                                                       const DownloadConfiguration& downloadConfig,
                                                                       const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context)
         {
+          // Track S3 Express bucket usage
+          m_transferConfig.s3Client->AppendToUserAgent("ft/s3-express");
+            
 #ifdef _MSC_VER
             auto createFileFn = [=]() { return Aws::New<Aws::FStream>(CLASS_TAG, Aws::Utils::StringUtils::ToWString(writeToFile.c_str()).c_str(),
                                                                      std::ios_base::out | std::ios_base::in | std::ios_base::binary | std::ios_base::trunc);};
@@ -1504,4 +1519,4 @@ namespace Aws
           }
         }
     }
-}
+}