From 42e428619956dfec38a6657d05e76eb587c647c8 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 7 May 2026 11:54:40 -0700 Subject: [PATCH 1/6] handle the fact that __name__ and importlib metadata dont always match at runtime (ddtrace_serverless) --- ddtrace/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddtrace/version.py b/ddtrace/version.py index a688dcc6383..68cf654e4c7 100644 --- a/ddtrace/version.py +++ b/ddtrace/version.py @@ -8,6 +8,6 @@ __version__: str try: - __version__ = importlib.metadata.version(__package__ or __name__) + __version__ = importlib.metadata.version("ddtrace") except importlib.metadata.PackageNotFoundError: __version__ = "0.0.0" From 2d54a9fe28e556ad8126cd5f5259ff391af83703 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 7 May 2026 12:01:39 -0700 Subject: [PATCH 2/6] use packages_distributions --- ddtrace/version.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ddtrace/version.py b/ddtrace/version.py index 68cf654e4c7..3d9ff4584bc 100644 --- a/ddtrace/version.py +++ b/ddtrace/version.py @@ -8,6 +8,7 @@ __version__: str try: - __version__ = importlib.metadata.version("ddtrace") + distributions = importlib.metadata.packages_distributions().get(__package__ or __name__) + __version__ = importlib.metadata.version(distributions[0] if distributions else "ddtrace") except importlib.metadata.PackageNotFoundError: __version__ = "0.0.0" From d52373cce632eec9f78d178462d40815622aab25 Mon Sep 17 00:00:00 2001 From: Emmett Butler <723615+emmettbutler@users.noreply.github.com> Date: Thu, 7 May 2026 12:07:20 -0700 Subject: [PATCH 3/6] Update ddtrace/version.py Co-authored-by: Brett Langdon --- ddtrace/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddtrace/version.py b/ddtrace/version.py index 3d9ff4584bc..e48bb2a909e 100644 --- a/ddtrace/version.py +++ b/ddtrace/version.py @@ -10,5 +10,5 @@ try: distributions = importlib.metadata.packages_distributions().get(__package__ or __name__) __version__ = importlib.metadata.version(distributions[0] if distributions else "ddtrace") -except importlib.metadata.PackageNotFoundError: +except Exception: __version__ = "0.0.0" From 3f50409fe8e7f0cd5107b90e05b9e82a16579d34 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 8 May 2026 10:05:41 -0700 Subject: [PATCH 4/6] avoid benchmarks when version file changes --- benchmarks/suitespec.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/benchmarks/suitespec.yml b/benchmarks/suitespec.yml index 4c3d3e36712..0c894f8dee8 100644 --- a/benchmarks/suitespec.yml +++ b/benchmarks/suitespec.yml @@ -1,4 +1,3 @@ ---- components: bootstrap: - ddtrace/bootstrap/* @@ -88,7 +87,6 @@ components: - ddtrace/internal/wrapping/* - ddtrace/__init__.py - ddtrace/py.typed - - ddtrace/version.py - ddtrace/internal/settings/_config.py - src/native/* suites: From 4fa55cfb2fffbde2a58fb39e91207e99c9bbf42e Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 8 May 2026 10:06:26 -0700 Subject: [PATCH 5/6] whoopsie --- benchmarks/suitespec.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/benchmarks/suitespec.yml b/benchmarks/suitespec.yml index 0c894f8dee8..5d4299ac92a 100644 --- a/benchmarks/suitespec.yml +++ b/benchmarks/suitespec.yml @@ -1,3 +1,4 @@ +--- components: bootstrap: - ddtrace/bootstrap/* From 8b91adea7975ab275a92db994fdfc0a00d15241f Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 8 May 2026 10:17:36 -0700 Subject: [PATCH 6/6] also the suitespec file itself (temporary, to unblock) --- benchmarks/suitespec.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/benchmarks/suitespec.yml b/benchmarks/suitespec.yml index 5d4299ac92a..0802b8ed9ca 100644 --- a/benchmarks/suitespec.yml +++ b/benchmarks/suitespec.yml @@ -136,7 +136,6 @@ suites: - '@tracing' - '@vendor' - benchmarks/set_http_meta/* - - benchmarks/suitespec.yml cpus_per_run: 1 type: 'microbenchmark' telemetry_add_metric: