From 5e6c04170d79933d60059039857a5c5c3173274b Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 10 Aug 2023 17:55:11 +0200 Subject: [PATCH 1/6] [*/datadog] Bump opentelemetry-mapping-go/* to v0.7.1 --- cmd/configschema/go.mod | 10 +++++----- cmd/configschema/go.sum | 22 +++++++++++----------- cmd/otelcontribcol/go.mod | 10 +++++----- cmd/otelcontribcol/go.sum | 22 +++++++++++----------- exporter/datadogexporter/go.mod | 10 +++++----- exporter/datadogexporter/go.sum | 22 +++++++++++----------- go.mod | 10 +++++----- go.sum | 22 +++++++++++----------- internal/datadog/go.mod | 8 ++++---- internal/datadog/go.sum | 22 +++++++++++----------- processor/datadogprocessor/go.mod | 6 +++--- processor/datadogprocessor/go.sum | 14 +++++++------- 12 files changed, 89 insertions(+), 89 deletions(-) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 390b7fc6346d..76f341f7abb2 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -22,8 +22,8 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.8.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 // indirect github.com/gocql/gocql v1.3.1 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.82.0 // indirect @@ -246,9 +246,9 @@ require ( 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/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index ff2a038bcf66..db38ff473f39 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -754,17 +754,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-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.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 h1:BB6F4KNaZct4AeEJU911OYeFL1ErLE/ECg9GeCvQVmk= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1/go.mod h1:MkppuaQyJQDGZWI02b5V5fnR1rbkpZcbA/A1wKEnE9Y= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.1 h1:O/AafNJVhMY2Ko81VDmBBATjoMkvvUUPRVi5sIlvfu4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 h1:kROpGjWTkQlaJRGAutv0FEgvumcKEKTEhh2uSrbCrpk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 h1:TdGfCqJ956gbtHtSguTwbjfU4midHioKU5DIDbfagXY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1/go.mod h1:g25g1hu8TJt4mxEJSRLsbIpLpR2n2DTp+JUB3IzA2l4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 h1:5rs8lNS/LTXcuQBdIssHh/3ztvjCzMgf9PtrLOCrnEs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1/go.mod h1:9Hud32aw1U3yzHGbNIX9NyzhAYwoMFCY7XYn80lGBzw= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 h1:eC41nVeyBYIKABisjR/RlT5Gy1zWyNCGlx+zeD3L6QM= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1/go.mod h1:IPF+YQzxuCQSGTCzqOSYrQKFw1K3JRu4FcbGzte8NMY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 782376b41a81..b6e35c88f4f0 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -264,11 +264,11 @@ require ( 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/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 3ff83366f964..7dc529bd098b 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -700,17 +700,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-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.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 h1:BB6F4KNaZct4AeEJU911OYeFL1ErLE/ECg9GeCvQVmk= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1/go.mod h1:MkppuaQyJQDGZWI02b5V5fnR1rbkpZcbA/A1wKEnE9Y= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.1 h1:O/AafNJVhMY2Ko81VDmBBATjoMkvvUUPRVi5sIlvfu4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 h1:kROpGjWTkQlaJRGAutv0FEgvumcKEKTEhh2uSrbCrpk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 h1:TdGfCqJ956gbtHtSguTwbjfU4midHioKU5DIDbfagXY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1/go.mod h1:g25g1hu8TJt4mxEJSRLsbIpLpR2n2DTp+JUB3IzA2l4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 h1:5rs8lNS/LTXcuQBdIssHh/3ztvjCzMgf9PtrLOCrnEs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1/go.mod h1:9Hud32aw1U3yzHGbNIX9NyzhAYwoMFCY7XYn80lGBzw= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 h1:eC41nVeyBYIKABisjR/RlT5Gy1zWyNCGlx+zeD3L6QM= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1/go.mod h1:IPF+YQzxuCQSGTCzqOSYrQKFw1K3JRu4FcbGzte8NMY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index a50bdd8d2eed..981d99e7f066 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 github.com/DataDog/datadog-api-client-go/v2 v2.14.0 github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 github.com/DataDog/sketches-go v1.4.2 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 github.com/aws/aws-sdk-go v1.44.319 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 23d320988505..13c659dc4d32 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -75,17 +75,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-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.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 h1:BB6F4KNaZct4AeEJU911OYeFL1ErLE/ECg9GeCvQVmk= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1/go.mod h1:MkppuaQyJQDGZWI02b5V5fnR1rbkpZcbA/A1wKEnE9Y= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.1 h1:O/AafNJVhMY2Ko81VDmBBATjoMkvvUUPRVi5sIlvfu4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 h1:kROpGjWTkQlaJRGAutv0FEgvumcKEKTEhh2uSrbCrpk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 h1:TdGfCqJ956gbtHtSguTwbjfU4midHioKU5DIDbfagXY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1/go.mod h1:g25g1hu8TJt4mxEJSRLsbIpLpR2n2DTp+JUB3IzA2l4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 h1:5rs8lNS/LTXcuQBdIssHh/3ztvjCzMgf9PtrLOCrnEs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1/go.mod h1:9Hud32aw1U3yzHGbNIX9NyzhAYwoMFCY7XYn80lGBzw= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 h1:eC41nVeyBYIKABisjR/RlT5Gy1zWyNCGlx+zeD3L6QM= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1/go.mod h1:IPF+YQzxuCQSGTCzqOSYrQKFw1K3JRu4FcbGzte8NMY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= diff --git a/go.mod b/go.mod index 4b157748d7a2..cade705a6015 100644 --- a/go.mod +++ b/go.mod @@ -241,11 +241,11 @@ require ( 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/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/go.sum b/go.sum index 5f58e9bcef2a..b4084eeedc36 100644 --- a/go.sum +++ b/go.sum @@ -756,17 +756,17 @@ github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9 github.com/DataDog/go-tuf v1.0.1-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.7.0 h1:l21vDOju9zcCx+RYrNrsNs9qpWaLA8SKTHTDiHUhgEA= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.0/go.mod h1:0n4yKpsgezj7KqhkLM5weDi2kmtNlRCdlAmHN7WfMhQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0 h1:j2wXBnS0KwLzB7tG63vI+fi6hHRbvprRHmv8XsgLfbs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0/go.mod h1:CUx9KlayjXNeJeL5ZCjbXKJ/JFYrrCOFSKZ37LlXH/w= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1 h1:BB6F4KNaZct4AeEJU911OYeFL1ErLE/ECg9GeCvQVmk= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.7.1/go.mod h1:MkppuaQyJQDGZWI02b5V5fnR1rbkpZcbA/A1wKEnE9Y= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.1 h1:O/AafNJVhMY2Ko81VDmBBATjoMkvvUUPRVi5sIlvfu4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 h1:kROpGjWTkQlaJRGAutv0FEgvumcKEKTEhh2uSrbCrpk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1 h1:TdGfCqJ956gbtHtSguTwbjfU4midHioKU5DIDbfagXY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.1/go.mod h1:g25g1hu8TJt4mxEJSRLsbIpLpR2n2DTp+JUB3IzA2l4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 h1:5rs8lNS/LTXcuQBdIssHh/3ztvjCzMgf9PtrLOCrnEs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1/go.mod h1:9Hud32aw1U3yzHGbNIX9NyzhAYwoMFCY7XYn80lGBzw= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 h1:eC41nVeyBYIKABisjR/RlT5Gy1zWyNCGlx+zeD3L6QM= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1/go.mod h1:IPF+YQzxuCQSGTCzqOSYrQKFw1K3JRu4FcbGzte8NMY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 23d9252f641e..602a6b309093 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -5,7 +5,7 @@ go 1.19 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/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 ) @@ -19,8 +19,8 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // 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/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -58,7 +58,7 @@ require ( go.opentelemetry.io/collector/semconv v0.82.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.24.0 // indirect + go.uber.org/zap v1.25.0 // indirect golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.14.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index 41e50e90f8ab..4bd16285b6b5 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -18,20 +18,20 @@ github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5Tl 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/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.1 h1:O/AafNJVhMY2Ko81VDmBBATjoMkvvUUPRVi5sIlvfu4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 h1:kROpGjWTkQlaJRGAutv0FEgvumcKEKTEhh2uSrbCrpk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 h1:5rs8lNS/LTXcuQBdIssHh/3ztvjCzMgf9PtrLOCrnEs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1/go.mod h1:9Hud32aw1U3yzHGbNIX9NyzhAYwoMFCY7XYn80lGBzw= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 h1:eC41nVeyBYIKABisjR/RlT5Gy1zWyNCGlx+zeD3L6QM= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1/go.mod h1:IPF+YQzxuCQSGTCzqOSYrQKFw1K3JRu4FcbGzte8NMY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= 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/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -150,11 +150,11 @@ 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.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 48de52c738ba..29ce3357d78f 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 github.com/DataDog/sketches-go v1.4.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.82.0 github.com/stretchr/testify v1.8.4 @@ -28,8 +28,8 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // 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/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index c6ec2f219116..99ec2b6977be 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -21,13 +21,13 @@ github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5Tl 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/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.1 h1:O/AafNJVhMY2Ko81VDmBBATjoMkvvUUPRVi5sIlvfu4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 h1:kROpGjWTkQlaJRGAutv0FEgvumcKEKTEhh2uSrbCrpk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 h1:5rs8lNS/LTXcuQBdIssHh/3ztvjCzMgf9PtrLOCrnEs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1/go.mod h1:9Hud32aw1U3yzHGbNIX9NyzhAYwoMFCY7XYn80lGBzw= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 h1:eC41nVeyBYIKABisjR/RlT5Gy1zWyNCGlx+zeD3L6QM= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1/go.mod h1:IPF+YQzxuCQSGTCzqOSYrQKFw1K3JRu4FcbGzte8NMY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= From 51f82065a090066297ce799db6d963c55156c731 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 10 Aug 2023 18:01:04 +0200 Subject: [PATCH 2/6] [exporter/datadog] Use reporter for exporter host as well --- exporter/datadogexporter/factory.go | 6 +++--- .../internal/hostmetadata/metadata.go | 18 +++--------------- exporter/datadogexporter/logs_exporter.go | 2 +- exporter/datadogexporter/metrics_exporter.go | 2 +- exporter/datadogexporter/traces_exporter.go | 2 +- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 7beee5bdce53..593d4c3fa35f 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -246,7 +246,7 @@ func (f *factory) createMetricsExporter( if md.ResourceMetrics().Len() > 0 { attrs = md.ResourceMetrics().At(0).Resource().Attributes() } - go hostmetadata.RunPusher(ctx, set, pcfg, hostProvider, attrs) + go hostmetadata.RunPusher(ctx, set, pcfg, hostProvider, attrs, metadataReporter) }) // Consume resources for host metadata @@ -331,7 +331,7 @@ func (f *factory) createTracesExporter( if td.ResourceSpans().Len() > 0 { attrs = td.ResourceSpans().At(0).Resource().Attributes() } - go hostmetadata.RunPusher(ctx, set, pcfg, hostProvider, attrs) + go hostmetadata.RunPusher(ctx, set, pcfg, hostProvider, attrs, metadataReporter) }) // Consume resources for host metadata for i := 0; i < td.ResourceSpans().Len(); i++ { @@ -402,7 +402,7 @@ func (f *factory) createLogsExporter( pusher = func(_ context.Context, td plog.Logs) error { f.onceMetadata.Do(func() { attrs := pcommon.NewMap() - go hostmetadata.RunPusher(ctx, set, pcfg, hostProvider, attrs) + go hostmetadata.RunPusher(ctx, set, pcfg, hostProvider, attrs, metadataReporter) }) for i := 0; i < td.ResourceLogs().Len(); i++ { res := td.ResourceLogs().At(i).Resource() diff --git a/exporter/datadogexporter/internal/hostmetadata/metadata.go b/exporter/datadogexporter/internal/hostmetadata/metadata.go index 94199fc027b7..d8cbcbe4802c 100644 --- a/exporter/datadogexporter/internal/hostmetadata/metadata.go +++ b/exporter/datadogexporter/internal/hostmetadata/metadata.go @@ -150,12 +150,11 @@ func NewPusher(params exporter.CreateSettings, pcfg PusherConfig) inframetadata. // RunPusher to push host metadata payloads from the host where the Collector is running periodically to Datadog intake. // This function is blocking and it is meant to be run on a goroutine. -func RunPusher(ctx context.Context, params exporter.CreateSettings, pcfg PusherConfig, p source.Provider, attrs pcommon.Map) { +func RunPusher(ctx context.Context, params exporter.CreateSettings, pcfg PusherConfig, p source.Provider, attrs pcommon.Map, reporter *inframetadata.Reporter) { // Push metadata every 30 minutes ticker := time.NewTicker(30 * time.Minute) defer ticker.Stop() defer params.Logger.Debug("Shut down host metadata routine") - pusher := NewPusher(params, pcfg) // Get host metadata from resources and fill missing info using our exporter. // Currently we only retrieve it once but still send the same payload @@ -170,23 +169,12 @@ func RunPusher(ctx context.Context, params exporter.CreateSettings, pcfg PusherC } fillHostMetadata(params, pcfg, p, &hostMetadata) - // Run one first time at startup - if err := pusher.Push(ctx, hostMetadata); err != nil { - params.Logger.Warn("Initial host metadata failed", zap.Error(err)) - } else { - params.Logger.Info("Sent initial host metadata") - } - for { select { case <-ctx.Done(): return - case <-ticker.C: // Send host metadata - if err := pusher.Push(ctx, hostMetadata); err != nil { - params.Logger.Warn("Sending host metadata failed", zap.Error(err)) - } else { - params.Logger.Info("Sent host metadata") - } + case <-ticker.C: + reporter.ConsumeHostMetadata(hostMetadata) } } } diff --git a/exporter/datadogexporter/logs_exporter.go b/exporter/datadogexporter/logs_exporter.go index ae775a78e067..92f5e50d20a6 100644 --- a/exporter/datadogexporter/logs_exporter.go +++ b/exporter/datadogexporter/logs_exporter.go @@ -93,7 +93,7 @@ func (exp *logsExporter) consumeLogs(_ context.Context, ld plog.Logs) (err error if ld.ResourceLogs().Len() > 0 { attrs = ld.ResourceLogs().At(0).Resource().Attributes() } - go hostmetadata.RunPusher(exp.ctx, exp.params, newMetadataConfigfromConfig(exp.cfg), exp.sourceProvider, attrs) + go hostmetadata.RunPusher(exp.ctx, exp.params, newMetadataConfigfromConfig(exp.cfg), exp.sourceProvider, attrs, exp.metadataReporter) }) // Consume resources for host metadata diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 8f2445e51820..0fe47798fde7 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -190,7 +190,7 @@ func (exp *metricsExporter) PushMetricsData(ctx context.Context, md pmetric.Metr if md.ResourceMetrics().Len() > 0 { attrs = md.ResourceMetrics().At(0).Resource().Attributes() } - go hostmetadata.RunPusher(exp.ctx, exp.params, newMetadataConfigfromConfig(exp.cfg), exp.sourceProvider, attrs) + go hostmetadata.RunPusher(exp.ctx, exp.params, newMetadataConfigfromConfig(exp.cfg), exp.sourceProvider, attrs, exp.metadataReporter) }) // Consume resources for host metadata diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index c9a808460c10..7eb800052a3b 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -103,7 +103,7 @@ func (exp *traceExporter) consumeTraces( if td.ResourceSpans().Len() > 0 { attrs = td.ResourceSpans().At(0).Resource().Attributes() } - go hostmetadata.RunPusher(exp.ctx, exp.params, newMetadataConfigfromConfig(exp.cfg), exp.sourceProvider, attrs) + go hostmetadata.RunPusher(exp.ctx, exp.params, newMetadataConfigfromConfig(exp.cfg), exp.sourceProvider, attrs, exp.metadataReporter) }) // Consume resources for host metadata From f9ef662e24b9fe1728025b6eed8e42bdb47c2f56 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 14 Aug 2023 14:35:59 +0200 Subject: [PATCH 3/6] Add changelog --- .../mx-psi_inframetadata-base-reporter.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 .chloggen/mx-psi_inframetadata-base-reporter.yaml diff --git a/.chloggen/mx-psi_inframetadata-base-reporter.yaml b/.chloggen/mx-psi_inframetadata-base-reporter.yaml new file mode 100755 index 000000000000..4ee04edb1704 --- /dev/null +++ b/.chloggen/mx-psi_inframetadata-base-reporter.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Host metadata for remote hosts is now reported on first sight or on change + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25145] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + Host metadata for remote hosts will only be sent for payloads with the datadog.host.use_as_metadata resource attribute. + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] From 04c11cbc1cf510c7e6796b86347d6195bb3ccd49 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 14 Aug 2023 14:43:25 +0200 Subject: [PATCH 4/6] Fix test and send on startup --- .../datadogexporter/internal/hostmetadata/metadata.go | 2 ++ .../internal/hostmetadata/metadata_test.go | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/exporter/datadogexporter/internal/hostmetadata/metadata.go b/exporter/datadogexporter/internal/hostmetadata/metadata.go index d8cbcbe4802c..ce8c8dc9fe18 100644 --- a/exporter/datadogexporter/internal/hostmetadata/metadata.go +++ b/exporter/datadogexporter/internal/hostmetadata/metadata.go @@ -168,6 +168,8 @@ func RunPusher(ctx context.Context, params exporter.CreateSettings, pcfg PusherC hostMetadata = metadataFromAttributes(attrs) } fillHostMetadata(params, pcfg, p, &hostMetadata) + // Consume one first time + reporter.ConsumeHostMetadata(hostMetadata) for { select { diff --git a/exporter/datadogexporter/internal/hostmetadata/metadata_test.go b/exporter/datadogexporter/internal/hostmetadata/metadata_test.go index 1f88482a464f..fb6dca6597cb 100644 --- a/exporter/datadogexporter/internal/hostmetadata/metadata_test.go +++ b/exporter/datadogexporter/internal/hostmetadata/metadata_test.go @@ -11,7 +11,9 @@ import ( "net/http/httptest" "os" "testing" + "time" + "github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata" "github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata/payload" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/azure" @@ -23,6 +25,7 @@ import ( "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" + "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/testutil" ) @@ -229,7 +232,7 @@ func TestPusher(t *testing.T) { params := exportertest.NewNopCreateSettings() params.BuildInfo = mockBuildInfo - hostProvider, err := GetSourceProvider(componenttest.NewNopTelemetrySettings(), "") + hostProvider, err := GetSourceProvider(componenttest.NewNopTelemetrySettings(), "source-hostname") require.NoError(t, err) attrs := testutil.NewAttributeMap(map[string]string{ @@ -242,7 +245,11 @@ func TestPusher(t *testing.T) { defer server.Close() pcfg.MetricsEndpoint = server.URL - go RunPusher(ctx, params, pcfg, hostProvider, attrs) + pusher := NewPusher(mockExporterCreateSettings, pcfg) + reporter, err := inframetadata.NewReporter(zap.NewNop(), pusher, 1*time.Second) + require.NoError(t, err) + + go RunPusher(ctx, params, pcfg, hostProvider, attrs, reporter) body := <-server.MetadataChan var recvMetadata payload.HostMetadata From cf84dedacc30ddc165497ae54cd55f40701dfebe Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 14 Aug 2023 15:30:34 +0200 Subject: [PATCH 5/6] make gotidy --- connector/datadogconnector/go.mod | 6 +++--- connector/datadogconnector/go.sum | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index ef3096db0998..c71b937d7a8d 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.82.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.82.0 @@ -24,8 +24,8 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // 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/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 843fc1ad13c1..a420c8e700a5 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -21,13 +21,13 @@ github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5Tl 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/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.0 h1:mVnISj3nNq9fQM7C7zi5iuEHWe7tAHS/VNPBs3qc/ug= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0 h1:8STZKmgRY3OvrUkaNglRiLgEvAMcTt2l+naAlW+p36k= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0 h1:433zmJS94Pids2V+l5fQGOSfZPxnibHXAd3iqB7P4HY= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.0/go.mod h1:uVTWlYOzK82Cf88d57GvcQ+zgPW/kyOBn4xp6tCqi5Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 h1:8sRT2Yb9eW7GhRAkqMBrcFDb6WW9D/KslM8D+6EcsYk= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0/go.mod h1:m/Vn+wxCD5ND4e0RwIweiBfpihD3NHuVCRDjSvhHYps= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.7.1 h1:O/AafNJVhMY2Ko81VDmBBATjoMkvvUUPRVi5sIlvfu4= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1 h1:kROpGjWTkQlaJRGAutv0FEgvumcKEKTEhh2uSrbCrpk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.1/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1 h1:5rs8lNS/LTXcuQBdIssHh/3ztvjCzMgf9PtrLOCrnEs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.7.1/go.mod h1:9Hud32aw1U3yzHGbNIX9NyzhAYwoMFCY7XYn80lGBzw= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1 h1:eC41nVeyBYIKABisjR/RlT5Gy1zWyNCGlx+zeD3L6QM= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.1/go.mod h1:IPF+YQzxuCQSGTCzqOSYrQKFw1K3JRu4FcbGzte8NMY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= From 18127cc3cb092d0bcb0a2a5defae625c94f10870 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 14 Aug 2023 16:30:26 +0200 Subject: [PATCH 6/6] Address lint failure --- .../datadogexporter/internal/hostmetadata/metadata.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/exporter/datadogexporter/internal/hostmetadata/metadata.go b/exporter/datadogexporter/internal/hostmetadata/metadata.go index ce8c8dc9fe18..ed4ea8626c77 100644 --- a/exporter/datadogexporter/internal/hostmetadata/metadata.go +++ b/exporter/datadogexporter/internal/hostmetadata/metadata.go @@ -169,14 +169,18 @@ func RunPusher(ctx context.Context, params exporter.CreateSettings, pcfg PusherC } fillHostMetadata(params, pcfg, p, &hostMetadata) // Consume one first time - reporter.ConsumeHostMetadata(hostMetadata) + if err := reporter.ConsumeHostMetadata(hostMetadata); err != nil { + params.Logger.Warn("Failed to consume host metadata", zap.Any("payload", hostMetadata)) + } for { select { case <-ctx.Done(): return case <-ticker.C: - reporter.ConsumeHostMetadata(hostMetadata) + if err := reporter.ConsumeHostMetadata(hostMetadata); err != nil { + params.Logger.Warn("Failed to consume host metadata", zap.Any("payload", hostMetadata)) + } } } }