Skip to content

Commit

Permalink
Downgrade to agent-payload v5.0.52 and exclude v5.0.59 (open-telemetr…
Browse files Browse the repository at this point in the history
  • Loading branch information
mx-psi authored Jan 6, 2023
1 parent a7a203f commit 5531013
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/ClickHouse/ch-go v0.50.0 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.4.3 // indirect
github.com/DataDog/agent-payload/v5 v5.0.59 // indirect
github.com/DataDog/agent-payload/v5 v5.0.52 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.42.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/otlp/model v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233 // indirect
github.com/DataDog/datadog-agent/pkg/quantile v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/configschema/go.sum

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

2 changes: 1 addition & 1 deletion cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/ClickHouse/ch-go v0.50.0 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.4.3 // indirect
github.com/DataDog/agent-payload/v5 v5.0.59 // indirect
github.com/DataDog/agent-payload/v5 v5.0.52 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.42.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/otlp/model v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233 // indirect
github.com/DataDog/datadog-agent/pkg/quantile v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/go.sum

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

5 changes: 4 additions & 1 deletion exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datado
go 1.18

require (
github.com/DataDog/agent-payload/v5 v5.0.59
github.com/DataDog/agent-payload/v5 v5.0.52
github.com/DataDog/datadog-agent/pkg/otlp/model v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233
github.com/DataDog/datadog-agent/pkg/quantile v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233
github.com/DataDog/datadog-agent/pkg/trace v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233
Expand Down Expand Up @@ -221,3 +221,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/filte
retract v0.65.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../pkg/ottl

// see https://github.com/DataDog/agent-payload/issues/218
exclude github.com/DataDog/agent-payload/v5 v5.0.59
4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.sum

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

5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/ClickHouse/ch-go v0.50.0 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.4.3 // indirect
github.com/DataDog/agent-payload/v5 v5.0.59 // indirect
github.com/DataDog/agent-payload/v5 v5.0.52 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.42.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/otlp/model v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233 // indirect
github.com/DataDog/datadog-agent/pkg/quantile v0.42.0-rc.2.0.20221215161218-ae4a2b6bc233 // indirect
Expand Down Expand Up @@ -1027,6 +1027,9 @@ retract (
// see https://github.com/distribution/distribution/issues/3590
exclude github.com/docker/distribution v2.8.0+incompatible

// see https://github.com/DataDog/agent-payload/issues/218
exclude github.com/DataDog/agent-payload/v5 v5.0.59

// see https://github.com/mattn/go-ieproxy/issues/45
replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1

Expand Down
4 changes: 2 additions & 2 deletions go.sum

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

0 comments on commit 5531013

Please sign in to comment.