[chore] Relocate dashscope instrumentation and fix genai util (#90)

Author: Cirilla-zmh

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/README.rst

@@ -25,7 +25,7 @@ Usage
     from opentelemetry.sdk.trace import TracerProvider
     from opentelemetry.sdk.trace.export import ConsoleSpanExporter, SimpleSpanProcessor
 
-    from loongsuite.instrumentation.dashscope import DashScopeInstrumentor
+    from opentelemetry.instrumentation.dashscope import DashScopeInstrumentor
 
     # Initialize tracing
     trace.set_tracer_provider(TracerProvider())

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/examples/basic_example.py

@@ -13,9 +13,9 @@
 import os
 
 from dashscope import Generation, TextEmbedding
-from loongsuite.instrumentation.dashscope import DashScopeInstrumentor
 
 from opentelemetry import trace
+from opentelemetry.instrumentation.dashscope import DashScopeInstrumentor
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/pyproject.toml

@@ -37,13 +37,13 @@ instruments = [
 ]
 
 [project.entry-points.opentelemetry_instrumentor]
-dashscope = "loongsuite.instrumentation.dashscope:DashScopeInstrumentor"
+dashscope = "opentelemetry.instrumentation.dashscope:DashScopeInstrumentor"
 
 [project.urls]
 Homepage = "https://github.com/alibaba/loongsuite-python-agent"
 
 [tool.hatch.version]
-path = "src/loongsuite/instrumentation/dashscope/version.py"
+path = "src/opentelemetry/instrumentation/dashscope/version.py"
 
 [tool.hatch.build.targets.sdist]
 include = [
@@ -52,5 +52,5 @@ include = [
 ]
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/loongsuite"]
+packages = ["src/opentelemetry"]
 

…ion-dashscope/src/loongsuite/__init__.py …-dashscope/src/opentelemetry/__init__.pyinstrumentation-loongsuite/loongsuite-instrumentation-dashscope/src/loongsuite/__init__.py renamed to instrumentation-loongsuite/loongsuite-instrumentation-dashscope/src/opentelemetry/__init__.py instrumentation-loongsuite/loongsuite-instrumentation-dashscope/src/loongsuite/__init__.py renamed to instrumentation-loongsuite/loongsuite-instrumentation-dashscope/src/opentelemetry/__init__.py

@@ -30,7 +30,7 @@
 completion functionality.
 
 Usage:
-    from loongsuite.instrumentation.dashscope import DashScopeInstrumentor
+    from opentelemetry.instrumentation.dashscope import DashScopeInstrumentor
 
     DashScopeInstrumentor().instrument()
 
@@ -42,8 +42,10 @@
 import logging
 from typing import Collection
 
-from loongsuite.instrumentation.dashscope.package import _instruments
-from loongsuite.instrumentation.dashscope.patch import (
+from wrapt import wrap_function_wrapper
+
+from opentelemetry.instrumentation.dashscope.package import _instruments
+from opentelemetry.instrumentation.dashscope.patch import (
     wrap_aio_generation_call,
     wrap_generation_call,
     wrap_image_synthesis_async_call,
@@ -52,9 +54,7 @@
     wrap_text_embedding_call,
     wrap_text_rerank_call,
 )
-from loongsuite.instrumentation.dashscope.version import __version__
-from wrapt import wrap_function_wrapper
-
+from opentelemetry.instrumentation.dashscope.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
 from opentelemetry.util.genai.extended_handler import (