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/trace/api: ensure that OTLP container tags get added to the payload #16430

Merged
merged 2 commits into from
Apr 10, 2023

Conversation

gbbr
Copy link
Contributor

@gbbr gbbr commented Apr 4, 2023

This change ensures that container tags are not just renamed as regular span tags, but are also set on the payload as part of the _dd.tags.container tag value. This approach results in them being picked up as primary tags (as expected by the backend) and having them picked up for correlation.

@gbbr gbbr added this to the 7.45.0 milestone Apr 4, 2023
@gbbr gbbr added the team/opentelemetry OpenTelemetry team label Apr 4, 2023
@gbbr gbbr requested a review from Barbayar April 4, 2023 18:48
@gbbr gbbr marked this pull request as ready for review April 4, 2023 18:48
@gbbr gbbr requested review from a team as code owners April 4, 2023 18:48
@gbbr gbbr requested a review from liustanley April 4, 2023 18:48
pkg/trace/api/otlp.go Show resolved Hide resolved
pkg/trace/api/otlp_test.go Show resolved Hide resolved
Copy link
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

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

LGTM

pkg/trace/api/otlp.go Show resolved Hide resolved
@gbbr gbbr merged commit ec049fd into main Apr 10, 2023
@gbbr gbbr deleted the gbbr/container-tags branch April 10, 2023 09:37
mackjmr added a commit to mackjmr/opentelemetry-collector-contrib that referenced this pull request Apr 17, 2023
…/trace.

This PR updates `github.com/DataDog/datadog-agent/pkg/trace` to `v0.45.0-rc.1`.

**Context:** The following [PR](open-telemetry#20286) had pinned a pseudoversion of `github.com/DataDog/datadog-agent/pkg/trace` (`v0.44.0-rc.4.0.20230322085447-8b27e87df01c`) which was required in order to take advantages of the following [commit](DataDog/datadog-agent@8b27e87).

This was later updated by Dependabot from `v0.44.0-rc.4.0.20230322085447-8b27e87df01c` to `0.44.0-rc.5` in this [PR](open-telemetry#20486). `0.44.0-rc.5` does not contain changes from the required [commit](DataDog/datadog-agent@8b27e87) (milestone `7.45.0`).

This PR now re-adds the changes back by updating to `v0.45.0-rc.1`.

Because the latest release contains `github.com/DataDog/datadog-agent/pkg/trace` `v0.44.0-rc.5`, which does not contain the changes from the following [commit](DataDog/datadog-agent@8b27e87), this brings two issues:
- the span links change was not added in the latest release, but it was added to the release notes => This PR adds a `bug_fix` changelog to indicate this.
- in the latest release, the hostname preview logic is off by default, instead of on by default (due to the removal of the following [setting](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20286/files#diff-9ca998552699e406631ae1a165fef81d5373ba6876136c8c48c10ae0355edf2aL179) which only works in combination of the  required [commit](DataDog/datadog-agent@8b27e87)) => This PR adds a `bug_fix` changelog to indicate this.

It also adds the changelog related to [PR1](DataDog/datadog-agent#16337) and [PR2](DataDog/datadog-agent#16430), which are brought in from the upgrade to `v0.45.0-rc.1`.
mx-psi pushed a commit to open-telemetry/opentelemetry-collector-contrib that referenced this pull request Apr 17, 2023
…/trace. (#20923)

* exporter/datadogexporter: update github.com/DataDog/datadog-agent/pkg/trace.

This PR updates `github.com/DataDog/datadog-agent/pkg/trace` to `v0.45.0-rc.1`.

**Context:** The following [PR](#20286) had pinned a pseudoversion of `github.com/DataDog/datadog-agent/pkg/trace` (`v0.44.0-rc.4.0.20230322085447-8b27e87df01c`) which was required in order to take advantages of the following [commit](DataDog/datadog-agent@8b27e87).

This was later updated by Dependabot from `v0.44.0-rc.4.0.20230322085447-8b27e87df01c` to `0.44.0-rc.5` in this [PR](#20486). `0.44.0-rc.5` does not contain changes from the required [commit](DataDog/datadog-agent@8b27e87) (milestone `7.45.0`).

This PR now re-adds the changes back by updating to `v0.45.0-rc.1`.

Because the latest release contains `github.com/DataDog/datadog-agent/pkg/trace` `v0.44.0-rc.5`, which does not contain the changes from the following [commit](DataDog/datadog-agent@8b27e87), this brings two issues:
- the span links change was not added in the latest release, but it was added to the release notes => This PR adds a `bug_fix` changelog to indicate this.
- in the latest release, the hostname preview logic is off by default, instead of on by default (due to the removal of the following [setting](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20286/files#diff-9ca998552699e406631ae1a165fef81d5373ba6876136c8c48c10ae0355edf2aL179) which only works in combination of the  required [commit](DataDog/datadog-agent@8b27e87)) => This PR adds a `bug_fix` changelog to indicate this.

It also adds the changelog related to [PR1](DataDog/datadog-agent#16337) and [PR2](DataDog/datadog-agent#16430), which are brought in from the upgrade to `v0.45.0-rc.1`.

* update wording

* add issue # to changelog

* Update .chloggen/datadog-semconv-1.17.yaml

Co-authored-by: Yang Song <[email protected]>

---------

Co-authored-by: Yang Song <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team/opentelemetry OpenTelemetry team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants