Update user agent tracking

Author: jterapin

gems/aws-sdk-s3/lib/aws-sdk-s3/customizations/object.rb

@@ -400,10 +400,7 @@ def upload_stream(options = {}, &block)
           part_size: uploading_options.delete(:part_size)
         )
         Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
-          uploader.upload(
-            uploading_options.merge(bucket: bucket_name, key: key),
-            &block
-          )
+          uploader.upload(uploading_options.merge(bucket: bucket_name, key: key), &block)
         end
         true
       end

gems/aws-sdk-s3/lib/aws-sdk-s3/file_downloader.rb

@@ -9,7 +9,10 @@ module S3
     # @api private
     class FileDownloader
 
+      # @api private
       MIN_CHUNK_SIZE = 5 * 1024 * 1024
+
+      # @api private
       MAX_PARTS = 10_000
 
       def initialize(options = {})
@@ -29,18 +32,16 @@ def download(destination, options = {})
         @params = options
         validate!
 
-        Aws::Plugins::UserAgent.metric('S3_TRANSFER') do
-          case @mode
-          when 'auto' then multipart_download
-          when 'single_request' then single_request
-          when 'get_range'
-            raise ArgumentError, 'In get_range mode, :chunk_size must be provided' unless @chunk_size
+        case @mode
+        when 'auto' then multipart_download
+        when 'single_request' then single_request
+        when 'get_range'
+          raise ArgumentError, 'In get_range mode, :chunk_size must be provided' unless @chunk_size
 
-            resp = @client.head_object(@params)
-            multithreaded_get_by_ranges(resp.content_length, resp.etag)
-          else
-            raise ArgumentError, "Invalid mode #{@mode} provided, :mode should be single_request, get_range or auto"
-          end
+          resp = @client.head_object(@params)
+          multithreaded_get_by_ranges(resp.content_length, resp.etag)
+        else
+          raise ArgumentError, "Invalid mode #{@mode} provided, :mode should be single_request, get_range or auto"
         end
         File.rename(@temp_path, @path) if @temp_path
       ensure

gems/aws-sdk-s3/lib/aws-sdk-s3/file_uploader.rb

@@ -36,14 +36,12 @@ def initialize(options = {})
       #   objects smaller than the multipart threshold.
       # @return [void]
       def upload(source, options = {})
-        Aws::Plugins::UserAgent.metric('S3_TRANSFER') do
-          if File.size(source) >= multipart_threshold
-            MultipartFileUploader.new(@options).upload(source, options)
-          else
-            # remove multipart parameters not supported by put_object
-            options.delete(:thread_count)
-            put_object(source, options)
-          end
+        if File.size(source) >= @multipart_threshold
+          MultipartFileUploader.new(@options).upload(source, options)
+        else
+          # remove multipart parameters not supported by put_object
+          options.delete(:thread_count)
+          put_object(source, options)
         end
       end
 

gems/aws-sdk-s3/lib/aws-sdk-s3/multipart_stream_uploader.rb

@@ -40,11 +40,9 @@ def initialize(options = {})
       # @option options [Integer] :thread_count (DEFAULT_THREAD_COUNT)
       # @return [Seahorse::Client::Response] - the CompleteMultipartUploadResponse
       def upload(options = {}, &block)
-        Aws::Plugins::UserAgent.metric('S3_TRANSFER') do
-          upload_id = initiate_upload(options)
-          parts = upload_parts(upload_id, options, &block)
-          complete_upload(upload_id, parts, options)
-        end
+        upload_id = initiate_upload(options)
+        parts = upload_parts(upload_id, options, &block)
+        complete_upload(upload_id, parts, options)
       end
 
       private

gems/aws-sdk-s3/lib/aws-sdk-s3/object_copier.rb

@@ -28,13 +28,11 @@ def copy_object(source, target, options)
         options[:bucket] = target_bucket
         options[:key] = target_key
         options[:copy_source] = copy_source(source)
-        Aws::Plugins::UserAgent.metric('S3_TRANSFER') do
-          if options.delete(:multipart_copy)
-            apply_source_client(source, options)
-            ObjectMultipartCopier.new(@options).copy(options)
-          else
-            @object.client.copy_object(options)
-          end
+        if options.delete(:multipart_copy)
+          apply_source_client(source, options)
+          ObjectMultipartCopier.new(@options).copy(options)
+        else
+          @object.client.copy_object(options)
         end
       end
 

gems/aws-sdk-s3/lib/aws-sdk-s3/transfer_manager.rb

@@ -95,8 +95,9 @@ def initialize(options = {})
       # @see Client#head_object
       def download_file(destination, bucket:, key:, **options)
         downloader = FileDownloader.new(client: @client)
-        # TODO: wrap with user-agent metric tracking
-        downloader.download(destination, options.merge(bucket: bucket, key: key))
+        Aws::Plugins::UserAgent.metric('S3_TRANSFER') do
+          downloader.download(destination, options.merge(bucket: bucket, key: key))
+        end
         true
       end
 
@@ -168,13 +169,11 @@ def download_file(destination, bucket:, key:, **options)
       # @see Client#complete_multipart_upload
       # @see Client#upload_part
       def upload_file(source, bucket:, key:, **options)
-        uploading_options = options.dup
-        uploader = FileUploader.new(
-          multipart_threshold: uploading_options.delete(:multipart_threshold),
-          client: @client
-        )
-        # TODO: wrap with user-agent metric tracking
-        response = uploader.upload(source, uploading_options.merge(bucket: bucket, key: key))
+        upload_opts = options.dup
+        uploader = FileUploader.new(multipart_threshold: upload_opts.delete(:multipart_threshold), client: @client)
+        response = Aws::Plugins::UserAgent.metric('S3_TRANSFER') do
+          uploader.upload(source, upload_opts.merge(bucket: bucket, key: key))
+        end
         yield response if block_given?
         true
       end
@@ -231,15 +230,16 @@ def upload_file(source, bucket:, key:, **options)
       # @see Client#complete_multipart_upload
       # @see Client#upload_part
       def upload_stream(bucket:, key:, **options, &block)
-        uploading_options = options.dup
+        upload_opts = options.dup
         uploader = MultipartStreamUploader.new(
           client: @client,
-          thread_count: uploading_options.delete(:thread_count),
-          tempfile: uploading_options.delete(:tempfile),
-          part_size: uploading_options.delete(:part_size)
+          thread_count: upload_opts.delete(:thread_count),
+          tempfile: upload_opts.delete(:tempfile),
+          part_size: upload_opts.delete(:part_size)
         )
-        # TODO: wrap with user-agent metric tracking
-        uploader.upload(uploading_options.merge(bucket: bucket, key: key), &block)
+        Aws::Plugins::UserAgent.metric('S3_TRANSFER') do
+          uploader.upload(upload_opts.merge(bucket: bucket, key: key), &block)
+        end
         true
       end
     end