Skip to content

Commit

Permalink
[chore] [exporter/datadog] Refactor host metadata in terms of a pusher (
Browse files Browse the repository at this point in the history
open-telemetry#24271)

**Description:** 

Refactors current host metadata logic in preparation for using
`inframetadata.Reporter`.

This is an internal-only change with no user-facing consequences
  • Loading branch information
mx-psi committed Jul 17, 2023
1 parent 84df0e6 commit f0ba02b
Show file tree
Hide file tree
Showing 14 changed files with 133 additions and 109 deletions.
10 changes: 5 additions & 5 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.8.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 // indirect
github.com/gocql/gocql v1.3.1 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.81.0 // indirect
Expand Down Expand Up @@ -248,9 +248,9 @@ require (
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/inframetadata v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect
github.com/DataDog/sketches-go v1.4.2 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
Expand Down
22 changes: 11 additions & 11 deletions cmd/configschema/go.sum

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

10 changes: 5 additions & 5 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@ require (
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/inframetadata v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.1 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect
github.com/DataDog/sketches-go v1.4.2 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
Expand Down
22 changes: 11 additions & 11 deletions cmd/otelcontribcol/go.sum

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

6 changes: 3 additions & 3 deletions exporter/datadogexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func (f *factory) createMetricsExporter(
if md.ResourceMetrics().Len() > 0 {
attrs = md.ResourceMetrics().At(0).Resource().Attributes()
}
go hostmetadata.Pusher(ctx, set, newMetadataConfigfromConfig(cfg), hostProvider, attrs)
go hostmetadata.RunPusher(ctx, set, newMetadataConfigfromConfig(cfg), hostProvider, attrs)
})

return nil
Expand Down Expand Up @@ -264,7 +264,7 @@ func (f *factory) createTracesExporter(
if td.ResourceSpans().Len() > 0 {
attrs = td.ResourceSpans().At(0).Resource().Attributes()
}
go hostmetadata.Pusher(ctx, set, newMetadataConfigfromConfig(cfg), hostProvider, attrs)
go hostmetadata.RunPusher(ctx, set, newMetadataConfigfromConfig(cfg), hostProvider, attrs)
})
return nil
}
Expand Down Expand Up @@ -320,7 +320,7 @@ func (f *factory) createLogsExporter(
pusher = func(_ context.Context, td plog.Logs) error {
f.onceMetadata.Do(func() {
attrs := pcommon.NewMap()
go hostmetadata.Pusher(ctx, set, newMetadataConfigfromConfig(cfg), hostProvider, attrs)
go hostmetadata.RunPusher(ctx, set, newMetadataConfigfromConfig(cfg), hostProvider, attrs)
})
return nil
}
Expand Down
10 changes: 5 additions & 5 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ require (
github.com/DataDog/datadog-agent/pkg/trace v0.47.0-rc.2
github.com/DataDog/datadog-api-client-go/v2 v2.14.0
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.1
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.1
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.1
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.1
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.1
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2
github.com/DataDog/sketches-go v1.4.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.16.1
github.com/aws/aws-sdk-go v1.44.299
Expand Down
22 changes: 11 additions & 11 deletions exporter/datadogexporter/go.sum

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

Loading

0 comments on commit f0ba02b

Please sign in to comment.