Skip to content

Commit 8a5be86

Browse files
authored
Fix default value overriding user-configured sampling ratio in distro (#44162)
* Fix default value overriding user-configured sampling ratio in distro * Added CHANGELOG * Improve readability
1 parent 844658a commit 8a5be86

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
### Bugs Fixed
1010

11+
- Fix default value overriding user-configured sampling ratio in distro
12+
([#44162](https://github.com/Azure/azure-sdk-for-python/pull/44162))
13+
1114
### Other Changes
1215

1316
## 1.8.2 (2025-11-14)

sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_utils/configurations.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,16 @@ def _default_sampling_ratio(configurations):
187187

188188
# Handle all other cases (no sampler type specified or unsupported sampler type)
189189
else:
190-
configurations[SAMPLING_RATIO_ARG] = default_value
190+
if configurations.get(SAMPLING_RATIO_ARG) is None:
191+
configurations[SAMPLING_RATIO_ARG] = default_value
191192
if sampler_type is not None:
192193
_logger.error( # pylint: disable=C
193194
"Invalid argument for the sampler to be used for tracing. "
194195
"Supported values are %s and %s. Defaulting to %s: %s",
195196
RATE_LIMITED_SAMPLER,
196197
FIXED_PERCENTAGE_SAMPLER,
197-
OTEL_TRACES_SAMPLER,
198-
OTEL_TRACES_SAMPLER_ARG,
198+
FIXED_PERCENTAGE_SAMPLER,
199+
configurations[SAMPLING_RATIO_ARG],
199200
)
200201

201202
def _default_instrumentation_options(configurations):

sdk/monitor/azure-monitor-opentelemetry/tests/utils/test_configurations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_get_configurations(self, resource_create_mock):
8686
self.assertEqual(configurations["resource"].attributes, TEST_MERGED_RESOURCE.attributes)
8787
self.assertEqual(environ[OTEL_EXPERIMENTAL_RESOURCE_DETECTORS], "azure_app_service,azure_vm")
8888
resource_create_mock.assert_called_once_with(TEST_CUSTOM_RESOURCE.attributes)
89-
self.assertEqual(configurations["sampling_ratio"], 1.0)
89+
self.assertEqual(configurations["sampling_ratio"], 0.5)
9090
self.assertEqual(configurations["credential"], "test_credential")
9191
self.assertEqual(
9292
configurations["instrumentation_options"],

0 commit comments

Comments
 (0)