From 0d7d7918b6779ea4f84d0eb5cda1012a4eb5fdfa Mon Sep 17 00:00:00 2001
From: "Wei Sun (Jack)" <weisun@google.com>
Date: Fri, 16 May 2025 23:03:27 -0700
Subject: [PATCH] chore: logger = logging.getLogger(__name__) --> logger =
 logging.getLogger('google_adk.' + __name__)

PiperOrigin-RevId: 759894901
---
 src/google/adk/agents/llm_agent.py            |  2 +-
 src/google/adk/agents/run_config.py           |  2 +-
 .../adk/artifacts/gcs_artifact_service.py     |  2 +-
 .../artifacts/in_memory_artifact_service.py   |  2 +-
 src/google/adk/evaluation/__init__.py         |  2 +-
 src/google/adk/evaluation/agent_evaluator.py  |  2 +-
 .../adk/evaluation/local_eval_sets_manager.py |  4 +++-
 src/google/adk/examples/example_util.py       |  5 +++--
 .../adk/flows/llm_flows/base_llm_flow.py      |  2 +-
 src/google/adk/flows/llm_flows/functions.py   |  2 +-
 src/google/adk/flows/llm_flows/single_flow.py |  2 +-
 src/google/adk/memory/__init__.py             |  2 +-
 src/google/adk/models/anthropic_llm.py        |  5 +++--
 .../adk/models/gemini_llm_connection.py       | 22 +++++++++----------
 src/google/adk/models/lite_llm.py             |  2 +-
 src/google/adk/models/registry.py             |  2 +-
 src/google/adk/runners.py                     |  2 +-
 src/google/adk/sessions/__init__.py           |  2 +-
 .../adk/sessions/database_session_service.py  |  9 ++++----
 .../adk/sessions/in_memory_session_service.py |  4 ++--
 .../adk/sessions/vertex_ai_session_service.py |  6 ++---
 .../application_integration_toolset.py        |  7 +++---
 .../integration_connector_tool.py             |  8 ++++---
 .../adk/tools/built_in_code_execution_tool.py |  3 +--
 .../tools/function_parameter_parse_util.py    |  2 +-
 .../google_api_tool/google_api_toolsets.py    |  7 +++---
 .../googleapi_to_openapi_converter.py         |  2 +-
 src/google/adk/tools/mcp_tool/__init__.py     |  5 +++--
 .../adk/tools/mcp_tool/mcp_session_manager.py | 13 +++++++----
 src/google/adk/tools/mcp_tool/mcp_toolset.py  |  5 +++--
 .../openapi_spec_parser/openapi_toolset.py    |  2 +-
 .../openapi_spec_parser/tool_auth_handler.py  |  2 +-
 src/google/adk/tools/retrieval/__init__.py    |  2 +-
 .../retrieval/vertex_ai_rag_retrieval.py      |  2 +-
 34 files changed, 79 insertions(+), 64 deletions(-)

diff --git a/src/google/adk/agents/llm_agent.py b/src/google/adk/agents/llm_agent.py
index 4a419ef..6f211f4 100644
--- a/src/google/adk/agents/llm_agent.py
+++ b/src/google/adk/agents/llm_agent.py
@@ -53,7 +53,7 @@ from .callback_context import CallbackContext
 from .invocation_context import InvocationContext
 from .readonly_context import ReadonlyContext
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 _SingleBeforeModelCallback: TypeAlias = Callable[
     [CallbackContext, LlmRequest],
diff --git a/src/google/adk/agents/run_config.py b/src/google/adk/agents/run_config.py
index f19ae0f..566fe86 100644
--- a/src/google/adk/agents/run_config.py
+++ b/src/google/adk/agents/run_config.py
@@ -22,7 +22,7 @@ from pydantic import BaseModel
 from pydantic import ConfigDict
 from pydantic import field_validator
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class StreamingMode(Enum):
diff --git a/src/google/adk/artifacts/gcs_artifact_service.py b/src/google/adk/artifacts/gcs_artifact_service.py
index 8adbfe5..e4af21e 100644
--- a/src/google/adk/artifacts/gcs_artifact_service.py
+++ b/src/google/adk/artifacts/gcs_artifact_service.py
@@ -23,7 +23,7 @@ from typing_extensions import override
 
 from .base_artifact_service import BaseArtifactService
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 class GcsArtifactService(BaseArtifactService):
diff --git a/src/google/adk/artifacts/in_memory_artifact_service.py b/src/google/adk/artifacts/in_memory_artifact_service.py
index fcfb881..1dd724b 100644
--- a/src/google/adk/artifacts/in_memory_artifact_service.py
+++ b/src/google/adk/artifacts/in_memory_artifact_service.py
@@ -24,7 +24,7 @@ from typing_extensions import override
 
 from .base_artifact_service import BaseArtifactService
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 class InMemoryArtifactService(BaseArtifactService, BaseModel):
diff --git a/src/google/adk/evaluation/__init__.py b/src/google/adk/evaluation/__init__.py
index ae92ac7..0fa5ec1 100644
--- a/src/google/adk/evaluation/__init__.py
+++ b/src/google/adk/evaluation/__init__.py
@@ -14,7 +14,7 @@
 
 import logging
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 __all__ = []
 
diff --git a/src/google/adk/evaluation/agent_evaluator.py b/src/google/adk/evaluation/agent_evaluator.py
index a29af99..78d2063 100644
--- a/src/google/adk/evaluation/agent_evaluator.py
+++ b/src/google/adk/evaluation/agent_evaluator.py
@@ -34,7 +34,7 @@ from .local_eval_sets_manager import convert_eval_set_to_pydanctic_schema
 from .response_evaluator import ResponseEvaluator
 from .trajectory_evaluator import TrajectoryEvaluator
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 # Constants for default runs and evaluation criteria
diff --git a/src/google/adk/evaluation/local_eval_sets_manager.py b/src/google/adk/evaluation/local_eval_sets_manager.py
index 456893f..ad61cf2 100644
--- a/src/google/adk/evaluation/local_eval_sets_manager.py
+++ b/src/google/adk/evaluation/local_eval_sets_manager.py
@@ -19,9 +19,11 @@ import re
 import time
 from typing import Any
 import uuid
+
 from google.genai import types as genai_types
 from pydantic import ValidationError
 from typing_extensions import override
+
 from .eval_case import EvalCase
 from .eval_case import IntermediateData
 from .eval_case import Invocation
@@ -29,7 +31,7 @@ from .eval_case import SessionInput
 from .eval_set import EvalSet
 from .eval_sets_manager import EvalSetsManager
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 _EVAL_SET_FILE_EXTENSION = ".evalset.json"
 
diff --git a/src/google/adk/examples/example_util.py b/src/google/adk/examples/example_util.py
index 6e264b4..62ba55c 100644
--- a/src/google/adk/examples/example_util.py
+++ b/src/google/adk/examples/example_util.py
@@ -15,8 +15,9 @@
 """Utility functions for converting examples to a string that can be used in system instructions in the prompt."""
 
 import logging
-from typing import Optional, Union
+from typing import Optional
 from typing import TYPE_CHECKING
+from typing import Union
 
 from .base_example_provider import BaseExampleProvider
 from .example import Example
@@ -24,7 +25,7 @@ from .example import Example
 if TYPE_CHECKING:
   from ..sessions.session import Session
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 # Constant parts of the example string
 _EXAMPLES_INTRO = (
diff --git a/src/google/adk/flows/llm_flows/base_llm_flow.py b/src/google/adk/flows/llm_flows/base_llm_flow.py
index bece41f..e0bbfa0 100644
--- a/src/google/adk/flows/llm_flows/base_llm_flow.py
+++ b/src/google/adk/flows/llm_flows/base_llm_flow.py
@@ -48,7 +48,7 @@ if TYPE_CHECKING:
   from ._base_llm_processor import BaseLlmRequestProcessor
   from ._base_llm_processor import BaseLlmResponseProcessor
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class BaseLlmFlow(ABC):
diff --git a/src/google/adk/flows/llm_flows/functions.py b/src/google/adk/flows/llm_flows/functions.py
index 0e3c8f2..53ddb35 100644
--- a/src/google/adk/flows/llm_flows/functions.py
+++ b/src/google/adk/flows/llm_flows/functions.py
@@ -41,7 +41,7 @@ from ...tools.tool_context import ToolContext
 AF_FUNCTION_CALL_ID_PREFIX = 'adk-'
 REQUEST_EUC_FUNCTION_CALL_NAME = 'adk_request_credential'
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 def generate_client_function_call_id() -> str:
diff --git a/src/google/adk/flows/llm_flows/single_flow.py b/src/google/adk/flows/llm_flows/single_flow.py
index 8d3239c..0a642b4 100644
--- a/src/google/adk/flows/llm_flows/single_flow.py
+++ b/src/google/adk/flows/llm_flows/single_flow.py
@@ -25,7 +25,7 @@ from . import identity
 from . import instructions
 from .base_llm_flow import BaseLlmFlow
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class SingleFlow(BaseLlmFlow):
diff --git a/src/google/adk/memory/__init__.py b/src/google/adk/memory/__init__.py
index 473e315..f2ac4f9 100644
--- a/src/google/adk/memory/__init__.py
+++ b/src/google/adk/memory/__init__.py
@@ -16,7 +16,7 @@ import logging
 from .base_memory_service import BaseMemoryService
 from .in_memory_memory_service import InMemoryMemoryService
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 __all__ = [
     'BaseMemoryService',
diff --git a/src/google/adk/models/anthropic_llm.py b/src/google/adk/models/anthropic_llm.py
index 0fc7502..0c635e2 100644
--- a/src/google/adk/models/anthropic_llm.py
+++ b/src/google/adk/models/anthropic_llm.py
@@ -24,8 +24,9 @@ from typing import AsyncGenerator
 from typing import Generator
 from typing import Iterable
 from typing import Literal
-from typing import Optional, Union
+from typing import Optional
 from typing import TYPE_CHECKING
+from typing import Union
 
 from anthropic import AnthropicVertex
 from anthropic import NOT_GIVEN
@@ -42,7 +43,7 @@ if TYPE_CHECKING:
 
 __all__ = ["Claude"]
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 MAX_TOKEN = 1024
 
diff --git a/src/google/adk/models/gemini_llm_connection.py b/src/google/adk/models/gemini_llm_connection.py
index 4018975..400aab3 100644
--- a/src/google/adk/models/gemini_llm_connection.py
+++ b/src/google/adk/models/gemini_llm_connection.py
@@ -21,7 +21,7 @@ from google.genai import types
 from .base_llm_connection import BaseLlmConnection
 from .llm_response import LlmResponse
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class GeminiLlmConnection(BaseLlmConnection):
@@ -149,16 +149,16 @@ class GeminiLlmConnection(BaseLlmConnection):
             message.server_content.input_transcription
             and message.server_content.input_transcription.text
         ):
-            user_text = message.server_content.input_transcription.text
-            parts = [
-                types.Part.from_text(
-                    text=user_text,
-                )
-            ]
-            llm_response = LlmResponse(
-                content=types.Content(role='user', parts=parts)
-            )
-            yield llm_response
+          user_text = message.server_content.input_transcription.text
+          parts = [
+              types.Part.from_text(
+                  text=user_text,
+              )
+          ]
+          llm_response = LlmResponse(
+              content=types.Content(role='user', parts=parts)
+          )
+          yield llm_response
         if (
             message.server_content.output_transcription
             and message.server_content.output_transcription.text
diff --git a/src/google/adk/models/lite_llm.py b/src/google/adk/models/lite_llm.py
index 27c856d..8826432 100644
--- a/src/google/adk/models/lite_llm.py
+++ b/src/google/adk/models/lite_llm.py
@@ -51,7 +51,7 @@ from .base_llm import BaseLlm
 from .llm_request import LlmRequest
 from .llm_response import LlmResponse
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 _NEW_LINE = "\n"
 _EXCLUDED_PART_FIELD = {"inline_data": {"data"}}
diff --git a/src/google/adk/models/registry.py b/src/google/adk/models/registry.py
index 68be9eb..22e24d4 100644
--- a/src/google/adk/models/registry.py
+++ b/src/google/adk/models/registry.py
@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
   from .base_llm import BaseLlm
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 _llm_registry_dict: dict[str, type[BaseLlm]] = {}
diff --git a/src/google/adk/runners.py b/src/google/adk/runners.py
index 9bebbe8..b01d87f 100644
--- a/src/google/adk/runners.py
+++ b/src/google/adk/runners.py
@@ -43,7 +43,7 @@ from .sessions.session import Session
 from .telemetry import tracer
 from .tools.built_in_code_execution_tool import built_in_code_execution
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class Runner:
diff --git a/src/google/adk/sessions/__init__.py b/src/google/adk/sessions/__init__.py
index c9b8390..5583ac4 100644
--- a/src/google/adk/sessions/__init__.py
+++ b/src/google/adk/sessions/__init__.py
@@ -19,7 +19,7 @@ from .session import Session
 from .state import State
 from .vertex_ai_session_service import VertexAiSessionService
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 __all__ = [
diff --git a/src/google/adk/sessions/database_session_service.py b/src/google/adk/sessions/database_session_service.py
index fdf0c8a..648abd5 100644
--- a/src/google/adk/sessions/database_session_service.py
+++ b/src/google/adk/sessions/database_session_service.py
@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import copy
-from datetime import datetime, timezone
+from datetime import datetime
+from datetime import timezone
 import json
 import logging
-from typing import Any, Optional
+from typing import Any
+from typing import Optional
 import uuid
 
 from sqlalchemy import Boolean
@@ -53,8 +55,7 @@ from .base_session_service import ListSessionsResponse
 from .session import Session
 from .state import State
 
-
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 DEFAULT_MAX_KEY_LENGTH = 128
 DEFAULT_MAX_VARCHAR_LENGTH = 256
diff --git a/src/google/adk/sessions/in_memory_session_service.py b/src/google/adk/sessions/in_memory_session_service.py
index 6f2b4cd..9eb72c6 100644
--- a/src/google/adk/sessions/in_memory_session_service.py
+++ b/src/google/adk/sessions/in_memory_session_service.py
@@ -28,7 +28,7 @@ from .base_session_service import ListSessionsResponse
 from .session import Session
 from .state import State
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class InMemorySessionService(BaseSessionService):
@@ -167,7 +167,7 @@ class InMemorySessionService(BaseSessionService):
             break
           i -= 1
         if i >= 0:
-          copied_session.events = copied_session.events[i + 1:]
+          copied_session.events = copied_session.events[i + 1 :]
 
     return self._merge_state(app_name, user_id, copied_session)
 
diff --git a/src/google/adk/sessions/vertex_ai_session_service.py b/src/google/adk/sessions/vertex_ai_session_service.py
index cb9831e..c56b23a 100644
--- a/src/google/adk/sessions/vertex_ai_session_service.py
+++ b/src/google/adk/sessions/vertex_ai_session_service.py
@@ -14,7 +14,8 @@
 import logging
 import re
 import time
-from typing import Any, Optional
+from typing import Any
+from typing import Optional
 
 from dateutil import parser
 from google import genai
@@ -28,9 +29,8 @@ from .base_session_service import GetSessionConfig
 from .base_session_service import ListSessionsResponse
 from .session import Session
 
-
 isoparse = parser.isoparse
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class VertexAiSessionService(BaseSessionService):
diff --git a/src/google/adk/tools/application_integration_tool/application_integration_toolset.py b/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
index b6e0b39..a26b24f 100644
--- a/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
+++ b/src/google/adk/tools/application_integration_tool/application_integration_toolset.py
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 import logging
-from typing import List, Optional, Union
+from typing import List
+from typing import Optional
+from typing import Union
 
 from fastapi.openapi.models import HTTPBearer
 from typing_extensions import override
@@ -34,8 +36,7 @@ from .clients.connections_client import ConnectionsClient
 from .clients.integration_client import IntegrationClient
 from .integration_connector_tool import IntegrationConnectorTool
 
-
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 # TODO(cheliu): Apply a common toolset interface
diff --git a/src/google/adk/tools/application_integration_tool/integration_connector_tool.py b/src/google/adk/tools/application_integration_tool/integration_connector_tool.py
index 58ec637..d9d5bcb 100644
--- a/src/google/adk/tools/application_integration_tool/integration_connector_tool.py
+++ b/src/google/adk/tools/application_integration_tool/integration_connector_tool.py
@@ -13,7 +13,10 @@
 # limitations under the License.
 
 import logging
-from typing import Any, Dict, Optional, Union
+from typing import Any
+from typing import Dict
+from typing import Optional
+from typing import Union
 
 from google.genai.types import FunctionDeclaration
 from typing_extensions import override
@@ -26,8 +29,7 @@ from ..openapi_tool.openapi_spec_parser.rest_api_tool import to_gemini_schema
 from ..openapi_tool.openapi_spec_parser.tool_auth_handler import ToolAuthHandler
 from ..tool_context import ToolContext
 
-
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class IntegrationConnectorTool(BaseTool):
diff --git a/src/google/adk/tools/built_in_code_execution_tool.py b/src/google/adk/tools/built_in_code_execution_tool.py
index 8148366..296e1d7 100644
--- a/src/google/adk/tools/built_in_code_execution_tool.py
+++ b/src/google/adk/tools/built_in_code_execution_tool.py
@@ -24,11 +24,10 @@ from typing_extensions import override
 from .base_tool import BaseTool
 from .tool_context import ToolContext
 
-
 if TYPE_CHECKING:
   from ..models import LlmRequest
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 @deprecated(
diff --git a/src/google/adk/tools/function_parameter_parse_util.py b/src/google/adk/tools/function_parameter_parse_util.py
index 407e048..d1a1794 100644
--- a/src/google/adk/tools/function_parameter_parse_util.py
+++ b/src/google/adk/tools/function_parameter_parse_util.py
@@ -35,7 +35,7 @@ _py_builtin_type_to_schema_type = {
     dict: types.Type.OBJECT,
 }
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 def _is_builtin_primitive_or_compound(
diff --git a/src/google/adk/tools/google_api_tool/google_api_toolsets.py b/src/google/adk/tools/google_api_tool/google_api_toolsets.py
index 4d61f4f..8b981ef 100644
--- a/src/google/adk/tools/google_api_tool/google_api_toolsets.py
+++ b/src/google/adk/tools/google_api_tool/google_api_toolsets.py
@@ -14,14 +14,15 @@
 
 
 import logging
-from typing import List, Optional, Union
+from typing import List
+from typing import Optional
+from typing import Union
 
 from google.adk.tools.base_toolset import ToolPredicate
 
 from .google_api_toolset import GoogleApiToolset
 
-
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 class BigQueryToolset(GoogleApiToolset):
diff --git a/src/google/adk/tools/google_api_tool/googleapi_to_openapi_converter.py b/src/google/adk/tools/google_api_tool/googleapi_to_openapi_converter.py
index 14e92a1..ba74d81 100644
--- a/src/google/adk/tools/google_api_tool/googleapi_to_openapi_converter.py
+++ b/src/google/adk/tools/google_api_tool/googleapi_to_openapi_converter.py
@@ -24,7 +24,7 @@ from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 
 # Configure logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 class GoogleApiToOpenApiConverter:
diff --git a/src/google/adk/tools/mcp_tool/__init__.py b/src/google/adk/tools/mcp_tool/__init__.py
index 8b93a1a..b849b1f 100644
--- a/src/google/adk/tools/mcp_tool/__init__.py
+++ b/src/google/adk/tools/mcp_tool/__init__.py
@@ -15,7 +15,8 @@
 __all__ = []
 
 try:
-  from .conversion_utils import adk_to_mcp_tool_type, gemini_to_json_schema
+  from .conversion_utils import adk_to_mcp_tool_type
+  from .conversion_utils import gemini_to_json_schema
   from .mcp_tool import MCPTool
   from .mcp_toolset import MCPToolset
 
@@ -30,7 +31,7 @@ except ImportError as e:
   import logging
   import sys
 
-  logger = logging.getLogger(__name__)
+  logger = logging.getLogger('google_adk.' + __name__)
 
   if sys.version_info < (3, 10):
     logger.warning(
diff --git a/src/google/adk/tools/mcp_tool/mcp_session_manager.py b/src/google/adk/tools/mcp_tool/mcp_session_manager.py
index 2c6729c..2d2b2f9 100644
--- a/src/google/adk/tools/mcp_tool/mcp_session_manager.py
+++ b/src/google/adk/tools/mcp_tool/mcp_session_manager.py
@@ -13,16 +13,21 @@
 # limitations under the License.
 
 import asyncio
-from contextlib import AsyncExitStack, asynccontextmanager
+from contextlib import asynccontextmanager
+from contextlib import AsyncExitStack
 import functools
 import logging
 import sys
-from typing import Any, Optional, TextIO
+from typing import Any
+from typing import Optional
+from typing import TextIO
+
 import anyio
 from pydantic import BaseModel
 
 try:
-  from mcp import ClientSession, StdioServerParameters
+  from mcp import ClientSession
+  from mcp import StdioServerParameters
   from mcp.client.sse import sse_client
   from mcp.client.stdio import stdio_client
 except ImportError as e:
@@ -36,7 +41,7 @@ except ImportError as e:
   else:
     raise e
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class SseServerParams(BaseModel):
diff --git a/src/google/adk/tools/mcp_tool/mcp_toolset.py b/src/google/adk/tools/mcp_tool/mcp_toolset.py
index e93fbdf..e013bcb 100644
--- a/src/google/adk/tools/mcp_tool/mcp_toolset.py
+++ b/src/google/adk/tools/mcp_tool/mcp_toolset.py
@@ -18,9 +18,10 @@ import logging
 import os
 import signal
 import sys
-from typing import List, Union
+from typing import List
 from typing import Optional
 from typing import TextIO
+from typing import Union
 
 from typing_extensions import override
 
@@ -51,7 +52,7 @@ except ImportError as e:
 
 from .mcp_tool import MCPTool
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 class MCPToolset(BaseToolset):
diff --git a/src/google/adk/tools/openapi_tool/openapi_spec_parser/openapi_toolset.py b/src/google/adk/tools/openapi_tool/openapi_spec_parser/openapi_toolset.py
index 1bfeac1..495a228 100644
--- a/src/google/adk/tools/openapi_tool/openapi_spec_parser/openapi_toolset.py
+++ b/src/google/adk/tools/openapi_tool/openapi_spec_parser/openapi_toolset.py
@@ -33,7 +33,7 @@ from ...base_toolset import ToolPredicate
 from .openapi_spec_parser import OpenApiSpecParser
 from .rest_api_tool import RestApiTool
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 
 class OpenAPIToolset(BaseToolset):
diff --git a/src/google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py b/src/google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py
index eac1ef3..cdce222 100644
--- a/src/google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py
+++ b/src/google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py
@@ -30,7 +30,7 @@ from ..auth.credential_exchangers.auto_auth_credential_exchanger import AutoAuth
 from ..auth.credential_exchangers.base_credential_exchanger import AuthCredentialMissingError
 from ..auth.credential_exchangers.base_credential_exchanger import BaseAuthCredentialExchanger
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 AuthPreparationState = Literal["pending", "done"]
 
diff --git a/src/google/adk/tools/retrieval/__init__.py b/src/google/adk/tools/retrieval/__init__.py
index 424b75a..5eb5d77 100644
--- a/src/google/adk/tools/retrieval/__init__.py
+++ b/src/google/adk/tools/retrieval/__init__.py
@@ -29,7 +29,7 @@ try:
 except ImportError:
   import logging
 
-  logger = logging.getLogger(__name__)
+  logger = logging.getLogger('google_adk.' + __name__)
   logger.debug(
       'The Vertex sdk is not installed. If you want to use the Vertex RAG with'
       ' agents, please install it. If not, you can ignore this warning.'
diff --git a/src/google/adk/tools/retrieval/vertex_ai_rag_retrieval.py b/src/google/adk/tools/retrieval/vertex_ai_rag_retrieval.py
index ad33262..fd49e94 100644
--- a/src/google/adk/tools/retrieval/vertex_ai_rag_retrieval.py
+++ b/src/google/adk/tools/retrieval/vertex_ai_rag_retrieval.py
@@ -30,7 +30,7 @@ from .base_retrieval_tool import BaseRetrievalTool
 if TYPE_CHECKING:
   from ...models.llm_request import LlmRequest
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('google_adk.' + __name__)
 
 
 class VertexAiRagRetrieval(BaseRetrievalTool):