rename instrumentation.py to instrumentor.py

Author: lukeina2z

instrumentation-genai/opentelemetry-instrumentation-mcp/src/opentelemetry/instrumentation/mcp/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .instrumentation import McpInstrumentor
+from .instrumentor import McpInstrumentor
 from .version import __version__
 
 __all__ = ["McpInstrumentor", "__version__"]

…y/instrumentation/mcp/instrumentation.py …etry/instrumentation/mcp/instrumentor.pyinstrumentation-genai/opentelemetry-instrumentation-mcp/src/opentelemetry/instrumentation/mcp/instrumentation.py renamed to instrumentation-genai/opentelemetry-instrumentation-mcp/src/opentelemetry/instrumentation/mcp/instrumentor.py instrumentation-genai/opentelemetry-instrumentation-mcp/src/opentelemetry/instrumentation/mcp/instrumentation.py renamed to instrumentation-genai/opentelemetry-instrumentation-mcp/src/opentelemetry/instrumentation/mcp/instrumentor.py

@@ -68,15 +68,15 @@ def setUp(self):
         self.instrumentor = McpInstrumentor()
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.register_post_import_hook"
+        "opentelemetry.instrumentation.mcp.instrumentor.register_post_import_hook"
     )
     def test_instrument_registers_hooks(self, mock_register: MagicMock):
         """Test that _instrument registers all required hooks."""
         self.instrumentor._instrument()
         self.assertEqual(mock_register.call_count, 4)
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.register_post_import_hook"
+        "opentelemetry.instrumentation.mcp.instrumentor.register_post_import_hook"
     )
     def test_instrument_registers_session_hooks(
         self, mock_register: MagicMock
@@ -92,7 +92,7 @@ def test_instrument_registers_session_hooks(
         self.assertEqual(len(session_calls), 2)
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.register_post_import_hook"
+        "opentelemetry.instrumentation.mcp.instrumentor.register_post_import_hook"
     )
     def test_instrument_registers_server_hooks(self, mock_register: MagicMock):
         """Test that _instrument registers server hooks."""
@@ -112,21 +112,21 @@ class TestMcpInstrumentorUninstrument(unittest.TestCase):
     def setUp(self):
         self.instrumentor = McpInstrumentor()
 
-    @patch("opentelemetry.instrumentation.mcp.instrumentation.unwrap")
+    @patch("opentelemetry.instrumentation.mcp.instrumentor.unwrap")
     def test_uninstrument_unwraps_all(self, mock_unwrap: MagicMock):
         """Test that _uninstrument unwraps all hooks."""
         self.instrumentor._uninstrument()
         self.assertEqual(mock_unwrap.call_count, 4)
 
-    @patch("opentelemetry.instrumentation.mcp.instrumentation.unwrap")
+    @patch("opentelemetry.instrumentation.mcp.instrumentor.unwrap")
     def test_uninstrument_unwraps_send_request(self, mock_unwrap: MagicMock):
         """Test that _uninstrument unwraps send_request."""
         self.instrumentor._uninstrument()
         mock_unwrap.assert_any_call(
             "mcp.shared.session", "BaseSession.send_request"
         )
 
-    @patch("opentelemetry.instrumentation.mcp.instrumentation.unwrap")
+    @patch("opentelemetry.instrumentation.mcp.instrumentor.unwrap")
     def test_uninstrument_unwraps_send_notification(
         self, mock_unwrap: MagicMock
     ):
@@ -136,15 +136,15 @@ def test_uninstrument_unwraps_send_notification(
             "mcp.shared.session", "BaseSession.send_notification"
         )
 
-    @patch("opentelemetry.instrumentation.mcp.instrumentation.unwrap")
+    @patch("opentelemetry.instrumentation.mcp.instrumentor.unwrap")
     def test_uninstrument_unwraps_handle_request(self, mock_unwrap: MagicMock):
         """Test that _uninstrument unwraps handle_request."""
         self.instrumentor._uninstrument()
         mock_unwrap.assert_any_call(
             "mcp.server.lowlevel.server", "Server._handle_request"
         )
 
-    @patch("opentelemetry.instrumentation.mcp.instrumentation.unwrap")
+    @patch("opentelemetry.instrumentation.mcp.instrumentor.unwrap")
     def test_uninstrument_unwraps_handle_notification(
         self, mock_unwrap: MagicMock
     ):

instrumentation-genai/opentelemetry-instrumentation-mcp/tests/test_instrumentor.py

@@ -82,7 +82,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
         self.assertEqual(result, {"result": "success"})
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_server_handle_request_with_request(
         self, mock_generate_attrs: MagicMock
@@ -126,7 +126,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
         self.assertEqual(result, {"result": "success"})
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_server_handle_notification_with_notification(
         self, mock_generate_attrs: MagicMock
@@ -170,7 +170,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
         self.assertEqual(result, {"result": "success"})
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_server_message_handler_with_request_id(
         self, mock_generate_attrs: MagicMock
@@ -206,7 +206,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             self.assertEqual(call_kwargs["kind"], SpanKind.SERVER)
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_server_message_handler_without_request_id(
         self, mock_generate_attrs: MagicMock
@@ -240,7 +240,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             mock_span_ctx.assert_called_once()
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_server_message_handler_extracts_trace_context(
         self, mock_generate_attrs: MagicMock
@@ -282,7 +282,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
                 self.assertIn("carrier", call_kwargs)
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_server_message_handler_success_status(
         self, mock_generate_attrs: MagicMock
@@ -317,7 +317,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             mock_span.set_status.assert_called_once()
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_server_message_handler_error_status(
         self, mock_generate_attrs: MagicMock

instrumentation-genai/opentelemetry-instrumentation-mcp/tests/test_server_wrapper.py

@@ -126,7 +126,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
         self.assertEqual(result, {"result": "success"})
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_session_send_client_request(
         self, mock_generate_attrs: MagicMock
@@ -159,7 +159,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> dict[str, str]:
             self.assertEqual(call_kwargs["kind"], SpanKind.CLIENT)
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_session_send_client_notification(
         self, mock_generate_attrs: MagicMock
@@ -190,7 +190,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             self.assertEqual(call_kwargs["kind"], SpanKind.CLIENT)
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_session_send_server_request(
         self, mock_generate_attrs: MagicMock
@@ -221,7 +221,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             self.assertEqual(call_kwargs["kind"], SpanKind.SERVER)
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_session_send_injects_trace_context(
         self, mock_generate_attrs: MagicMock
@@ -254,7 +254,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             )
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_session_send_success_status(
         self, mock_generate_attrs: MagicMock
@@ -285,7 +285,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             mock_span.set_status.assert_called_once()
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_session_send_error_status(
         self, mock_generate_attrs: MagicMock
@@ -317,7 +317,7 @@ async def mock_wrapped(*args: Any, **kwargs: Any) -> Any:
             mock_span.record_exception.assert_called_once()
 
     @patch(
-        "opentelemetry.instrumentation.mcp.instrumentation.McpInstrumentor._generate_mcp_message_attrs"
+        "opentelemetry.instrumentation.mcp.instrumentor.McpInstrumentor._generate_mcp_message_attrs"
     )
     def test_wrap_session_send_preserves_existing_params(
         self, mock_generate_attrs: MagicMock