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

[pkg/otlp] Make hostname logic consistent with exporter #14073

Merged
merged 2 commits into from
Oct 28, 2022
Merged

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Oct 27, 2022

What does this PR do?

Use preview hostname resolution for the Datadog Agent, to make it consistent with the logic from the Datadog exporter. This relates to open-telemetry/opentelemetry-collector-contrib/issues/10424

Motivation

Consistency across products. Ignore container id when getting hostname.

Describe how to test/QA your changes

  • Send OTLP metrics with container.id set in the resource attribute. Check that the hostname on these metrics is not that value, but rather the one resolved by the Agent
  • Send OTLP traces with container.id set in the resource attribute. Check that the hostname on these metrics is not that value, but rather the one resolved by the Agent

Reviewer's Checklist

  • If known, an appropriate milestone has been selected; otherwise the Triage milestone is set.
  • Use the major_change label if your change either has a major impact on the code base, is impacting multiple teams or is changing important well-established internals of the Agent. This label will be use during QA to make sure each team pay extra attention to the changed behavior. For any customer facing change use a releasenote.
  • A release note has been added or the changelog/no-changelog label has been applied.
  • Changed code has automated tests for its functionality.
  • Adequate QA/testing plan information is provided if the qa/skip-qa label is not applied.
  • At least one team/.. label has been applied, indicating the team(s) that should QA this change.
  • If applicable, docs team has been notified or an issue has been opened on the documentation repo.
  • If applicable, the need-change/operator and need-change/helm labels have been applied.
  • If applicable, the k8s/<min-version> label, indicating the lowest Kubernetes version compatible with this feature.
  • If applicable, the config template has been updated.

@mx-psi mx-psi added component/otlp PRs and issues related to OTLP ingest team/opentelemetry OpenTelemetry team labels Oct 27, 2022
@mx-psi mx-psi added this to the 7.41.0 milestone Oct 27, 2022
@mx-psi mx-psi marked this pull request as ready for review October 27, 2022 12:00
@mx-psi mx-psi requested review from a team as code owners October 27, 2022 12:00
Copy link
Contributor

@ajgajg1134 ajgajg1134 left a comment

Choose a reason for hiding this comment

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

Looks good for APM

Copy link
Contributor

@jtappa jtappa left a comment

Choose a reason for hiding this comment

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

tiny edit, approving so I'm not blocking on release note

releasenotes/notes/fix-hostname-d787b81e9103c48a.yaml Outdated Show resolved Hide resolved
@mx-psi mx-psi merged commit a20fc62 into main Oct 28, 2022
@mx-psi mx-psi deleted the mx-psi-patch-3 branch October 28, 2022 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/otlp PRs and issues related to OTLP ingest team/opentelemetry OpenTelemetry team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants