Merge remote-tracking branch 'upstream/master' into rebranding

Author: Gallaecio

scrapy_zyte_smartproxy/middleware.py

@@ -156,13 +156,15 @@ def get_proxyauth(self, spider):
         return basic_auth_header(self.apikey, '')
 
     def process_request(self, request, spider):
+        from scrapy_zyte_smartproxy import __version__
         if self._is_enabled_for_request(request):
             self._set_zyte_smartproxy_default_headers(request)
             request.meta['proxy'] = self.url
             request.meta['download_timeout'] = self.download_timeout
             request.headers['Proxy-Authorization'] = self._proxyauth
             if self.job_id:
                 request.headers['X-Crawlera-Jobid'] = self.job_id
+            request.headers['X-Crawlera-Client'] = 'scrapy-zyte-smartproxy/%s' % __version__
             self.crawler.stats.inc_value('zyte_smartproxy/request')
             self.crawler.stats.inc_value('zyte_smartproxy/request/method/%s' % request.method)
         else:

tests/test_all.py

@@ -15,7 +15,7 @@
 from scrapy.exceptions import ScrapyDeprecationWarning
 from twisted.internet.error import ConnectionRefusedError, ConnectionDone
 
-from scrapy_zyte_smartproxy import ZyteSmartProxyMiddleware
+from scrapy_zyte_smartproxy import __version__, ZyteSmartProxyMiddleware
 from scrapy_zyte_smartproxy.utils import exp_backoff
 
 
@@ -897,3 +897,15 @@ def test_settings_dict(self):
         mw.process_request(req, self.spider)
         assert mw.process_request(req, self.spider) is None
         self.assertEqual(req.headers['X-Crawlera-Profile'], b'desktop')
+
+    def test_client_header(self):
+        self.spider.zyte_smartproxy_enabled = True
+        crawler = self._mock_crawler(self.spider, self.settings)
+        mw = self.mwcls.from_crawler(crawler)
+        mw.open_spider(self.spider)
+        req = Request('http://www.scrapytest.org')
+        self.assertEqual(mw.process_request(req, self.spider), None)
+        self.assertEqual(
+            req.headers.get('X-Crawlera-Client').decode('utf-8'),
+            'scrapy-zyte-smartproxy/%s' % __version__
+        )