Roll version of gsutil to 4.15.

third_party/gsutil/gslib/cloud_api_delegator.py

 # -*- coding: utf-8 -*-
 # Copyright 2013 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 23 matching lines @@
   During initialization it takes as an argument a gsutil_api_map which maps
   providers to their default and supported gsutil Cloud API implementations
   (see comments in cs_api_map for details).
 
   Instantiation of multiple delegators per-thread is required for multiprocess
   and/or multithreaded operations. Calling methods on the same delegator in
   multiple threads is unsafe.
   """
 
   def __init__(self, bucket_storage_uri_class, gsutil_api_map, logger,
-               provider=None, debug=0):
+               provider=None, debug=0, trace_token=None):
     """Performs necessary setup for delegating cloud storage requests.
 
     This function has different arguments than the gsutil Cloud API __init__
     function because of the delegation responsibilties of this class.
 
     Args:
       bucket_storage_uri_class: boto storage_uri class, used by APIs that
                                 provide boto translation or mocking.
       gsutil_api_map: Map of providers and API selector tuples to api classes
                       which can be used to communicate with those providers.
       logger: logging.logger for outputting log messages.
       provider: Default provider prefix describing cloud storage provider to
                 connect to.
       debug: Debug level for the API implementation (0..3).
+      trace_token: Apiary trace token to pass to API.
     """
     super(CloudApiDelegator, self).__init__(bucket_storage_uri_class, logger,
-                                            provider=provider, debug=debug)
+                                            provider=provider, debug=debug,
+                                            trace_token=trace_token)
     self.api_map = gsutil_api_map
     self.prefer_api = boto.config.get('GSUtil', 'prefer_api', '').upper()
     self.loaded_apis = {}
 
     if not self.api_map[ApiMapConstants.API_MAP]:
       raise ArgumentException('No apiclass supplied for gsutil Cloud API map.')
 
   def _GetApi(self, provider):
     """Returns a valid CloudApi for use by the caller.
 
@@ skipping 37 matching lines @@
           'gsutil Cloud API map contains no entry for provider %s.' % provider)
     if api_selector not in self.api_map[ApiMapConstants.API_MAP][provider]:
       raise ArgumentException(
           'gsutil Cloud API map does not support API %s for provider %s.' %
           (api_selector, provider))
     self.loaded_apis[provider][api_selector] = (
         self.api_map[ApiMapConstants.API_MAP][provider][api_selector](
             self.bucket_storage_uri_class,
             self.logger,
             provider=provider,
-            debug=self.debug))
+            debug=self.debug,
+            trace_token=self.trace_token))
 
   def GetApiSelector(self, provider=None):
     """Returns a cs_api_map.ApiSelector based on input and configuration.
 
     Args:
       provider: Provider to return the ApiSelector for.  If None, class-wide
                 default is used.
 
     Returns:
       cs_api_map.ApiSelector that will be used for calls to the delegator
@@ skipping 286 matching lines @@
 
     Raises:
       ArgumentException for errors during input validation.
       ServiceException for errors interacting with cloud storage providers.
 
     Returns:
       Website configuration XML for the bucket specified by storage_url.
     """
     return self._GetApi(provider).XmlPassThroughGetWebsite(storage_url)