diff --git a/.github/component_owners.yml b/.github/component_owners.yml index 70375ce48f..1cbda52c97 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -45,7 +45,7 @@ components: - DylanRussell - keith-decker - instrumentation-genai/opentelemetry-instrumentation-langchain: + instrumentation-genai/opentelemetry-instrumentation-langchain-v2: - zhirafovod - wrisa diff --git a/RELEASING.md b/RELEASING.md index 05aca72d79..2680e655a7 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -25,7 +25,7 @@ > - opentelemetry-instrumentation-openai-agents-v2 > - opentelemetry-instrumentation-vertexai > - opentelemetry-instrumentation-google-genai -> - opentelemetry-instrumentation-langchain +- opentelemetry-instrumentation-langchain-v2 > - opentelemetry-instrumentation-weaviate > - opentelemetry-util-genai > @@ -92,7 +92,7 @@ The workflow will create a pull request that should be merged in order to procee > - opentelemetry-instrumentation-openai-agents-v2 > - opentelemetry-instrumentation-vertexai > - opentelemetry-instrumentation-google-genai -> - opentelemetry-instrumentation-langchain +- opentelemetry-instrumentation-langchain-v2 > - opentelemetry-instrumentation-weaviate > - opentelemetry-util-genai > - opentelemetry-exporter-credential-provider-gcp diff --git a/eachdist.ini b/eachdist.ini index 239258065a..d9db85d2ec 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -56,7 +56,7 @@ packages= opentelemetry-instrumentation-openai-v2 opentelemetry-instrumentation-openai-agents-v2 opentelemetry-instrumentation-test - opentelemetry-instrumentation-langchain + opentelemetry-instrumentation-langchain-v2 opentelemetry-instrumentation-weaviate opentelemetry-util-genai diff --git a/instrumentation-genai/README.md b/instrumentation-genai/README.md index 1b8f5e49e6..fad2a1b92a 100644 --- a/instrumentation-genai/README.md +++ b/instrumentation-genai/README.md @@ -2,7 +2,7 @@ | Instrumentation | Supported Packages | Metrics support | Semconv status | | --------------- | ------------------ | --------------- | -------------- | | [opentelemetry-instrumentation-google-genai](./opentelemetry-instrumentation-google-genai) | google-genai >= 1.0.0 | No | development -| [opentelemetry-instrumentation-langchain](./opentelemetry-instrumentation-langchain) | langchain >= 0.3.21 | No | development +| [opentelemetry-instrumentation-langchain-v2](./opentelemetry-instrumentation-langchain-v2) | langchain >= 0.3.21 | No | development | [opentelemetry-instrumentation-openai-agents-v2](./opentelemetry-instrumentation-openai-agents-v2) | openai-agents >= 0.3.3 | No | development | [opentelemetry-instrumentation-openai-v2](./opentelemetry-instrumentation-openai-v2) | openai >= 1.26.0 | Yes | development | [opentelemetry-instrumentation-vertexai](./opentelemetry-instrumentation-vertexai) | google-cloud-aiplatform >= 1.64 | No | development diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/CHANGELOG.md b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/CHANGELOG.md similarity index 67% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/CHANGELOG.md rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/CHANGELOG.md index c3d51f9fef..d4fd404ad6 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-langchain/CHANGELOG.md +++ b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/CHANGELOG.md @@ -8,4 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased - Added span support for genAI langchain llm invocation. - ([#3665](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3665)) \ No newline at end of file + ([#3665](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3665)) +- Renamed package directory to `opentelemetry-instrumentation-langchain-v2`. + ([#3873](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3873)) diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/LICENSE b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/LICENSE similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/LICENSE rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/LICENSE diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/NOTICE b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/NOTICE similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/NOTICE rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/NOTICE diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/README.rst b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/README.rst similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/README.rst rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/README.rst diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/.env b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/.env similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/.env rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/.env diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/README.rst b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/README.rst similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/README.rst rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/README.rst diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/main.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/main.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/main.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/main.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/requirements.txt b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/requirements.txt similarity index 74% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/requirements.txt rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/requirements.txt index 0f986b1be0..9d975112b5 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/requirements.txt +++ b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/manual/requirements.txt @@ -4,4 +4,4 @@ opentelemetry-sdk>=1.31.0 opentelemetry-exporter-otlp-proto-grpc>=1.31.0 # Uncomment after lanchain instrumetation is released -# opentelemetry-instrumentation-langchain~=2.0b0.dev \ No newline at end of file +# opentelemetry-instrumentation-langchain-v2~=2.0b0.dev diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/.env b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/.env similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/.env rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/.env diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/README.rst b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/README.rst similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/README.rst rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/README.rst diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/main.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/main.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/main.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/main.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/requirements.txt b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/requirements.txt similarity index 77% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/requirements.txt rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/requirements.txt index 63b3f56cf1..bdd54b2252 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-langchain/examples/zero-code/requirements.txt +++ b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/zero-code/requirements.txt @@ -5,4 +5,4 @@ opentelemetry-exporter-otlp-proto-grpc>=1.31.0 opentelemetry-distro~=0.51b0 # Uncomment after lanchain instrumetation is released -# opentelemetry-instrumentation-langchain~=2.0b0.dev +# opentelemetry-instrumentation-langchain-v2~=2.0b0.dev diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/pyproject.toml b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/pyproject.toml similarity index 95% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/pyproject.toml rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/pyproject.toml index 4f3e88115b..bf9f4cb3ab 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-langchain/pyproject.toml +++ b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/pyproject.toml @@ -3,7 +3,7 @@ requires = ["hatchling"] build-backend = "hatchling.build" [project] -name = "opentelemetry-instrumentation-langchain" +name = "opentelemetry-instrumentation-langchain-v2" dynamic = ["version"] description = "OpenTelemetry Official Langchain instrumentation" readme = "README.rst" @@ -39,7 +39,7 @@ instruments = [ langchain = "opentelemetry.instrumentation.langchain:LangChainInstrumentor" [project.urls] -Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation-genai/opentelemetry-instrumentation-langchain" +Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation-genai/opentelemetry-instrumentation-langchain-v2" Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib" [tool.hatch.version] @@ -53,4 +53,3 @@ include = [ [tool.hatch.build.targets.wheel] packages = ["src/opentelemetry"] - diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/__init__.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/__init__.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/__init__.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/__init__.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/callback_handler.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/callback_handler.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/package.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/package.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/package.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/package.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/span_manager.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/span_manager.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/span_manager.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/span_manager.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/version.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/version.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/version.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/src/opentelemetry/instrumentation/langchain/version.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/tests/__init__.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/__init__.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/tests/__init__.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/__init__.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/tests/cassettes/test_chat_openai_gpt_3_5_turbo_model_llm_call.yaml b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/cassettes/test_chat_openai_gpt_3_5_turbo_model_llm_call.yaml similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/tests/cassettes/test_chat_openai_gpt_3_5_turbo_model_llm_call.yaml rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/cassettes/test_chat_openai_gpt_3_5_turbo_model_llm_call.yaml diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/tests/cassettes/test_us_amazon_nova_lite_v1_0_bedrock_llm_call.yaml b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/cassettes/test_us_amazon_nova_lite_v1_0_bedrock_llm_call.yaml similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/tests/cassettes/test_us_amazon_nova_lite_v1_0_bedrock_llm_call.yaml rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/cassettes/test_us_amazon_nova_lite_v1_0_bedrock_llm_call.yaml diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/tests/conftest.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/conftest.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/tests/conftest.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/conftest.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_llm_call.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/test_llm_call.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_llm_call.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/test_llm_call.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_span_manager.py b/instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/test_span_manager.py similarity index 100% rename from instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_span_manager.py rename to instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/test_span_manager.py diff --git a/pyproject.toml b/pyproject.toml index 30ada5bb25..fc7ee53c4a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -202,7 +202,7 @@ include = [ "instrumentation/opentelemetry-instrumentation-asyncclick", "instrumentation/opentelemetry-instrumentation-threading", "instrumentation-genai/opentelemetry-instrumentation-vertexai", - "instrumentation-genai/opentelemetry-instrumentation-langchain", + "instrumentation-genai/opentelemetry-instrumentation-langchain-v2", "instrumentation-genai/opentelemetry-instrumentation-weaviate", "util/opentelemetry-util-genai", "exporter/opentelemetry-exporter-credential-provider-gcp", @@ -215,8 +215,8 @@ exclude = [ "instrumentation/opentelemetry-instrumentation-threading/tests/**", "instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/**/*.py", "instrumentation-genai/opentelemetry-instrumentation-vertexai/examples/**/*.py", - "instrumentation-genai/opentelemetry-instrumentation-langchain/tests/**/*.py", - "instrumentation-genai/opentelemetry-instrumentation-langchain/examples/**/*.py", + "instrumentation-genai/opentelemetry-instrumentation-langchain-v2/tests/**/*.py", + "instrumentation-genai/opentelemetry-instrumentation-langchain-v2/examples/**/*.py", "instrumentation-genai/opentelemetry-instrumentation-weaviate/tests/**/*.py", "instrumentation-genai/opentelemetry-instrumentation-weaviate/examples/**/*.py", "util/opentelemetry-util-genai/tests/**/*.py", diff --git a/scripts/generate_instrumentation_bootstrap.py b/scripts/generate_instrumentation_bootstrap.py index 9843885fe6..2f44eaab71 100755 --- a/scripts/generate_instrumentation_bootstrap.py +++ b/scripts/generate_instrumentation_bootstrap.py @@ -67,7 +67,7 @@ # Langchain instrumentation is currently excluded because it is still in early # development. This filter will get removed once it is further along in its # development lifecycle and ready to be included by default. - "opentelemetry-instrumentation-langchain", + "opentelemetry-instrumentation-langchain-v2", # Weaviate instrumentation is currently excluded because it is still in early # development. This filter will get removed once it is further along in its # development lifecycle and ready to be included by default. diff --git a/uv.lock b/uv.lock index 76a60b9134..280522ce6a 100644 --- a/uv.lock +++ b/uv.lock @@ -43,7 +43,7 @@ members = [ "opentelemetry-instrumentation-httpx", "opentelemetry-instrumentation-jinja2", "opentelemetry-instrumentation-kafka-python", - "opentelemetry-instrumentation-langchain", + "opentelemetry-instrumentation-langchain-v2", "opentelemetry-instrumentation-logging", "opentelemetry-instrumentation-mysql", "opentelemetry-instrumentation-mysqlclient", @@ -3264,8 +3264,8 @@ requires-dist = [ provides-extras = ["instruments", "instruments-any"] [[package]] -name = "opentelemetry-instrumentation-langchain" -source = { editable = "instrumentation-genai/opentelemetry-instrumentation-langchain" } +name = "opentelemetry-instrumentation-langchain-v2" +source = { editable = "instrumentation-genai/opentelemetry-instrumentation-langchain-v2" } dependencies = [ { name = "opentelemetry-api" }, { name = "opentelemetry-instrumentation" },