Merge branch 'main' into feature/asyncio-instrumentation

Author: allen-k1m

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)
 

resource/opentelemetry-resource-detector-azure/src/opentelemetry/resource/detector/azure/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"

resource/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