From a5528c9061ce13faf9a86211c2e626eb2016c956 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Wed, 11 Oct 2023 16:41:50 -0400 Subject: [PATCH] [chore] Remove stale go mod replace for datadog-agent (#27622) **Description:** Remove stale go mod replace for datadog-agent and upgrade to the released version. **Link to tracking Issue:** Fixes https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/25119. --- cmd/configschema/go.mod | 23 +++++------ cmd/configschema/go.sum | 38 +++++++++--------- cmd/otelcontribcol/builder-config.yaml | 2 - cmd/otelcontribcol/go.mod | 22 +++++------ cmd/otelcontribcol/go.sum | 38 +++++++++--------- cmd/oteltestbedcol/builder-config.yaml | 2 - cmd/oteltestbedcol/go.mod | 4 -- connector/datadogconnector/go.mod | 22 +++++------ connector/datadogconnector/go.sum | 39 +++++++++---------- exporter/datadogexporter/go.mod | 23 +++++------ exporter/datadogexporter/go.sum | 38 +++++++++--------- .../datadogexporter/traces_exporter_test.go | 1 + go.mod | 23 +++++------ go.sum | 38 +++++++++--------- internal/datadog/go.mod | 23 +++++------ internal/datadog/go.sum | 39 +++++++++---------- processor/datadogprocessor/go.mod | 23 +++++------ processor/datadogprocessor/go.sum | 39 +++++++++---------- receiver/datadogreceiver/go.mod | 7 +--- receiver/datadogreceiver/go.sum | 4 +- testbed/go.mod | 2 +- testbed/go.sum | 4 +- 22 files changed, 196 insertions(+), 258 deletions(-) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index e60806816bf2..83cccb1be9b5 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -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 @@ -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 diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 2e885f7d28c2..20535fa7f0e2 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -157,29 +157,29 @@ github.com/ClickHouse/clickhouse-go/v2 v2.14.2/go.mod h1:ZLn63wODwGxVdnGB0EIYmFL github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 h1:jdYARP+CFtab94A6rz3kIj5bDVIylpyx4zzp/Eu0G/M= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0 h1:c8vSMG+xJh7QXKL+t0N/newoCOwK+s4tb9H9FHZGIYU= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0/go.mod h1:ZB6gKXHfbiOY/Cb3fqYK5lTzn1GPuu/YkXw7T7EAmJs= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 h1:WNccVem4lQkLHIK7JXSs0XzxTTimo+xGWQZ4XXMNMH4= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0/go.mod h1:KWLQMjJCc0XTek/gfUx4oYbq8JXOA5mDW+qNd+QkgBw= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 h1:59lB4AN8Dn9EBhaEPJDGS7COZ6Dj5lphN/WVZ77kTBE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0/go.mod h1:BPbt5P2DC3ko6j5YUufVrZ8C6CGCq/zBK6g/MTbBN0s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 h1:AoOyAtpLGS69WR1eJaDS5ybP+KprKoKrLkTyyfo8WGc= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 h1:gq5MyC/rFiuJXYMam9XXA0llYFVgE8Et4kVMK8lR0B0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.17.0 h1:0jI5TotLfWgsydMg/QTHkuoqNCFKSMorjU3ki/fbVI8= github.com/DataDog/datadog-api-client-go/v2 v2.17.0/go.mod h1:uJd7G1BONVIyiVw684VMn2XYI1FfN1tx4bRGenAf2bo= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= -github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= +github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= @@ -222,7 +222,6 @@ github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7Y github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.0 h1:7EFNIY4igHEXUdj1zXgAyU3fLc7QfOKHbkldRVTBdiM= @@ -1770,7 +1769,6 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index e8d2ea40ff54..d8146bcb945b 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -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 diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 6b2518a0fdbd..6fa200d4e003 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -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 @@ -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 diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index cc2e74c89ae2..35abe1643fad 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -650,29 +650,29 @@ github.com/ClickHouse/clickhouse-go/v2 v2.14.2/go.mod h1:ZLn63wODwGxVdnGB0EIYmFL github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 h1:jdYARP+CFtab94A6rz3kIj5bDVIylpyx4zzp/Eu0G/M= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0 h1:c8vSMG+xJh7QXKL+t0N/newoCOwK+s4tb9H9FHZGIYU= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0/go.mod h1:ZB6gKXHfbiOY/Cb3fqYK5lTzn1GPuu/YkXw7T7EAmJs= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 h1:WNccVem4lQkLHIK7JXSs0XzxTTimo+xGWQZ4XXMNMH4= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0/go.mod h1:KWLQMjJCc0XTek/gfUx4oYbq8JXOA5mDW+qNd+QkgBw= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 h1:59lB4AN8Dn9EBhaEPJDGS7COZ6Dj5lphN/WVZ77kTBE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0/go.mod h1:BPbt5P2DC3ko6j5YUufVrZ8C6CGCq/zBK6g/MTbBN0s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 h1:AoOyAtpLGS69WR1eJaDS5ybP+KprKoKrLkTyyfo8WGc= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 h1:gq5MyC/rFiuJXYMam9XXA0llYFVgE8Et4kVMK8lR0B0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.17.0 h1:0jI5TotLfWgsydMg/QTHkuoqNCFKSMorjU3ki/fbVI8= github.com/DataDog/datadog-api-client-go/v2 v2.17.0/go.mod h1:uJd7G1BONVIyiVw684VMn2XYI1FfN1tx4bRGenAf2bo= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= -github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= +github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= @@ -715,7 +715,6 @@ github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.0 h1:7EFNIY4igHEXUdj1zXgAyU3fLc7QfOKHbkldRVTBdiM= @@ -2256,7 +2255,6 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= diff --git a/cmd/oteltestbedcol/builder-config.yaml b/cmd/oteltestbedcol/builder-config.yaml index 189ebf584a4e..6acb50995589 100644 --- a/cmd/oteltestbedcol/builder-config.yaml +++ b/cmd/oteltestbedcol/builder-config.yaml @@ -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 diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index 44b497c8db79..ce7a8669d029 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -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 diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 333b65e21211..86bf6146d5e5 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datad go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 + github.com/DataDog/datadog-agent/pkg/proto v0.48.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.87.0 github.com/stretchr/testify v1.8.4 @@ -15,15 +15,15 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate 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/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-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/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect @@ -90,7 +90,3 @@ require ( ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog - -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 diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 614364bfa1fc..7b326a0a4c60 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -1,26 +1,26 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 h1:jdYARP+CFtab94A6rz3kIj5bDVIylpyx4zzp/Eu0G/M= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0 h1:c8vSMG+xJh7QXKL+t0N/newoCOwK+s4tb9H9FHZGIYU= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0/go.mod h1:ZB6gKXHfbiOY/Cb3fqYK5lTzn1GPuu/YkXw7T7EAmJs= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 h1:WNccVem4lQkLHIK7JXSs0XzxTTimo+xGWQZ4XXMNMH4= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0/go.mod h1:KWLQMjJCc0XTek/gfUx4oYbq8JXOA5mDW+qNd+QkgBw= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 h1:59lB4AN8Dn9EBhaEPJDGS7COZ6Dj5lphN/WVZ77kTBE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0/go.mod h1:BPbt5P2DC3ko6j5YUufVrZ8C6CGCq/zBK6g/MTbBN0s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 h1:AoOyAtpLGS69WR1eJaDS5ybP+KprKoKrLkTyyfo8WGc= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 h1:gq5MyC/rFiuJXYMam9XXA0llYFVgE8Et4kVMK8lR0B0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= -github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= +github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= @@ -31,7 +31,6 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -331,7 +330,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= @@ -377,7 +375,6 @@ go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1 go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 0ee333328288..43402befe65b 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/DataDog/agent-payload/v5 v5.0.89 - github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 + github.com/DataDog/datadog-agent/pkg/proto v0.48.0 + github.com/DataDog/datadog-agent/pkg/trace v0.48.0 github.com/DataDog/datadog-api-client-go/v2 v2.17.0 github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 @@ -55,14 +55,14 @@ require ( cloud.google.com/go/compute v1.21.0 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate 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/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/remoteconfig/state 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-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/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect @@ -275,11 +275,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/pkg/pdatatest => ../../pkg/pdatatest replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 870a9102ef59..2ca41c228415 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -50,29 +50,29 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 h1:jdYARP+CFtab94A6rz3kIj5bDVIylpyx4zzp/Eu0G/M= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0 h1:c8vSMG+xJh7QXKL+t0N/newoCOwK+s4tb9H9FHZGIYU= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0/go.mod h1:ZB6gKXHfbiOY/Cb3fqYK5lTzn1GPuu/YkXw7T7EAmJs= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 h1:WNccVem4lQkLHIK7JXSs0XzxTTimo+xGWQZ4XXMNMH4= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0/go.mod h1:KWLQMjJCc0XTek/gfUx4oYbq8JXOA5mDW+qNd+QkgBw= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 h1:59lB4AN8Dn9EBhaEPJDGS7COZ6Dj5lphN/WVZ77kTBE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0/go.mod h1:BPbt5P2DC3ko6j5YUufVrZ8C6CGCq/zBK6g/MTbBN0s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 h1:AoOyAtpLGS69WR1eJaDS5ybP+KprKoKrLkTyyfo8WGc= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 h1:gq5MyC/rFiuJXYMam9XXA0llYFVgE8Et4kVMK8lR0B0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.17.0 h1:0jI5TotLfWgsydMg/QTHkuoqNCFKSMorjU3ki/fbVI8= github.com/DataDog/datadog-api-client-go/v2 v2.17.0/go.mod h1:uJd7G1BONVIyiVw684VMn2XYI1FfN1tx4bRGenAf2bo= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= -github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= +github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= @@ -93,7 +93,6 @@ github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 h1:tk85AYGwOf6VNtoOQi8w/kVDi2vmPxp3/OU2FsUpdcA= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.0 h1:7EFNIY4igHEXUdj1zXgAyU3fLc7QfOKHbkldRVTBdiM= @@ -800,7 +799,6 @@ go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lI go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= diff --git a/exporter/datadogexporter/traces_exporter_test.go b/exporter/datadogexporter/traces_exporter_test.go index 6969b543fee7..5ff91312c04e 100644 --- a/exporter/datadogexporter/traces_exporter_test.go +++ b/exporter/datadogexporter/traces_exporter_test.go @@ -229,6 +229,7 @@ func TestTracesSource(t *testing.T) { } func TestTraceExporter(t *testing.T) { + t.Skip("Flaky test on CI, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27630") metricsServer := testutil.DatadogServerMock() defer metricsServer.Close() diff --git a/go.mod b/go.mod index 27448d62db4a..71c6df9e697b 100644 --- a/go.mod +++ b/go.mod @@ -226,17 +226,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 @@ -1120,9 +1120,4 @@ 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 diff --git a/go.sum b/go.sum index 0279a690a6bb..1591dd9cdbbe 100644 --- a/go.sum +++ b/go.sum @@ -161,29 +161,29 @@ github.com/ClickHouse/clickhouse-go/v2 v2.14.2/go.mod h1:ZLn63wODwGxVdnGB0EIYmFL github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 h1:jdYARP+CFtab94A6rz3kIj5bDVIylpyx4zzp/Eu0G/M= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0 h1:c8vSMG+xJh7QXKL+t0N/newoCOwK+s4tb9H9FHZGIYU= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0/go.mod h1:ZB6gKXHfbiOY/Cb3fqYK5lTzn1GPuu/YkXw7T7EAmJs= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 h1:WNccVem4lQkLHIK7JXSs0XzxTTimo+xGWQZ4XXMNMH4= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0/go.mod h1:KWLQMjJCc0XTek/gfUx4oYbq8JXOA5mDW+qNd+QkgBw= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 h1:59lB4AN8Dn9EBhaEPJDGS7COZ6Dj5lphN/WVZ77kTBE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0/go.mod h1:BPbt5P2DC3ko6j5YUufVrZ8C6CGCq/zBK6g/MTbBN0s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 h1:AoOyAtpLGS69WR1eJaDS5ybP+KprKoKrLkTyyfo8WGc= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 h1:gq5MyC/rFiuJXYMam9XXA0llYFVgE8Et4kVMK8lR0B0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.17.0 h1:0jI5TotLfWgsydMg/QTHkuoqNCFKSMorjU3ki/fbVI8= github.com/DataDog/datadog-api-client-go/v2 v2.17.0/go.mod h1:uJd7G1BONVIyiVw684VMn2XYI1FfN1tx4bRGenAf2bo= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= -github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= +github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 h1:1EK3s2e3Q6gLMkoEGdq8Eeu/ap/c/7nOiLQ+egs3M4s= @@ -226,7 +226,6 @@ github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7Y github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.0 h1:7EFNIY4igHEXUdj1zXgAyU3fLc7QfOKHbkldRVTBdiM= @@ -1774,7 +1773,6 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 91929269f5cd..abb6eb44e163 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -3,22 +3,22 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/datado go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 + github.com/DataDog/datadog-agent/pkg/proto v0.48.0 + github.com/DataDog/datadog-agent/pkg/trace v0.48.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate 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/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/remoteconfig/state 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-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/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect @@ -72,8 +72,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -// 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 diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index 68448f2a6290..97cac6caa823 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -1,23 +1,23 @@ -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 h1:jdYARP+CFtab94A6rz3kIj5bDVIylpyx4zzp/Eu0G/M= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0 h1:c8vSMG+xJh7QXKL+t0N/newoCOwK+s4tb9H9FHZGIYU= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0/go.mod h1:ZB6gKXHfbiOY/Cb3fqYK5lTzn1GPuu/YkXw7T7EAmJs= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 h1:WNccVem4lQkLHIK7JXSs0XzxTTimo+xGWQZ4XXMNMH4= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0/go.mod h1:KWLQMjJCc0XTek/gfUx4oYbq8JXOA5mDW+qNd+QkgBw= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 h1:59lB4AN8Dn9EBhaEPJDGS7COZ6Dj5lphN/WVZ77kTBE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0/go.mod h1:BPbt5P2DC3ko6j5YUufVrZ8C6CGCq/zBK6g/MTbBN0s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 h1:AoOyAtpLGS69WR1eJaDS5ybP+KprKoKrLkTyyfo8WGc= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 h1:gq5MyC/rFiuJXYMam9XXA0llYFVgE8Et4kVMK8lR0B0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= -github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= +github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= @@ -28,7 +28,6 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -125,7 +124,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= @@ -147,7 +145,6 @@ go.opentelemetry.io/collector/pdata v1.0.0-rcv0016/go.mod h1:OdN0alYOlYhHXu6BDlG go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8= go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index d7850948176f..b16883bdf7cd 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/datad go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 + github.com/DataDog/datadog-agent/pkg/proto v0.48.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 github.com/DataDog/sketches-go v1.4.3 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.87.0 @@ -20,15 +20,15 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate 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/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-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/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect @@ -94,11 +94,6 @@ require ( // 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/internal/datadog => ../../internal/datadog retract ( diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 0aa3fc4f8af6..ff8bc56497c5 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -1,26 +1,26 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0 h1:jdYARP+CFtab94A6rz3kIj5bDVIylpyx4zzp/Eu0G/M= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0 h1:c8vSMG+xJh7QXKL+t0N/newoCOwK+s4tb9H9FHZGIYU= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0/go.mod h1:ZB6gKXHfbiOY/Cb3fqYK5lTzn1GPuu/YkXw7T7EAmJs= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0 h1:WNccVem4lQkLHIK7JXSs0XzxTTimo+xGWQZ4XXMNMH4= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0/go.mod h1:KWLQMjJCc0XTek/gfUx4oYbq8JXOA5mDW+qNd+QkgBw= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0 h1:59lB4AN8Dn9EBhaEPJDGS7COZ6Dj5lphN/WVZ77kTBE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0/go.mod h1:BPbt5P2DC3ko6j5YUufVrZ8C6CGCq/zBK6g/MTbBN0s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0 h1:AoOyAtpLGS69WR1eJaDS5ybP+KprKoKrLkTyyfo8WGc= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 h1:gq5MyC/rFiuJXYMam9XXA0llYFVgE8Et4kVMK8lR0B0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= -github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= +github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.0 h1:+SG7GraRkuMV/1btvAjEhlivLVAbVTwIUDudn7w2EpA= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 h1:NNSjBdo9PlfjUKmCrjNWTxAtG7ovemO5EHT08zVpeUU= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0/go.mod h1:8d/zACzxfdBllttohcF3mwL6ELg8vXTGiPkib/1ObOA= @@ -31,7 +31,6 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0/go.mod h1:qpCkRg github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -331,7 +330,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= @@ -379,7 +377,6 @@ go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1 go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index 965f1224e816..cdf251e6ddeb 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datado go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 + github.com/DataDog/datadog-agent/pkg/proto v0.48.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.87.0 github.com/stretchr/testify v1.8.4 github.com/vmihailenco/msgpack/v4 v4.3.12 @@ -66,11 +66,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// 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/internal/sharedcomponent => ../../internal/sharedcomponent retract ( diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index ec73b5c5dc6e..5aea08a8ba61 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= diff --git a/testbed/go.mod b/testbed/go.mod index df2360c42d2e..c44ef9f5b1b9 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -74,7 +74,7 @@ require ( github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.48.0 // indirect github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 7febf224ac01..d7909bc50b6a 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -70,8 +70,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkM github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= -github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 h1:N2BRKjJ/c+ipDwt5b+ijqEc2EsmK3zXq2lNeIPnSwMI= github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02/go.mod h1:EalMiS87Guu6PkLdxz7gmWqi+dRs9sjYLTOyTrM/aVU= github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-20201009091607-ce4e57cdf8f4/go.mod h1:cRy7lwapA3jcjnX74kU6NFkXaRGQyB0l/QZA0IwYGEQ=