RP Id for statsbeat needs work

Author: jeremydvoss

sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/statsbeat/_statsbeat_metrics.py

@@ -18,6 +18,7 @@
 from azure.monitor.opentelemetry.exporter._constants import (
     _ATTACH_METRIC_NAME,
     _FEATURE_METRIC_NAME,
+    _KUBERNETES_SERVICE_HOST,
     _REQ_DURATION_NAME,
     _REQ_EXCEPTION_NAME,
     _REQ_FAILURE_NAME,
@@ -187,7 +188,9 @@ def _get_attach_metric(self, options: CallbackOptions) -> Iterable[Observation]:
         elif _utils._is_on_aks():
             # AKS
             rp = _RP_Names.AKS.value
-            rpId = os.environ.get(_AKS_ARM_NAMESPACE_ID, "")
+            # TODO: AKS_ARM_NAMESPACE_ID is only for attach
+            # rpId = os.environ.get(_AKS_ARM_NAMESPACE_ID, "")
+            rpId = os.environ.get(_KUBERNETES_SERVICE_HOST , "")
         elif self._vm_retry and self._get_azure_compute_metadata():
             # VM
             rp = _RP_Names.VM.value

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/statsbeat/test_statsbeat.py

@@ -446,14 +446,16 @@ def test_get_attach_metric_functions(self, metadata_mock):
     @mock.patch.dict(
         os.environ,
         {
-            "AKS_ARM_NAMESPACE_ID": "namespace_id",
+            "KUBERNETES_SERVICE_HOST": "TEST_KUBERNETES_SERVICE_HOST",
         },
     )
     def test_get_attach_metric_aks(self):
         attributes = dict(_StatsbeatMetrics._COMMON_ATTRIBUTES)
         self.assertEqual(attributes["rp"], _RP_Names.UNKNOWN.value)
         attributes["rp"] = _RP_Names.AKS.value
-        attributes["rpId"] = "namespace_id"
+        # TODO: What should rpId be for aks?
+        # attributes["rpId"] = ""
+        attributes["rpId"] = "TEST_KUBERNETES_SERVICE_HOST"
         observations = self._metric._get_attach_metric(options=None)
         for obs in observations:
             self.assertEqual(obs.value, 1)