Merge branch 'master' into sunset

Author: aabmass

contrib/opencensus-ext-azure/CHANGELOG.md

@@ -2,9 +2,24 @@
 
 ## Unreleased
 
-# 1.1.13
+## 1.1.15
+
+Released 2025-06-03
+
+- Switch ordering for Statsbeat Attach detection to prioritize Azure Functions
+  ([#1251](https://github.com/census-instrumentation/opencensus-python/pull/1251))
+
+## 1.1.14
+
+Released 2025-01-06
+
+- Remove status code `206` from retry code + only count batch level for statsbeat
+([#1247](https://github.com/census-instrumentation/opencensus-python/pull/1247))
+
+## 1.1.13
 
 Released 2024-01-03
+
 - Changed bit-mapping for `httpx` and `fastapi` integrations
 ([#1239](https://github.com/census-instrumentation/opencensus-python/pull/1239))
 

contrib/opencensus-ext-azure/opencensus/ext/azure/common/transport.py

@@ -39,7 +39,6 @@
 _REACHED_INGESTION_STATUS_CODES = (200, 206, 402, 408, 429, 439, 500)
 REDIRECT_STATUS_CODES = (307, 308)
 RETRYABLE_STATUS_CODES = (
-    206,  # Partial success
     401,  # Unauthorized
     403,  # Forbidden
     408,  # Request Timeout
@@ -214,8 +213,6 @@ def _transmit(self, envelopes):
                     for error in data['errors']:
                         if _status_code_is_retryable(error['statusCode']):
                             resend_envelopes.append(envelopes[error['index']])
-                            if self._check_stats_collection():
-                                _update_requests_map('retry', value=error['statusCode'])  # noqa: E501
                         else:
                             if not self._is_stats_exporter():
                                 logger.error(

contrib/opencensus-ext-azure/opencensus/ext/azure/statsbeat/statsbeat_metrics.py

@@ -131,7 +131,7 @@ def _get_common_properties():
     properties.append(LabelKey("cikey", 'customer ikey'))
     properties.append(LabelKey("runtimeVersion", 'Python version'))
     properties.append(LabelKey("os", 'os of application being instrumented'))
-    properties.append(LabelKey("language", 'Python'))
+    properties.append(LabelKey("language", 'python'))
     properties.append(LabelKey("version", 'sdkVersion - version of the ext'))
     return properties
 
@@ -412,17 +412,17 @@ def _get_attach_metric(self):
         rp = ''
         rpId = ''
         # rp, rpId
-        if os.environ.get("WEBSITE_SITE_NAME") is not None:
+        if os.environ.get("FUNCTIONS_WORKER_RUNTIME") is not None:
+            # Function apps
+            rp = _RP_NAMES[1]
+            rpId = os.environ.get("WEBSITE_HOSTNAME")
+        elif os.environ.get("WEBSITE_SITE_NAME") is not None:
             # Web apps
             rp = _RP_NAMES[0]
             rpId = '{}/{}'.format(
                         os.environ.get("WEBSITE_SITE_NAME"),
                         os.environ.get("WEBSITE_HOME_STAMPNAME", '')
             )
-        elif os.environ.get("FUNCTIONS_WORKER_RUNTIME") is not None:
-            # Function apps
-            rp = _RP_NAMES[1]
-            rpId = os.environ.get("WEBSITE_HOSTNAME")
         elif self._vm_retry and self._get_azure_compute_metadata():
             # VM
             rp = _RP_NAMES[2]

contrib/opencensus-ext-azure/setup.py

@@ -43,7 +43,7 @@
     install_requires=[
         'azure-core >= 1.12.0, < 2.0.0',
         'azure-identity >= 1.5.0, < 2.0.0',
-        'opencensus >= 0.12.dev0, < 1.0.0',
+        'opencensus >= 0.11.4, < 1.0.0',
         'psutil >= 5.6.3',
         'requests >= 2.19.0',
     ],

contrib/opencensus-ext-azure/tests/test_azure_statsbeat_metrics.py

@@ -665,6 +665,7 @@ def test_get_attach_metric_appsvc(self):
         {
             "FUNCTIONS_WORKER_RUNTIME": "runtime",
             "WEBSITE_HOSTNAME": "host_name",
+            "WEBSITE_SITE_NAME": "site_name",
         }
     )
     def test_get_attach_metric_functions(self):

contrib/opencensus-ext-azure/tests/test_transport_mixin.py

@@ -454,9 +454,10 @@ def test_statsbeat_206_partial_retry(self):
                     ],
                 }))
             result = mixin._transmit([1, 2, 3])
-            self.assertEqual(len(_requests_map), 3)
+            # We do not record any network statsbeat for 206 status code
+            self.assertEqual(len(_requests_map), 2)
             self.assertIsNotNone(_requests_map['duration'])
-            self.assertEqual(_requests_map['retry'][500], 1)
+            self.assertIsNone(_requests_map.get('retry'))
             self.assertEqual(_requests_map['count'], 1)
             self.assertEqual(result, TransportStatusCode.DROP)
             storage_mock.put.assert_called_once()