fixed according to linter

Author: haneric00

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/opentelemetry/instrumentation/langchain_v2/__init__.py

@@ -21,6 +21,10 @@
 
 
 class LangChainInstrumentor(BaseInstrumentor):
+    def __init__(self):
+        super().__init__()
+        self.handler = None  # Initialize the handler attribute
+        self._wrapped = []
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/opentelemetry/instrumentation/langchain_v2/callback_handler.py

@@ -355,12 +355,13 @@ def on_chain_end(
         _set_span_attribute(span, "gen_ai.completion", str(outputs))
         self._end_span(span, run_id)
 
+    # pylint: disable=arguments-differ
     def on_chain_error(
         self,
         error: BaseException,
+        *,
         run_id: UUID,
         parent_run_id: Optional[UUID] = None,
-        tags: Optional[list[str]] = None,
         **kwargs: Any,
     ):
         self._handle_error(error, run_id, parent_run_id, **kwargs)
@@ -425,14 +426,14 @@ def on_tool_end(
     def on_tool_error(
         self,
         error: BaseException,
+        *,
         run_id: UUID,
         parent_run_id: Optional[UUID] = None,
-        tags: Optional[list[str]] = None,
         **kwargs: Any,
     ):
         self._handle_error(error, run_id, parent_run_id, **kwargs)
 
-    def on_agent_action(self, action: AgentAction, run_id: UUID, parent_run_id: UUID, **kwargs: Any):
+    def on_agent_action(self, action: AgentAction, *, run_id: UUID, parent_run_id: UUID, **kwargs: Any):
         tool = getattr(action, "tool", None)
         tool_input = getattr(action, "tool_input", None)
 
@@ -443,7 +444,7 @@ def on_agent_action(self, action: AgentAction, run_id: UUID, parent_run_id: UUID
             _set_span_attribute(span, "gen_ai.agent.tool.name", tool)
             _set_span_attribute(span, SpanAttributes.GEN_AI_OPERATION_NAME, "invoke_agent")
 
-    def on_agent_finish(self, finish: AgentFinish, run_id: UUID, parent_run_id: UUID, **kwargs: Any):
+    def on_agent_finish(self, finish: AgentFinish, *, run_id: UUID, parent_run_id: UUID, **kwargs: Any):
 
         span = self.span_mapping[run_id].span
 

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test-opentelemetry-instrumentation-langchain-v2/mock_agents.py

@@ -60,10 +60,13 @@ def mock_prompt():
     )
 
 
-def test_agents(instrument_langchain, span_exporter, mock_model, mock_search_tool, mock_prompt):
-    tools = [mock_search_tool]
+def test_agents(
+    instrument_langchain, span_exporter, model_fixture, search_tool_fixture, prompt_fixture
+):  # Changed parameter names
+    # pylint: disable=redefined-outer-name
+    tools = [search_tool_fixture]  # Use renamed parameter
 
-    agent = create_tool_calling_agent(mock_model, tools, mock_prompt)
+    agent = create_tool_calling_agent(model_fixture, tools, prompt_fixture)  # Use renamed parameters
     agent_executor = AgentExecutor(agent=agent, tools=tools)
 
     # Mock the agent's intermediate steps
@@ -90,11 +93,12 @@ def test_agents(instrument_langchain, span_exporter, mock_model, mock_search_too
 
 
 def test_agents_with_events_with_content(
-    instrument_with_content, span_exporter, mock_model, mock_search_tool, mock_prompt
+    instrument_with_content, span_exporter, model_param, search_tool_param, prompt_param  # Changed parameter names
 ):
-    tools = [mock_search_tool]
+    # pylint: disable=redefined-outer-name
+    tools = [search_tool_param]  # Use renamed parameter
 
-    agent = create_tool_calling_agent(mock_model, tools, mock_prompt)
+    agent = create_tool_calling_agent(model_param, tools, prompt_param)  # Use renamed parameters
     agent_executor = AgentExecutor(agent=agent, tools=tools)
 
     with patch("langchain.agents.AgentExecutor._iter_next_step") as mock_iter:
@@ -120,11 +124,12 @@ def test_agents_with_events_with_content(
 
 
 def test_agents_with_events_with_no_content(
-    instrument_langchain, span_exporter, mock_model, mock_search_tool, mock_prompt
+    instrument_langchain, span_exporter, model_input, search_tool_input, prompt_input  # Changed parameter names
 ):
-    tools = [mock_search_tool]
+    # pylint: disable=redefined-outer-name
+    tools = [search_tool_input]  # Use renamed parameter
 
-    agent = create_tool_calling_agent(mock_model, tools, mock_prompt)
+    agent = create_tool_calling_agent(model_input, tools, prompt_input)  # Use renamed parameters
     agent_executor = AgentExecutor(agent=agent, tools=tools)
 
     with patch("langchain.agents.AgentExecutor._iter_next_step") as mock_iter:

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test-opentelemetry-instrumentation-langchain-v2/mock_langgraph_agent.py

@@ -21,10 +21,10 @@ async def test_langgraph_ainvoke(instrument_langchain, span_exporter):
     # Mock the boto3 client
     with patch("boto3.client", autospec=True):
         # Mock the ChatBedrock client
-        with patch("langchain_aws.chat_models.ChatBedrock", autospec=True) as MockChatBedrock:
+        with patch("langchain_aws.chat_models.ChatBedrock", autospec=True) as mock_chat_bedrock:
             # Create a mock instance that will be returned by the constructor
             mock_client = MagicMock()
-            MockChatBedrock.return_value = mock_client
+            mock_chat_bedrock.return_value = mock_client
 
             # Set up the response for the invoke method
             mock_response = AIMessage(content="The answer is 10.")