Merge branch 'main' into resource-detector-azure-release-0.1.2

jeremydvoss · Jan 25, 2024 · c1a1498 · c1a1498
2 parents c32976e + 743c2fe
commit c1a1498
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-resource-detector-azure` Added 10s timeout to VM Resource Detector
   ([#2119](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2119))
+- `opentelemetry-resource-detector-azure` Changed timeout to 4 seconds due to [timeout bug](https://github.com/open-telemetry/opentelemetry-python/issues/3644)
+  ([#2136](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2136))
 
 ## Version 1.22.0/0.43b0 (2023-12-14)
 

diff --git a/...rce/opentelemetry-resource-detector-azure/src/opentelemetry/resource/detector/azure/vm.py b/...rce/opentelemetry-resource-detector-azure/src/opentelemetry/resource/detector/azure/vm.py
@@ -68,7 +68,10 @@ def get_azure_vm_metadata(self):  # pylint: disable=no-self-use
         request = Request(_AZURE_VM_METADATA_ENDPOINT)
         request.add_header("Metadata", "True")
         try:
-            with urlopen(request, timeout=10) as response:
+            # TODO: Changed to 4s to fit into OTel SDK's 5 second timeout.
+            # Lengthen or allow user input if issue is resolved.
+            # See https://github.com/open-telemetry/opentelemetry-python/issues/3644
+            with urlopen(request, timeout=4) as response:
                 return loads(response.read())
         except URLError:
             # Not on Azure VM