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.

Sign up for GitHub

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

exporter/datadogexporter: Graduate exporter.datadog.hostname.preview to stable. #20286

Merged
merged 5 commits into from
Mar 23, 2023
Merged

exporter/datadogexporter: Graduate exporter.datadog.hostname.preview to stable. #20286

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ad9b45
exporter/datadogexporter: Graduate exporter.datadog.hostname.preview …
mackjmr Mar 23, 2023
f59a6e0
add PR # to changelog
mackjmr Mar 23, 2023
4a35884
run make gotidy
mackjmr Mar 23, 2023
0f7b63f
Merge branch 'main' into mackjmr/graduate-exporter-datadog-hostname-p…
mackjmr Mar 23, 2023
6757879
Update .chloggen/datadog-exporter-span-links-support.yaml
mackjmr Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .chloggen/datadog-exporter-span-links-support.yaml
View file
Open in desktop
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: Adds support for OpenTelemetry span links when converting OTLP spans (span links are added as metadata to the converted span).
mackjmr marked this conversation as resolved.
Show resolved Hide resolved

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

# (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/mackjmr_graduate-exporter-datadog-hostname-preview.yaml
View file
Open in desktop
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: breaking

# 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: Graduate exporter.datadog.hostname.preview feature gate to Stable.

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

# (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: 8 additions & 8 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
require (
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.7.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.1.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.1.3 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.1.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.74.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.74.0 // indirect
Expand Down Expand Up @@ -241,13 +241,13 @@ require (
github.com/ClickHouse/ch-go v0.52.1 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.7.0 // indirect
github.com/DataDog/agent-payload/v5 v5.0.76 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.4.0.20230322085447-8b27e87df01c // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.10.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
32 changes: 16 additions & 16 deletions cmd/configschema/go.sum
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,18 +218,18 @@ require (
github.com/ClickHouse/ch-go v0.52.1 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.7.0 // indirect
github.com/DataDog/agent-payload/v5 v5.0.76 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.4.0.20230322085447-8b27e87df01c // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.10.0 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.1.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.1.3 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.1.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.1.3 // indirect
github.com/DataDog/sketches-go v1.4.1 // indirect
Expand Down
32 changes: 16 additions & 16 deletions cmd/otelcontribcol/go.sum
View file
Open in desktop

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

7 changes: 1 addition & 6 deletions exporter/datadogexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,6 @@ func defaulttimeoutSettings() exporterhelper.TimeoutSettings {

// createDefaultConfig creates the default exporter configuration
func (f *factory) createDefaultConfig() component.Config {
hostnameSource := HostnameSourceFirstResource
if hostmetadata.HostnamePreviewFeatureGate.IsEnabled() {
hostnameSource = HostnameSourceConfigOrSystem
}

return &Config{
TimeoutSettings: defaulttimeoutSettings(),
RetrySettings: exporterhelper.NewDefaultRetrySettings(),
Expand Down Expand Up @@ -169,7 +164,7 @@ func (f *factory) createDefaultConfig() component.Config {

HostMetadata: HostMetadataConfig{
Enabled: true,
HostnameSource: hostnameSource,
HostnameSource: HostnameSourceConfigOrSystem,
},
}
}
Expand Down
22 changes: 11 additions & 11 deletions exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.19

require (
github.com/DataDog/agent-payload/v5 v5.0.76
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.3
github.com/DataDog/datadog-agent/pkg/trace v0.44.0-rc.4.0.20230322085447-8b27e87df01c
github.com/DataDog/datadog-api-client-go/v2 v2.10.0
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.1.2
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.1.3
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.1.2
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.1.3
github.com/DataDog/sketches-go v1.4.1
Expand All @@ -23,7 +23,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.74.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.74.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.74.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.74.0
go.opentelemetry.io/collector/component v0.74.0
Expand All @@ -46,15 +45,15 @@ require (
)

require (
cloud.google.com/go/compute v1.15.1 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.44.0-rc.4 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
github.com/DataDog/zstd v1.5.2 // indirect
Expand Down Expand Up @@ -139,6 +138,7 @@ require (
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
github.com/outcaste-io/ristretto v0.2.0 // indirect
github.com/panta/machineid v1.0.2 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand Down Expand Up @@ -178,7 +178,7 @@ require (
golang.org/x/time v0.3.0 // indirect
gonum.org/v1/gonum v0.12.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/grpc v1.53.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading