Skip to content

Commit

Permalink
[chore] Remove stale go mod replace for datadog-agent (#27622)
Browse files Browse the repository at this point in the history
**Description:**  Remove stale go mod replace for datadog-agent and upgrade to the released version.

**Link to tracking Issue:**  Fixes #25119.
  • Loading branch information
songy23 authored Oct 11, 2023
1 parent 918a81e commit a5528c9
Show file tree
Hide file tree
Showing 22 changed files with 196 additions and 258 deletions.
23 changes: 9 additions & 14 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -213,17 +213,17 @@ require (
github.com/ClickHouse/ch-go v0.58.2 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.14.2 // indirect
github.com/DataDog/agent-payload/v5 v5.0.89 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.17.0 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 // indirect
Expand Down Expand Up @@ -1108,11 +1108,6 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
// It appears that the v0.2.0 tag was modified. Replacing with v0.2.1
replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1

// v0.47.x and v0.48.x are incompatible, prefer to use v0.48.x
replace github.com/DataDog/datadog-agent/pkg/proto => github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1

replace github.com/DataDog/datadog-agent/pkg/trace => github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snowflakereceiver => ../../receiver/snowflakereceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ../../extension/observer/dockerobserver
Expand Down
38 changes: 18 additions & 20 deletions cmd/configschema/go.sum

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

2 changes: 0 additions & 2 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -416,5 +416,3 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ../../connector/spanmetricsconnector
- github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
- github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
- github.com/DataDog/datadog-agent/pkg/proto => github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1
- github.com/DataDog/datadog-agent/pkg/trace => github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1
22 changes: 9 additions & 13 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,17 @@ require (
github.com/ClickHouse/ch-go v0.58.2 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.14.2 // indirect
github.com/DataDog/agent-payload/v5 v5.0.89 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.17.0 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect
Expand Down Expand Up @@ -1133,9 +1133,5 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api

replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1

replace github.com/DataDog/datadog-agent/pkg/proto => github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1

replace github.com/DataDog/datadog-agent/pkg/trace => github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1

// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules
replace cloud.google.com/go => cloud.google.com/go v0.110.2
38 changes: 18 additions & 20 deletions cmd/otelcontribcol/go.sum

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

2 changes: 0 additions & 2 deletions cmd/oteltestbedcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,3 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
- github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
- github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
- github.com/DataDog/datadog-agent/pkg/proto => github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1
- github.com/DataDog/datadog-agent/pkg/trace => github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1
4 changes: 0 additions & 4 deletions cmd/oteltestbedcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,5 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api

replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1

replace github.com/DataDog/datadog-agent/pkg/proto => github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1

replace github.com/DataDog/datadog-agent/pkg/trace => github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1

// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules
replace cloud.google.com/go => cloud.google.com/go v0.110.2
Loading

0 comments on commit a5528c9

Please sign in to comment.