Skip to content

Add application.ver to Part A fields for exporter #34401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzchen merged 2 commits into from
Feb 22, 2024
Merged

Add application.ver to Part A fields for exporter #34401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f80baf
ver
lzchen Feb 21, 2024
8505b1e
lint
lzchen Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

- Add device.* to part A fields
([#34229](https://github.com/Azure/azure-sdk-for-python/pull/34229))
- Add application.ver to part A fields
([#34401](https://github.com/Azure/azure-sdk-for-python/pull/34401))

### Breaking Changes

Expand Down
4 changes: 4 additions & 0 deletions ...nitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ def _populate_part_a_fields(resource: Resource):
device_id = resource.attributes.get(ResourceAttributes.DEVICE_ID)
device_model = resource.attributes.get(ResourceAttributes.DEVICE_MODEL_NAME)
device_make = resource.attributes.get(ResourceAttributes.DEVICE_MANUFACTURER)
app_version = resource.attributes.get(ResourceAttributes.SERVICE_VERSION)
if service_name:
if service_namespace:
tags[ContextTagKeys.AI_CLOUD_ROLE] = str(service_namespace) + \
Expand All @@ -199,6 +200,9 @@ def _populate_part_a_fields(resource: Resource):
tags[ContextTagKeys.AI_DEVICE_MODEL] = device_model # type: ignore
if device_make:
tags[ContextTagKeys.AI_DEVICE_OEM_NAME] = device_make # type: ignore
if app_version:
tags[ContextTagKeys.AI_APPLICATION_VER] = app_version # type: ignore

return tags

# pylint: disable=W0622
Expand Down
6 changes: 5 additions & 1 deletion sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ def test_populate_part_a_fields(self):
"service.instance.id": "testServiceInstanceId",
"device.id": "testDeviceId",
"device.model.name": "testDeviceModel",
"device.manufacturer": "testDeviceMake"})
"device.manufacturer": "testDeviceMake",
"service.version": "testApplicationVer",
}
)
tags = _utils._populate_part_a_fields(resource)
self.assertIsNotNone(tags)
self.assertEqual(tags.get("ai.cloud.role"), "testServiceNamespace.testServiceName")
Expand All @@ -60,6 +63,7 @@ def test_populate_part_a_fields(self):
self.assertEqual(tags.get("ai.device.id"), "testDeviceId")
self.assertEqual(tags.get("ai.device.model"), "testDeviceModel")
self.assertEqual(tags.get("ai.device.oemName"), "testDeviceMake")
self.assertEqual(tags.get("ai.application.ver"), "testApplicationVer")

def test_populate_part_a_fields_default(self):
resource = Resource(
Expand Down