Skip to content

Commit

Permalink
[exporter/datadog] Clean up dead APM stats consumer code (#32560)
Browse files Browse the repository at this point in the history 
`APMStatsConsumer` and the related code path is no longer in use since
#31416.
This cleanup should be a no-op and not visible to users.
  • Loading branch information
@songy23
songy23 committed Apr 23, 2024
1 parent 5975f22 commit 53bf60a
Show file tree
Hide file tree
Showing 19 changed files with 112 additions and 230 deletions.
10 changes: 5 additions & 5 deletions cmd/configschema/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.15.0 // indirect
github.com/gocql/gocql v1.6.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.99.0 // indirect
Expand Down Expand Up @@ -231,9 +231,9 @@ require (
github.com/DataDog/go-sqllexer v0.0.9 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.15.0 // indirect
github.com/DataDog/sketches-go v1.4.4 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
Expand Down
24 changes: 12 additions & 12 deletions cmd/configschema/go.sum
View file

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ require (
github.com/DataDog/go-sqllexer v0.0.9 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.15.0 // indirect
github.com/DataDog/sketches-go v1.4.4 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
Expand Down
24 changes: 12 additions & 12 deletions cmd/otelcontribcol/go.sum
View file

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

10 changes: 5 additions & 5 deletions connector/datadogconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
github.com/DataDog/datadog-agent/pkg/proto v0.52.1-0.20240321095122-a3c5dbb936ae
github.com/DataDog/datadog-agent/pkg/trace v0.52.1-0.20240321095122-a3c5dbb936ae
github.com/DataDog/datadog-go/v5 v5.5.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.14.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.15.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.99.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.99.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.99.0
Expand Down Expand Up @@ -45,9 +45,9 @@ require (
github.com/DataDog/go-sqllexer v0.0.9 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.15.0 // indirect
github.com/DataDog/sketches-go v1.4.4 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.22.0 // indirect
Expand Down
24 changes: 12 additions & 12 deletions connector/datadogconnector/go.sum
View file

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

2 changes: 1 addition & 1 deletion exporter/datadogexporter/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ func (f *factory) createMetricsExporter(
return nil
}
} else {
exp, metricsErr := newMetricsExporter(ctx, set, cfg, acfg, &f.onceMetadata, attrsTranslator, hostProvider, statsToAgent, metadataReporter, statsIn)
exp, metricsErr := newMetricsExporter(ctx, set, cfg, acfg, &f.onceMetadata, attrsTranslator, hostProvider, metadataReporter, statsIn)
if metricsErr != nil {
cancel() // first cancel context
f.wg.Wait() // then wait for shutdown
Expand Down
10 changes: 5 additions & 5 deletions exporter/datadogexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ require (
github.com/DataDog/datadog-api-client-go/v2 v2.25.0
github.com/DataDog/datadog-go/v5 v5.5.0
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.14.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.14.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.14.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.15.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.15.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.15.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.15.0
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.15.0
github.com/DataDog/sketches-go v1.4.4
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.22.0
github.com/aws/aws-sdk-go v1.51.26
Expand Down
Loading

0 comments on commit 53bf60a

Please sign in to comment.