Add user agent to all requests

Author: tpoliaw

src/blueapi/client/rest.py

@@ -38,6 +38,8 @@
 
 LOGGER = logging.getLogger(__name__)
 
+USER_AGENT = f"blueapi cli {__version__}"
+
 
 class UnauthorisedAccessError(Exception):
     pass
@@ -260,14 +262,15 @@ def _request_and_deserialize(
     ) -> T:
         url = self._config.url.unicode_string().removesuffix("/") + suffix
         # Get the trace context to propagate to the REST API
-        carr = get_context_propagator()
+        headers = get_context_propagator()
+        headers["User-Agent"] = USER_AGENT
         try:
             response = self._pool.request(
                 method,
                 url,
                 json=data,
                 params=params,
-                headers=carr,
+                headers=headers,
                 auth=JWTAuth(self._session_manager),
             )
         except requests.exceptions.ConnectionError as ce:
@@ -293,14 +296,14 @@ def _request_and_deserialize(
 
     def run_blocking(self, req: TaskRequest):
         url = self._ws_address().unicode_string().removesuffix("/") + "/run_plan"
-        headers = {}
+        headers = get_context_propagator()
         if self._session_manager:
             auth = self._session_manager.get_valid_access_token()
             headers["Authorization"] = f"Bearer {auth}"
         with connect(
             url,
             additional_headers=headers,
-            user_agent_header="blueapi cli",
+            user_agent_header=USER_AGENT,
         ) as ws:
             ws.send(req.model_dump_json())
             for message in ws: