From 1e7558f1e9efea83370568ef3817a9e77b417a65 Mon Sep 17 00:00:00 2001 From: mccoyp Date: Mon, 9 Feb 2026 18:14:02 +0000 Subject: [PATCH 1/3] Remove remaining imports of pkg_resources --- sdk/evaluation/azure-ai-evaluation/setup.py | 1 - sdk/ml/azure-ai-ml/setup.py | 1 - .../azure/monitor/opentelemetry/exporter/_utils.py | 12 ++---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sdk/evaluation/azure-ai-evaluation/setup.py b/sdk/evaluation/azure-ai-evaluation/setup.py index 5b6d80bccf9a..868005a58990 100644 --- a/sdk/evaluation/azure-ai-evaluation/setup.py +++ b/sdk/evaluation/azure-ai-evaluation/setup.py @@ -9,7 +9,6 @@ from io import open from typing import Any, Match, cast -import pkg_resources from setuptools import find_packages, setup # Change the PACKAGE_NAME only to change folder and different name diff --git a/sdk/ml/azure-ai-ml/setup.py b/sdk/ml/azure-ai-ml/setup.py index ed0de30b08a3..6a6e6c28f512 100644 --- a/sdk/ml/azure-ai-ml/setup.py +++ b/sdk/ml/azure-ai-ml/setup.py @@ -7,7 +7,6 @@ from io import open from typing import Any, Match, cast -import pkg_resources from setuptools import find_packages, setup # Change the PACKAGE_NAME only to change folder and different name diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py index 4d8e2ea129e4..7cf26653709d 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py @@ -41,17 +41,9 @@ opentelemetry_version = "" -# Workaround for missing version file -try: - from importlib.metadata import version +from importlib.metadata import version - opentelemetry_version = version("opentelemetry-sdk") -except ImportError: - # Temporary workaround for Date: Mon, 9 Feb 2026 18:19:45 +0000 Subject: [PATCH 2/3] Restore comment explaining opentelemetry_version --- .../azure/monitor/opentelemetry/exporter/_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py index 7cf26653709d..1014a2f25188 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py @@ -41,6 +41,7 @@ opentelemetry_version = "" +# Workaround for missing version file from importlib.metadata import version opentelemetry_version = version("opentelemetry-sdk") From 914fcd8f5e03909fc0c696c88e84feed7823b0da Mon Sep 17 00:00:00 2001 From: mccoyp Date: Mon, 9 Feb 2026 22:43:42 +0000 Subject: [PATCH 3/3] Cleanup --- .../azure/monitor/opentelemetry/exporter/_utils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py index 1014a2f25188..024b23fc0959 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py @@ -2,6 +2,7 @@ # Licensed under the MIT License. import datetime +from importlib.metadata import version import locale from os import environ from os.path import isdir @@ -39,11 +40,7 @@ _RP_Names, ) -opentelemetry_version = "" - # Workaround for missing version file -from importlib.metadata import version - opentelemetry_version = version("opentelemetry-sdk")