Skip to content

Update order of hostname detection logic#360

Merged
sarah-witt merged 3 commits into
masterfrom
sarah/fix-http-aws-merge
Aug 29, 2023
Merged

Update order of hostname detection logic#360
sarah-witt merged 3 commits into
masterfrom
sarah/fix-http-aws-merge

Conversation

@sarah-witt

@sarah-witt sarah-witt commented Aug 28, 2023

Copy link
Copy Markdown
Collaborator

What does this PR do?

The merge of #346 did not take into account the changes from #345 causing build failures. This PR refactors the getAWSInstanceId to use the new HTTP client

Additionally changes the order of the hostname collection so that the AWS instance param takes precedence over the HOSTNAME variable

Description of the Change

Alternate Designs

Possible Drawbacks

Verification Process

Additional Notes

Release Notes

Review checklist (to be filled by reviewers)

  • Feature or bug fix MUST have appropriate tests (unit, integration, etc...)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have one changelog/ label attached. If applicable it should have the backward-incompatible label attached.
  • PR should not have do-not-merge/ label attached.
  • If Applicable, issue must have kind/ and severity/ labels attached at least.

@sarah-witt sarah-witt added the changelog/Fixed Fixed features results into a bug fix version bump label Aug 28, 2023
@sarah-witt
sarah-witt marked this pull request as ready for review August 28, 2023 18:46
Comment thread src/main/java/org/datadog/jenkins/plugins/datadog/DatadogUtilities.java Outdated
@sarah-witt
sarah-witt merged commit 1b0ed46 into master Aug 29, 2023
@sarah-witt
sarah-witt deleted the sarah/fix-http-aws-merge branch August 29, 2023 15:02
@sarah-witt sarah-witt added changelog/no-changelog Changes don't appear in changelog changelog/Fixed Fixed features results into a bug fix version bump and removed changelog/Fixed Fixed features results into a bug fix version bump changelog/no-changelog Changes don't appear in changelog labels Oct 4, 2023
@sarah-witt sarah-witt changed the title Use new http client in getAwsInstanceID method Update order of hostname detection logic Oct 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/Fixed Fixed features results into a bug fix version bump

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants