BREAKING CHANGE: ready for official distribution

Author: minimAluminiumalism

opentelemetry-distro/pyproject.toml

@@ -3,9 +3,9 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "opentelemetry-distro"
+name = "tapm-distro"
 dynamic = ["version"]
-description = "OpenTelemetry Python Distro"
+description = "TAPM Python Distro"
 readme = "README.rst"
 license = "Apache-2.0"
 requires-python = ">=3.8"
@@ -28,7 +28,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.55b0.dev",
+  "tapm-instrumentation == 0.55b2.post17",
   "opentelemetry-sdk ~= 1.13",
 ]
 

opentelemetry-distro/src/opentelemetry/distro/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.55b0.dev"
+__version__ = "0.55b0.post4"

opentelemetry-instrumentation/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "opentelemetry-instrumentation"
+name = "tapm-instrumentation"
 dynamic = ["version"]
 description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"
 readme = "README.rst"
@@ -27,16 +27,16 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.4",
-  "opentelemetry-semantic-conventions == 0.55b0.dev",
+  "opentelemetry-semantic-conventions >= 0.55b0",
   "wrapt >= 1.0.0, < 2.0.0",
   "packaging >= 18.0",
 ]
 
 [project.scripts]
-opentelemetry-bootstrap = "opentelemetry.instrumentation.bootstrap:run"
-opentelemetry-instrument = "opentelemetry.instrumentation.auto_instrumentation:run"
+tapm-bootstrap = "opentelemetry.instrumentation.bootstrap:run"
+tapm-instrument = "opentelemetry.instrumentation.auto_instrumentation:run"
 
-[project.entry-points.opentelemetry_environment_variables]
+[project.entry-points.tapm_environment_variables]
 instrumentation = "opentelemetry.instrumentation.environment_variables"
 
 [project.urls]

opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py

@@ -52,21 +52,25 @@ def run() -> None:
     )
 
     argument_otel_environment_variable = {}
-
-    for entry_point in entry_points(
-        group="opentelemetry_environment_variables"
-    ):
-        environment_variable_module = entry_point.load()
-
-        for attribute in dir(environment_variable_module):
-            if attribute.startswith("OTEL_"):
-                argument = sub(r"OTEL_(PYTHON_)?", "", attribute).lower()
-
-                parser.add_argument(
-                    f"--{argument}",
-                    required=False,
-                )
-                argument_otel_environment_variable[argument] = attribute
+    seen_arguments = set()  # 跟踪已添加的参数以避免重复
+
+    # 加载两个 entry point 组以保持兼容性
+    for group_name in ["opentelemetry_environment_variables", "tapm_environment_variables"]:
+        for entry_point in entry_points(group=group_name):
+            environment_variable_module = entry_point.load()
+
+            for attribute in dir(environment_variable_module):
+                if attribute.startswith("OTEL_"):
+                    argument = sub(r"OTEL_(PYTHON_)?", "", attribute).lower()
+
+                    # 检查参数是否已经添加过，避免重复
+                    if argument not in seen_arguments:
+                        parser.add_argument(
+                            f"--{argument}",
+                            required=False,
+                        )
+                        argument_otel_environment_variable[argument] = attribute
+                        seen_arguments.add(argument)
 
     parser.add_argument(
         "--version",

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py

@@ -105,7 +105,7 @@ def _is_installed(req):
     except PackageNotFoundError:
         return False
 
-    if not req.specifier.filter(dist_version):
+    if dist_version not in req.specifier:
         logger.warning(
             "instrumentation for package %s is available"
             " but version %s is installed. Skipping.",

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -16,6 +16,18 @@
 # RUN `python scripts/generate_instrumentation_bootstrap.py` TO REGENERATE.
 
 libraries = [
+    {
+        "library": "langchain>=0.0.346",
+        "instrumentation": "tapm-instrumentation-langchain==0.40.7a3",
+    },
+    {
+        "library": "langchain-core>0.1.0",
+        "instrumentation": "tapm-instrumentation-langchain==0.40.7a3",
+    },
+    {
+        "library": "ollama>=0.2.0,<1",
+        "instrumentation": "tapm-instrumentation-ollama==0.40.7a3",
+    },
     {
         "library": "openai >= 1.26.0",
         "instrumentation": "opentelemetry-instrumentation-openai-v2",

opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.55b0.dev"
+__version__ = "0.55b2.post17"