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.

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

Validate HTTP connectivity for Agent traces port #464

Merged

Conversation

nikita-tkachenko-datadog
Copy link
Collaborator

Requirements for Contributing to this repository

  • Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
  • The pull request must only fix one issue at the time.
  • The pull request must update the test suite to demonstrate the changed functionality.
  • After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see CONTRIBUTING.

What does this PR do?

Improves connectivity check for Agent traces port.

Current check only verifies that a TCP socket can be opened using the Agent's host and configured traces port.
Traces are sent over HTTP, so it is possible that there is TCP connectivity, but not HTTP connectivity (for example, if there is an HTTP proxy in between Jenkins and the Agent).

The improved check verifies HTTP connectivity: it sends an HTTP request to the agent's /info endpoint. The check is considered successful if the info can be retrieved.

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.

@nikita-tkachenko-datadog nikita-tkachenko-datadog added the changelog/Added Added features results into a minor version bump label Nov 5, 2024
@nikita-tkachenko-datadog nikita-tkachenko-datadog force-pushed the nikita-tkachenko/configuration-refactoring-updated branch from d20b98e to b8e26e6 Compare November 20, 2024 10:03
@nikita-tkachenko-datadog nikita-tkachenko-datadog force-pushed the nikita-tkachenko/configuration-refactoring-updated branch 2 times, most recently from 0404aa5 to 0260867 Compare December 5, 2024 15:55
Base automatically changed from nikita-tkachenko/configuration-refactoring-updated to master December 11, 2024 09:53
@nikita-tkachenko-datadog nikita-tkachenko-datadog force-pushed the nikita-tkachenko/agent-traces-validation branch from df3e530 to d70595b Compare December 18, 2024 16:22
@nikita-tkachenko-datadog nikita-tkachenko-datadog marked this pull request as ready for review January 2, 2025 15:37
Copy link
Collaborator

@drodriguezhdez drodriguezhdez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropped some comments

DatadogUtilities.severe(logger, ex, "Failed to create socket to host: " + host + ", port: " + port);
return ex.getMessage();
try {
Set<String> endpoints = DatadogAgentClient.fetchAgentEndpoints(new HttpClient(10_000), agentHost, agentTraceCollectionPort);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a constant to name that 10_000?

Also, I'm seeing that this is the timeout. This means that if the plugin cannot communicate with the Datadog Agent, the request can take 10 seconds? This might be confusing for customers if there's no indication that the plugin is doing something under the hood.

If that's the case, could we limit the timeout to something lower (1 second? 2 seconds at most?) to provide quicker feedback.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've lowered the timeout to 2 seconds just to be on the safe side, and moved the value to a named constant.

if (!endpoints.isEmpty()) {
return FormValidation.ok("Success!");
} else {
return FormValidation.error("The agent returned empty endpoints list");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use a more user-friendly error here to indicate what happened (Maybe something like Failed to communicate with host xxxxxx or similar?)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, updated the message

DatadogUtilities.severe(logger, ex, "Failed to create socket to host: " + host + ", port: " + port);
return ex.getMessage();
try {
Set<String> endpoints = DatadogAgentClient.fetchAgentEndpoints(new HttpClient(10_000), agentHost, agentTraceCollectionPort);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way that the plugin can send traces directly over TCP socket? Or this is not possible anymore?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this was ever possible, I haven't seen it neither in the plugin nor in the Java tracer.

@nikita-tkachenko-datadog nikita-tkachenko-datadog merged commit eb4a68c into master Jan 13, 2025
19 checks passed
@nikita-tkachenko-datadog nikita-tkachenko-datadog deleted the nikita-tkachenko/agent-traces-validation branch January 13, 2025 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/Added Added features results into a minor version bump
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants