Skip to content

Commit 547e41e

Browse files
authored
[Monitor OpenTelemetry Exporter] Remove the Device OS Setting (#41549)
* Remove the device OS setting. * Update CHANGELOG.md * Update changelog message.
1 parent 10c4961 commit 547e41e

File tree

6 files changed

+2
-27
lines changed

6 files changed

+2
-27
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
### Bugs Fixed
1010
- Fix for issue #41470. Added back exception message, removed earlier due to linting errors
1111
([#41512] https://github.com/Azure/azure-sdk-for-python/pull/41512)
12+
- Should leave ingestion to populate Device OS from User Agent
13+
([#41549] https://github.com/Azure/azure-sdk-for-python/pull/41549)
1214

1315
### Other Changes
1416

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ def _getlocale():
130130
azure_monitor_context = {
131131
ContextTagKeys.AI_DEVICE_ID: platform.node(),
132132
ContextTagKeys.AI_DEVICE_LOCALE: _getlocale(),
133-
ContextTagKeys.AI_DEVICE_OS_VERSION: platform.version(),
134133
ContextTagKeys.AI_DEVICE_TYPE: "Other",
135134
ContextTagKeys.AI_INTERNAL_SDK_VERSION: _get_sdk_version(),
136135
}

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,6 @@ def test_log_to_envelope_partA(self):
362362
self.assertEqual(
363363
envelope.tags.get(ContextTagKeys.AI_DEVICE_LOCALE), azure_monitor_context[ContextTagKeys.AI_DEVICE_LOCALE]
364364
)
365-
self.assertEqual(
366-
envelope.tags.get(ContextTagKeys.AI_DEVICE_OS_VERSION),
367-
azure_monitor_context[ContextTagKeys.AI_DEVICE_OS_VERSION],
368-
)
369365
self.assertEqual(
370366
envelope.tags.get(ContextTagKeys.AI_DEVICE_TYPE), azure_monitor_context[ContextTagKeys.AI_DEVICE_TYPE]
371367
)

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/metrics/test_metrics.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ def test_point_to_envelope_partA(self):
187187
self.assertEqual(
188188
envelope.tags.get(ContextTagKeys.AI_DEVICE_LOCALE), azure_monitor_context[ContextTagKeys.AI_DEVICE_LOCALE]
189189
)
190-
self.assertEqual(
191-
envelope.tags.get(ContextTagKeys.AI_DEVICE_OS_VERSION),
192-
azure_monitor_context[ContextTagKeys.AI_DEVICE_OS_VERSION],
193-
)
194190
self.assertEqual(
195191
envelope.tags.get(ContextTagKeys.AI_DEVICE_TYPE), azure_monitor_context[ContextTagKeys.AI_DEVICE_TYPE]
196192
)

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515

1616
TEST_AI_DEVICE_ID = "TEST_AI_DEVICE_ID"
1717
TEST_AI_DEVICE_LOCALE = "TEST_AI_DEVICE_LOCALE"
18-
TEST_OS_VERSION = "TEST_OS_VERSION"
1918
TEST_SDK_VERSION_PREFIX = "TEST_AZURE_SDK_VERSION_PREFIX"
2019
TEST_AZURE_MONITOR_CONTEXT = {
2120
"ai.device.id": TEST_AI_DEVICE_ID,
2221
"ai.device.locale": TEST_AI_DEVICE_LOCALE,
23-
"ai.device.osVersion": TEST_OS_VERSION,
2422
"ai.device.type": "Other",
2523
"ai.internal.sdkVersion": "{}py1.2.3:otel4.5.6:ext7.8.9".format(
2624
TEST_SDK_VERSION_PREFIX,

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/trace/test_trace.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,6 @@ def test_span_to_envelope_partA(self):
290290
self.assertEqual(
291291
envelope.tags.get(ContextTagKeys.AI_DEVICE_LOCALE), azure_monitor_context[ContextTagKeys.AI_DEVICE_LOCALE]
292292
)
293-
self.assertEqual(
294-
envelope.tags.get(ContextTagKeys.AI_DEVICE_OS_VERSION),
295-
azure_monitor_context[ContextTagKeys.AI_DEVICE_OS_VERSION],
296-
)
297293
self.assertEqual(
298294
envelope.tags.get(ContextTagKeys.AI_DEVICE_TYPE), azure_monitor_context[ContextTagKeys.AI_DEVICE_TYPE]
299295
)
@@ -1448,10 +1444,6 @@ def test_span_events_to_envelopes_exception(self):
14481444
self.assertEqual(
14491445
envelope.tags.get(ContextTagKeys.AI_DEVICE_LOCALE), azure_monitor_context[ContextTagKeys.AI_DEVICE_LOCALE]
14501446
)
1451-
self.assertEqual(
1452-
envelope.tags.get(ContextTagKeys.AI_DEVICE_OS_VERSION),
1453-
azure_monitor_context[ContextTagKeys.AI_DEVICE_OS_VERSION],
1454-
)
14551447
self.assertEqual(
14561448
envelope.tags.get(ContextTagKeys.AI_DEVICE_TYPE), azure_monitor_context[ContextTagKeys.AI_DEVICE_TYPE]
14571449
)
@@ -1510,10 +1502,6 @@ def test_span_events_to_envelopes_message(self):
15101502
self.assertEqual(
15111503
envelope.tags.get(ContextTagKeys.AI_DEVICE_LOCALE), azure_monitor_context[ContextTagKeys.AI_DEVICE_LOCALE]
15121504
)
1513-
self.assertEqual(
1514-
envelope.tags.get(ContextTagKeys.AI_DEVICE_OS_VERSION),
1515-
azure_monitor_context[ContextTagKeys.AI_DEVICE_OS_VERSION],
1516-
)
15171505
self.assertEqual(
15181506
envelope.tags.get(ContextTagKeys.AI_DEVICE_TYPE), azure_monitor_context[ContextTagKeys.AI_DEVICE_TYPE]
15191507
)
@@ -1574,10 +1562,6 @@ def test_span_events_to_envelopes_sample_rate(self):
15741562
self.assertEqual(
15751563
envelope.tags.get(ContextTagKeys.AI_DEVICE_LOCALE), azure_monitor_context[ContextTagKeys.AI_DEVICE_LOCALE]
15761564
)
1577-
self.assertEqual(
1578-
envelope.tags.get(ContextTagKeys.AI_DEVICE_OS_VERSION),
1579-
azure_monitor_context[ContextTagKeys.AI_DEVICE_OS_VERSION],
1580-
)
15811565
self.assertEqual(
15821566
envelope.tags.get(ContextTagKeys.AI_DEVICE_TYPE), azure_monitor_context[ContextTagKeys.AI_DEVICE_TYPE]
15831567
)

0 commit comments

Comments
 (0)