Skip to content
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

Jump to bottom

Update azure resource detector timeout to 4 seconds #2136

Merged
merged 3 commits into from
Jan 24, 2024
Merged

Update azure resource detector timeout to 4 seconds #2136

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94ba4f2
Change timeout to 4 seconds
jeremydvoss Jan 22, 2024
6056a3f
changelog
jeremydvoss Jan 22, 2024
546f186
Feedback
jeremydvoss Jan 23, 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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ...pentelemetry-resource-detector-azure/src/opentelemetry/resource/detector/azure/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion ...rce/opentelemetry-resource-detector-azure/src/opentelemetry/resource/detector/azure/vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ 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:
with urlopen(request, timeout=4) as response:
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
return loads(response.read())
except URLError:
# Not on Azure VM
Expand Down
Loading