Skip to content

Commit

Permalink
exporter/datadogexporter: update github.com/DataDog/datadog-agent/pkg…
Browse files Browse the repository at this point in the history
…/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`.
  • Loading branch information
mackjmr committed Apr 17, 2023
1 parent 5e2a0f6 commit 8e97409
Show file tree
Hide file tree
Showing 12 changed files with 155 additions and 108 deletions.
16 changes: 16 additions & 0 deletions .chloggen/datadog-container-tags-payload.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: datadogexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Ensure that container tags are set globally on the payload so that they can be picked up as primary tags in the app (APM).

# One or more tracking issues related to the change
issues: []

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
16 changes: 16 additions & 0 deletions .chloggen/datadog-exporter-span-links-support.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: datadogexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Re-add support for span links (span links are added as metadata to the converted span), which were erroneously removed from previous release.

# One or more tracking issues related to the change
issues: []

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
16 changes: 16 additions & 0 deletions .chloggen/datadog-fix-hostname-issue.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: datadogexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix issue in hostname detection.

# One or more tracking issues related to the change
issues: []

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: As exporter.datadog.hostname.preview feature gate was graduated to stable, hostname detection was set to the behaviour of the feature gate disabled, instead of enabled.
16 changes: 16 additions & 0 deletions .chloggen/datadog-semconv-1.17.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: datadogexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Support OTel semconv 1.17.0 in OTLP ingest endpoint.

# One or more tracking issues related to the change
issues: []

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
17 changes: 8 additions & 9 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,13 @@ require (
github.com/ClickHouse/ch-go v0.52.1 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.8.3 // indirect
github.com/DataDog/agent-payload/v5 v5.0.81 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.11.0 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
Expand Down Expand Up @@ -316,7 +316,6 @@ require (
github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
Expand Down Expand Up @@ -511,7 +510,7 @@ require (
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/openzipkin/zipkin-go v0.4.1 // indirect
github.com/outcaste-io/ristretto v0.2.0 // indirect
github.com/outcaste-io/ristretto v0.2.1 // indirect
github.com/ovh/go-ovh v1.3.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/paulmach/orb v0.9.0 // indirect
Expand Down
30 changes: 14 additions & 16 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,13 @@ require (
github.com/ClickHouse/ch-go v0.52.1 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.8.3 // indirect
github.com/DataDog/agent-payload/v5 v5.0.81 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.6 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.45.0-rc.1 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.11.0 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
Expand Down Expand Up @@ -305,7 +305,6 @@ require (
github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
Expand Down Expand Up @@ -513,7 +512,7 @@ require (
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/openzipkin/zipkin-go v0.4.1 // indirect
github.com/outcaste-io/ristretto v0.2.0 // indirect
github.com/outcaste-io/ristretto v0.2.1 // indirect
github.com/ovh/go-ovh v1.3.0 // indirect
github.com/panta/machineid v1.0.2 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
Expand Down
30 changes: 14 additions & 16 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8e97409

Please sign in to comment.