diff --git a/slack_bolt/adapter/aws_lambda/lambda_s3_oauth_flow.py b/slack_bolt/adapter/aws_lambda/lambda_s3_oauth_flow.py index f6c8ba4d7..14c3f41d3 100644 --- a/slack_bolt/adapter/aws_lambda/lambda_s3_oauth_flow.py +++ b/slack_bolt/adapter/aws_lambda/lambda_s3_oauth_flow.py @@ -72,7 +72,7 @@ def __init__( @property def client(self) -> WebClient: if self._client is None: - self._client = create_web_client() + self._client = create_web_client(logger=self.logger) return self._client @property diff --git a/slack_bolt/app/app.py b/slack_bolt/app/app.py index 2d2c8a116..1941f129f 100644 --- a/slack_bolt/app/app.py +++ b/slack_bolt/app/app.py @@ -138,7 +138,11 @@ def __init__( warning_client_prioritized_and_token_skipped() ) else: - self._client = create_web_client(token) # NOTE: the token here can be None + self._client = create_web_client( + # NOTE: the token here can be None + token=token, + logger=self._framework_logger, + ) # -------------------------------------- # Authorize & OAuthFlow initialization diff --git a/slack_bolt/app/async_app.py b/slack_bolt/app/async_app.py index 83242ca90..df4d909b4 100644 --- a/slack_bolt/app/async_app.py +++ b/slack_bolt/app/async_app.py @@ -145,8 +145,11 @@ def __init__( warning_client_prioritized_and_token_skipped() ) else: - # NOTE: the token here can be None - self._async_client = create_async_web_client(token) + self._async_client = create_async_web_client( + # NOTE: the token here can be None + token=token, + logger=self._framework_logger, + ) # -------------------------------------- # Authorize & OAuthFlow initialization diff --git a/slack_bolt/oauth/async_oauth_flow.py b/slack_bolt/oauth/async_oauth_flow.py index 42a98c9e5..3808c1408 100644 --- a/slack_bolt/oauth/async_oauth_flow.py +++ b/slack_bolt/oauth/async_oauth_flow.py @@ -39,7 +39,7 @@ class AsyncOAuthFlow: @property def client(self) -> AsyncWebClient: if self._async_client is None: - self._async_client = create_async_web_client() + self._async_client = create_async_web_client(logger=self.logger) return self._async_client @property diff --git a/slack_bolt/oauth/oauth_flow.py b/slack_bolt/oauth/oauth_flow.py index c03f406d2..df03ef452 100644 --- a/slack_bolt/oauth/oauth_flow.py +++ b/slack_bolt/oauth/oauth_flow.py @@ -38,7 +38,7 @@ class OAuthFlow: @property def client(self) -> WebClient: if self._client is None: - self._client = create_web_client() + self._client = create_web_client(logger=self.logger) return self._client @property diff --git a/slack_bolt/util/async_utils.py b/slack_bolt/util/async_utils.py index 60bbe0903..de01d6835 100644 --- a/slack_bolt/util/async_utils.py +++ b/slack_bolt/util/async_utils.py @@ -1,3 +1,4 @@ +from logging import Logger from typing import Optional from slack_sdk.web.async_client import AsyncWebClient @@ -5,8 +6,11 @@ from slack_bolt.version import __version__ as bolt_version -def create_async_web_client(token: Optional[str] = None) -> AsyncWebClient: +def create_async_web_client( + token: Optional[str] = None, logger: Optional[Logger] = None +) -> AsyncWebClient: return AsyncWebClient( token=token, + logger=logger, user_agent_prefix=f"Bolt-Async/{bolt_version}", ) diff --git a/slack_bolt/util/utils.py b/slack_bolt/util/utils.py index 15352367e..e603110f8 100644 --- a/slack_bolt/util/utils.py +++ b/slack_bolt/util/utils.py @@ -1,5 +1,6 @@ import copy import sys +from logging import Logger from typing import Optional, Union, Dict, Any, Sequence, Callable from slack_sdk import WebClient @@ -9,9 +10,12 @@ from slack_bolt.version import __version__ as bolt_version -def create_web_client(token: Optional[str] = None) -> WebClient: +def create_web_client( + token: Optional[str] = None, logger: Optional[Logger] = None +) -> WebClient: return WebClient( token=token, + logger=logger, user_agent_prefix=f"Bolt/{bolt_version}", )