From 76e541b2de54267b0957d195d368aed8ee2b96ea Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Mon, 18 May 2026 13:55:28 -0700 Subject: [PATCH 1/4] Revert adding azure monitor distro in sdkVersion --- .../azure-monitor-opentelemetry-exporter/CHANGELOG.md | 1 + .../azure/monitor/opentelemetry/exporter/_constants.py | 1 - .../azure/monitor/opentelemetry/exporter/_utils.py | 9 --------- .../tests/test_utils.py | 9 +-------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md index f99bf1546ba8..21fdfc595d31 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md @@ -7,6 +7,7 @@ ### Breaking Changes ### Bugs Fixed +- The sdkversion should only show the exporter/distro version which emits the sdkstats. Removed the AZURE_MONITOR_DISTRO_VERSION variable ### Other Changes diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_constants.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_constants.py index 218340e3a13d..9135aad5ba0e 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_constants.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_constants.py @@ -23,7 +23,6 @@ _APPLICATIONINSIGHTS_METRIC_NAMESPACE_OPT_IN = "APPLICATIONINSIGHTS_METRIC_NAMESPACE_OPT_IN" # SDK version -_AZURE_MONITOR_DISTRO_VERSION = "AZURE_MONITOR_DISTRO_VERSION" _MICROSOFT_OPENTELEMETRY_VERSION = "MICROSOFT_OPENTELEMETRY_VERSION" _APPLICATIONINSIGHTS_METRICS_TO_LOGANALYTICS_ENABLED = "APPLICATIONINSIGHTS_METRICS_TO_LOGANALYTICS_ENABLED" 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 db99edde2c7c..ba8a9da77513 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 @@ -23,7 +23,6 @@ from azure.monitor.opentelemetry.exporter._connection_string_parser import ConnectionStringParser from azure.monitor.opentelemetry.exporter._constants import ( _AKS_ARM_NAMESPACE_ID, - _AZURE_MONITOR_DISTRO_VERSION, _DEFAULT_AAD_SCOPE, _FUNCTIONS_WORKER_RUNTIME, _INSTRUMENTATIONS_BIT_MAP, @@ -120,7 +119,6 @@ def _get_sdk_version_prefix(): def _get_sdk_version(): prefix = _get_sdk_version_prefix() - distro_version = environ.get(_AZURE_MONITOR_DISTRO_VERSION) ms_otel_version = environ.get(_MICROSOFT_OPENTELEMETRY_VERSION) if ms_otel_version: return "{}py{}:otel{}:mot{}".format( @@ -129,13 +127,6 @@ def _get_sdk_version(): opentelemetry_version, ms_otel_version, ) - if distro_version: - return "{}py{}:otel{}:dst{}".format( - prefix, - platform.python_version(), - opentelemetry_version, - distro_version, - ) return "{}py{}:otel{}:ext{}".format( prefix, platform.python_version(), diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py index d471e8bca8b5..0bae10fdc963 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py @@ -806,11 +806,6 @@ def test_is_synthetic_source_test(self): "azure.monitor.opentelemetry.exporter._utils.ext_version", "1.0.0b21", ) - @patch.dict( - "azure.monitor.opentelemetry.exporter._utils.environ", - {}, - clear=True, - ) def test_get_sdk_version_default(self, mock_python_version, mock_prefix): result = _utils._get_sdk_version() self.assertEqual(result, "uum_py3.11.0:otel1.20.0:ext1.0.0b21") @@ -829,12 +824,11 @@ def test_get_sdk_version_default(self, mock_python_version, mock_prefix): ) @patch.dict( "azure.monitor.opentelemetry.exporter._utils.environ", - {"AZURE_MONITOR_DISTRO_VERSION": "1.8.8"}, clear=True, ) def test_get_sdk_version_distro(self, mock_python_version, mock_prefix): result = _utils._get_sdk_version() - self.assertEqual(result, "uum_py3.11.0:otel1.20.0:dst1.8.8") + self.assertEqual(result, "uum_py3.11.0:otel1.20.0:ext1.0.0b53") @patch( "azure.monitor.opentelemetry.exporter._utils._get_sdk_version_prefix", @@ -872,7 +866,6 @@ def test_get_sdk_version_microsoft_opentelemetry(self, mock_python_version, mock @patch.dict( "azure.monitor.opentelemetry.exporter._utils.environ", { - "AZURE_MONITOR_DISTRO_VERSION": "1.8.8", "MICROSOFT_OPENTELEMETRY_VERSION": "2.0.0", }, clear=True, From 2e0de01214668c1ce200a37990829892bfba023b Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Mon, 18 May 2026 13:59:53 -0700 Subject: [PATCH 2/4] Update CHANGELOG --- sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md index 21fdfc595d31..ae3acb310bb9 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md @@ -8,6 +8,7 @@ ### Bugs Fixed - The sdkversion should only show the exporter/distro version which emits the sdkstats. Removed the AZURE_MONITOR_DISTRO_VERSION variable + ([#46963](https://github.com/Azure/azure-sdk-for-python/pull/46963)) ### Other Changes From ff97b3d9da2ccb1f70efb3e1b5382ec6079f3dbb Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Mon, 18 May 2026 14:02:33 -0700 Subject: [PATCH 3/4] Fix current version instead of hardcoded values --- .../azure-monitor-opentelemetry-exporter/tests/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py index 0bae10fdc963..c8cd186b36e8 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py @@ -828,7 +828,7 @@ def test_get_sdk_version_default(self, mock_python_version, mock_prefix): ) def test_get_sdk_version_distro(self, mock_python_version, mock_prefix): result = _utils._get_sdk_version() - self.assertEqual(result, "uum_py3.11.0:otel1.20.0:ext1.0.0b53") + self.assertEqual(result, "uum_py3.11.0:otel1.20.0:ext{}".format(_utils.ext_version)) @patch( "azure.monitor.opentelemetry.exporter._utils._get_sdk_version_prefix", From ef4959c2b6ef7bce199465da289553724536f258 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Mon, 18 May 2026 14:07:09 -0700 Subject: [PATCH 4/4] Address feedback --- .../azure-monitor-opentelemetry-exporter/tests/test_utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py index c8cd186b36e8..51946fe820ba 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py @@ -806,6 +806,10 @@ def test_is_synthetic_source_test(self): "azure.monitor.opentelemetry.exporter._utils.ext_version", "1.0.0b21", ) + @patch.dict( + "azure.monitor.opentelemetry.exporter._utils.environ", + clear=True, + ) def test_get_sdk_version_default(self, mock_python_version, mock_prefix): result = _utils._get_sdk_version() self.assertEqual(result, "uum_py3.11.0:otel1.20.0:ext1.0.0b21")