refactored to fit Johnny's PR

Author: haneric00

aws-opentelemetry-distro/pyproject.toml

@@ -95,6 +95,9 @@ test = []
 [project.entry-points.opentelemetry_configurator]
 aws_configurator = "amazon.opentelemetry.distro.aws_opentelemetry_configurator:AwsOpenTelemetryConfigurator"
 
+[project.entry-points.opentelemetry_instrumentor]
+langchain = "amazon.opentelemetry.distro.instrumentation.mcp.instrumentation:McpInstrumentor"
+
 [project.entry-points.opentelemetry_distro]
 aws_distro = "amazon.opentelemetry.distro.aws_opentelemetry_distro:AwsOpenTelemetryDistro"
 

ai_agent_instrumentation/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain_v2/__init__.py renamed to aws-opentelemetry-distro/src/amazon/opentelemetry/distro/opentelemetry/instrumentation/langchain_v2/__init__.py

@@ -7,9 +7,11 @@
 
 from wrapt import wrap_function_wrapper
 
+from amazon.opentelemetry.distro.opentelemetry.instrumentation.langchain_v2.callback_handler import (
+    OpenTelemetryCallbackHandler,
+)
+from amazon.opentelemetry.distro.opentelemetry.instrumentation.langchain_v2.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry.instrumentation.langchain_v2.callback_handler import OpenTelemetryCallbackHandler
-from opentelemetry.instrumentation.langchain_v2.version import __version__
 from opentelemetry.instrumentation.utils import unwrap
 from opentelemetry.trace import get_tracer
 
@@ -20,7 +22,7 @@
 
 class LangChainInstrumentor(BaseInstrumentor):
 
-    def instrumentation_dependencies(self, cls) -> Collection[str]:
+    def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs):

ai_agent_instrumentation/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain_v2/callback_handler.py renamed to aws-opentelemetry-distro/src/amazon/opentelemetry/distro/opentelemetry/instrumentation/langchain_v2/callback_handler.py

@@ -13,8 +13,11 @@
 from langchain_core.messages import BaseMessage
 from langchain_core.outputs import LLMResult
 
+from amazon.opentelemetry.distro.opentelemetry.instrumentation.langchain_v2.span_attributes import (
+    GenAIOperationValues,
+    SpanAttributes,
+)
 from opentelemetry import context as context_api
-from opentelemetry.instrumentation.langchain_v2.span_attributes import GenAIOperationValues, SpanAttributes
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 from opentelemetry.trace import SpanKind, set_span_in_context
 from opentelemetry.trace.span import Span

ai_agent_instrumentation/opentelemetry-instrumentation-langchain-v2/pyproject.toml renamed to aws-opentelemetry-distro/src/amazon/opentelemetry/distro/opentelemetry/instrumentation/langchain_v2/pyproject.toml

@@ -37,7 +37,8 @@ instruments = [
 
 
 [tool.hatch.version]
-path = "src/opentelemetry/instrumentation/langchain_v2/version.py"
+path = "version.py"
+
 
 [tool.hatch.build.targets.sdist]
 include = [

ai_agent_instrumentation/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain_v2/span_attributes.py renamed to aws-opentelemetry-distro/src/amazon/opentelemetry/distro/opentelemetry/instrumentation/langchain_v2/span_attributes.py

@@ -6,8 +6,8 @@
 import os
 
 import pytest
-from src.opentelemetry.instrumentation.langchain_v2 import LangChainInstrumentor
 
+from amazon.opentelemetry.distro.opentelemetry.instrumentation.langchain_v2 import LangChainInstrumentor
 from opentelemetry.sdk._logs.export import InMemoryLogExporter
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
@@ -97,15 +97,19 @@ def instrument_with_content(tracer_provider):
     instrumentor.uninstrument()
 
 
+# Define these variables once at the module level
+current_dir = os.path.dirname(os.path.abspath(__file__))
+cassette_dir = os.path.join(current_dir, "fixtures", "vcr_cassettes")
+# Create the directory for cassettes if it doesn't exist
+os.makedirs(cassette_dir, exist_ok=True)
+
+
 @pytest.fixture(scope="module")
 def vcr_config():
+    # Reuse the module-level variables instead of redefining them
     return {
         "filter_headers": ["Authorization", "X-Amz-Date", "X-Amz-Security-Token"],
         "filter_query_parameters": ["X-Amz-Signature", "X-Amz-Credential", "X-Amz-SignedHeaders"],
         "record_mode": "once",
-        "cassette_library_dir": "tests/fixtures/vcr_cassettes",
+        "cassette_library_dir": cassette_dir,
     }
-
-
-# Create the directory for cassettes if it doesn't exist
-os.makedirs("tests/fixtures/vcr_cassettes", exist_ok=True)