diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index e1d142afacaf..7c496e9514ab 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9 - go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 golang.org/x/mod v0.5.1 ) diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 1cb77462ae23..7b80237be9f3 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2280,19 +2280,16 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9 h1:Ge6PYtsfU2OYOeSHw/jSg1bX6HE7hjOpJ8rnKyl+lpc= -go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9 h1:fhA7W2RJYNZkhDfdLJHW2H24CrlI7cy8pJn3CxucUeY= -go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 356e0ea06928..dc184b6e8626 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -7,8 +7,8 @@ require ( github.com/go-playground/universal-translator v0.18.0 github.com/go-playground/validator/v10 v10.10.1 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 51f6821de2b3..109193cb12ac 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -138,10 +138,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index ecc815063785..7c9ca1e629ce 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -30,9 +30,9 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 6a8337146afd..b174d47cadbf 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -367,23 +367,23 @@ go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go index d4185f5a45b6..3c7892774c48 100644 --- a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go @@ -164,8 +164,8 @@ func fillHTTPServerSpan(span pdata.Span) { status.SetMessage("something error") } -func constructSpanAttributes(attributes map[string]interface{}) pdata.AttributeMap { - attrs := pdata.NewAttributeMap() +func constructSpanAttributes(attributes map[string]interface{}) pdata.Map { + attrs := pdata.NewMap() for key, value := range attributes { if cast, ok := value.(int); ok { attrs.InsertInt(key, int64(cast)) diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go index 9f0234937122..9605aa48cbe6 100644 --- a/exporter/awscloudwatchlogsexporter/exporter.go +++ b/exporter/awscloudwatchlogsexporter/exporter.go @@ -211,7 +211,7 @@ func logToCWLog(resourceAttrs map[string]interface{}, log pdata.LogRecord) (*clo }, nil } -func attrsValue(attrs pdata.AttributeMap) map[string]interface{} { +func attrsValue(attrs pdata.Map) map[string]interface{} { if attrs.Len() == 0 { return nil } diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 1f2d33f03ced..27c0e5d2ddd3 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -28,9 +28,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/stretchr/objx v0.1.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 601eb523cf93..938b5c1e0b66 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -169,23 +169,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/awsemfexporter/datapoint.go b/exporter/awsemfexporter/datapoint.go index 8fcea6312953..5a6a571b5b3b 100644 --- a/exporter/awsemfexporter/datapoint.go +++ b/exporter/awsemfexporter/datapoint.go @@ -198,7 +198,7 @@ func (dps summaryDataPointSlice) At(i int) (dataPoint, bool) { // createLabels converts OTel AttributesMap attributes to a map // and optionally adds in the OTel instrumentation library name -func createLabels(attributes pdata.AttributeMap, instrLibName string) map[string]string { +func createLabels(attributes pdata.Map, instrLibName string) map[string]string { labels := make(map[string]string, attributes.Len()+1) attributes.Range(func(k string, v pdata.Value) bool { labels[k] = v.AsString() diff --git a/exporter/awsemfexporter/datapoint_test.go b/exporter/awsemfexporter/datapoint_test.go index 5d33f3e8ffad..8572c1c9c199 100644 --- a/exporter/awsemfexporter/datapoint_test.go +++ b/exporter/awsemfexporter/datapoint_test.go @@ -263,7 +263,7 @@ func TestIntDataPointSliceAt(t *testing.T) { setupDataPointCache() instrLibName := "cloudwatch-otel" - labels := map[string]pdata.Value{"label": pdata.NewValueString("value")} + labels := map[string]interface{}{"label": "value"} testDeltaCases := []struct { testName string @@ -296,7 +296,7 @@ func TestIntDataPointSliceAt(t *testing.T) { testDPS := pdata.NewNumberDataPointSlice() testDP := testDPS.AppendEmpty() testDP.SetIntVal(tc.value.(int64)) - pdata.NewAttributeMapFromMap(labels).CopyTo(testDP.Attributes()) + pdata.NewMapFromRaw(labels).CopyTo(testDP.Attributes()) dps := numberDataPointSlice{ instrLibName, @@ -334,7 +334,7 @@ func TestDoubleDataPointSliceAt(t *testing.T) { setupDataPointCache() instrLibName := "cloudwatch-otel" - labels := map[string]pdata.Value{"label1": pdata.NewValueString("value1")} + labels := map[string]interface{}{"label1": "value1"} testDeltaCases := []struct { testName string @@ -367,7 +367,7 @@ func TestDoubleDataPointSliceAt(t *testing.T) { testDPS := pdata.NewNumberDataPointSlice() testDP := testDPS.AppendEmpty() testDP.SetDoubleVal(tc.value.(float64)) - pdata.NewAttributeMapFromMap(labels).CopyTo(testDP.Attributes()) + pdata.NewMapFromRaw(labels).CopyTo(testDP.Attributes()) dps := numberDataPointSlice{ instrLibName, @@ -394,7 +394,7 @@ func TestDoubleDataPointSliceAt(t *testing.T) { func TestHistogramDataPointSliceAt(t *testing.T) { instrLibName := "cloudwatch-otel" - labels := map[string]pdata.Value{"label1": pdata.NewValueString("value1")} + labels := map[string]interface{}{"label1": "value1"} testDPS := pdata.NewHistogramDataPointSlice() testDP := testDPS.AppendEmpty() @@ -402,7 +402,7 @@ func TestHistogramDataPointSliceAt(t *testing.T) { testDP.SetSum(17.13) testDP.SetBucketCounts([]uint64{1, 2, 3}) testDP.SetExplicitBounds([]float64{1, 2, 3}) - pdata.NewAttributeMapFromMap(labels).CopyTo(testDP.Attributes()) + pdata.NewMapFromRaw(labels).CopyTo(testDP.Attributes()) dps := histogramDataPointSlice{ instrLibName, @@ -429,7 +429,7 @@ func TestSummaryDataPointSliceAt(t *testing.T) { setupDataPointCache() instrLibName := "cloudwatch-otel" - labels := map[string]pdata.Value{"label1": pdata.NewValueString("value1")} + labels := map[string]interface{}{"label1": "value1"} metadataTimeStamp := time.Now().UnixNano() / int64(time.Millisecond) testCases := []struct { @@ -468,7 +468,7 @@ func TestSummaryDataPointSliceAt(t *testing.T) { testQuantileValue = testDP.QuantileValues().AppendEmpty() testQuantileValue.SetQuantile(100) testQuantileValue.SetValue(float64(5)) - pdata.NewAttributeMapFromMap(labels).CopyTo(testDP.Attributes()) + pdata.NewMapFromRaw(labels).CopyTo(testDP.Attributes()) dps := summaryDataPointSlice{ instrLibName, @@ -518,10 +518,10 @@ func TestCreateLabels(t *testing.T) { "b": "B", "c": "C", } - labelsMap := pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a": pdata.NewValueString("A"), - "b": pdata.NewValueString("B"), - "c": pdata.NewValueString("C"), + labelsMap := pdata.NewMapFromRaw(map[string]interface{}{ + "a": "A", + "b": "B", + "c": "C", }) labels := createLabels(labelsMap, noInstrumentationLibraryName) @@ -646,7 +646,7 @@ func TestGetDataPoints(t *testing.T) { logger := zap.NewNop() - expectedAttributes := pdata.NewAttributeMapFromMap(map[string]pdata.Value{"label1": pdata.NewValueString("value1")}) + expectedAttributes := pdata.NewMapFromRaw(map[string]interface{}{"label1": "value1"}) t.Run(tc.testName, func(t *testing.T) { setupDataPointCache() diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 5fe6cfda7763..b7958f7a83ad 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -13,8 +13,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 ) diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index aa6d1c01ac5a..902046f999df 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -195,11 +195,11 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= @@ -208,7 +208,7 @@ go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbD go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= diff --git a/exporter/awsemfexporter/metric_translator_test.go b/exporter/awsemfexporter/metric_translator_test.go index 4580415e9785..3a725fdefeea 100644 --- a/exporter/awsemfexporter/metric_translator_test.go +++ b/exporter/awsemfexporter/metric_translator_test.go @@ -2261,8 +2261,8 @@ func BenchmarkTranslateCWMetricToEMF(b *testing.B) { type testMetric struct { metricNames []string metricValues [][]float64 - resourceAttributeMap map[string]pdata.Value - attributeMap map[string]pdata.Value + resourceAttributeMap map[string]interface{} + attributeMap map[string]interface{} } type logGroupStreamTest struct { @@ -2292,9 +2292,9 @@ var ( inputMetrics: generateTestMetrics(testMetric{ metricNames: []string{"metric_1", "metric_2"}, metricValues: [][]float64{{100}, {4}}, - resourceAttributeMap: map[string]pdata.Value{ - "ClusterName": pdata.NewValueString("test-cluster"), - "PodName": pdata.NewValueString("test-pod"), + resourceAttributeMap: map[string]interface{}{ + "ClusterName": "test-cluster", + "PodName": "test-pod", }, }), inLogGroupName: "test-log-group-{ClusterName}", @@ -2307,9 +2307,9 @@ var ( inputMetrics: generateTestMetrics(testMetric{ metricNames: []string{"metric_1", "metric_2"}, metricValues: [][]float64{{100}, {4}}, - resourceAttributeMap: map[string]pdata.Value{ - "ClusterName": pdata.NewValueString("test-cluster"), - "PodName": pdata.NewValueString("test-pod"), + resourceAttributeMap: map[string]interface{}{ + "ClusterName": "test-cluster", + "PodName": "test-pod", }, }), inLogGroupName: "test-log-group", @@ -2322,9 +2322,9 @@ var ( inputMetrics: generateTestMetrics(testMetric{ metricNames: []string{"metric_1", "metric_2"}, metricValues: [][]float64{{100}, {4}}, - attributeMap: map[string]pdata.Value{ - "ClusterName": pdata.NewValueString("test-cluster"), - "PodName": pdata.NewValueString("test-pod"), + attributeMap: map[string]interface{}{ + "ClusterName": "test-cluster", + "PodName": "test-pod", }, }), inLogGroupName: "test-log-group-{ClusterName}", @@ -2337,9 +2337,9 @@ var ( inputMetrics: generateTestMetrics(testMetric{ metricNames: []string{"metric_1", "metric_2"}, metricValues: [][]float64{{100}, {4}}, - attributeMap: map[string]pdata.Value{ - "ClusterName": pdata.NewValueString("test-cluster"), - "PodName": pdata.NewValueString("test-pod"), + attributeMap: map[string]interface{}{ + "ClusterName": "test-cluster", + "PodName": "test-pod", }, }), inLogGroupName: "test-log-group", @@ -2352,11 +2352,11 @@ var ( inputMetrics: generateTestMetrics(testMetric{ metricNames: []string{"metric_1", "metric_2"}, metricValues: [][]float64{{100}, {4}}, - resourceAttributeMap: map[string]pdata.Value{ - "ClusterName": pdata.NewValueString("test-cluster"), + resourceAttributeMap: map[string]interface{}{ + "ClusterName": "test-cluster", }, - attributeMap: map[string]pdata.Value{ - "PodName": pdata.NewValueString("test-pod"), + attributeMap: map[string]interface{}{ + "PodName": "test-pod", }, }), inLogGroupName: "test-log-group-{ClusterName}", @@ -2380,8 +2380,8 @@ var ( inputMetrics: generateTestMetrics(testMetric{ metricNames: []string{"metric_1", "metric_2"}, metricValues: [][]float64{{100}, {4}}, - attributeMap: map[string]pdata.Value{ - "PodName": pdata.NewValueString("test-pod"), + attributeMap: map[string]interface{}{ + "PodName": "test-pod", }, }), inLogGroupName: "test-log-group-{ClusterName}", @@ -2426,7 +2426,7 @@ func generateTestMetrics(tm testMetric) pdata.Metrics { now := time.Now() rm := md.ResourceMetrics().AppendEmpty() - pdata.NewAttributeMapFromMap(tm.resourceAttributeMap).CopyTo(rm.Resource().Attributes()) + pdata.NewMapFromRaw(tm.resourceAttributeMap).CopyTo(rm.Resource().Attributes()) ms := rm.InstrumentationLibraryMetrics().AppendEmpty().Metrics() for i, name := range tm.metricNames { @@ -2437,7 +2437,7 @@ func generateTestMetrics(tm testMetric) pdata.Metrics { dp := m.Gauge().DataPoints().AppendEmpty() dp.SetTimestamp(pdata.NewTimestampFromTime(now.Add(10 * time.Second))) dp.SetDoubleVal(value) - pdata.NewAttributeMapFromMap(tm.attributeMap).CopyTo(dp.Attributes()) + pdata.NewMapFromRaw(tm.attributeMap).CopyTo(dp.Attributes()) } } return md diff --git a/exporter/awsemfexporter/util.go b/exporter/awsemfexporter/util.go index a13ab88304af..73867d736f52 100644 --- a/exporter/awsemfexporter/util.go +++ b/exporter/awsemfexporter/util.go @@ -167,8 +167,8 @@ func unixNanoToMilliseconds(timestamp pdata.Timestamp) int64 { return int64(uint64(timestamp) / uint64(time.Millisecond)) } -// attrMaptoStringMap converts a pdata.AttributeMap to a map[string]string -func attrMaptoStringMap(attrMap pdata.AttributeMap) map[string]string { +// attrMaptoStringMap converts a pdata.Map to a map[string]string +func attrMaptoStringMap(attrMap pdata.Map) map[string]string { strMap := make(map[string]string, attrMap.Len()) attrMap.Range(func(k string, v pdata.Value) bool { diff --git a/exporter/awsemfexporter/util_test.go b/exporter/awsemfexporter/util_test.go index 0579140f9e63..96a441434148 100644 --- a/exporter/awsemfexporter/util_test.go +++ b/exporter/awsemfexporter/util_test.go @@ -33,7 +33,7 @@ func TestReplacePatternValidTaskId(t *testing.T) { input := "{TaskId}" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("aws.ecs.cluster.name", "test-cluster-name") attrMap.UpsertString("aws.ecs.task.id", "test-task-id") @@ -48,7 +48,7 @@ func TestReplacePatternValidClusterName(t *testing.T) { input := "/aws/ecs/containerinsights/{ClusterName}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("aws.ecs.cluster.name", "test-cluster-name") attrMap.UpsertString("aws.ecs.task.id", "test-task-id") @@ -63,7 +63,7 @@ func TestReplacePatternMissingAttribute(t *testing.T) { input := "/aws/ecs/containerinsights/{ClusterName}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("aws.ecs.task.id", "test-task-id") s, success := replacePatterns(input, attrMaptoStringMap(attrMap), logger) @@ -77,7 +77,7 @@ func TestReplacePatternValidPodName(t *testing.T) { input := "/aws/eks/containerinsights/{PodName}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("aws.eks.cluster.name", "test-cluster-name") attrMap.UpsertString("PodName", "test-pod-001") @@ -92,7 +92,7 @@ func TestReplacePatternValidPod(t *testing.T) { input := "/aws/eks/containerinsights/{PodName}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("aws.eks.cluster.name", "test-cluster-name") attrMap.UpsertString("pod", "test-pod-001") @@ -107,7 +107,7 @@ func TestReplacePatternMissingPodName(t *testing.T) { input := "/aws/eks/containerinsights/{PodName}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("aws.eks.cluster.name", "test-cluster-name") s, success := replacePatterns(input, attrMaptoStringMap(attrMap), logger) @@ -121,7 +121,7 @@ func TestReplacePatternAttrPlaceholderClusterName(t *testing.T) { input := "/aws/ecs/containerinsights/{ClusterName}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("ClusterName", "test-cluster-name") s, success := replacePatterns(input, attrMaptoStringMap(attrMap), logger) @@ -135,7 +135,7 @@ func TestReplacePatternWrongKey(t *testing.T) { input := "/aws/ecs/containerinsights/{WrongKey}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("ClusterName", "test-task-id") s, success := replacePatterns(input, attrMaptoStringMap(attrMap), logger) @@ -149,7 +149,7 @@ func TestReplacePatternNilAttrValue(t *testing.T) { input := "/aws/ecs/containerinsights/{ClusterName}/performance" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.InsertNull("ClusterName") s, success := replacePatterns(input, attrMaptoStringMap(attrMap), logger) @@ -163,7 +163,7 @@ func TestReplacePatternValidTaskDefinitionFamily(t *testing.T) { input := "{TaskDefinitionFamily}" - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.UpsertString("aws.ecs.cluster.name", "test-cluster-name") attrMap.UpsertString("aws.ecs.task.family", "test-task-definition-family") diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 48b43ee94d7a..a060c398996d 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -38,9 +38,9 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 5cfe75046f2c..acc3bf91ef4b 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -243,23 +243,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod index 765b890b88d6..9a213fa1e6b3 100644 --- a/exporter/awsprometheusremotewriteexporter/go.mod +++ b/exporter/awsprometheusremotewriteexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.43.23 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -41,7 +41,7 @@ require ( github.com/tidwall/tinylru v1.1.0 // indirect github.com/tidwall/wal v1.1.7 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum index 6043b4c3860d..21fa5993b161 100644 --- a/exporter/awsprometheusremotewriteexporter/go.sum +++ b/exporter/awsprometheusremotewriteexporter/go.sum @@ -1321,10 +1321,10 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9 h1:Ge6PYtsfU2OYOeSHw/jSg1bX6HE7hjOpJ8rnKyl+lpc= -go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= -go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9 h1:fhA7W2RJYNZkhDfdLJHW2H24CrlI7cy8pJn3CxucUeY= -go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go index 2a17d3b00da4..4a40ea023899 100644 --- a/exporter/awsxrayexporter/awsxray_test.go +++ b/exporter/awsxrayexporter/awsxray_test.go @@ -149,7 +149,7 @@ func constructW3CFormatTraceSpanData(ispans pdata.InstrumentationLibrarySpans) { func constructResource() pdata.Resource { resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeServiceName, "signup_aggregator") attrs.InsertString(conventions.AttributeContainerName, "signup_aggregator") attrs.InsertString(conventions.AttributeContainerImageName, "otel/signupaggregator") @@ -217,8 +217,8 @@ func constructHTTPServerSpan(traceID pdata.TraceID) pdata.Span { return span } -func constructSpanAttributes(attributes map[string]interface{}) pdata.AttributeMap { - attrs := pdata.NewAttributeMap() +func constructSpanAttributes(attributes map[string]interface{}) pdata.Map { + attrs := pdata.NewMap() for key, value := range attributes { if cast, ok := value.(int); ok { attrs.InsertInt(key, int64(cast)) diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 7c732fd0bf5f..f386779423dc 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -29,9 +29,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/stretchr/objx v0.2.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index f33989f80822..92f2dd5f46cc 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -171,23 +171,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/awsxrayexporter/internal/translator/aws.go b/exporter/awsxrayexporter/internal/translator/aws.go index a388d00bed10..22064affb5e9 100644 --- a/exporter/awsxrayexporter/internal/translator/aws.go +++ b/exporter/awsxrayexporter/internal/translator/aws.go @@ -56,8 +56,8 @@ func makeAws(attributes map[string]pdata.Value, resource pdata.Resource) (map[st taskArn string taskFamily string launchType string - logGroups pdata.AttributeValueSlice - logGroupArns pdata.AttributeValueSlice + logGroups pdata.Slice + logGroupArns pdata.Slice cwl []awsxray.LogGroupMetadata ec2 *awsxray.EC2Metadata ecs *awsxray.ECSMetadata @@ -212,9 +212,9 @@ func makeAws(attributes map[string]pdata.Value, resource pdata.Resource) (map[st // Since we must couple log group ARNs and Log Group Names in the same CWLogs object, we first try to derive the // names from the ARN, then fall back to just recording the names - if logGroupArns != (pdata.AttributeValueSlice{}) && logGroupArns.Len() > 0 { + if logGroupArns != (pdata.Slice{}) && logGroupArns.Len() > 0 { cwl = getLogGroupMetadata(logGroupArns, true) - } else if logGroups != (pdata.AttributeValueSlice{}) && logGroups.Len() > 0 { + } else if logGroups != (pdata.Slice{}) && logGroups.Len() > 0 { cwl = getLogGroupMetadata(logGroups, false) } @@ -251,7 +251,7 @@ func makeAws(attributes map[string]pdata.Value, resource pdata.Resource) (map[st // Given an array of log group ARNs, create a corresponding amount of LogGroupMetadata objects with log_group and arn // populated, or given an array of just log group names, create the LogGroupMetadata objects with arn omitted -func getLogGroupMetadata(logGroups pdata.AttributeValueSlice, isArn bool) []awsxray.LogGroupMetadata { +func getLogGroupMetadata(logGroups pdata.Slice, isArn bool) []awsxray.LogGroupMetadata { var lgm []awsxray.LogGroupMetadata for i := 0; i < logGroups.Len(); i++ { if isArn { diff --git a/exporter/awsxrayexporter/internal/translator/aws_test.go b/exporter/awsxrayexporter/internal/translator/aws_test.go index 930b2850ea2d..2a0421f49aea 100644 --- a/exporter/awsxrayexporter/internal/translator/aws_test.go +++ b/exporter/awsxrayexporter/internal/translator/aws_test.go @@ -30,7 +30,7 @@ func TestAwsFromEc2Resource(t *testing.T) { hostType := "m5.xlarge" imageID := "ami-0123456789" resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSEC2) attrs.InsertString(conventions.AttributeCloudAccountID, "123456789") @@ -70,7 +70,7 @@ func TestAwsFromEcsResource(t *testing.T) { clusterArn := "arn:aws:ecs:us-west-2:123456789123:cluster/my-cluster" containerArn := "arn:aws:ecs:us-west-2:123456789123:container-instance/123" resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSECS) attrs.InsertString(conventions.AttributeCloudAccountID, "123456789") @@ -115,7 +115,7 @@ func TestAwsFromBeanstalkResource(t *testing.T) { deployID := "232" versionLabel := "4" resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSElasticBeanstalk) attrs.InsertString(conventions.AttributeCloudAccountID, "123456789") @@ -147,7 +147,7 @@ func TestAwsFromEksResource(t *testing.T) { containerName := "signup_aggregator-x82ufje83" containerID := "0123456789A" resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSEKS) attrs.InsertString(conventions.AttributeCloudAccountID, "123456789") @@ -186,7 +186,7 @@ func TestAwsWithAwsSqsResources(t *testing.T) { containerName := "signup_aggregator-x82ufje83" containerID := "0123456789A" resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudAccountID, "123456789") attrs.InsertString(conventions.AttributeCloudAvailabilityZone, "us-east-1c") @@ -246,7 +246,7 @@ func TestAwsWithAwsDynamoDbResources(t *testing.T) { containerName := "signup_aggregator-x82ufje83" containerID := "0123456789A" resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudAccountID, "123456789") attrs.InsertString(conventions.AttributeCloudAvailabilityZone, "us-east-1c") diff --git a/exporter/awsxrayexporter/internal/translator/cause_test.go b/exporter/awsxrayexporter/internal/translator/cause_test.go index 5ddbd3a32c46..7f36ebf1d46f 100644 --- a/exporter/awsxrayexporter/internal/translator/cause_test.go +++ b/exporter/awsxrayexporter/internal/translator/cause_test.go @@ -33,7 +33,7 @@ func TestCauseWithExceptions(t *testing.T) { event1 := span.Events().AppendEmpty() event1.SetName(ExceptionEventName) - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.InsertString(conventions.AttributeExceptionType, "java.lang.IllegalStateException") attributes.InsertString(conventions.AttributeExceptionMessage, "bad state") attributes.InsertString(conventions.AttributeExceptionStacktrace, `java.lang.IllegalStateException: state is not legal @@ -45,7 +45,7 @@ Caused by: java.lang.IllegalArgumentException: bad argument`) event2 := span.Events().AppendEmpty() event2.SetName(ExceptionEventName) - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() attributes.InsertString(conventions.AttributeExceptionType, "EmptyError") attributes.CopyTo(event2.Attributes()) diff --git a/exporter/awsxrayexporter/internal/translator/http.go b/exporter/awsxrayexporter/internal/translator/http.go index d7c353ec0a24..cb2ba6356daf 100644 --- a/exporter/awsxrayexporter/internal/translator/http.go +++ b/exporter/awsxrayexporter/internal/translator/http.go @@ -140,7 +140,7 @@ func extractResponseSizeFromEvents(span pdata.Span) int64 { return size } -func extractResponseSizeFromAttributes(attributes pdata.AttributeMap) int64 { +func extractResponseSizeFromAttributes(attributes pdata.Map) int64 { typeVal, ok := attributes.Get("message.type") if ok && typeVal.StringVal() == "RECEIVED" { if sizeVal, ok := attributes.Get(conventions.AttributeMessagingMessagePayloadSizeBytes); ok { diff --git a/exporter/awsxrayexporter/internal/translator/segment_test.go b/exporter/awsxrayexporter/internal/translator/segment_test.go index 61ecca81d792..7d45dc48722e 100644 --- a/exporter/awsxrayexporter/internal/translator/segment_test.go +++ b/exporter/awsxrayexporter/internal/translator/segment_test.go @@ -389,7 +389,7 @@ func TestServerSpanWithNilAttributes(t *testing.T) { span := constructServerSpan(parentSpanID, spanName, pdata.StatusCodeError, "OK", attributes) timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTimestamp()) timeEvents.CopyTo(span.Events()) - pdata.NewAttributeMap().CopyTo(span.Attributes()) + pdata.NewMap().CopyTo(span.Attributes()) segment, _ := MakeSegment(span, resource, nil, false) @@ -540,7 +540,7 @@ func TestOriginNotAws(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderGCP) attrs.InsertString(conventions.AttributeHostID, "instance-123") attrs.CopyTo(resource.Attributes()) @@ -557,7 +557,7 @@ func TestOriginEc2(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSEC2) attrs.InsertString(conventions.AttributeHostID, "instance-123") @@ -575,7 +575,7 @@ func TestOriginEcs(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSECS) attrs.InsertString(conventions.AttributeHostID, "instance-123") @@ -594,7 +594,7 @@ func TestOriginEcsEc2(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSECS) attrs.InsertString(conventions.AttributeAWSECSLaunchtype, conventions.AttributeAWSECSLaunchtypeEC2) @@ -614,7 +614,7 @@ func TestOriginEcsFargate(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSECS) attrs.InsertString(conventions.AttributeAWSECSLaunchtype, conventions.AttributeAWSECSLaunchtypeFargate) @@ -634,7 +634,7 @@ func TestOriginEb(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSElasticBeanstalk) attrs.InsertString(conventions.AttributeHostID, "instance-123") @@ -657,7 +657,7 @@ func TestOriginEks(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSEKS) attrs.InsertString(conventions.AttributeCloudAccountID, "123456789") @@ -686,7 +686,7 @@ func TestOriginAppRunner(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSAppRunner) attrs.CopyTo(resource.Attributes()) @@ -703,7 +703,7 @@ func TestOriginBlank(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.CopyTo(resource.Attributes()) span := constructServerSpan(parentSpanID, spanName, pdata.StatusCodeError, "OK", attributes) @@ -719,7 +719,7 @@ func TestOriginPrefersInfraService(t *testing.T) { parentSpanID := newSegmentID() attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) attrs.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSEC2) attrs.InsertString(conventions.AttributeK8SClusterName, "cluster-123") @@ -741,7 +741,7 @@ func TestFilteredAttributesMetadata(t *testing.T) { attributes := make(map[string]interface{}) resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString("string_value", "value") attrs.InsertInt("int_value", 123) attrs.InsertDouble("float_value", 456.78) @@ -831,8 +831,8 @@ func constructServerSpan(parentSpanID pdata.SpanID, name string, code pdata.Stat return span } -func constructSpanAttributes(attributes map[string]interface{}) pdata.AttributeMap { - attrs := pdata.NewAttributeMap() +func constructSpanAttributes(attributes map[string]interface{}) pdata.Map { + attrs := pdata.NewMap() for key, value := range attributes { if cast, ok := value.(int); ok { attrs.InsertInt(key, int64(cast)) @@ -847,7 +847,7 @@ func constructSpanAttributes(attributes map[string]interface{}) pdata.AttributeM func constructDefaultResource() pdata.Resource { resource := pdata.NewResource() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString(conventions.AttributeServiceName, "signup_aggregator") attrs.InsertString(conventions.AttributeServiceVersion, "semver:1.1.4") attrs.InsertString(conventions.AttributeContainerName, "signup_aggregator") @@ -882,7 +882,7 @@ func constructDefaultResource() pdata.Resource { } func constructTimedEventsWithReceivedMessageEvent(tm pdata.Timestamp) pdata.SpanEventSlice { - eventAttr := pdata.NewAttributeMap() + eventAttr := pdata.NewMap() eventAttr.InsertString("message.type", "RECEIVED") eventAttr.InsertInt(conventions.AttributeMessagingMessageID, 1) eventAttr.InsertInt(conventions.AttributeMessagingMessagePayloadCompressedSizeBytes, 6478) @@ -899,7 +899,7 @@ func constructTimedEventsWithReceivedMessageEvent(tm pdata.Timestamp) pdata.Span } func constructTimedEventsWithSentMessageEvent(tm pdata.Timestamp) pdata.SpanEventSlice { - eventAttr := pdata.NewAttributeMap() + eventAttr := pdata.NewMap() eventAttr.InsertString("message.type", "SENT") eventAttr.InsertInt(conventions.AttributeMessagingMessageID, 1) eventAttr.InsertInt(conventions.AttributeMessagingMessagePayloadSizeBytes, 7480) diff --git a/exporter/azuremonitorexporter/conventions_test.go b/exporter/azuremonitorexporter/conventions_test.go index 7574ed8348d9..61829e668641 100644 --- a/exporter/azuremonitorexporter/conventions_test.go +++ b/exporter/azuremonitorexporter/conventions_test.go @@ -23,29 +23,29 @@ import ( ) func TestHTTPAttributeMapping(t *testing.T) { - httpAttributeValues := map[string]pdata.Value{ - conventions.AttributeHTTPMethod: pdata.NewValueString(conventions.AttributeHTTPMethod), - conventions.AttributeHTTPURL: pdata.NewValueString(conventions.AttributeHTTPURL), - conventions.AttributeHTTPTarget: pdata.NewValueString(conventions.AttributeHTTPTarget), - conventions.AttributeHTTPHost: pdata.NewValueString(conventions.AttributeHTTPHost), - conventions.AttributeHTTPScheme: pdata.NewValueString(conventions.AttributeHTTPScheme), + httpAttributeValues := map[string]interface{}{ + conventions.AttributeHTTPMethod: conventions.AttributeHTTPMethod, + conventions.AttributeHTTPURL: conventions.AttributeHTTPURL, + conventions.AttributeHTTPTarget: conventions.AttributeHTTPTarget, + conventions.AttributeHTTPHost: conventions.AttributeHTTPHost, + conventions.AttributeHTTPScheme: conventions.AttributeHTTPScheme, // Exercise the INT or STRING logic - conventions.AttributeHTTPStatusCode: pdata.NewValueString("200"), - "http.status_text": pdata.NewValueString("http.status_text"), - conventions.AttributeHTTPFlavor: pdata.NewValueString(conventions.AttributeHTTPFlavor), - conventions.AttributeHTTPUserAgent: pdata.NewValueString(conventions.AttributeHTTPUserAgent), - conventions.AttributeHTTPRequestContentLength: pdata.NewValueInt(1), - conventions.AttributeHTTPRequestContentLengthUncompressed: pdata.NewValueInt(2), - conventions.AttributeHTTPResponseContentLength: pdata.NewValueInt(3), - conventions.AttributeHTTPResponseContentLengthUncompressed: pdata.NewValueInt(4), - - conventions.AttributeHTTPRoute: pdata.NewValueString(conventions.AttributeHTTPRoute), - conventions.AttributeHTTPServerName: pdata.NewValueString(conventions.AttributeHTTPServerName), - conventions.AttributeHTTPClientIP: pdata.NewValueString(conventions.AttributeHTTPClientIP), + conventions.AttributeHTTPStatusCode: "200", + "http.status_text": "http.status_text", + conventions.AttributeHTTPFlavor: conventions.AttributeHTTPFlavor, + conventions.AttributeHTTPUserAgent: conventions.AttributeHTTPUserAgent, + conventions.AttributeHTTPRequestContentLength: 1, + conventions.AttributeHTTPRequestContentLengthUncompressed: 2, + conventions.AttributeHTTPResponseContentLength: 3, + conventions.AttributeHTTPResponseContentLengthUncompressed: 4, + + conventions.AttributeHTTPRoute: conventions.AttributeHTTPRoute, + conventions.AttributeHTTPServerName: conventions.AttributeHTTPServerName, + conventions.AttributeHTTPClientIP: conventions.AttributeHTTPClientIP, } - attributeMap := pdata.NewAttributeMapFromMap(httpAttributeValues) + attributeMap := pdata.NewMapFromRaw(httpAttributeValues) // Add all the network attributes appendToAttributeMap(attributeMap, getNetworkAttributes()) @@ -74,13 +74,13 @@ func TestHTTPAttributeMapping(t *testing.T) { } func TestRPCPAttributeMapping(t *testing.T) { - rpcAttributeValues := map[string]pdata.Value{ - conventions.AttributeRPCSystem: pdata.NewValueString(conventions.AttributeRPCSystem), - conventions.AttributeRPCService: pdata.NewValueString(conventions.AttributeRPCService), - conventions.AttributeRPCMethod: pdata.NewValueString(conventions.AttributeRPCMethod), + rpcAttributeValues := map[string]interface{}{ + conventions.AttributeRPCSystem: conventions.AttributeRPCSystem, + conventions.AttributeRPCService: conventions.AttributeRPCService, + conventions.AttributeRPCMethod: conventions.AttributeRPCMethod, } - attributeMap := pdata.NewAttributeMapFromMap(rpcAttributeValues) + attributeMap := pdata.NewMapFromRaw(rpcAttributeValues) // Add all the network attributes appendToAttributeMap(attributeMap, getNetworkAttributes()) @@ -96,21 +96,21 @@ func TestRPCPAttributeMapping(t *testing.T) { } func TestDatabaseAttributeMapping(t *testing.T) { - databaseAttributeValues := map[string]pdata.Value{ - conventions.AttributeDBSystem: pdata.NewValueString(conventions.AttributeDBSystem), - conventions.AttributeDBConnectionString: pdata.NewValueString(conventions.AttributeDBConnectionString), - conventions.AttributeDBUser: pdata.NewValueString(conventions.AttributeDBUser), - conventions.AttributeDBStatement: pdata.NewValueString(conventions.AttributeDBStatement), - conventions.AttributeDBOperation: pdata.NewValueString(conventions.AttributeDBOperation), - conventions.AttributeDBMSSQLInstanceName: pdata.NewValueString(conventions.AttributeDBMSSQLInstanceName), - conventions.AttributeDBJDBCDriverClassname: pdata.NewValueString(conventions.AttributeDBJDBCDriverClassname), - conventions.AttributeDBCassandraKeyspace: pdata.NewValueString(conventions.AttributeDBCassandraKeyspace), - conventions.AttributeDBHBaseNamespace: pdata.NewValueString(conventions.AttributeDBHBaseNamespace), - conventions.AttributeDBRedisDBIndex: pdata.NewValueString(conventions.AttributeDBRedisDBIndex), - conventions.AttributeDBMongoDBCollection: pdata.NewValueString(conventions.AttributeDBMongoDBCollection), + databaseAttributeValues := map[string]interface{}{ + conventions.AttributeDBSystem: conventions.AttributeDBSystem, + conventions.AttributeDBConnectionString: conventions.AttributeDBConnectionString, + conventions.AttributeDBUser: conventions.AttributeDBUser, + conventions.AttributeDBStatement: conventions.AttributeDBStatement, + conventions.AttributeDBOperation: conventions.AttributeDBOperation, + conventions.AttributeDBMSSQLInstanceName: conventions.AttributeDBMSSQLInstanceName, + conventions.AttributeDBJDBCDriverClassname: conventions.AttributeDBJDBCDriverClassname, + conventions.AttributeDBCassandraKeyspace: conventions.AttributeDBCassandraKeyspace, + conventions.AttributeDBHBaseNamespace: conventions.AttributeDBHBaseNamespace, + conventions.AttributeDBRedisDBIndex: conventions.AttributeDBRedisDBIndex, + conventions.AttributeDBMongoDBCollection: conventions.AttributeDBMongoDBCollection, } - attributeMap := pdata.NewAttributeMapFromMap(databaseAttributeValues) + attributeMap := pdata.NewMapFromRaw(databaseAttributeValues) // Add all the network attributes appendToAttributeMap(attributeMap, getNetworkAttributes()) @@ -132,22 +132,22 @@ func TestDatabaseAttributeMapping(t *testing.T) { } func TestMessagingAttributeMapping(t *testing.T) { - messagingAttributeValues := map[string]pdata.Value{ - conventions.AttributeMessagingSystem: pdata.NewValueString(conventions.AttributeMessagingSystem), - conventions.AttributeMessagingDestination: pdata.NewValueString(conventions.AttributeMessagingDestination), - conventions.AttributeMessagingDestinationKind: pdata.NewValueString(conventions.AttributeMessagingDestinationKind), - conventions.AttributeMessagingTempDestination: pdata.NewValueString(conventions.AttributeMessagingTempDestination), - conventions.AttributeMessagingProtocol: pdata.NewValueString(conventions.AttributeMessagingProtocol), - conventions.AttributeMessagingProtocolVersion: pdata.NewValueString(conventions.AttributeMessagingProtocolVersion), - conventions.AttributeMessagingURL: pdata.NewValueString(conventions.AttributeMessagingURL), - conventions.AttributeMessagingMessageID: pdata.NewValueString(conventions.AttributeMessagingMessageID), - conventions.AttributeMessagingConversationID: pdata.NewValueString(conventions.AttributeMessagingConversationID), - conventions.AttributeMessagingMessagePayloadSizeBytes: pdata.NewValueInt(1), - conventions.AttributeMessagingMessagePayloadCompressedSizeBytes: pdata.NewValueInt(2), - conventions.AttributeMessagingOperation: pdata.NewValueString(conventions.AttributeMessagingOperation), + messagingAttributeValues := map[string]interface{}{ + conventions.AttributeMessagingSystem: conventions.AttributeMessagingSystem, + conventions.AttributeMessagingDestination: conventions.AttributeMessagingDestination, + conventions.AttributeMessagingDestinationKind: conventions.AttributeMessagingDestinationKind, + conventions.AttributeMessagingTempDestination: conventions.AttributeMessagingTempDestination, + conventions.AttributeMessagingProtocol: conventions.AttributeMessagingProtocol, + conventions.AttributeMessagingProtocolVersion: conventions.AttributeMessagingProtocolVersion, + conventions.AttributeMessagingURL: conventions.AttributeMessagingURL, + conventions.AttributeMessagingMessageID: conventions.AttributeMessagingMessageID, + conventions.AttributeMessagingConversationID: conventions.AttributeMessagingConversationID, + conventions.AttributeMessagingMessagePayloadSizeBytes: 1, + conventions.AttributeMessagingMessagePayloadCompressedSizeBytes: 2, + conventions.AttributeMessagingOperation: conventions.AttributeMessagingOperation, } - attributeMap := pdata.NewAttributeMapFromMap(messagingAttributeValues) + attributeMap := pdata.NewMapFromRaw(messagingAttributeValues) // Add all the network attributes appendToAttributeMap(attributeMap, getNetworkAttributes()) @@ -173,11 +173,11 @@ func TestMessagingAttributeMapping(t *testing.T) { // Tests what happens when an attribute that should be an int is not func TestAttributeMappingWithSomeBadValues(t *testing.T) { // Try this out with any attribute struct with an int value - values := map[string]pdata.Value{ - conventions.AttributeNetPeerPort: pdata.NewValueString("xx"), + values := map[string]interface{}{ + conventions.AttributeNetPeerPort: "xx", } - attributeMap := pdata.NewAttributeMapFromMap(values) + attributeMap := pdata.NewMapFromRaw(values) attrs := &NetworkAttributes{} attributeMap.Range(attrs.MapAttribute) @@ -186,16 +186,16 @@ func TestAttributeMappingWithSomeBadValues(t *testing.T) { assert.Equal(t, int64(0), attrs.NetPeerPort) } -func getNetworkAttributes() map[string]pdata.Value { - return map[string]pdata.Value{ - conventions.AttributeNetTransport: pdata.NewValueString(conventions.AttributeNetTransport), - conventions.AttributeNetPeerIP: pdata.NewValueString(conventions.AttributeNetPeerIP), - conventions.AttributeNetPeerPort: pdata.NewValueInt(1), - conventions.AttributeNetPeerName: pdata.NewValueString(conventions.AttributeNetPeerName), - conventions.AttributeNetHostIP: pdata.NewValueString(conventions.AttributeNetHostIP), - conventions.AttributeNetHostPort: pdata.NewValueInt(2), - conventions.AttributeNetHostName: pdata.NewValueString(conventions.AttributeNetHostName), - } +func getNetworkAttributes() pdata.Map { + return pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeNetTransport: conventions.AttributeNetTransport, + conventions.AttributeNetPeerIP: conventions.AttributeNetPeerIP, + conventions.AttributeNetPeerPort: 1, + conventions.AttributeNetPeerName: conventions.AttributeNetPeerName, + conventions.AttributeNetHostIP: conventions.AttributeNetHostIP, + conventions.AttributeNetHostPort: 2, + conventions.AttributeNetHostName: conventions.AttributeNetHostName, + }) } func networkAttributesValidations(t *testing.T, networkAttributes NetworkAttributes) { diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 63b5efc0562e..1d3cbec4c84b 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d ) @@ -30,9 +30,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/stretchr/objx v0.2.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 3d51ce5a77a7..923a06b8ee69 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -182,23 +182,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/azuremonitorexporter/trace_to_envelope.go b/exporter/azuremonitorexporter/trace_to_envelope.go index 867ddd85000d..763cfa7571fd 100644 --- a/exporter/azuremonitorexporter/trace_to_envelope.go +++ b/exporter/azuremonitorexporter/trace_to_envelope.go @@ -491,7 +491,7 @@ func fillRemoteDependencyDataMessaging(span pdata.Span, data *contracts.RemoteDe // Copies all attributes to either properties or measurements and passes the key/value to another mapping function func copyAndMapAttributes( - attributeMap pdata.AttributeMap, + attributeMap pdata.Map, properties map[string]string, measurements map[string]float64, mappingFunc func(k string, v pdata.Value)) { @@ -507,7 +507,7 @@ func copyAndMapAttributes( // Copies all attributes to either properties or measurements without any kind of mapping to a known set of attributes func copyAttributesWithoutMapping( - attributeMap pdata.AttributeMap, + attributeMap pdata.Map, properties map[string]string, measurements map[string]float64) { @@ -516,7 +516,7 @@ func copyAttributesWithoutMapping( // Attribute extraction logic for HTTP Span attributes func copyAndExtractHTTPAttributes( - attributeMap pdata.AttributeMap, + attributeMap pdata.Map, properties map[string]string, measurements map[string]float64) *HTTPAttributes { @@ -532,7 +532,7 @@ func copyAndExtractHTTPAttributes( // Attribute extraction logic for RPC Span attributes func copyAndExtractRPCAttributes( - attributeMap pdata.AttributeMap, + attributeMap pdata.Map, properties map[string]string, measurements map[string]float64) *RPCAttributes { @@ -548,7 +548,7 @@ func copyAndExtractRPCAttributes( // Attribute extraction logic for Database Span attributes func copyAndExtractDatabaseAttributes( - attributeMap pdata.AttributeMap, + attributeMap pdata.Map, properties map[string]string, measurements map[string]float64) *DatabaseAttributes { @@ -564,7 +564,7 @@ func copyAndExtractDatabaseAttributes( // Attribute extraction logic for Messaging Span attributes func copyAndExtractMessagingAttributes( - attributeMap pdata.AttributeMap, + attributeMap pdata.Map, properties map[string]string, measurements map[string]float64) *MessagingAttributes { @@ -585,7 +585,7 @@ func formatSpanDuration(span pdata.Span) string { } // Maps incoming Span to a type defined in the specification -func mapIncomingSpanToType(attributeMap pdata.AttributeMap) spanType { +func mapIncomingSpanToType(attributeMap pdata.Map) spanType { // No attributes if attributeMap.Len() == 0 { return unknownSpanType diff --git a/exporter/azuremonitorexporter/trace_to_envelope_test.go b/exporter/azuremonitorexporter/trace_to_envelope_test.go index be8c50a09702..cdbfa80d4b3b 100644 --- a/exporter/azuremonitorexporter/trace_to_envelope_test.go +++ b/exporter/azuremonitorexporter/trace_to_envelope_test.go @@ -72,23 +72,23 @@ var ( defaultMessagingStatusCodeAsString = strconv.FormatInt(defaultRPCStatusCode, 10) // Required attribute for any HTTP Span - requiredHTTPAttributes = map[string]pdata.Value{ - conventions.AttributeHTTPMethod: pdata.NewValueString(defaultHTTPMethod), + requiredHTTPAttributes = map[string]interface{}{ + conventions.AttributeHTTPMethod: defaultHTTPMethod, } // Required attribute for any RPC Span - requiredRPCAttributes = map[string]pdata.Value{ - conventions.AttributeRPCSystem: pdata.NewValueString(defaultRPCSystem), + requiredRPCAttributes = map[string]interface{}{ + conventions.AttributeRPCSystem: defaultRPCSystem, } - requiredDatabaseAttributes = map[string]pdata.Value{ - conventions.AttributeDBSystem: pdata.NewValueString(defaultDBSystem), - conventions.AttributeDBName: pdata.NewValueString(defaultDBName), + requiredDatabaseAttributes = map[string]interface{}{ + conventions.AttributeDBSystem: defaultDBSystem, + conventions.AttributeDBName: defaultDBName, } - requiredMessagingAttributes = map[string]pdata.Value{ - conventions.AttributeMessagingSystem: pdata.NewValueString(defaultMessagingSystem), - conventions.AttributeMessagingDestination: pdata.NewValueString(defaultMessagingDestination), + requiredMessagingAttributes = map[string]interface{}{ + conventions.AttributeMessagingSystem: defaultMessagingSystem, + conventions.AttributeMessagingDestination: defaultMessagingDestination, } defaultResource = getResource() @@ -118,24 +118,22 @@ func TestHTTPServerSpanToRequestDataAttributeSet1(t *testing.T) { span.Status().SetMessage("Fubar") spanAttributes := span.Attributes() - set := map[string]pdata.Value{ + appendToAttributeMap(spanAttributes, pdata.NewMapFromRaw(map[string]interface{}{ // http.scheme, http.host, http.target => data.Url - conventions.AttributeHTTPScheme: pdata.NewValueString("https"), - conventions.AttributeHTTPHost: pdata.NewValueString("foo"), - conventions.AttributeHTTPTarget: pdata.NewValueString("/bar?biz=baz"), + conventions.AttributeHTTPScheme: "https", + conventions.AttributeHTTPHost: "foo", + conventions.AttributeHTTPTarget: "/bar?biz=baz", // A non 2xx status code - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(400), + conventions.AttributeHTTPStatusCode: 400, // A specific http route - conventions.AttributeHTTPRoute: pdata.NewValueString("bizzle"), + conventions.AttributeHTTPRoute: "bizzle", // Unused but should get copied to the RequestData .Properties and .Measurements - "somebool": pdata.NewValueBool(false), - "somedouble": pdata.NewValueDouble(0.1), - } - - appendToAttributeMap(spanAttributes, set) + "somebool": false, + "somedouble": 0.1, + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRequestDataEnvelopeName) @@ -162,15 +160,15 @@ func TestHTTPServerSpanToRequestDataAttributeSet2(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(defaultHTTPStatusCode), - conventions.AttributeHTTPScheme: pdata.NewValueString("https"), - conventions.AttributeHTTPServerName: pdata.NewValueString("foo"), - conventions.AttributeNetHostPort: pdata.NewValueInt(81), - conventions.AttributeHTTPTarget: pdata.NewValueString("/bar?biz=baz"), - - conventions.AttributeNetPeerIP: pdata.NewValueString("127.0.0.1"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPStatusCode: defaultHTTPStatusCode, + conventions.AttributeHTTPScheme: "https", + conventions.AttributeHTTPServerName: "foo", + conventions.AttributeNetHostPort: 81, + conventions.AttributeHTTPTarget: "/bar?biz=baz", + + conventions.AttributeNetPeerIP: "127.0.0.1", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRequestDataEnvelopeName) @@ -191,16 +189,16 @@ func TestHTTPServerSpanToRequestDataAttributeSet3(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(defaultHTTPStatusCode), - conventions.AttributeHTTPScheme: pdata.NewValueString("https"), - conventions.AttributeNetHostName: pdata.NewValueString("foo"), - conventions.AttributeNetHostPort: pdata.NewValueInt(81), - conventions.AttributeHTTPTarget: pdata.NewValueString("/bar?biz=baz"), - - conventions.AttributeHTTPClientIP: pdata.NewValueString("127.0.0.2"), - conventions.AttributeNetPeerIP: pdata.NewValueString("127.0.0.1"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPStatusCode: defaultHTTPStatusCode, + conventions.AttributeHTTPScheme: "https", + conventions.AttributeNetHostName: "foo", + conventions.AttributeNetHostPort: 81, + conventions.AttributeHTTPTarget: "/bar?biz=baz", + + conventions.AttributeHTTPClientIP: "127.0.0.2", + conventions.AttributeNetPeerIP: "127.0.0.1", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRequestDataEnvelopeName) @@ -218,10 +216,10 @@ func TestHTTPServerSpanToRequestDataAttributeSet4(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(defaultHTTPStatusCode), - conventions.AttributeHTTPURL: pdata.NewValueString("https://foo:81/bar?biz=baz"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPStatusCode: defaultHTTPStatusCode, + conventions.AttributeHTTPURL: "https://foo:81/bar?biz=baz", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRequestDataEnvelopeName) @@ -249,11 +247,11 @@ func TestHTTPClientSpanToRemoteDependencyAttributeSet1(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeHTTPURL: pdata.NewValueString("https://foo:81/bar?biz=baz"), + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPURL: "https://foo:81/bar?biz=baz", - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(400), - }) + conventions.AttributeHTTPStatusCode: 400, + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -277,16 +275,16 @@ func TestHTTPClientSpanToRemoteDependencyAttributeSet2(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ + pdata.NewMapFromRaw(map[string]interface{}{ // http.scheme, http.host, http.target => data.Url - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(defaultHTTPStatusCode), - conventions.AttributeHTTPScheme: pdata.NewValueString("https"), - conventions.AttributeHTTPHost: pdata.NewValueString("foo"), - conventions.AttributeHTTPTarget: pdata.NewValueString("bar/12345?biz=baz"), + conventions.AttributeHTTPStatusCode: defaultHTTPStatusCode, + conventions.AttributeHTTPScheme: "https", + conventions.AttributeHTTPHost: "foo", + conventions.AttributeHTTPTarget: "bar/12345?biz=baz", // A specific http.route - conventions.AttributeHTTPRoute: pdata.NewValueString("/bar/:baz_id"), - }) + conventions.AttributeHTTPRoute: "/bar/:baz_id", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -308,13 +306,13 @@ func TestHTTPClientSpanToRemoteDependencyAttributeSet3(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(defaultHTTPStatusCode), - conventions.AttributeHTTPScheme: pdata.NewValueString("https"), - conventions.AttributeNetPeerName: pdata.NewValueString("foo"), - conventions.AttributeNetPeerPort: pdata.NewValueInt(81), - conventions.AttributeHTTPTarget: pdata.NewValueString("/bar?biz=baz"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPStatusCode: defaultHTTPStatusCode, + conventions.AttributeHTTPScheme: "https", + conventions.AttributeNetPeerName: "foo", + conventions.AttributeNetPeerPort: 81, + conventions.AttributeHTTPTarget: "/bar?biz=baz", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -331,13 +329,13 @@ func TestHTTPClientSpanToRemoteDependencyAttributeSet4(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(defaultHTTPStatusCode), - conventions.AttributeHTTPScheme: pdata.NewValueString("https"), - conventions.AttributeNetPeerIP: pdata.NewValueString("127.0.0.1"), - conventions.AttributeNetPeerPort: pdata.NewValueInt(81), - conventions.AttributeHTTPTarget: pdata.NewValueString("/bar?biz=baz"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPStatusCode: defaultHTTPStatusCode, + conventions.AttributeHTTPScheme: "https", + conventions.AttributeNetPeerIP: "127.0.0.1", + conventions.AttributeNetPeerPort: 81, + conventions.AttributeHTTPTarget: "/bar?biz=baz", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -353,11 +351,11 @@ func TestRPCServerSpanToRequestData(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeNetPeerName: pdata.NewValueString("foo"), - conventions.AttributeNetPeerIP: pdata.NewValueString("127.0.0.1"), - conventions.AttributeNetPeerPort: pdata.NewValueInt(81), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeNetPeerName: "foo", + conventions.AttributeNetPeerIP: "127.0.0.1", + conventions.AttributeNetPeerPort: 81, + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRequestDataEnvelopeName) @@ -367,10 +365,10 @@ func TestRPCServerSpanToRequestData(t *testing.T) { // test fallback to peerip appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeNetPeerName: pdata.NewValueString(""), - conventions.AttributeNetPeerIP: pdata.NewValueString("127.0.0.1"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeNetPeerName: "", + conventions.AttributeNetPeerIP: "127.0.0.1", + })) envelope, _ = spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) data = envelope.Data.(*contracts.Data).BaseData.(*contracts.RequestData) @@ -384,11 +382,11 @@ func TestRPCClientSpanToRemoteDependencyData(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeNetPeerName: pdata.NewValueString("foo"), - conventions.AttributeNetPeerPort: pdata.NewValueInt(81), - conventions.AttributeNetPeerIP: pdata.NewValueString("127.0.0.1"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeNetPeerName: "foo", + conventions.AttributeNetPeerPort: 81, + conventions.AttributeNetPeerIP: "127.0.0.1", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -398,10 +396,10 @@ func TestRPCClientSpanToRemoteDependencyData(t *testing.T) { // test fallback to peerip appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeNetPeerName: pdata.NewValueString(""), - conventions.AttributeNetPeerIP: pdata.NewValueString("127.0.0.1"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeNetPeerName: "", + conventions.AttributeNetPeerIP: "127.0.0.1", + })) envelope, _ = spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) data = envelope.Data.(*contracts.Data).BaseData.(*contracts.RemoteDependencyData) @@ -427,11 +425,11 @@ func TestDatabaseClientSpanToRemoteDependencyData(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeDBStatement: pdata.NewValueString(defaultDBStatement), - conventions.AttributeNetPeerName: pdata.NewValueString("foo"), - conventions.AttributeNetPeerPort: pdata.NewValueInt(81), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeDBStatement: defaultDBStatement, + conventions.AttributeNetPeerName: "foo", + conventions.AttributeNetPeerPort: 81, + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -444,10 +442,10 @@ func TestDatabaseClientSpanToRemoteDependencyData(t *testing.T) { // Test the fallback to data.Data fallback to DBOperation appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeDBStatement: pdata.NewValueString(""), - conventions.AttributeDBOperation: pdata.NewValueString(defaultDBOperation), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeDBStatement: "", + conventions.AttributeDBOperation: defaultDBOperation, + })) envelope, _ = spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) data = envelope.Data.(*contracts.Data).BaseData.(*contracts.RemoteDependencyData) @@ -461,11 +459,11 @@ func TestMessagingConsumerSpanToRequestData(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeMessagingURL: pdata.NewValueString(defaultMessagingURL), - conventions.AttributeNetPeerName: pdata.NewValueString("foo"), - conventions.AttributeNetPeerPort: pdata.NewValueInt(81), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeMessagingURL: defaultMessagingURL, + conventions.AttributeNetPeerName: "foo", + conventions.AttributeNetPeerPort: 81, + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRequestDataEnvelopeName) @@ -477,9 +475,9 @@ func TestMessagingConsumerSpanToRequestData(t *testing.T) { // test fallback from MessagingURL to net.* properties appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeMessagingURL: pdata.NewValueString(""), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeMessagingURL: "", + })) envelope, _ = spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) data = envelope.Data.(*contracts.Data).BaseData.(*contracts.RequestData) @@ -494,11 +492,11 @@ func TestMessagingProducerSpanToRequestData(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeMessagingURL: pdata.NewValueString(defaultMessagingURL), - conventions.AttributeNetPeerName: pdata.NewValueString("foo"), - conventions.AttributeNetPeerPort: pdata.NewValueInt(81), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeMessagingURL: defaultMessagingURL, + conventions.AttributeNetPeerName: "foo", + conventions.AttributeNetPeerPort: 81, + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -510,9 +508,9 @@ func TestMessagingProducerSpanToRequestData(t *testing.T) { // test fallback from MessagingURL to net.* properties appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - conventions.AttributeMessagingURL: pdata.NewValueString(""), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeMessagingURL: "", + })) envelope, _ = spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) data = envelope.Data.(*contracts.Data).BaseData.(*contracts.RemoteDependencyData) @@ -527,9 +525,9 @@ func TestUnknownInternalSpanToRemoteDependencyData(t *testing.T) { appendToAttributeMap( spanAttributes, - map[string]pdata.Value{ - "foo": pdata.NewValueString("bar"), - }) + pdata.NewMapFromRaw(map[string]interface{}{ + "foo": "bar", + })) envelope, _ := spanToEnvelope(defaultResource, defaultInstrumentationLibrary, span, zap.NewNop()) commonEnvelopeValidations(t, span, envelope, defaultRemoteDependencyDataEnvelopeName) @@ -728,7 +726,7 @@ func defaultInternalRemoteDependencyDataValidations( // Verifies that all attributes are copies to either the properties or measurements maps of the envelope's data element func assertAttributesCopiedToPropertiesOrMeasurements( t *testing.T, - attributeMap pdata.AttributeMap, + attributeMap pdata.Map, properties map[string]string, measurements map[string]float64) { @@ -758,7 +756,7 @@ func assertAttributesCopiedToPropertiesOrMeasurements( /* The remainder of these methods are for building up test assets */ -func getSpan(spanName string, spanKind pdata.SpanKind, initialAttributes map[string]pdata.Value) pdata.Span { +func getSpan(spanName string, spanKind pdata.SpanKind, initialAttributes map[string]interface{}) pdata.Span { span := pdata.NewSpan() span.SetTraceID(pdata.NewTraceID(defaultTraceID)) span.SetSpanID(pdata.NewSpanID(defaultSpanID)) @@ -767,32 +765,32 @@ func getSpan(spanName string, spanKind pdata.SpanKind, initialAttributes map[str span.SetKind(spanKind) span.SetStartTimestamp(defaultSpanStartTime) span.SetEndTimestamp(defaultSpanEndTme) - pdata.NewAttributeMapFromMap(initialAttributes).CopyTo(span.Attributes()) + pdata.NewMapFromRaw(initialAttributes).CopyTo(span.Attributes()) return span } // Returns a default server span -func getServerSpan(spanName string, initialAttributes map[string]pdata.Value) pdata.Span { +func getServerSpan(spanName string, initialAttributes map[string]interface{}) pdata.Span { return getSpan(spanName, pdata.SpanKindServer, initialAttributes) } // Returns a default client span -func getClientSpan(spanName string, initialAttributes map[string]pdata.Value) pdata.Span { +func getClientSpan(spanName string, initialAttributes map[string]interface{}) pdata.Span { return getSpan(spanName, pdata.SpanKindClient, initialAttributes) } // Returns a default consumer span -func getConsumerSpan(spanName string, initialAttributes map[string]pdata.Value) pdata.Span { +func getConsumerSpan(spanName string, initialAttributes map[string]interface{}) pdata.Span { return getSpan(spanName, pdata.SpanKindConsumer, initialAttributes) } // Returns a default producer span -func getProducerSpan(spanName string, initialAttributes map[string]pdata.Value) pdata.Span { +func getProducerSpan(spanName string, initialAttributes map[string]interface{}) pdata.Span { return getSpan(spanName, pdata.SpanKindProducer, initialAttributes) } // Returns a default internal span -func getInternalSpan(spanName string, initialAttributes map[string]pdata.Value) pdata.Span { +func getInternalSpan(spanName string, initialAttributes map[string]interface{}) pdata.Span { return getSpan(spanName, pdata.SpanKindInternal, initialAttributes) } @@ -841,7 +839,7 @@ func getDefaultMessagingProducerSpan() pdata.Span { func getDefaultInternalSpan() pdata.Span { return getInternalSpan( defaultInternalSpanName, - map[string]pdata.Value{}) + map[string]interface{}{}) } // Returns a default Resource @@ -862,10 +860,11 @@ func getInstrumentationLibrary() pdata.InstrumentationLibrary { } // Adds a map of AttributeValues to an existing AttributeMap -func appendToAttributeMap(attributeMap pdata.AttributeMap, maps ...map[string]pdata.Value) { +func appendToAttributeMap(attributeMap pdata.Map, maps ...pdata.Map) { for _, m := range maps { - for k, v := range m { + m.Range(func(k string, v pdata.Value) bool { attributeMap.Upsert(k, v) - } + return true + }) } } diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index e6017edac232..de7b0f7f39bc 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/protobuf v1.27.1 ) @@ -29,9 +29,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 106a56e51a83..c03e0f2202f2 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -186,23 +186,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/clickhouseexporter/exporter.go b/exporter/clickhouseexporter/exporter.go index 1dee250cb71e..f78256e5e98b 100644 --- a/exporter/clickhouseexporter/exporter.go +++ b/exporter/clickhouseexporter/exporter.go @@ -108,7 +108,7 @@ func (e *clickhouseExporter) pushLogsData(ctx context.Context, ld pdata.Logs) er return err } -func attributesToSlice(attributes pdata.AttributeMap) ([]string, []string) { +func attributesToSlice(attributes pdata.Map) ([]string, []string) { keys := make([]string, 0, attributes.Len()) values := make([]string, 0, attributes.Len()) attributes.Range(func(k string, v pdata.Value) bool { diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index 36af0fe9633c..118e5f52af52 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickh go 1.17 require ( - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -34,9 +34,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index bcf6a4562a15..06494ba7e6a8 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -177,23 +177,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 02b1b86aee91..4846fa84f57e 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -4,13 +4,13 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d ) require ( github.com/coralogix/opentelemetry-cx-protobuf-api/coralogixpb v0.0.0-20211201100428-d2a5d0ecf53e github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 ) @@ -40,10 +40,10 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index eb63eb021cc3..05535c061bef 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -220,24 +220,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= @@ -345,7 +345,6 @@ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index c886e5a83c5a..e41a8da4b9f8 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -131,7 +131,7 @@ func (f *factory) createMetricsExporter( pushMetricsFn = func(_ context.Context, md pdata.Metrics) error { // only sending metadata use only metrics f.onceMetadata.Do(func() { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() if md.ResourceMetrics().Len() > 0 { attrs = md.ResourceMetrics().At(0).Resource().Attributes() } @@ -194,7 +194,7 @@ func (f *factory) createTracesExporter( pushTracesFn = func(_ context.Context, td pdata.Traces) error { // only sending metadata, use only attributes f.onceMetadata.Do(func() { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() if td.ResourceSpans().Len() > 0 { attrs = td.ResourceSpans().At(0).Resource().Attributes() } diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 836aa2a3d7d8..f61502af8922 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -13,8 +13,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 gopkg.in/DataDog/dd-trace-go.v1 v1.37.0 @@ -48,9 +48,9 @@ require ( github.com/tinylib/msgp v1.1.2 // indirect github.com/zorkian/go-datadog-api v2.30.0+incompatible // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 22350d5e5ca0..ee01a5c7de15 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -790,24 +790,24 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/datadogexporter/internal/metadata/metadata.go b/exporter/datadogexporter/internal/metadata/metadata.go index 0e4ed319f708..e3687529ebf9 100644 --- a/exporter/datadogexporter/internal/metadata/metadata.go +++ b/exporter/datadogexporter/internal/metadata/metadata.go @@ -92,7 +92,7 @@ type Meta struct { // metadataFromAttributes gets metadata info from attributes following // OpenTelemetry semantic conventions -func metadataFromAttributes(attrs pdata.AttributeMap) *HostMetadata { +func metadataFromAttributes(attrs pdata.Map) *HostMetadata { hm := &HostMetadata{Meta: &Meta{}, Tags: &HostTags{}} if hostname, ok := attributes.HostnameFromAttributes(attrs); ok { @@ -196,7 +196,7 @@ func pushMetadataWithRetry(retrier *utils.Retrier, params component.ExporterCrea } // Pusher pushes host metadata payloads periodically to Datadog intake -func Pusher(ctx context.Context, params component.ExporterCreateSettings, pcfg PusherConfig, attrs pdata.AttributeMap) { +func Pusher(ctx context.Context, params component.ExporterCreateSettings, pcfg PusherConfig, attrs pdata.Map) { // Push metadata every 30 minutes ticker := time.NewTicker(30 * time.Minute) defer ticker.Stop() diff --git a/exporter/datadogexporter/internal/model/attributes/attributes.go b/exporter/datadogexporter/internal/model/attributes/attributes.go index 6d2081a5c3b1..1a19b70809d6 100644 --- a/exporter/datadogexporter/internal/model/attributes/attributes.go +++ b/exporter/datadogexporter/internal/model/attributes/attributes.go @@ -118,7 +118,7 @@ var ( // TagsFromAttributes converts a selected list of attributes // to a tag list that can be added to metrics. -func TagsFromAttributes(attrs pdata.AttributeMap) []string { +func TagsFromAttributes(attrs pdata.Map) []string { tags := make([]string, 0, attrs.Len()) var processAttributes processAttributes @@ -165,7 +165,7 @@ func TagsFromAttributes(attrs pdata.AttributeMap) []string { // OriginIDFromAttributes gets the origin IDs from resource attributes. // If not found, an empty string is returned for each of them. -func OriginIDFromAttributes(attrs pdata.AttributeMap) (originID string) { +func OriginIDFromAttributes(attrs pdata.Map) (originID string) { // originID is always empty. Container ID is preferred over Kubernetes pod UID. // Prefixes come from pkg/util/kubernetes/kubelet and pkg/util/containers. if containerID, ok := attrs.Get(conventions.AttributeContainerID); ok { @@ -177,7 +177,7 @@ func OriginIDFromAttributes(attrs pdata.AttributeMap) (originID string) { } // RunningTagsFromAttributes gets tags used for running metrics from attributes. -func RunningTagsFromAttributes(attrs pdata.AttributeMap) []string { +func RunningTagsFromAttributes(attrs pdata.Map) []string { tags := make([]string, 0, 1) for _, key := range runningTagsAttributes { if val, ok := attrs.Get(key); ok { diff --git a/exporter/datadogexporter/internal/model/attributes/attributes_test.go b/exporter/datadogexporter/internal/model/attributes/attributes_test.go index 4620d70bb820..d270989d3a04 100644 --- a/exporter/datadogexporter/internal/model/attributes/attributes_test.go +++ b/exporter/datadogexporter/internal/model/attributes/attributes_test.go @@ -24,19 +24,19 @@ import ( ) func TestTagsFromAttributes(t *testing.T) { - attributeMap := map[string]pdata.Value{ - conventions.AttributeProcessExecutableName: pdata.NewValueString("otelcol"), - conventions.AttributeProcessExecutablePath: pdata.NewValueString("/usr/bin/cmd/otelcol"), - conventions.AttributeProcessCommand: pdata.NewValueString("cmd/otelcol"), - conventions.AttributeProcessCommandLine: pdata.NewValueString("cmd/otelcol --config=\"/path/to/config.yaml\""), - conventions.AttributeProcessPID: pdata.NewValueInt(1), - conventions.AttributeProcessOwner: pdata.NewValueString("root"), - conventions.AttributeOSType: pdata.NewValueString("linux"), - conventions.AttributeK8SDaemonSetName: pdata.NewValueString("daemon_set_name"), - conventions.AttributeAWSECSClusterARN: pdata.NewValueString("cluster_arn"), - "tags.datadoghq.com/service": pdata.NewValueString("service_name"), + attributeMap := map[string]interface{}{ + conventions.AttributeProcessExecutableName: "otelcol", + conventions.AttributeProcessExecutablePath: "/usr/bin/cmd/otelcol", + conventions.AttributeProcessCommand: "cmd/otelcol", + conventions.AttributeProcessCommandLine: "cmd/otelcol --config=\"/path/to/config.yaml\"", + conventions.AttributeProcessPID: 1, + conventions.AttributeProcessOwner: "root", + conventions.AttributeOSType: "linux", + conventions.AttributeK8SDaemonSetName: "daemon_set_name", + conventions.AttributeAWSECSClusterARN: "cluster_arn", + "tags.datadoghq.com/service": "service_name", } - attrs := pdata.NewAttributeMapFromMap(attributeMap) + attrs := pdata.NewMapFromRaw(attributeMap) assert.ElementsMatch(t, []string{ fmt.Sprintf("%s:%s", conventions.AttributeProcessExecutableName, "otelcol"), @@ -48,7 +48,7 @@ func TestTagsFromAttributes(t *testing.T) { } func TestTagsFromAttributesEmpty(t *testing.T) { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() assert.Equal(t, []string{}, TagsFromAttributes(attrs)) } @@ -85,34 +85,34 @@ func TestContainerTagFromAttributesEmpty(t *testing.T) { func TestOriginIDFromAttributes(t *testing.T) { tests := []struct { name string - attrs pdata.AttributeMap + attrs pdata.Map originID string }{ { name: "pod UID and container ID", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeContainerID: pdata.NewValueString("container_id_goes_here"), - conventions.AttributeK8SPodUID: pdata.NewValueString("k8s_pod_uid_goes_here"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeContainerID: "container_id_goes_here", + conventions.AttributeK8SPodUID: "k8s_pod_uid_goes_here", }), originID: "container_id://container_id_goes_here", }, { name: "only container ID", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeContainerID: pdata.NewValueString("container_id_goes_here"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeContainerID: "container_id_goes_here", }), originID: "container_id://container_id_goes_here", }, { name: "only pod UID", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeK8SPodUID: pdata.NewValueString("k8s_pod_uid_goes_here"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeK8SPodUID: "k8s_pod_uid_goes_here", }), originID: "kubernetes_pod_uid://k8s_pod_uid_goes_here", }, { name: "none", - attrs: pdata.NewAttributeMap(), + attrs: pdata.NewMap(), }, } diff --git a/exporter/datadogexporter/internal/model/attributes/azure/azure.go b/exporter/datadogexporter/internal/model/attributes/azure/azure.go index 36f4de6482bb..b6545ad0d73a 100644 --- a/exporter/datadogexporter/internal/model/attributes/azure/azure.go +++ b/exporter/datadogexporter/internal/model/attributes/azure/azure.go @@ -33,7 +33,7 @@ type HostInfo struct { // HostInfoFromAttributes gets Azure host info from attributes following // OpenTelemetry semantic conventions -func HostInfoFromAttributes(attrs pdata.AttributeMap) (hostInfo *HostInfo) { +func HostInfoFromAttributes(attrs pdata.Map) (hostInfo *HostInfo) { hostInfo = &HostInfo{} // Add Azure VM ID as a host alias if available for compatibility with Azure integration @@ -45,7 +45,7 @@ func HostInfoFromAttributes(attrs pdata.AttributeMap) (hostInfo *HostInfo) { } // HostnameFromAttributes gets the Azure hostname from attributes -func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { +func HostnameFromAttributes(attrs pdata.Map) (string, bool) { if hostname, ok := attrs.Get(conventions.AttributeHostName); ok { return hostname.StringVal(), true } @@ -54,7 +54,7 @@ func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { } // ClusterNameFromAttributes gets the Azure cluster name from attributes -func ClusterNameFromAttributes(attrs pdata.AttributeMap) (string, bool) { +func ClusterNameFromAttributes(attrs pdata.Map) (string, bool) { // Get cluster name from resource group from pkg/util/cloudprovider/azure:GetClusterName if resourceGroup, ok := attrs.Get(AttributeResourceGroupName); ok { splitAll := strings.Split(resourceGroup.StringVal(), "_") diff --git a/exporter/datadogexporter/internal/model/attributes/ec2/ec2.go b/exporter/datadogexporter/internal/model/attributes/ec2/ec2.go index b92dbca49b95..e636f852d596 100644 --- a/exporter/datadogexporter/internal/model/attributes/ec2/ec2.go +++ b/exporter/datadogexporter/internal/model/attributes/ec2/ec2.go @@ -48,7 +48,7 @@ func isDefaultHostname(hostname string) bool { // HostnameFromAttributes gets a valid hostname from labels // if available -func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { +func HostnameFromAttributes(attrs pdata.Map) (string, bool) { hostName, ok := attrs.Get(conventions.AttributeHostName) if ok && !isDefaultHostname(hostName.StringVal()) { return hostName.StringVal(), true @@ -63,7 +63,7 @@ func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { // HostInfoFromAttributes gets EC2 host info from attributes following // OpenTelemetry semantic conventions -func HostInfoFromAttributes(attrs pdata.AttributeMap) (hostInfo *HostInfo) { +func HostInfoFromAttributes(attrs pdata.Map) (hostInfo *HostInfo) { hostInfo = &HostInfo{} if hostID, ok := attrs.Get(conventions.AttributeHostID); ok { @@ -86,7 +86,7 @@ func HostInfoFromAttributes(attrs pdata.AttributeMap) (hostInfo *HostInfo) { } // ClusterNameFromAttributes gets the AWS cluster name from attributes -func ClusterNameFromAttributes(attrs pdata.AttributeMap) (clusterName string, ok bool) { +func ClusterNameFromAttributes(attrs pdata.Map) (clusterName string, ok bool) { // Get cluster name from tag keys // https://github.com/DataDog/datadog-agent/blob/1c94b11/pkg/util/ec2/ec2.go#L238 attrs.Range(func(k string, _ pdata.Value) bool { diff --git a/exporter/datadogexporter/internal/model/attributes/gcp/gcp.go b/exporter/datadogexporter/internal/model/attributes/gcp/gcp.go index 5993f7e7a028..460946a03f0b 100644 --- a/exporter/datadogexporter/internal/model/attributes/gcp/gcp.go +++ b/exporter/datadogexporter/internal/model/attributes/gcp/gcp.go @@ -29,7 +29,7 @@ type HostInfo struct { // HostnameFromAttributes gets a valid hostname from labels // if available -func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { +func HostnameFromAttributes(attrs pdata.Map) (string, bool) { if hostName, ok := attrs.Get(conventions.AttributeHostName); ok { return hostName.StringVal(), true } @@ -39,7 +39,7 @@ func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { // HostInfoFromAttributes gets GCP host info from attributes following // OpenTelemetry semantic conventions -func HostInfoFromAttributes(attrs pdata.AttributeMap) (hostInfo *HostInfo) { +func HostInfoFromAttributes(attrs pdata.Map) (hostInfo *HostInfo) { hostInfo = &HostInfo{} if hostID, ok := attrs.Get(conventions.AttributeHostID); ok { diff --git a/exporter/datadogexporter/internal/model/attributes/hostname.go b/exporter/datadogexporter/internal/model/attributes/hostname.go index d99455616af1..4188a09d4857 100644 --- a/exporter/datadogexporter/internal/model/attributes/hostname.go +++ b/exporter/datadogexporter/internal/model/attributes/hostname.go @@ -30,7 +30,7 @@ const ( AttributeK8sNodeName = "k8s.node.name" ) -func getClusterName(attrs pdata.AttributeMap) (string, bool) { +func getClusterName(attrs pdata.Map) (string, bool) { if k8sClusterName, ok := attrs.Get(conventions.AttributeK8SClusterName); ok { return k8sClusterName.StringVal(), true } @@ -55,7 +55,7 @@ func getClusterName(attrs pdata.AttributeMap) (string, bool) { // 6. the host.name attribute. // // It returns a boolean value indicated if any name was found -func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { +func HostnameFromAttributes(attrs pdata.Map) (string, bool) { // Check if the host is localhost or 0.0.0.0, if so discard it. // We don't do the more strict validation done for metadata, // to avoid breaking users existing invalid-but-accepted hostnames. @@ -75,7 +75,7 @@ func HostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { return candidateHost, ok } -func unsanitizedHostnameFromAttributes(attrs pdata.AttributeMap) (string, bool) { +func unsanitizedHostnameFromAttributes(attrs pdata.Map) (string, bool) { // Custom hostname: useful for overriding in k8s/cloud envs if customHostname, ok := attrs.Get(AttributeDatadogHostname); ok { return customHostname.StringVal(), true diff --git a/exporter/datadogexporter/internal/model/internal/testutils/test_utils.go b/exporter/datadogexporter/internal/model/internal/testutils/test_utils.go index 7cc31ef27fa3..31fba0a6eabe 100644 --- a/exporter/datadogexporter/internal/model/internal/testutils/test_utils.go +++ b/exporter/datadogexporter/internal/model/internal/testutils/test_utils.go @@ -16,7 +16,7 @@ package testutils // import "github.com/open-telemetry/opentelemetry-collector-c import "go.opentelemetry.io/collector/model/pdata" -func fillAttributeMap(attrs pdata.AttributeMap, mp map[string]string) { +func fillAttributeMap(attrs pdata.Map, mp map[string]string) { attrs.Clear() attrs.EnsureCapacity(len(mp)) for k, v := range mp { @@ -26,8 +26,8 @@ func fillAttributeMap(attrs pdata.AttributeMap, mp map[string]string) { // NewAttributeMap creates a new attribute map (string only) // from a Go map -func NewAttributeMap(mp map[string]string) pdata.AttributeMap { - attrs := pdata.NewAttributeMap() +func NewAttributeMap(mp map[string]string) pdata.Map { + attrs := pdata.NewMap() fillAttributeMap(attrs, mp) return attrs } diff --git a/exporter/datadogexporter/internal/model/translator/dimensions.go b/exporter/datadogexporter/internal/model/translator/dimensions.go index ef22c154bfed..2646ea6a7c68 100644 --- a/exporter/datadogexporter/internal/model/translator/dimensions.go +++ b/exporter/datadogexporter/internal/model/translator/dimensions.go @@ -58,7 +58,7 @@ func (d *Dimensions) OriginID() string { } // getTags maps an attributeMap into a slice of Datadog tags -func getTags(labels pdata.AttributeMap) []string { +func getTags(labels pdata.Map) []string { tags := make([]string, 0, labels.Len()) labels.Range(func(key string, value pdata.Value) bool { v := value.AsString() @@ -83,7 +83,7 @@ func (d *Dimensions) AddTags(tags ...string) *Dimensions { } // WithAttributeMap creates a new metricDimensions struct with additional tags from attributes. -func (d *Dimensions) WithAttributeMap(labels pdata.AttributeMap) *Dimensions { +func (d *Dimensions) WithAttributeMap(labels pdata.Map) *Dimensions { return d.AddTags(getTags(labels)...) } diff --git a/exporter/datadogexporter/internal/model/translator/dimensions_test.go b/exporter/datadogexporter/internal/model/translator/dimensions_test.go index 0ba6ff7840d6..fe0a396f5f4c 100644 --- a/exporter/datadogexporter/internal/model/translator/dimensions_test.go +++ b/exporter/datadogexporter/internal/model/translator/dimensions_test.go @@ -22,10 +22,10 @@ import ( ) func TestWithAttributeMap(t *testing.T) { - attributes := pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "key1": pdata.NewValueString("val1"), - "key2": pdata.NewValueString("val2"), - "key3": pdata.NewValueString(""), + attributes := pdata.NewMapFromRaw(map[string]interface{}{ + "key1": "val1", + "key2": "val2", + "key3": "", }) dims := Dimensions{} @@ -110,8 +110,8 @@ func TestAllFieldsAreCopied(t *testing.T) { newDims := dims. AddTags("tagThree:c"). WithSuffix("suffix"). - WithAttributeMap(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "tagFour": pdata.NewValueString("d"), + WithAttributeMap(pdata.NewMapFromRaw(map[string]interface{}{ + "tagFour": "d", })) assert.Equal(t, "example.name.suffix", newDims.Name()) diff --git a/exporter/datadogexporter/internal/testutils/test_utils.go b/exporter/datadogexporter/internal/testutils/test_utils.go index 46a92e5cd077..595ed70db47b 100644 --- a/exporter/datadogexporter/internal/testutils/test_utils.go +++ b/exporter/datadogexporter/internal/testutils/test_utils.go @@ -85,7 +85,7 @@ func newMetadataEndpoint(c chan []byte) func(http.ResponseWriter, *http.Request) } } -func fillAttributeMap(attrs pdata.AttributeMap, mp map[string]string) { +func fillAttributeMap(attrs pdata.Map, mp map[string]string) { attrs.Clear() attrs.EnsureCapacity(len(mp)) for k, v := range mp { @@ -95,8 +95,8 @@ func fillAttributeMap(attrs pdata.AttributeMap, mp map[string]string) { // NewAttributeMap creates a new attribute map (string only) // from a Go map -func NewAttributeMap(mp map[string]string) pdata.AttributeMap { - attrs := pdata.NewAttributeMap() +func NewAttributeMap(mp map[string]string) pdata.Map { + attrs := pdata.NewMap() fillAttributeMap(attrs, mp) return attrs } diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 675155179c20..e24670d3957c 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -161,7 +161,7 @@ func (exp *metricsExporter) PushMetricsData(ctx context.Context, md pdata.Metric // the first payload. if exp.cfg.SendMetadata { exp.onceMetadata.Do(func() { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() if md.ResourceMetrics().Len() > 0 { attrs = md.ResourceMetrics().At(0).Resource().Attributes() } diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index af5e71f976b1..6f2be901d1b2 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -118,7 +118,7 @@ func (exp *traceExporter) pushTraceData( // the first payload. if exp.cfg.SendMetadata { exp.onceMetadata.Do(func() { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() if td.ResourceSpans().Len() > 0 { attrs = td.ResourceSpans().At(0).Resource().Attributes() } diff --git a/exporter/datadogexporter/translate_traces_test.go b/exporter/datadogexporter/translate_traces_test.go index c8367ec28eea..041cba11beb1 100644 --- a/exporter/datadogexporter/translate_traces_test.go +++ b/exporter/datadogexporter/translate_traces_test.go @@ -95,18 +95,18 @@ func NewResourceSpansData(mockTraceID [16]byte, mockSpanID [8]byte, mockParentSp evt.SetTimestamp(pdataEndTime) evt.SetName("end") evt.Attributes().InsertBool("flag", false) - attribs := map[string]pdata.Value{ - "cache_hit": pdata.NewValueBool(true), - "timeout_ns": pdata.NewValueInt(12e9), - "ping_count": pdata.NewValueInt(25), - "agent": pdata.NewValueString("ocagent"), + attribs := map[string]interface{}{ + "cache_hit": true, + "timeout_ns": 12e9, + "ping_count": 25, + "agent": "ocagent", } if statusCode == pdata.StatusCodeError { - attribs["http.status_code"] = pdata.NewValueString("501") + attribs["http.status_code"] = "501" } - pdata.NewAttributeMapFromMap(attribs).CopyTo(span.Attributes()) + pdata.NewMapFromRaw(attribs).CopyTo(span.Attributes()) resource := rs.Resource() @@ -479,10 +479,10 @@ func TestTracesTranslationErrorsFromEventsUsesLast(t *testing.T) { mockSpanID := [8]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8} mockParentSpanID := [8]byte{0xEF, 0xEE, 0xED, 0xEC, 0xEB, 0xEA, 0xE9, 0xE8} - attribs := map[string]pdata.Value{ - conventions.AttributeExceptionType: pdata.NewValueString("HttpError"), - conventions.AttributeExceptionStacktrace: pdata.NewValueString("HttpError at line 67\nthing at line 45"), - conventions.AttributeExceptionMessage: pdata.NewValueString("HttpError error occurred"), + attribs := map[string]interface{}{ + conventions.AttributeExceptionType: "HttpError", + conventions.AttributeExceptionStacktrace: "HttpError at line 67\nthing at line 45", + conventions.AttributeExceptionMessage: "HttpError error occurred", } mockEndTime := time.Now().Round(time.Second) @@ -503,7 +503,7 @@ func TestTracesTranslationErrorsFromEventsUsesLast(t *testing.T) { event = events.AppendEmpty() event.SetName(AttributeExceptionEventName) - pdata.NewAttributeMapFromMap(attribs).CopyTo(event.Attributes()) + pdata.NewMapFromRaw(attribs).CopyTo(event.Attributes()) event = events.AppendEmpty() event.SetName("end") @@ -519,13 +519,14 @@ func TestTracesTranslationErrorsFromEventsUsesLast(t *testing.T) { datadogPayload := resourceSpansToDatadogSpans(rs, hostname, &cfg, denylister, map[string]string{}) // Ensure the error type is copied over from the last error event logged - assert.Equal(t, attribs[conventions.AttributeExceptionType].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorType]) + assert.Equal(t, attribs[conventions.AttributeExceptionType].(string), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorType]) // Ensure the stack trace is copied over from the last error event logged - assert.Equal(t, attribs[conventions.AttributeExceptionStacktrace].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorStack]) + assert.Equal(t, attribs[conventions.AttributeExceptionStacktrace].(string), + datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorStack]) // Ensure the error message is copied over from the last error event logged - assert.Equal(t, attribs[conventions.AttributeExceptionMessage].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorMsg]) + assert.Equal(t, attribs[conventions.AttributeExceptionMessage].(string), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorMsg]) } // Ensures that if the first or last event in the list is the error, that translation still behaves properly @@ -548,15 +549,15 @@ func TestTracesTranslationErrorsFromEventsBounds(t *testing.T) { events.EnsureCapacity(3) // Start with the error as the first element in the list... - attribs := map[string]pdata.Value{ - conventions.AttributeExceptionType: pdata.NewValueString("HttpError"), - conventions.AttributeExceptionStacktrace: pdata.NewValueString("HttpError at line 67\nthing at line 45"), - conventions.AttributeExceptionMessage: pdata.NewValueString("HttpError error occurred"), + attribs := map[string]interface{}{ + conventions.AttributeExceptionType: "HttpError", + conventions.AttributeExceptionStacktrace: "HttpError at line 67\nthing at line 45", + conventions.AttributeExceptionMessage: "HttpError error occurred", } evt := events.AppendEmpty() evt.SetName(AttributeExceptionEventName) - pdata.NewAttributeMapFromMap(attribs).CopyTo(evt.Attributes()) + pdata.NewMapFromRaw(attribs).CopyTo(evt.Attributes()) evt = events.AppendEmpty() evt.SetName("start") @@ -575,33 +576,34 @@ func TestTracesTranslationErrorsFromEventsBounds(t *testing.T) { datadogPayload := resourceSpansToDatadogSpans(rs, hostname, &cfg, denylister, map[string]string{}) // Ensure the error type is copied over - assert.Equal(t, attribs[conventions.AttributeExceptionType].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorType]) + assert.Equal(t, attribs[conventions.AttributeExceptionType].(string), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorType]) // Ensure the stack trace is copied over - assert.Equal(t, attribs[conventions.AttributeExceptionStacktrace].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorStack]) + assert.Equal(t, attribs[conventions.AttributeExceptionStacktrace].(string), + datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorStack]) // Ensure the error message is copied over - assert.Equal(t, attribs[conventions.AttributeExceptionMessage].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorMsg]) + assert.Equal(t, attribs[conventions.AttributeExceptionMessage].(string), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorMsg]) // Now with the error event at the end of the list... events.At(0).SetName("start") // Reset the attributes - pdata.NewAttributeMap().CopyTo(events.At(0).Attributes()) + pdata.NewMap().CopyTo(events.At(0).Attributes()) events.At(1).SetName("end") events.At(1).Attributes().InsertBool("flag", false) events.At(2).SetName(AttributeExceptionEventName) - pdata.NewAttributeMapFromMap(attribs).CopyTo(events.At(2).Attributes()) + pdata.NewMapFromRaw(attribs).CopyTo(events.At(2).Attributes()) // Ensure the error type is copied over - assert.Equal(t, attribs[conventions.AttributeExceptionType].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorType]) + assert.Equal(t, attribs[conventions.AttributeExceptionType].(string), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorType]) // Ensure the stack trace is copied over - assert.Equal(t, attribs[conventions.AttributeExceptionStacktrace].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorStack]) + assert.Equal(t, attribs[conventions.AttributeExceptionStacktrace].(string), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorStack]) // Ensure the error message is copied over - assert.Equal(t, attribs[conventions.AttributeExceptionMessage].StringVal(), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorMsg]) + assert.Equal(t, attribs[conventions.AttributeExceptionMessage].(string), datadogPayload.Traces[0].Spans[0].Meta[ext.ErrorMsg]) } func TestTracesTranslationOkStatus(t *testing.T) { @@ -1555,11 +1557,11 @@ func TestSpanRateLimitTag(t *testing.T) { instrumentationLibrary.SetVersion("v1") span := ilss.Spans().AppendEmpty() - attribs := map[string]pdata.Value{ - "_sample_rate": pdata.NewValueString("0.5"), + attribs := map[string]interface{}{ + "_sample_rate": "0.5", } - pdata.NewAttributeMapFromMap(attribs).CopyTo(span.Attributes()) + pdata.NewMapFromRaw(attribs).CopyTo(span.Attributes()) traceID := pdata.NewTraceID(mockTraceID) spanID := pdata.NewSpanID(mockSpanID) diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index f1456b72262c..fc8a92e6c1ef 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -32,10 +32,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 464b32778638..928e4ddafe51 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -182,24 +182,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/dynatraceexporter/serialization/serialization.go b/exporter/dynatraceexporter/serialization/serialization.go index 95fa0f42273c..68b1ca704c08 100644 --- a/exporter/dynatraceexporter/serialization/serialization.go +++ b/exporter/dynatraceexporter/serialization/serialization.go @@ -105,7 +105,7 @@ func SerializeMetric(logger *zap.Logger, prefix string, metric pdata.Metric, def return metricLines, nil } -func makeCombinedDimensions(labels pdata.AttributeMap, defaultDimensions, staticDimensions dimensions.NormalizedDimensionList) dimensions.NormalizedDimensionList { +func makeCombinedDimensions(labels pdata.Map, defaultDimensions, staticDimensions dimensions.NormalizedDimensionList) dimensions.NormalizedDimensionList { dimsFromLabels := []dimensions.Dimension{} labels.Range(func(k string, v pdata.Value) bool { diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index 8f3b09679184..78e46e1aaf69 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.7.1 go.elastic.co/apm v1.15.0 go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -39,10 +39,10 @@ require ( github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.4.1 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/mod v0.5.1 // indirect diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index 58aa82307435..ea3ef2a0019e 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -189,24 +189,24 @@ go.elastic.co/fastjson v1.1.0 h1:3MrGBWWVIxe/xvsbpghtkFoPciPhOCmjsR/HfwEeQR4= go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/elasticexporter/internal/translator/elastic/metadata_test.go b/exporter/elasticexporter/internal/translator/elastic/metadata_test.go index 588c0651960e..3b553508199f 100644 --- a/exporter/elasticexporter/internal/translator/elastic/metadata_test.go +++ b/exporter/elasticexporter/internal/translator/elastic/metadata_test.go @@ -41,24 +41,24 @@ func TestMetadataDefaults(t *testing.T) { } func TestMetadataServiceName(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "service.name": pdata.NewValueString("foo"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "service.name": "foo", }) out := metadataWithResource(t, resource) assert.Equal(t, "foo", out.service.Name) } func TestMetadataServiceVersion(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "service.version": pdata.NewValueString("1.2.3"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "service.version": "1.2.3", }) out := metadataWithResource(t, resource) assert.Equal(t, "1.2.3", out.service.Version) } func TestMetadataServiceInstance(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "service.instance.id": pdata.NewValueString("foo-1"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "service.instance.id": "foo-1", }) out := metadataWithResource(t, resource) assert.Equal(t, &model.ServiceNode{ @@ -67,24 +67,24 @@ func TestMetadataServiceInstance(t *testing.T) { } func TestMetadataServiceEnvironment(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "deployment.environment": pdata.NewValueString("foo"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "deployment.environment": "foo", }) out := metadataWithResource(t, resource) assert.Equal(t, "foo", out.service.Environment) } func TestMetadataSystemHostname(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "host.name": pdata.NewValueString("foo"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "host.name": "foo", }) out := metadataWithResource(t, resource) assert.Equal(t, "foo", out.system.Hostname) } func TestMetadataServiceLanguageName(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "telemetry.sdk.language": pdata.NewValueString("java"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "telemetry.sdk.language": "java", }) out := metadataWithResource(t, resource) assert.Equal(t, "java", out.service.Language.Name) @@ -92,9 +92,9 @@ func TestMetadataServiceLanguageName(t *testing.T) { } func TestMetadataAgentName(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "telemetry.sdk.name": pdata.NewValueString("foo"), - "telemetry.sdk.version": pdata.NewValueString("bar"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "telemetry.sdk.name": "foo", + "telemetry.sdk.version": "bar", }) out := metadataWithResource(t, resource) assert.Equal(t, &model.Agent{ @@ -104,13 +104,13 @@ func TestMetadataAgentName(t *testing.T) { } func TestMetadataLabels(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "string": pdata.NewValueString("abc"), - "int": pdata.NewValueInt(123), - "double": pdata.NewValueDouble(123.456), - "bool": pdata.NewValueBool(true), + resource := resourceFromAttributesMap(map[string]interface{}{ + "string": "abc", + "int": 123, + "double": 123.456, + "bool": true, // well known resource label, not carried across - conventions.AttributeServiceVersion: pdata.NewValueString("..."), + conventions.AttributeServiceVersion: "...", }) out := metadataWithResource(t, resource) assert.Equal(t, model.IfaceMap{ @@ -122,10 +122,10 @@ func TestMetadataLabels(t *testing.T) { } func TestMetadataKubernetes(t *testing.T) { - resource := resourceFromAttributesMap(map[string]pdata.Value{ - "k8s.namespace.name": pdata.NewValueString("namespace_name"), - "k8s.pod.name": pdata.NewValueString("pod_name"), - "k8s.pod.uid": pdata.NewValueString("pod_uid"), + resource := resourceFromAttributesMap(map[string]interface{}{ + "k8s.namespace.name": "namespace_name", + "k8s.pod.name": "pod_name", + "k8s.pod.uid": "pod_uid", }) out := metadataWithResource(t, resource) assert.Equal(t, &model.Kubernetes{ @@ -137,9 +137,9 @@ func TestMetadataKubernetes(t *testing.T) { }, out.system.Kubernetes) } -func resourceFromAttributesMap(attrs map[string]pdata.Value) pdata.Resource { +func resourceFromAttributesMap(attrs map[string]interface{}) pdata.Resource { resource := pdata.NewResource() - pdata.NewAttributeMapFromMap(attrs).CopyTo(resource.Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(resource.Attributes()) return resource } diff --git a/exporter/elasticexporter/internal/translator/elastic/metrics.go b/exporter/elasticexporter/internal/translator/elastic/metrics.go index 8e0e63c394d2..06813c743d17 100644 --- a/exporter/elasticexporter/internal/translator/elastic/metrics.go +++ b/exporter/elasticexporter/internal/translator/elastic/metrics.go @@ -101,7 +101,7 @@ func asTime(in pdata.Timestamp) model.Time { return model.Time(time.Unix(0, int64(in))) } -func asStringMap(in pdata.AttributeMap) model.StringMap { +func asStringMap(in pdata.Map) model.StringMap { var out model.StringMap in.Sort() in.Range(func(k string, v pdata.Value) bool { diff --git a/exporter/elasticexporter/internal/translator/elastic/traces_test.go b/exporter/elasticexporter/internal/translator/elastic/traces_test.go index 397dbfaead57..b459444b28bf 100644 --- a/exporter/elasticexporter/internal/translator/elastic/traces_test.go +++ b/exporter/elasticexporter/internal/translator/elastic/traces_test.go @@ -193,66 +193,66 @@ func TestEncodeSpanTruncation(t *testing.T) { } func TestTransactionHTTPRequestURL(t *testing.T) { - test := func(t *testing.T, expectedFull string, attrs map[string]pdata.Value) { + test := func(t *testing.T, expectedFull string, attrs map[string]interface{}) { transaction := transactionWithAttributes(t, attrs) assert.Equal(t, expectedFull, transaction.Context.Request.URL.Full) } t.Run("scheme_host_target", func(t *testing.T) { - test(t, "https://testing.invalid:80/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "http.host": pdata.NewValueString("testing.invalid:80"), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://testing.invalid:80/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "http.host": "testing.invalid:80", + "http.target": "/foo?bar", }) }) t.Run("scheme_servername_nethostport_target", func(t *testing.T) { - test(t, "https://testing.invalid:80/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "http.server_name": pdata.NewValueString("testing.invalid"), - "net.host.port": pdata.NewValueInt(80), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://testing.invalid:80/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "http.server_name": "testing.invalid", + "net.host.port": 80, + "http.target": "/foo?bar", }) }) t.Run("scheme_nethostname_nethostport_target", func(t *testing.T) { - test(t, "https://testing.invalid:80/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "net.host.name": pdata.NewValueString("testing.invalid"), - "net.host.port": pdata.NewValueInt(80), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://testing.invalid:80/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "net.host.name": "testing.invalid", + "net.host.port": 80, + "http.target": "/foo?bar", }) }) t.Run("http.url", func(t *testing.T) { const httpURL = "https://testing.invalid:80/foo?bar" - test(t, httpURL, map[string]pdata.Value{ - "http.url": pdata.NewValueString(httpURL), + test(t, httpURL, map[string]interface{}{ + "http.url": httpURL, }) }) t.Run("host_no_port", func(t *testing.T) { - test(t, "https://testing.invalid/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "http.host": pdata.NewValueString("testing.invalid"), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://testing.invalid/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "http.host": "testing.invalid", + "http.target": "/foo?bar", }) }) t.Run("ipv6_host_no_port", func(t *testing.T) { - test(t, "https://[::1]/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "http.host": pdata.NewValueString("[::1]"), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://[::1]/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "http.host": "[::1]", + "http.target": "/foo?bar", }) }) // Scheme is set to "http" if it can't be deduced from attributes. t.Run("default_scheme", func(t *testing.T) { - test(t, "http://testing.invalid:80/foo?bar", map[string]pdata.Value{ - "http.host": pdata.NewValueString("testing.invalid:80"), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "http://testing.invalid:80/foo?bar", map[string]interface{}{ + "http.host": "testing.invalid:80", + "http.target": "/foo?bar", }) }) } func TestTransactionHTTPRequestURLInvalid(t *testing.T) { - transaction := transactionWithAttributes(t, map[string]pdata.Value{ - "http.url": pdata.NewValueString("0.0.0.0:8081"), + transaction := transactionWithAttributes(t, map[string]interface{}{ + "http.url": "0.0.0.0:8081", }) require.NotNil(t, transaction.Context) assert.Nil(t, transaction.Context.Request) @@ -262,54 +262,54 @@ func TestTransactionHTTPRequestURLInvalid(t *testing.T) { } func TestTransactionHTTPRequestSocketRemoteAddr(t *testing.T) { - test := func(t *testing.T, expected string, attrs map[string]pdata.Value) { + test := func(t *testing.T, expected string, attrs map[string]interface{}) { transaction := transactionWithAttributes(t, attrs) assert.Equal(t, expected, transaction.Context.Request.Socket.RemoteAddress) } t.Run("net.peer.ip_port", func(t *testing.T) { - test(t, "192.168.0.1:1234", map[string]pdata.Value{ - "http.url": pdata.NewValueString("http://testing.invalid"), - "net.peer.ip": pdata.NewValueString("192.168.0.1"), - "net.peer.port": pdata.NewValueInt(1234), + test(t, "192.168.0.1:1234", map[string]interface{}{ + "http.url": "http://testing.invalid", + "net.peer.ip": "192.168.0.1", + "net.peer.port": 1234, }) }) t.Run("net.peer.ip", func(t *testing.T) { - test(t, "192.168.0.1", map[string]pdata.Value{ - "http.url": pdata.NewValueString("http://testing.invalid"), - "net.peer.ip": pdata.NewValueString("192.168.0.1"), + test(t, "192.168.0.1", map[string]interface{}{ + "http.url": "http://testing.invalid", + "net.peer.ip": "192.168.0.1", }) }) t.Run("http.remote_addr", func(t *testing.T) { - test(t, "192.168.0.1:1234", map[string]pdata.Value{ - "http.url": pdata.NewValueString("http://testing.invalid"), - "http.remote_addr": pdata.NewValueString("192.168.0.1:1234"), + test(t, "192.168.0.1:1234", map[string]interface{}{ + "http.url": "http://testing.invalid", + "http.remote_addr": "192.168.0.1:1234", }) }) t.Run("http.remote_addr_no_port", func(t *testing.T) { - test(t, "192.168.0.1", map[string]pdata.Value{ - "http.url": pdata.NewValueString("http://testing.invalid"), - "http.remote_addr": pdata.NewValueString("192.168.0.1"), + test(t, "192.168.0.1", map[string]interface{}{ + "http.url": "http://testing.invalid", + "http.remote_addr": "192.168.0.1", }) }) } func TestTransactionHTTPRequestHTTPVersion(t *testing.T) { - transaction := transactionWithAttributes(t, map[string]pdata.Value{ - "http.flavor": pdata.NewValueString("1.1"), + transaction := transactionWithAttributes(t, map[string]interface{}{ + "http.flavor": "1.1", }) assert.Equal(t, "1.1", transaction.Context.Request.HTTPVersion) } func TestTransactionHTTPRequestHTTPMethod(t *testing.T) { - transaction := transactionWithAttributes(t, map[string]pdata.Value{ - "http.method": pdata.NewValueString("PATCH"), + transaction := transactionWithAttributes(t, map[string]interface{}{ + "http.method": "PATCH", }) assert.Equal(t, "PATCH", transaction.Context.Request.Method) } func TestTransactionHTTPRequestUserAgent(t *testing.T) { - transaction := transactionWithAttributes(t, map[string]pdata.Value{ - "http.user_agent": pdata.NewValueString("Foo/bar (baz)"), + transaction := transactionWithAttributes(t, map[string]interface{}{ + "http.user_agent": "Foo/bar (baz)", }) assert.Equal(t, model.Headers{{ Key: "User-Agent", @@ -318,8 +318,8 @@ func TestTransactionHTTPRequestUserAgent(t *testing.T) { } func TestTransactionHTTPRequestClientIP(t *testing.T) { - transaction := transactionWithAttributes(t, map[string]pdata.Value{ - "http.client_ip": pdata.NewValueString("256.257.258.259"), + transaction := transactionWithAttributes(t, map[string]interface{}{ + "http.client_ip": "256.257.258.259", }) assert.Equal(t, model.Headers{{ Key: "X-Forwarded-For", @@ -328,59 +328,60 @@ func TestTransactionHTTPRequestClientIP(t *testing.T) { } func TestTransactionHTTPResponseStatusCode(t *testing.T) { - transaction := transactionWithAttributes(t, map[string]pdata.Value{ - "http.status_code": pdata.NewValueInt(200), + transaction := transactionWithAttributes(t, map[string]interface{}{ + "http.status_code": 200, }) assert.Equal(t, 200, transaction.Context.Response.StatusCode) } func TestSpanHTTPURL(t *testing.T) { - test := func(t *testing.T, expectedURL string, attrs map[string]pdata.Value) { + test := func(t *testing.T, expectedURL string, attrs map[string]interface{}) { span := spanWithAttributes(t, attrs) assert.Equal(t, expectedURL, span.Context.HTTP.URL.String()) } t.Run("http.url", func(t *testing.T) { const httpURL = "https://testing.invalid:80/foo?bar" - test(t, httpURL, map[string]pdata.Value{ - "http.url": pdata.NewValueString(httpURL), + test(t, httpURL, map[string]interface{}{ + "http.url": httpURL, }) }) t.Run("scheme_host_target", func(t *testing.T) { - test(t, "https://testing.invalid:80/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "http.host": pdata.NewValueString("testing.invalid:80"), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://testing.invalid:80/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "http.host": "testing.invalid:80", + "http.target": "/foo?bar", }) }) t.Run("scheme_netpeername_netpeerport_target", func(t *testing.T) { - test(t, "https://testing.invalid:80/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "net.peer.name": pdata.NewValueString("testing.invalid"), - "net.peer.ip": pdata.NewValueString("::1"), // net.peer.name preferred - "net.peer.port": pdata.NewValueInt(80), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://testing.invalid:80/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "net.peer.name": "testing.invalid", + "net.peer.ip": "::1", // net.peer.name preferred + "net.peer.port": 80, + "http.target": "/foo?bar", }) }) t.Run("scheme_netpeerip_netpeerport_target", func(t *testing.T) { - test(t, "https://[::1]:80/foo?bar", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "net.peer.ip": pdata.NewValueString("::1"), - "net.peer.port": pdata.NewValueInt(80), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "https://[::1]:80/foo?bar", map[string]interface{}{ + "http.scheme": "https", + "net.peer.ip": "::1", + "net.peer.port": 80, + "http.target": "/foo?bar", }) }) // Scheme is set to "http" if it can't be deduced from attributes. t.Run("default_scheme", func(t *testing.T) { - test(t, "http://testing.invalid:80/foo?bar", map[string]pdata.Value{ - "http.host": pdata.NewValueString("testing.invalid:80"), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "http://testing.invalid:80/foo?bar", map[string]interface{}{ + "http.host": "testing.invalid:80", + "http.target": "/foo?bar", }) }) } func TestSpanHTTPDestination(t *testing.T) { - test := func(t *testing.T, expectedAddr string, expectedPort int, expectedName string, expectedResource string, attrs map[string]pdata.Value) { + test := func(t *testing.T, expectedAddr string, expectedPort int, expectedName string, expectedResource string, + attrs map[string]interface{}) { span := spanWithAttributes(t, attrs) assert.Equal(t, &model.DestinationSpanContext{ Address: expectedAddr, @@ -393,40 +394,40 @@ func TestSpanHTTPDestination(t *testing.T) { }, span.Context.Destination) } t.Run("url_default_port_specified", func(t *testing.T) { - test(t, "testing.invalid", 443, "https://testing.invalid", "testing.invalid:443", map[string]pdata.Value{ - "http.url": pdata.NewValueString("https://testing.invalid:443/foo?bar"), + test(t, "testing.invalid", 443, "https://testing.invalid", "testing.invalid:443", map[string]interface{}{ + "http.url": "https://testing.invalid:443/foo?bar", }) }) t.Run("url_port_scheme", func(t *testing.T) { - test(t, "testing.invalid", 443, "https://testing.invalid", "testing.invalid:443", map[string]pdata.Value{ - "http.url": pdata.NewValueString("https://testing.invalid/foo?bar"), + test(t, "testing.invalid", 443, "https://testing.invalid", "testing.invalid:443", map[string]interface{}{ + "http.url": "https://testing.invalid/foo?bar", }) }) t.Run("url_non_default_port", func(t *testing.T) { - test(t, "testing.invalid", 444, "https://testing.invalid:444", "testing.invalid:444", map[string]pdata.Value{ - "http.url": pdata.NewValueString("https://testing.invalid:444/foo?bar"), + test(t, "testing.invalid", 444, "https://testing.invalid:444", "testing.invalid:444", map[string]interface{}{ + "http.url": "https://testing.invalid:444/foo?bar", }) }) t.Run("scheme_host_target", func(t *testing.T) { - test(t, "testing.invalid", 444, "https://testing.invalid:444", "testing.invalid:444", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "http.host": pdata.NewValueString("testing.invalid:444"), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "testing.invalid", 444, "https://testing.invalid:444", "testing.invalid:444", map[string]interface{}{ + "http.scheme": "https", + "http.host": "testing.invalid:444", + "http.target": "/foo?bar", }) }) t.Run("scheme_netpeername_nethostport_target", func(t *testing.T) { - test(t, "::1", 444, "https://[::1]:444", "[::1]:444", map[string]pdata.Value{ - "http.scheme": pdata.NewValueString("https"), - "net.peer.ip": pdata.NewValueString("::1"), - "net.peer.port": pdata.NewValueInt(444), - "http.target": pdata.NewValueString("/foo?bar"), + test(t, "::1", 444, "https://[::1]:444", "[::1]:444", map[string]interface{}{ + "http.scheme": "https", + "net.peer.ip": "::1", + "net.peer.port": 444, + "http.target": "/foo?bar", }) }) } func TestSpanHTTPURLInvalid(t *testing.T) { - span := spanWithAttributes(t, map[string]pdata.Value{ - "http.url": pdata.NewValueString("0.0.0.0:8081"), + span := spanWithAttributes(t, map[string]interface{}{ + "http.url": "0.0.0.0:8081", }) require.NotNil(t, span.Context) assert.Nil(t, span.Context.HTTP) @@ -436,8 +437,8 @@ func TestSpanHTTPURLInvalid(t *testing.T) { } func TestSpanHTTPStatusCode(t *testing.T) { - span := spanWithAttributes(t, map[string]pdata.Value{ - "http.status_code": pdata.NewValueInt(200), + span := spanWithAttributes(t, map[string]interface{}{ + "http.status_code": 200, }) assert.Equal(t, 200, span.Context.HTTP.StatusCode) } @@ -445,16 +446,16 @@ func TestSpanHTTPStatusCode(t *testing.T) { func TestSpanDatabaseContext(t *testing.T) { // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/database.md#mysql connectionString := "Server=shopdb.example.com;Database=ShopDb;Uid=billing_user;TableCache=true;UseCompression=True;MinimumPoolSize=10;MaximumPoolSize=50;" - span := spanWithAttributes(t, map[string]pdata.Value{ - "db.system": pdata.NewValueString("mysql"), - "db.connection_string": pdata.NewValueString(connectionString), - "db.user": pdata.NewValueString("billing_user"), - "db.name": pdata.NewValueString("ShopDb"), - "db.statement": pdata.NewValueString("SELECT * FROM orders WHERE order_id = 'o4711'"), - "net.peer.name": pdata.NewValueString("shopdb.example.com"), - "net.peer.ip": pdata.NewValueString("192.0.2.12"), - "net.peer.port": pdata.NewValueInt(3306), - "net.transport": pdata.NewValueString("IP.TCP"), + span := spanWithAttributes(t, map[string]interface{}{ + "db.system": "mysql", + "db.connection_string": connectionString, + "db.user": "billing_user", + "db.name": "ShopDb", + "db.statement": "SELECT * FROM orders WHERE order_id = 'o4711'", + "net.peer.name": "shopdb.example.com", + "net.peer.ip": "192.0.2.12", + "net.peer.port": 3306, + "net.transport": "IP.TCP", }) assert.Equal(t, "db", span.Type) @@ -513,12 +514,12 @@ func TestInstrumentationLibrary(t *testing.T) { }, payloads.Transactions[0].Context) } -func transactionWithAttributes(t *testing.T, attrs map[string]pdata.Value) model.Transaction { +func transactionWithAttributes(t *testing.T, attrs map[string]interface{}) model.Transaction { var w fastjson.Writer var recorder transporttest.RecorderTransport span := pdata.NewSpan() - pdata.NewAttributeMapFromMap(attrs).CopyTo(span.Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(span.Attributes()) resource := pdata.NewResource() elastic.EncodeResourceMetadata(resource, &w) @@ -531,13 +532,13 @@ func transactionWithAttributes(t *testing.T, attrs map[string]pdata.Value) model return payloads.Transactions[0] } -func spanWithAttributes(t *testing.T, attrs map[string]pdata.Value) model.Span { +func spanWithAttributes(t *testing.T, attrs map[string]interface{}) model.Span { var w fastjson.Writer var recorder transporttest.RecorderTransport span := pdata.NewSpan() span.SetParentSpanID(pdata.NewSpanID([8]byte{1})) - pdata.NewAttributeMapFromMap(attrs).CopyTo(span.Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(span.Attributes()) resource := pdata.NewResource() elastic.EncodeResourceMetadata(resource, &w) diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index bb172b8c8fbe..6517fcada884 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/elastic/go-structform v0.0.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 @@ -31,9 +31,9 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 97ab4da0df3b..159b4bcdaa41 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -171,23 +171,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/elasticsearchexporter/internal/objmodel/objmodel.go b/exporter/elasticsearchexporter/internal/objmodel/objmodel.go index ac52350793e9..5a0c0e26d977 100644 --- a/exporter/elasticsearchexporter/internal/objmodel/objmodel.go +++ b/exporter/elasticsearchexporter/internal/objmodel/objmodel.go @@ -104,7 +104,7 @@ type idValue interface { // DocumentFromAttributes creates a document from a OpenTelemetry attribute // map. All nested maps will be flattened, with keys being joined using a `.` symbol. -func DocumentFromAttributes(am pdata.AttributeMap) Document { +func DocumentFromAttributes(am pdata.Map) Document { return DocumentFromAttributesWithPath("", am) } @@ -112,7 +112,7 @@ func DocumentFromAttributes(am pdata.AttributeMap) Document { // map. All nested maps will be flattened, with keys being joined using a `.` symbol. // // All keys in the map will be prefixed with path. -func DocumentFromAttributesWithPath(path string, am pdata.AttributeMap) Document { +func DocumentFromAttributesWithPath(path string, am pdata.Map) Document { if am.Len() == 0 { return Document{} } @@ -154,7 +154,7 @@ func (doc *Document) AddInt(key string, value int64) { // AddAttributes expands and flattens all key-value pairs from the input attribute map into // the document. -func (doc *Document) AddAttributes(key string, attributes pdata.AttributeMap) { +func (doc *Document) AddAttributes(key string, attributes pdata.Map) { doc.fields = appendAttributeFields(doc.fields, key, attributes) } @@ -464,7 +464,7 @@ func (v *Value) iterJSON(w *json.Visitor, dedot bool) error { return nil } -func arrFromAttributes(aa pdata.AttributeValueSlice) []Value { +func arrFromAttributes(aa pdata.Slice) []Value { if aa.Len() == 0 { return nil } @@ -476,7 +476,7 @@ func arrFromAttributes(aa pdata.AttributeValueSlice) []Value { return values } -func appendAttributeFields(fields []field, path string, am pdata.AttributeMap) []field { +func appendAttributeFields(fields []field, path string, am pdata.Map) []field { am.Range(func(k string, val pdata.Value) bool { fields = appendAttributeValue(fields, path, k, val) return true diff --git a/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go b/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go index 1cb2effe1702..5d8e0275646f 100644 --- a/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go +++ b/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go @@ -35,41 +35,41 @@ func TestObjectModel_CreateMap(t *testing.T) { }{ "from empty map": { build: func() Document { - return DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{})) + return DocumentFromAttributes(pdata.NewMap()) }, }, "from map": { build: func() Document { - return DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "i": pdata.NewValueInt(42), - "str": pdata.NewValueString("test"), + return DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "i": 42, + "str": "test", })) }, want: Document{[]field{{"i", IntValue(42)}, {"str", StringValue("test")}}}, }, "ignores nil values": { build: func() Document { - return DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "null": pdata.NewValueEmpty(), - "str": pdata.NewValueString("test"), + return DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "null": nil, + "str": "test", })) }, want: Document{[]field{{"str", StringValue("test")}}}, }, "from map with prefix": { build: func() Document { - return DocumentFromAttributesWithPath("prefix", pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "i": pdata.NewValueInt(42), - "str": pdata.NewValueString("test"), + return DocumentFromAttributesWithPath("prefix", pdata.NewMapFromRaw(map[string]interface{}{ + "i": 42, + "str": "test", })) }, want: Document{[]field{{"prefix.i", IntValue(42)}, {"prefix.str", StringValue("test")}}}, }, "add attributes with key": { build: func() (doc Document) { - doc.AddAttributes("prefix", pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "i": pdata.NewValueInt(42), - "str": pdata.NewValueString("test"), + doc.AddAttributes("prefix", pdata.NewMapFromRaw(map[string]interface{}{ + "i": 42, + "str": "test", })) return doc }, @@ -158,7 +158,7 @@ func TestObjectModel_Dedup(t *testing.T) { namespace := pdata.NewValueMap() namespace.MapVal().InsertInt("a", 23) - am := pdata.NewAttributeMap() + am := pdata.NewMap() am.InsertInt("namespace.a", 42) am.InsertString("toplevel", "test") am.Insert("namespace", namespace) @@ -171,7 +171,7 @@ func TestObjectModel_Dedup(t *testing.T) { namespace := pdata.NewValueMap() namespace.MapVal().InsertInt("a", 23) - am := pdata.NewAttributeMap() + am := pdata.NewMap() am.Insert("namespace", namespace) am.InsertInt("namespace.a", 42) am.InsertString("toplevel", "test") @@ -291,45 +291,41 @@ func TestDocument_Serialize_Flat(t *testing.T) { want string }{ "no nesting with multiple fields": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a": pdata.NewValueString("test"), - "b": pdata.NewValueInt(1), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a": "test", + "b": 1, })), want: `{"a":"test","b":1}`, }, "shared prefix": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a.str": pdata.NewValueString("test"), - "a.i": pdata.NewValueInt(1), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a.str": "test", + "a.i": 1, })), want: `{"a.i":1,"a.str":"test"}`, }, "multiple namespaces with dot": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a.str": pdata.NewValueString("test"), - "b.i": pdata.NewValueInt(1), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a.str": "test", + "b.i": 1, })), want: `{"a.str":"test","b.i":1}`, }, "nested maps": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a": func() pdata.Value { - m := pdata.NewValueMap() - m.MapVal().InsertString("str", "test") - m.MapVal().InsertInt("i", 1) - return m - }(), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a": map[string]interface{}{ + "str": "test", + "i": 1, + }, })), want: `{"a.i":1,"a.str":"test"}`, }, "multi-level nested namespace maps": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a": func() pdata.Value { - m := pdata.NewValueMap() - m.MapVal().InsertString("b.str", "test") - m.MapVal().InsertInt("i", 1) - return m - }(), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a": map[string]interface{}{ + "b.str": "test", + "i": 1, + }, })), want: `{"a.b.str":"test","a.i":1}`, }, @@ -353,45 +349,41 @@ func TestDocument_Serialize_Dedot(t *testing.T) { want string }{ "no nesting with multiple fields": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a": pdata.NewValueString("test"), - "b": pdata.NewValueInt(1), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a": "test", + "b": 1, })), want: `{"a":"test","b":1}`, }, "shared prefix": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a.str": pdata.NewValueString("test"), - "a.i": pdata.NewValueInt(1), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a.str": "test", + "a.i": 1, })), want: `{"a":{"i":1,"str":"test"}}`, }, "multiple namespaces": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a.str": pdata.NewValueString("test"), - "b.i": pdata.NewValueInt(1), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a.str": "test", + "b.i": 1, })), want: `{"a":{"str":"test"},"b":{"i":1}}`, }, "nested maps": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a": func() pdata.Value { - m := pdata.NewValueMap() - m.MapVal().InsertString("str", "test") - m.MapVal().InsertInt("i", 1) - return m - }(), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a": map[string]interface{}{ + "str": "test", + "i": 1, + }, })), want: `{"a":{"i":1,"str":"test"}}`, }, "multi-level nested namespace maps": { - doc: DocumentFromAttributes(pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "a": func() pdata.Value { - m := pdata.NewValueMap() - m.MapVal().InsertString("b.c.str", "test") - m.MapVal().InsertInt("i", 1) - return m - }(), + doc: DocumentFromAttributes(pdata.NewMapFromRaw(map[string]interface{}{ + "a": map[string]interface{}{ + "b.c.str": "test", + "i": 1, + }, })), want: `{"a":{"b":{"c":{"str":"test"}},"i":1}}`, }, diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 8dd4fb5b374a..e54b43fa1bb8 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a google.golang.org/api v0.73.0 ) @@ -35,12 +35,12 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index ba821380a521..d43e2eabbb2f 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -310,24 +310,24 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 4205eff778b3..90350442d9f4 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -23,9 +23,9 @@ require ( github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 7422771a8e25..ca550e47b83e 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -160,23 +160,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 0fc23067c298..f564cc21ec3c 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/api v0.73.0 google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 google.golang.org/grpc v1.45.0 @@ -42,10 +42,10 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.4.1 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 6d7e2f8e624d..f34986820a61 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -439,14 +439,14 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= @@ -455,8 +455,9 @@ go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6 go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg= go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= go.opentelemetry.io/otel/internal/metric v0.23.0/go.mod h1:z+RPiDJe30YnCrOhFGivwBS+DU1JU/PiLKkk4re2DNY= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= @@ -466,15 +467,17 @@ go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1s go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo= go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs= go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 7b03338eb90e..8500d000b984 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,8 +6,8 @@ require ( cloud.google.com/go/pubsub v1.19.0 github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/api v0.73.0 google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 @@ -37,9 +37,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 7d38a7ae5828..050cb7d2ecec 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -316,23 +316,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index 1ce6df7a464c..0cd1638e3c3e 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/honeycombio/libhoney-go v1.15.8 github.com/klauspost/compress v1.15.1 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 @@ -35,9 +35,9 @@ require ( github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index f2693e49a25e..d3a5f4169a39 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -190,23 +190,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/honeycombexporter/translator.go b/exporter/honeycombexporter/translator.go index 324e22e42ece..793c0d95fdc1 100644 --- a/exporter/honeycombexporter/translator.go +++ b/exporter/honeycombexporter/translator.go @@ -22,7 +22,7 @@ import ( // spanAttributesToMap converts an opencensus proto Span_Attributes object into a map // of strings to generic types usable for sending events to honeycomb. -func spanAttributesToMap(spanAttrs pdata.AttributeMap) map[string]interface{} { +func spanAttributesToMap(spanAttrs pdata.Map) map[string]interface{} { var attrs = make(map[string]interface{}, spanAttrs.Len()) spanAttrs.Range(func(key string, value pdata.Value) bool { diff --git a/exporter/honeycombexporter/translator_test.go b/exporter/honeycombexporter/translator_test.go index ab68cbbe3ea5..3263d2276499 100644 --- a/exporter/honeycombexporter/translator_test.go +++ b/exporter/honeycombexporter/translator_test.go @@ -25,20 +25,20 @@ import ( func TestSpanAttributesToMap(t *testing.T) { - spanAttrs := []pdata.AttributeMap{ - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "foo": pdata.NewValueString("bar"), + spanAttrs := []pdata.Map{ + pdata.NewMapFromRaw(map[string]interface{}{ + "foo": "bar", }), - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "foo": pdata.NewValueInt(1234), + pdata.NewMapFromRaw(map[string]interface{}{ + "foo": 1234, }), - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "foo": pdata.NewValueBool(true), + pdata.NewMapFromRaw(map[string]interface{}{ + "foo": true, }), - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "foo": pdata.NewValueDouble(0.3145), + pdata.NewMapFromRaw(map[string]interface{}{ + "foo": 0.3145, }), - pdata.NewAttributeMap(), + pdata.NewMap(), } wantResults := []map[string]interface{}{ diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index 4bdf146bfb59..598c2ac85ba7 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) @@ -33,10 +33,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index b69709a6c779..ed752eb7b0ca 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -189,24 +189,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/humioexporter/traces_exporter.go b/exporter/humioexporter/traces_exporter.go index 5b1a1565ea2d..9ba6c398f043 100644 --- a/exporter/humioexporter/traces_exporter.go +++ b/exporter/humioexporter/traces_exporter.go @@ -209,7 +209,7 @@ func toHumioLinks(pLinks pdata.SpanLinkSlice) []*HumioLink { return links } -func toHumioAttributes(attrMaps ...pdata.AttributeMap) map[string]interface{} { +func toHumioAttributes(attrMaps ...pdata.Map) map[string]interface{} { attr := make(map[string]interface{}) for _, attrMap := range attrMaps { attrMap.Range(func(k string, v pdata.Value) bool { diff --git a/exporter/humioexporter/traces_exporter_test.go b/exporter/humioexporter/traces_exporter_test.go index 708ee6eb2e72..16a2606ffb96 100644 --- a/exporter/humioexporter/traces_exporter_test.go +++ b/exporter/humioexporter/traces_exporter_test.go @@ -366,13 +366,13 @@ func TestToHumioAttributes(t *testing.T) { // Arrange testCases := []struct { desc string - attr func() pdata.AttributeMap + attr func() pdata.Map expected interface{} }{ { desc: "Simple types", - attr: func() pdata.AttributeMap { - attrMap := pdata.NewAttributeMap() + attr: func() pdata.Map { + attrMap := pdata.NewMap() attrMap.InsertString("string", "val") attrMap.InsertInt("integer", 42) attrMap.InsertDouble("double", 4.2) @@ -388,8 +388,8 @@ func TestToHumioAttributes(t *testing.T) { }, { desc: "Nil element", - attr: func() pdata.AttributeMap { - attrMap := pdata.NewAttributeMap() + attr: func() pdata.Map { + attrMap := pdata.NewMap() attrMap.InsertNull("key") return attrMap }, @@ -399,8 +399,8 @@ func TestToHumioAttributes(t *testing.T) { }, { desc: "Array element", - attr: func() pdata.AttributeMap { - attrMap := pdata.NewAttributeMap() + attr: func() pdata.Map { + attrMap := pdata.NewMap() arr := pdata.NewValueArray() arr.SliceVal().AppendEmpty().SetStringVal("a") arr.SliceVal().AppendEmpty().SetStringVal("b") @@ -416,8 +416,8 @@ func TestToHumioAttributes(t *testing.T) { }, { desc: "Nested map", - attr: func() pdata.AttributeMap { - attrMap := pdata.NewAttributeMap() + attr: func() pdata.Map { + attrMap := pdata.NewMap() nested := pdata.NewValueMap() nested.MapVal().InsertString("key", "val") attrMap.Insert("nested", nested) @@ -445,11 +445,11 @@ func TestToHumioAttributes(t *testing.T) { func TestToHumioAttributesShaded(t *testing.T) { // Arrange - attrMapA := pdata.NewAttributeMap() + attrMapA := pdata.NewMap() attrMapA.InsertString("string", "val") attrMapA.InsertInt("integer", 42) - attrMapB := pdata.NewAttributeMap() + attrMapB := pdata.NewMap() attrMapB.InsertInt("integer", 0) attrMapB.InsertString("key", "val") diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 31918bf98593..a4462b6808f2 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.16 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -37,10 +37,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index ab05ef6a2b6e..17913e666317 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -208,26 +208,26 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index 5df884acd385..aab39e85cc40 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 ) @@ -36,10 +36,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index 3b63a7b457f7..d6067ec3c174 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -218,24 +218,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= @@ -343,7 +343,6 @@ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 4ac602e1cb3e..25398cffd1e6 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/jaegertracing/jaeger v1.32.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -36,10 +36,10 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 33639a05240a..bb45e62afcb5 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -201,24 +201,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 23ba4d6c39cb..5bb7f9698044 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -11,8 +11,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/stretchr/testify v1.7.1 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -48,9 +48,9 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index 6f8d31060976..bc5e7848e8ef 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -233,23 +233,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index e11da2e51259..49f696c44bcd 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -33,10 +33,10 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 566529a235b4..1f25912da702 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -320,24 +320,24 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index fc64da0c6173..3bcfb494bc42 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/logzio/jaeger-logzio v1.0.4 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -55,9 +55,9 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index b82de2aa0d6d..2bf703d35822 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -844,23 +844,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/lokiexporter/encode_json.go b/exporter/lokiexporter/encode_json.go index 6d285963b34b..5c40809ec965 100644 --- a/exporter/lokiexporter/encode_json.go +++ b/exporter/lokiexporter/encode_json.go @@ -96,7 +96,7 @@ func encodeJSON(lr pdata.LogRecord, res pdata.Resource) (string, error) { } // Copied from pdata (es AttributeValueSlice) asRaw() since its not exported -func attributeValueSliceAsRaw(es pdata.AttributeValueSlice) []interface{} { +func attributeValueSliceAsRaw(es pdata.Slice) []interface{} { rawSlice := make([]interface{}, 0, es.Len()) for i := 0; i < es.Len(); i++ { v := es.At(i) diff --git a/exporter/lokiexporter/exporter.go b/exporter/lokiexporter/exporter.go index 0dfb465ac1d3..e4e1daebbed0 100644 --- a/exporter/lokiexporter/exporter.go +++ b/exporter/lokiexporter/exporter.go @@ -213,7 +213,7 @@ func (l *lokiExporter) logDataToLoki(ld pdata.Logs) (pr *logproto.PushRequest, n return pr, numDroppedLogs } -func (l *lokiExporter) convertAttributesAndMerge(logAttrs pdata.AttributeMap, resourceAttrs pdata.AttributeMap) (mergedAttributes model.LabelSet, dropped bool) { +func (l *lokiExporter) convertAttributesAndMerge(logAttrs pdata.Map, resourceAttrs pdata.Map) (mergedAttributes model.LabelSet, dropped bool) { logRecordAttributes := l.convertAttributesToLabels(logAttrs, l.config.Labels.Attributes) resourceAttributes := l.convertAttributesToLabels(resourceAttrs, l.config.Labels.ResourceAttributes) @@ -226,7 +226,7 @@ func (l *lokiExporter) convertAttributesAndMerge(logAttrs pdata.AttributeMap, re return mergedAttributes, false } -func (l *lokiExporter) convertAttributesToLabels(attributes pdata.AttributeMap, allowedAttributes map[string]string) model.LabelSet { +func (l *lokiExporter) convertAttributesToLabels(attributes pdata.Map, allowedAttributes map[string]string) model.LabelSet { ls := model.LabelSet{} allowedLabels := l.config.Labels.getAttributes(allowedAttributes) diff --git a/exporter/lokiexporter/exporter_test.go b/exporter/lokiexporter/exporter_test.go index fc5296a6deab..ad14f218c2fd 100644 --- a/exporter/lokiexporter/exporter_test.go +++ b/exporter/lokiexporter/exporter_test.go @@ -54,7 +54,7 @@ var ( } ) -func createLogData(numberOfLogs int, attributes pdata.AttributeMap) pdata.Logs { +func createLogData(numberOfLogs int, attributes pdata.Map) pdata.Logs { logs := pdata.NewLogs() ill := logs.ResourceLogs().AppendEmpty().InstrumentationLibraryLogs().AppendEmpty() @@ -107,11 +107,11 @@ func TestExporter_pushLogData(t *testing.T) { genericGenLogsFunc := func() pdata.Logs { return createLogData(10, - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeContainerName: pdata.NewValueString("api"), - conventions.AttributeK8SClusterName: pdata.NewValueString("local"), - "resource.name": pdata.NewValueString("myresource"), - "severity": pdata.NewValueString("debug"), + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeContainerName: "api", + conventions.AttributeK8SClusterName: "local", + "resource.name": "myresource", + "severity": "debug", })) } @@ -186,8 +186,8 @@ func TestExporter_pushLogData(t *testing.T) { testServer: true, genLogsFunc: func() pdata.Logs { return createLogData(10, - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "not.a.match": pdata.NewValueString("random"), + pdata.NewMapFromRaw(map[string]interface{}{ + "not.a.match": "random", })) }, errFunc: func(err error) { @@ -205,16 +205,16 @@ func TestExporter_pushLogData(t *testing.T) { outLogs := pdata.NewLogs() matchingLogs := createLogData(10, - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeContainerName: pdata.NewValueString("api"), - conventions.AttributeK8SClusterName: pdata.NewValueString("local"), - "severity": pdata.NewValueString("debug"), + pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeContainerName: "api", + conventions.AttributeK8SClusterName: "local", + "severity": "debug", })) matchingLogs.ResourceLogs().MoveAndAppendTo(outLogs.ResourceLogs()) nonMatchingLogs := createLogData(5, - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "not.a.match": pdata.NewValueString("random"), + pdata.NewMapFromRaw(map[string]interface{}{ + "not.a.match": "random", })) nonMatchingLogs.ResourceLogs().MoveAndAppendTo(outLogs.ResourceLogs()) @@ -419,11 +419,11 @@ func TestExporter_convertAttributesToLabels(t *testing.T) { require.NoError(t, err) t.Run("with attributes that match", func(t *testing.T) { - am := pdata.NewAttributeMap() + am := pdata.NewMap() am.InsertString(conventions.AttributeContainerName, "mycontainer") am.InsertString(conventions.AttributeK8SClusterName, "mycluster") am.InsertString("severity", "debug") - ram := pdata.NewAttributeMap() + ram := pdata.NewMap() ram.InsertString("resource.name", "myresource") // this should overwrite log attribute of the same name ram.InsertString("severity", "info") @@ -439,33 +439,33 @@ func TestExporter_convertAttributesToLabels(t *testing.T) { }) t.Run("with attribute matches and the value is a boolean", func(t *testing.T) { - am := pdata.NewAttributeMap() + am := pdata.NewMap() am.InsertBool("severity", false) - ram := pdata.NewAttributeMap() + ram := pdata.NewMap() ls, _ := exp.convertAttributesAndMerge(am, ram) require.Nil(t, ls) }) t.Run("with attribute that matches and the value is a double", func(t *testing.T) { - am := pdata.NewAttributeMap() + am := pdata.NewMap() am.InsertDouble("severity", float64(0)) - ram := pdata.NewAttributeMap() + ram := pdata.NewMap() ls, _ := exp.convertAttributesAndMerge(am, ram) require.Nil(t, ls) }) t.Run("with attribute that matches and the value is an int", func(t *testing.T) { - am := pdata.NewAttributeMap() + am := pdata.NewMap() am.InsertInt("severity", 0) - ram := pdata.NewAttributeMap() + ram := pdata.NewMap() ls, _ := exp.convertAttributesAndMerge(am, ram) require.Nil(t, ls) }) t.Run("with attribute that matches and the value is null", func(t *testing.T) { - am := pdata.NewAttributeMap() + am := pdata.NewMap() am.InsertNull("severity") - ram := pdata.NewAttributeMap() + ram := pdata.NewMap() ls, _ := exp.convertAttributesAndMerge(am, ram) require.Nil(t, ls) }) diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 31b8889f6f1e..35b35350ddae 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220111145625-076109fa1910 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 @@ -40,10 +40,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20220105145211-5b0dc2dfae98 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index c33c7d9968bf..ea7a409fea60 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -1308,24 +1308,24 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index 9af38cd3916b..7733a5f08d8c 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa @@ -32,9 +32,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index 025c990c2102..da770e3d7bc9 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -188,23 +188,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/newrelicexporter/transformer.go b/exporter/newrelicexporter/transformer.go index 6a51dfe8d007..d901b0bdc0cd 100644 --- a/exporter/newrelicexporter/transformer.go +++ b/exporter/newrelicexporter/transformer.go @@ -408,7 +408,7 @@ func (t *transformer) BaseMetricAttributes(metric pdata.Metric) map[string]inter return attrs } -func (t *transformer) MetricAttributes(baseAttributes map[string]interface{}, attrMap pdata.AttributeMap) map[string]interface{} { +func (t *transformer) MetricAttributes(baseAttributes map[string]interface{}, attrMap pdata.Map) map[string]interface{} { rawMap := make(map[string]interface{}, len(baseAttributes)+attrMap.Len()) for k, v := range baseAttributes { rawMap[k] = v @@ -424,7 +424,7 @@ func (t *transformer) MetricAttributes(baseAttributes map[string]interface{}, at return rawMap } -func (t *transformer) TrackAttributes(location attributeLocation, attributeMap pdata.AttributeMap) { +func (t *transformer) TrackAttributes(location attributeLocation, attributeMap pdata.Map) { attributeMap.Range(func(_ string, v pdata.Value) bool { statsKey := attributeStatsKey{location: location, attributeType: v.Type()} t.details.attributeMetadataCount[statsKey]++ diff --git a/exporter/observiqexporter/converter.go b/exporter/observiqexporter/converter.go index b0d06523492e..4fe8ae0821a4 100644 --- a/exporter/observiqexporter/converter.go +++ b/exporter/observiqexporter/converter.go @@ -192,7 +192,7 @@ func severityFromRecord(log pdata.LogRecord) string { /* Transform AttributeMap to native Go map, skipping keys with nil values, and replacing dots in keys with _ */ -func attributeMapToBaseType(m pdata.AttributeMap) map[string]interface{} { +func attributeMapToBaseType(m pdata.Map) map[string]interface{} { mapOut := make(map[string]interface{}, m.Len()) m.Range(func(k string, v pdata.Value) bool { val := attributeValueToBaseType(v) diff --git a/exporter/observiqexporter/go.mod b/exporter/observiqexporter/go.mod index e8997dc1b831..a3b152a67836 100644 --- a/exporter/observiqexporter/go.mod +++ b/exporter/observiqexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -23,9 +23,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/exporter/observiqexporter/go.sum b/exporter/observiqexporter/go.sum index abd8da7fd08d..bab379a67995 100644 --- a/exporter/observiqexporter/go.sum +++ b/exporter/observiqexporter/go.sum @@ -159,23 +159,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index e358b1c62e3f..c509db0245a7 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/grpc v1.45.0 ) diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 55f9ccbe53a7..cffb53f1dcab 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -217,10 +217,10 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index a8af6da1ac50..4bde6dcff2fa 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parque go 1.17 require ( - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -19,9 +19,9 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index 4bded38129c3..a991296e917d 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -141,28 +141,28 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/prometheusexporter/accumulator.go b/exporter/prometheusexporter/accumulator.go index 844861ff0435..4bb100bd53eb 100644 --- a/exporter/prometheusexporter/accumulator.go +++ b/exporter/prometheusexporter/accumulator.go @@ -271,7 +271,7 @@ func (a *lastValueAccumulator) Collect() []pdata.Metric { return res } -func timeseriesSignature(ilmName string, metric pdata.Metric, attributes pdata.AttributeMap) string { +func timeseriesSignature(ilmName string, metric pdata.Metric, attributes pdata.Map) string { var b strings.Builder b.WriteString(metric.DataType().String()) b.WriteString("*" + ilmName) diff --git a/exporter/prometheusexporter/accumulator_test.go b/exporter/prometheusexporter/accumulator_test.go index 9092fd0e7cd9..dfe99558980e 100644 --- a/exporter/prometheusexporter/accumulator_test.go +++ b/exporter/prometheusexporter/accumulator_test.go @@ -94,7 +94,7 @@ func TestAccumulateDeltaAggregation(t *testing.T) { n := a.Accumulate(resourceMetrics) require.Equal(t, 0, n) - signature := timeseriesSignature(ilm.InstrumentationLibrary().Name(), ilm.Metrics().At(0), pdata.NewAttributeMap()) + signature := timeseriesSignature(ilm.InstrumentationLibrary().Name(), ilm.Metrics().At(0), pdata.NewMap()) v, ok := a.registeredMetrics.Load(signature) require.False(t, ok) require.Nil(t, v) @@ -386,7 +386,7 @@ func TestAccumulateMetrics(t *testing.T) { } func getMetricProperties(metric pdata.Metric) ( - attributes pdata.AttributeMap, + attributes pdata.Map, ts time.Time, value float64, temporality pdata.MetricAggregationTemporality, diff --git a/exporter/prometheusexporter/collector.go b/exporter/prometheusexporter/collector.go index b876206f4b86..03d641eb256f 100644 --- a/exporter/prometheusexporter/collector.go +++ b/exporter/prometheusexporter/collector.go @@ -79,7 +79,7 @@ func (c *collector) metricName(namespace string, metric pdata.Metric) string { return sanitize(metric.Name(), c.skipSanitizeLabel) } -func (c *collector) getMetricMetadata(metric pdata.Metric, attributes pdata.AttributeMap) (*prometheus.Desc, []string) { +func (c *collector) getMetricMetadata(metric pdata.Metric, attributes pdata.Map) (*prometheus.Desc, []string) { keys := make([]string, 0, attributes.Len()) values := make([]string, 0, attributes.Len()) diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index f87bf51a9251..81b503a25c1a 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/prometheus/client_model v0.2.0 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -101,9 +101,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index dd9434da9dc8..a5a7cec54074 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -1432,26 +1432,26 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/zpages v0.29.0 h1:rUnBzAxPP58lP7BApL21Ac2Fx8/5OflQa3sirlX0nQQ= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0 h1:HcGi6HmYRuszR3stcvN2GctJjQtvp44nw/VdfJCo/Ec= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/sdk/metric v0.27.0 h1:CDEu96Js5IP7f4bJ8eimxF09V5hKYmE7CeyKSjmAL1s= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 96e73cf7cee0..d234b41a5876 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -13,8 +13,8 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.1 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -43,10 +43,10 @@ require ( github.com/tidwall/tinylru v1.1.0 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index af448264905b..b09a8bbd90d2 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -1317,24 +1317,24 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/prometheusremotewriteexporter/testutil_test.go b/exporter/prometheusremotewriteexporter/testutil_test.go index 3d0d0c9cdcbb..67c6306191a8 100644 --- a/exporter/prometheusremotewriteexporter/testutil_test.go +++ b/exporter/prometheusremotewriteexporter/testutil_test.go @@ -85,7 +85,7 @@ var ( validHistogram: getHistogramMetric(validHistogram, lbs2, time2, floatVal2, uint64(intVal2), bounds, buckets), validSummary: getSummaryMetric(validSummary, lbs2, time2, floatVal2, uint64(intVal2), quantiles), validIntGaugeDirty: getIntGaugeMetric(validIntGaugeDirty, lbs1, intVal1, time1), - unmatchedBoundBucketHist: getHistogramMetric(unmatchedBoundBucketHist, pdata.NewAttributeMap(), 0, 0, 0, []float64{0.1, 0.2, 0.3}, []uint64{1, 2}), + unmatchedBoundBucketHist: getHistogramMetric(unmatchedBoundBucketHist, pdata.NewMap(), 0, 0, 0, []float64{0.1, 0.2, 0.3}, []uint64{1, 2}), } empty = "empty" @@ -132,8 +132,8 @@ var ( // OTLP metrics // attributes must come in pairs -func getAttributes(labels ...string) pdata.AttributeMap { - attributeMap := pdata.NewAttributeMap() +func getAttributes(labels ...string) pdata.Map { + attributeMap := pdata.NewMap() for i := 0; i < len(labels); i += 2 { attributeMap.UpsertString(labels[i], labels[i+1]) } @@ -192,7 +192,7 @@ func getEmptyGaugeMetric(name string) pdata.Metric { return metric } -func getIntGaugeMetric(name string, attributes pdata.AttributeMap, value int64, ts uint64) pdata.Metric { +func getIntGaugeMetric(name string, attributes pdata.Map, value int64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeGauge) @@ -208,7 +208,7 @@ func getIntGaugeMetric(name string, attributes pdata.AttributeMap, value int64, return metric } -func getDoubleGaugeMetric(name string, attributes pdata.AttributeMap, value float64, ts uint64) pdata.Metric { +func getDoubleGaugeMetric(name string, attributes pdata.Map, value float64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeGauge) @@ -231,7 +231,7 @@ func getEmptySumMetric(name string) pdata.Metric { return metric } -func getIntSumMetric(name string, attributes pdata.AttributeMap, value int64, ts uint64) pdata.Metric { +func getIntSumMetric(name string, attributes pdata.Map, value int64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSum) @@ -256,7 +256,7 @@ func getEmptyCumulativeSumMetric(name string) pdata.Metric { return metric } -func getSumMetric(name string, attributes pdata.AttributeMap, value float64, ts uint64) pdata.Metric { +func getSumMetric(name string, attributes pdata.Map, value float64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSum) @@ -288,7 +288,7 @@ func getEmptyCumulativeHistogramMetric(name string) pdata.Metric { return metric } -func getHistogramMetric(name string, attributes pdata.AttributeMap, ts uint64, sum float64, count uint64, bounds []float64, buckets []uint64) pdata.Metric { +func getHistogramMetric(name string, attributes pdata.Map, ts uint64, sum float64, count uint64, bounds []float64, buckets []uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeHistogram) @@ -314,7 +314,7 @@ func getEmptySummaryMetric(name string) pdata.Metric { return metric } -func getSummaryMetric(name string, attributes pdata.AttributeMap, ts uint64, sum float64, count uint64, quantiles pdata.ValueAtQuantileSlice) pdata.Metric { +func getSummaryMetric(name string, attributes pdata.Map, ts uint64, sum float64, count uint64, quantiles pdata.ValueAtQuantileSlice) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSummary) diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 9baf0c11e3a9..15e70281d9aa 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/signalfx/sapm-proto v0.9.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -36,10 +36,10 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index bf9c37e11430..d25c77b99a38 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -836,34 +836,36 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/zpages v0.29.0/go.mod h1:iHy2K1Cjz1Ss0Sv6cQPEExP0nD+gj7gAF024foxzFFE= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 5878c4a9ab09..d0571229e838 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/getsentry/sentry-go v0.13.0 github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -26,9 +26,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 03027a07c8d2..812e7bcc3475 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -170,23 +170,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/sentryexporter/sentry_exporter.go b/exporter/sentryexporter/sentry_exporter.go index 611385874c13..ce17d0fefed5 100644 --- a/exporter/sentryexporter/sentry_exporter.go +++ b/exporter/sentryexporter/sentry_exporter.go @@ -271,7 +271,7 @@ func convertToSentrySpan(span pdata.Span, library pdata.InstrumentationLibrary, // // See https://github.com/open-telemetry/opentelemetry-specification/tree/5b78ee1/specification/trace/semantic_conventions // for more details about the semantic conventions. -func generateSpanDescriptors(name string, attrs pdata.AttributeMap, spanKind pdata.SpanKind) (op string, description string) { +func generateSpanDescriptors(name string, attrs pdata.Map, spanKind pdata.SpanKind) (op string, description string) { var opBuilder strings.Builder var dBuilder strings.Builder @@ -339,7 +339,7 @@ func generateTagsFromResource(resource pdata.Resource) map[string]string { return generateTagsFromAttributes(resource.Attributes()) } -func generateTagsFromAttributes(attrs pdata.AttributeMap) map[string]string { +func generateTagsFromAttributes(attrs pdata.Map) map[string]string { tags := make(map[string]string) attrs.Range(func(key string, attr pdata.Value) bool { diff --git a/exporter/sentryexporter/sentry_exporter_test.go b/exporter/sentryexporter/sentry_exporter_test.go index 97bf073ec85a..8bb179c3dafa 100644 --- a/exporter/sentryexporter/sentry_exporter_test.go +++ b/exporter/sentryexporter/sentry_exporter_test.go @@ -362,7 +362,7 @@ type SpanDescriptorsCase struct { testName string // input name string - attrs pdata.AttributeMap + attrs pdata.Map spanKind pdata.SpanKind // output op string @@ -374,8 +374,8 @@ func TestGenerateSpanDescriptors(t *testing.T) { { testName: "http-client", name: "/api/users/{user_id}", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeHTTPMethod: pdata.NewValueString("GET"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPMethod: "GET", }), spanKind: pdata.SpanKindClient, op: "http.client", @@ -384,8 +384,8 @@ func TestGenerateSpanDescriptors(t *testing.T) { { testName: "http-server", name: "/api/users/{user_id}", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeHTTPMethod: pdata.NewValueString("POST"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPMethod: "POST", }), spanKind: pdata.SpanKindServer, op: "http.server", @@ -394,8 +394,8 @@ func TestGenerateSpanDescriptors(t *testing.T) { { testName: "db-call-without-statement", name: "SET mykey 'Val'", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeDBSystem: pdata.NewValueString("redis"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeDBSystem: "redis", }), spanKind: pdata.SpanKindClient, op: "db", @@ -404,9 +404,9 @@ func TestGenerateSpanDescriptors(t *testing.T) { { testName: "db-call-with-statement", name: "mysql call", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeDBSystem: pdata.NewValueString("sqlite"), - conventions.AttributeDBStatement: pdata.NewValueString("SELECT * FROM table"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeDBSystem: "sqlite", + conventions.AttributeDBStatement: "SELECT * FROM table", }), spanKind: pdata.SpanKindClient, op: "db", @@ -415,8 +415,8 @@ func TestGenerateSpanDescriptors(t *testing.T) { { testName: "rpc", name: "grpc.test.EchoService/Echo", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeRPCService: pdata.NewValueString("EchoService"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeRPCService: "EchoService", }), spanKind: pdata.SpanKindClient, op: "rpc", @@ -425,8 +425,8 @@ func TestGenerateSpanDescriptors(t *testing.T) { { testName: "message-system", name: "message-destination", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "messaging.system": pdata.NewValueString("kafka"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + "messaging.system": "kafka", }), spanKind: pdata.SpanKindProducer, op: "message", @@ -435,8 +435,8 @@ func TestGenerateSpanDescriptors(t *testing.T) { { testName: "faas", name: "message-destination", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "faas.trigger": pdata.NewValueString("pubsub"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + "faas.trigger": "pubsub", }), spanKind: pdata.SpanKindServer, op: "pubsub", @@ -454,7 +454,7 @@ func TestGenerateSpanDescriptors(t *testing.T) { } func TestGenerateTagsFromAttributes(t *testing.T) { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString("string-key", "string-value") attrs.InsertBool("bool-key", true) diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index f9c39922f60b..0b9da7332a82 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -14,8 +14,8 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -58,10 +58,10 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 37ac52ad532f..8675d848c3a7 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -274,24 +274,24 @@ go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/signalfxexporter/internal/translation/converter_test.go b/exporter/signalfxexporter/internal/translation/converter_test.go index 5c8236bac012..1db8c0bf368b 100644 --- a/exporter/signalfxexporter/internal/translation/converter_test.go +++ b/exporter/signalfxexporter/internal/translation/converter_test.go @@ -48,12 +48,12 @@ var ( func Test_MetricDataToSignalFxV2(t *testing.T) { logger := zap.NewNop() - labelMap := map[string]string{ + labelMap := map[string]interface{}{ "k0": "v0", "k1": "v1", } - longLabelMap := map[string]string{ + longLabelMap := map[string]interface{}{ fmt.Sprintf("l%sng_key", strings.Repeat("o", 128)): "v0", "k0": "v0", "k1": fmt.Sprintf("l%sng_value", strings.Repeat("o", 256)), @@ -69,21 +69,21 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { initDoublePtWithLabels := func(doublePtWithLabels pdata.NumberDataPoint) { initDoublePt(doublePtWithLabels) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(doublePtWithLabels.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(doublePtWithLabels.Attributes()) } initDoublePtWithLongLabels := func(doublePtWithLabels pdata.NumberDataPoint) { initDoublePt(doublePtWithLabels) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(longLabelMap)).CopyTo(doublePtWithLabels.Attributes()) + pdata.NewMapFromRaw(longLabelMap).CopyTo(doublePtWithLabels.Attributes()) } - differentLabelMap := map[string]string{ + differentLabelMap := map[string]interface{}{ "k00": "v00", "k11": "v11", } initDoublePtWithDifferentLabels := func(doublePtWithDifferentLabels pdata.NumberDataPoint) { initDoublePt(doublePtWithDifferentLabels) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(differentLabelMap)).CopyTo(doublePtWithDifferentLabels.Attributes()) + pdata.NewMapFromRaw(differentLabelMap).CopyTo(doublePtWithDifferentLabels.Attributes()) } initInt64Pt := func(int64Pt pdata.NumberDataPoint) { @@ -93,7 +93,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { initInt64PtWithLabels := func(int64PtWithLabels pdata.NumberDataPoint) { initInt64Pt(int64PtWithLabels) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(int64PtWithLabels.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(int64PtWithLabels.Attributes()) } histBounds := []float64{1, 2, 4} @@ -105,7 +105,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { histDP.SetSum(100.0) histDP.SetExplicitBounds(histBounds) histDP.SetBucketCounts(histCounts) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(histDP.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(histDP.Attributes()) } histDP := pdata.NewHistogramDataPoint() initHistDP(histDP) @@ -114,7 +114,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { histDP.SetCount(2) histDP.SetSum(10) histDP.SetTimestamp(ts) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(histDP.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(histDP.Attributes()) } histDPNoBuckets := pdata.NewHistogramDataPoint() initHistDPNoBuckets(histDPNoBuckets) @@ -279,7 +279,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { doubleSFxDataPoint( "gauge_double_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(map[string]string{ + maps.MergeRawMaps(map[string]interface{}{ "k_n0": "vn0", "k_n1": "vn1", "k_r0": "vr0", @@ -288,7 +288,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { int64SFxDataPoint( "gauge_int_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(map[string]string{ + maps.MergeRawMaps(map[string]interface{}{ "k_n0": "vn0", "k_n1": "vn1", "k_r0": "vr0", @@ -347,7 +347,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { int64SFxDataPoint( "gauge_int_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(map[string]string{ + maps.MergeRawMaps(map[string]interface{}{ "k_n0": "vn0", "k_n1": "vn1", "k_r0": "vr0", @@ -356,7 +356,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { int64SFxDataPoint( "gauge_int_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(map[string]string{ + maps.MergeRawMaps(map[string]interface{}{ "k_n0": "vn0", "k_n1": "vn1", "k_r0": "vr0", @@ -391,12 +391,12 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { doubleSFxDataPoint( "gauge_double_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(map[string]string{ + maps.MergeRawMaps(map[string]interface{}{ "k_n0": "vn0", "k_n1": "vn1", "k_r0": "vr0", "k_r1": "vr1", - }, map[string]string{ + }, map[string]interface{}{ "k0": "v0", "k2": "v2", })), @@ -426,7 +426,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { doubleSFxDataPoint( "gauge_double_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(labelMap, map[string]string{ + maps.MergeRawMaps(labelMap, map[string]interface{}{ "cloud_account_id": "efgh", "cloud_provider": conventions.AttributeCloudProviderAWS, "cloud_region": "us-east", @@ -460,7 +460,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { doubleSFxDataPoint( "gauge_double_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(labelMap, map[string]string{ + maps.MergeRawMaps(labelMap, map[string]interface{}{ "cloud_provider": conventions.AttributeCloudProviderAWS, "cloud_account_id": "efgh", "cloud_region": "us-east", @@ -494,7 +494,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { doubleSFxDataPoint( "gauge_double_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(labelMap, map[string]string{ + maps.MergeRawMaps(labelMap, map[string]interface{}{ "host_id": "abcd", "cloud_provider": conventions.AttributeCloudProviderGCP, "k_r0": "vr0", @@ -526,7 +526,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { doubleSFxDataPoint( "gauge_double_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(labelMap, map[string]string{ + maps.MergeRawMaps(labelMap, map[string]interface{}{ "gcp_id": "efgh_abcd", "k_r0": "vr0", "k_r1": "vr1", @@ -776,7 +776,7 @@ func sortDimensions(points []*sfxpb.DataPoint) { func doubleSFxDataPoint( metric string, metricType *sfxpb.MetricType, - dims map[string]string, + dims map[string]interface{}, ) *sfxpb.DataPoint { return &sfxpb.DataPoint{ Metric: metric, @@ -790,7 +790,7 @@ func doubleSFxDataPoint( func int64SFxDataPoint( metric string, metricType *sfxpb.MetricType, - dims map[string]string, + dims map[string]interface{}, ) *sfxpb.DataPoint { return &sfxpb.DataPoint{ Metric: metric, @@ -801,12 +801,12 @@ func int64SFxDataPoint( } } -func sfxDimensions(m map[string]string) []*sfxpb.Dimension { +func sfxDimensions(m map[string]interface{}) []*sfxpb.Dimension { sfxDims := make([]*sfxpb.Dimension, 0, len(m)) for k, v := range m { sfxDims = append(sfxDims, &sfxpb.Dimension{ Key: k, - Value: v, + Value: v.(string), }) } @@ -897,11 +897,3 @@ func TestMetricsConverter_ConvertDimension(t *testing.T) { }) } } - -func stringMapToAttributeMap(m map[string]string) map[string]pdata.Value { - ret := map[string]pdata.Value{} - for k, v := range m { - ret[k] = pdata.NewValueString(v) - } - return ret -} diff --git a/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go b/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go index 437df4b79aa4..eb799a8aca08 100644 --- a/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go +++ b/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go @@ -27,7 +27,7 @@ import ( func LogRecordSliceToSignalFxV2( logger *zap.Logger, logs pdata.LogRecordSlice, - resourceAttrs pdata.AttributeMap, + resourceAttrs pdata.Map, ) ([]*sfxpb.Event, int) { events := make([]*sfxpb.Event, 0, logs.Len()) numDroppedLogRecords := 0 @@ -45,7 +45,7 @@ func LogRecordSliceToSignalFxV2( return events, numDroppedLogRecords } -func convertLogRecord(lr pdata.LogRecord, resourceAttrs pdata.AttributeMap, logger *zap.Logger) (*sfxpb.Event, bool) { +func convertLogRecord(lr pdata.LogRecord, resourceAttrs pdata.Map, logger *zap.Logger) (*sfxpb.Event, bool) { attrs := lr.Attributes() categoryVal, ok := attrs.Get(splunk.SFxEventCategoryKey) @@ -78,7 +78,7 @@ func convertLogRecord(lr pdata.LogRecord, resourceAttrs pdata.AttributeMap, logg // keep a record of Resource attributes to add as dimensions // so as not to modify LogRecord attributes - resourceAttrsForDimensions := pdata.NewAttributeMap() + resourceAttrsForDimensions := pdata.NewMap() resourceAttrs.Range(func(k string, v pdata.Value) bool { // LogRecord attribute takes priority if _, ok := attrs.Get(k); !ok { diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index ccd261fe60db..cd11feda9b00 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/grpc v1.45.0 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 ) @@ -31,10 +31,10 @@ require ( github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index c75aa4b9230e..c28304aa5320 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -206,24 +206,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= @@ -341,7 +341,6 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 080999840927..51eb72079439 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 @@ -35,9 +35,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index f3f19220a104..bb528db59dd9 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -195,23 +195,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/splunkhecexporter/metricdata_to_splunk.go b/exporter/splunkhecexporter/metricdata_to_splunk.go index 666c42898fb0..e17c20bf75ea 100644 --- a/exporter/splunkhecexporter/metricdata_to_splunk.go +++ b/exporter/splunkhecexporter/metricdata_to_splunk.go @@ -234,7 +234,7 @@ func createEvent(timestamp pdata.Timestamp, host string, source string, sourceTy } -func populateAttributes(fields map[string]interface{}, attributeMap pdata.AttributeMap) { +func populateAttributes(fields map[string]interface{}, attributeMap pdata.Map) { attributeMap.Range(func(k string, v pdata.Value) bool { fields[k] = v.AsString() return true diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index 8dddb32fc9d2..307e7a93c74c 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -39,11 +39,11 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.4.1 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index e1cd907dc6a1..20b8ac7acebb 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -438,13 +438,13 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.0/go.mod h1:4vatbW3QwS11DK0H0SB7FR31/VbthXcYorswdkVXdyg= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= @@ -456,8 +456,9 @@ go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= go.opentelemetry.io/otel/internal/metric v0.23.0/go.mod h1:z+RPiDJe30YnCrOhFGivwBS+DU1JU/PiLKkk4re2DNY= go.opentelemetry.io/otel/internal/metric v0.24.0/go.mod h1:PSkQG+KuApZjBpC6ea6082ZrWUUy/w132tJ/LOU3TXk= @@ -470,8 +471,9 @@ go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo= go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs= @@ -479,8 +481,9 @@ go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/sumologicexporter/exporter.go b/exporter/sumologicexporter/exporter.go index d2452ba94e0d..5caac594c3b0 100644 --- a/exporter/sumologicexporter/exporter.go +++ b/exporter/sumologicexporter/exporter.go @@ -134,8 +134,8 @@ func (se *sumologicexporter) start(_ context.Context, host component.Host) (err // so they can be handled by OTC retry mechanism func (se *sumologicexporter) pushLogsData(ctx context.Context, ld pdata.Logs) error { var ( - currentMetadata = newFields(pdata.NewAttributeMap()) - previousMetadata = newFields(pdata.NewAttributeMap()) + currentMetadata = newFields(pdata.NewMap()) + previousMetadata = newFields(pdata.NewMap()) errs error droppedRecords []pdata.LogRecord err error @@ -234,11 +234,11 @@ func (se *sumologicexporter) pushLogsData(ctx context.Context, ld pdata.Logs) er // so they can be handle by the OTC retry mechanism func (se *sumologicexporter) pushMetricsData(ctx context.Context, md pdata.Metrics) error { var ( - currentMetadata = newFields(pdata.NewAttributeMap()) - previousMetadata = newFields(pdata.NewAttributeMap()) + currentMetadata = newFields(pdata.NewMap()) + previousMetadata = newFields(pdata.NewMap()) errs error droppedRecords []metricPair - attributes pdata.AttributeMap + attributes pdata.Map ) c, err := newCompressor(se.config.CompressEncoding) diff --git a/exporter/sumologicexporter/fields.go b/exporter/sumologicexporter/fields.go index ba3edcf54715..88ec10f9f2fc 100644 --- a/exporter/sumologicexporter/fields.go +++ b/exporter/sumologicexporter/fields.go @@ -24,11 +24,11 @@ import ( // fields represents metadata type fields struct { - orig pdata.AttributeMap + orig pdata.Map replacer *strings.Replacer } -func newFields(attrMap pdata.AttributeMap) fields { +func newFields(attrMap pdata.Map) fields { return fields{ orig: attrMap, replacer: strings.NewReplacer(",", "_", "=", ":", "\n", "_"), diff --git a/exporter/sumologicexporter/filter.go b/exporter/sumologicexporter/filter.go index 21d319d3ddb7..5197f6a420c7 100644 --- a/exporter/sumologicexporter/filter.go +++ b/exporter/sumologicexporter/filter.go @@ -42,8 +42,8 @@ func newFilter(flds []string) (filter, error) { } // filterIn returns fields which match at least one of the filter regexes -func (f *filter) filterIn(attributes pdata.AttributeMap) fields { - returnValue := pdata.NewAttributeMap() +func (f *filter) filterIn(attributes pdata.Map) fields { + returnValue := pdata.NewMap() attributes.Range(func(k string, v pdata.Value) bool { for _, regex := range f.regexes { @@ -59,8 +59,8 @@ func (f *filter) filterIn(attributes pdata.AttributeMap) fields { } // filterOut returns fields which don't match any of the filter regexes -func (f *filter) filterOut(attributes pdata.AttributeMap) fields { - returnValue := pdata.NewAttributeMap() +func (f *filter) filterOut(attributes pdata.Map) fields { + returnValue := pdata.NewMap() attributes.Range(func(k string, v pdata.Value) bool { for _, regex := range f.regexes { diff --git a/exporter/sumologicexporter/filter_test.go b/exporter/sumologicexporter/filter_test.go index 0169fd54f44a..a58088a3d740 100644 --- a/exporter/sumologicexporter/filter_test.go +++ b/exporter/sumologicexporter/filter_test.go @@ -23,7 +23,7 @@ import ( ) func TestGetMetadata(t *testing.T) { - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.InsertString("key3", "value3") attributes.InsertString("key1", "value1") attributes.InsertString("key2", "value2") @@ -45,7 +45,7 @@ func TestGetMetadata(t *testing.T) { } func TestFilterOutMetadata(t *testing.T) { - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.InsertString("key3", "value3") attributes.InsertString("key1", "value1") attributes.InsertString("key2", "value2") diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 675ab6621b9b..87e4d5b86c30 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) @@ -33,10 +33,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/zap v1.21.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index c3bbad1a163e..ad9d902f1675 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -187,23 +187,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/sumologicexporter/prometheus_formatter.go b/exporter/sumologicexporter/prometheus_formatter.go index f4ccfe8dafdb..0d6f2b156044 100644 --- a/exporter/sumologicexporter/prometheus_formatter.go +++ b/exporter/sumologicexporter/prometheus_formatter.go @@ -25,7 +25,7 @@ import ( type dataPoint interface { Timestamp() pdata.Timestamp - Attributes() pdata.AttributeMap + Attributes() pdata.Map } type prometheusFormatter struct { @@ -54,8 +54,8 @@ func newPrometheusFormatter() (prometheusFormatter, error) { } // PrometheusLabels returns all attributes as sanitized prometheus labels string -func (f *prometheusFormatter) tags2String(attr pdata.AttributeMap, labels pdata.AttributeMap) prometheusTags { - mergedAttributes := pdata.NewAttributeMap() +func (f *prometheusFormatter) tags2String(attr pdata.Map, labels pdata.Map) prometheusTags { + mergedAttributes := pdata.NewMap() attr.CopyTo(mergedAttributes) labels.Range(func(k string, v pdata.Value) bool { mergedAttributes.UpsertString(k, v.StringVal()) @@ -131,7 +131,7 @@ func (f *prometheusFormatter) uintLine(name string, attributes prometheusTags, v } // doubleValueLine returns prometheus line with given value -func (f *prometheusFormatter) doubleValueLine(name string, value float64, dp dataPoint, attributes pdata.AttributeMap) string { +func (f *prometheusFormatter) doubleValueLine(name string, value float64, dp dataPoint, attributes pdata.Map) string { return f.doubleLine( name, f.tags2String(attributes, dp.Attributes()), @@ -141,7 +141,7 @@ func (f *prometheusFormatter) doubleValueLine(name string, value float64, dp dat } // uintValueLine returns prometheus line with given value -func (f *prometheusFormatter) uintValueLine(name string, value uint64, dp dataPoint, attributes pdata.AttributeMap) string { +func (f *prometheusFormatter) uintValueLine(name string, value uint64, dp dataPoint, attributes pdata.Map) string { return f.uintLine( name, f.tags2String(attributes, dp.Attributes()), @@ -151,7 +151,7 @@ func (f *prometheusFormatter) uintValueLine(name string, value uint64, dp dataPo } // numberDataPointValueLine returns prometheus line with value from pdata.NumberDataPoint -func (f *prometheusFormatter) numberDataPointValueLine(name string, dp pdata.NumberDataPoint, attributes pdata.AttributeMap) string { +func (f *prometheusFormatter) numberDataPointValueLine(name string, dp pdata.NumberDataPoint, attributes pdata.Map) string { switch dp.ValueType() { case pdata.MetricValueTypeDouble: return f.doubleValueLine( @@ -181,9 +181,9 @@ func (f *prometheusFormatter) countMetric(name string) string { return fmt.Sprintf("%s_count", name) } -// mergeAttributes gets two pdata.AttributeMaps and returns new which contains values from both of them -func (f *prometheusFormatter) mergeAttributes(attributes pdata.AttributeMap, additionalAttributes pdata.AttributeMap) pdata.AttributeMap { - mergedAttributes := pdata.NewAttributeMap() +// mergeAttributes gets two pdata.Map and returns new which contains values from both of them +func (f *prometheusFormatter) mergeAttributes(attributes pdata.Map, additionalAttributes pdata.Map) pdata.Map { + mergedAttributes := pdata.NewMap() attributes.CopyTo(mergedAttributes) additionalAttributes.Range(func(k string, v pdata.Value) bool { mergedAttributes.Upsert(k, v) @@ -237,7 +237,7 @@ func (f *prometheusFormatter) summary2Strings(record metricPair) []string { for i := 0; i < dps.Len(); i++ { dp := dps.At(i) qs := dp.QuantileValues() - additionalAttributes := pdata.NewAttributeMap() + additionalAttributes := pdata.NewMap() for i := 0; i < qs.Len(); i++ { q := qs.At(i) additionalAttributes.UpsertDouble(prometheusQuantileTag, q.Quantile()) @@ -285,7 +285,7 @@ func (f *prometheusFormatter) histogram2Strings(record metricPair) []string { } var cumulative uint64 - additionalAttributes := pdata.NewAttributeMap() + additionalAttributes := pdata.NewMap() for i, bound := range explicitBounds { cumulative += dp.BucketCounts()[i] diff --git a/exporter/sumologicexporter/prometheus_formatter_test.go b/exporter/sumologicexporter/prometheus_formatter_test.go index 8a0a763de1e6..cfa8b270b7bd 100644 --- a/exporter/sumologicexporter/prometheus_formatter_test.go +++ b/exporter/sumologicexporter/prometheus_formatter_test.go @@ -46,7 +46,7 @@ func TestTags2StringNoLabels(t *testing.T) { mp := exampleIntMetric() mp.attributes.Clear() - assert.Equal(t, prometheusTags(""), f.tags2String(mp.attributes, pdata.NewAttributeMap())) + assert.Equal(t, prometheusTags(""), f.tags2String(mp.attributes, pdata.NewMap())) } func TestTags2String(t *testing.T) { @@ -57,7 +57,7 @@ func TestTags2String(t *testing.T) { assert.Equal( t, prometheusTags(`{test="test_value",test2="second_value"}`), - f.tags2String(mp.attributes, pdata.NewAttributeMap()), + f.tags2String(mp.attributes, pdata.NewMap()), ) } @@ -67,7 +67,7 @@ func TestTags2StringNoAttributes(t *testing.T) { mp := exampleIntMetric() mp.attributes.Clear() - assert.Equal(t, prometheusTags(""), f.tags2String(pdata.NewAttributeMap(), pdata.NewAttributeMap())) + assert.Equal(t, prometheusTags(""), f.tags2String(pdata.NewMap(), pdata.NewMap())) } func TestPrometheusMetricDataTypeIntGauge(t *testing.T) { diff --git a/exporter/sumologicexporter/sender.go b/exporter/sumologicexporter/sender.go index 63489f686fa2..0aea24d48315 100644 --- a/exporter/sumologicexporter/sender.go +++ b/exporter/sumologicexporter/sender.go @@ -37,7 +37,7 @@ type appendResponse struct { // metricPair represents information required to send one metric to the Sumo Logic type metricPair struct { - attributes pdata.AttributeMap + attributes pdata.Map metric pdata.Metric } diff --git a/exporter/sumologicexporter/sender_test.go b/exporter/sumologicexporter/sender_test.go index 2dee056968af..1ed48f912f02 100644 --- a/exporter/sumologicexporter/sender_test.go +++ b/exporter/sumologicexporter/sender_test.go @@ -231,7 +231,7 @@ func TestSendLogsSplit(t *testing.T) { test.s.config.MaxRequestBodySize = 10 test.s.logBuffer = exampleTwoLogs() - _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.NoError(t, err) } func TestSendLogsSplitFailedOne(t *testing.T) { @@ -252,7 +252,7 @@ func TestSendLogsSplitFailedOne(t *testing.T) { test.s.config.LogFormat = TextFormat test.s.logBuffer = exampleTwoLogs() - dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") assert.Equal(t, test.s.logBuffer[0:1], dropped) } @@ -277,7 +277,7 @@ func TestSendLogsSplitFailedAll(t *testing.T) { test.s.config.LogFormat = TextFormat test.s.logBuffer = exampleTwoLogs() - dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.EqualError( t, err, @@ -342,7 +342,7 @@ func TestSendLogsJsonSplit(t *testing.T) { test.s.config.MaxRequestBodySize = 10 test.s.logBuffer = exampleTwoLogs() - _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.NoError(t, err) } @@ -364,7 +364,7 @@ func TestSendLogsJsonSplitFailedOne(t *testing.T) { test.s.config.MaxRequestBodySize = 10 test.s.logBuffer = exampleTwoLogs() - dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") assert.Equal(t, test.s.logBuffer[0:1], dropped) } @@ -389,7 +389,7 @@ func TestSendLogsJsonSplitFailedAll(t *testing.T) { test.s.config.MaxRequestBodySize = 10 test.s.logBuffer = exampleTwoLogs() - dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.EqualError( t, err, @@ -408,7 +408,7 @@ func TestSendLogsUnexpectedFormat(t *testing.T) { logs := exampleTwoLogs() test.s.logBuffer = logs - dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.Error(t, err) assert.Equal(t, logs, dropped) } @@ -465,13 +465,13 @@ func TestLogsBuffer(t *testing.T) { assert.Equal(t, test.s.countLogs(), 0) logs := exampleTwoLogs() - droppedLogs, err := test.s.batchLog(context.Background(), logs[0], newFields(pdata.NewAttributeMap())) + droppedLogs, err := test.s.batchLog(context.Background(), logs[0], newFields(pdata.NewMap())) require.NoError(t, err) assert.Nil(t, droppedLogs) assert.Equal(t, 1, test.s.countLogs()) assert.Equal(t, []pdata.LogRecord{logs[0]}, test.s.logBuffer) - droppedLogs, err = test.s.batchLog(context.Background(), logs[1], newFields(pdata.NewAttributeMap())) + droppedLogs, err = test.s.batchLog(context.Background(), logs[1], newFields(pdata.NewMap())) require.NoError(t, err) assert.Nil(t, droppedLogs) assert.Equal(t, 2, test.s.countLogs()) @@ -489,7 +489,7 @@ func TestInvalidEndpoint(t *testing.T) { test.s.config.HTTPClientSettings.Endpoint = ":" test.s.logBuffer = exampleLog() - _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.EqualError(t, err, `parse ":": missing protocol scheme`) } @@ -500,7 +500,7 @@ func TestInvalidPostRequest(t *testing.T) { test.s.config.HTTPClientSettings.Endpoint = "" test.s.logBuffer = exampleLog() - _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewAttributeMap())) + _, err := test.s.sendLogs(context.Background(), newFields(pdata.NewMap())) assert.EqualError(t, err, `Post "": unsupported protocol scheme ""`) } @@ -510,7 +510,7 @@ func TestLogsBufferOverflow(t *testing.T) { test.s.config.HTTPClientSettings.Endpoint = ":" log := exampleLog() - flds := newFields(pdata.NewAttributeMap()) + flds := newFields(pdata.NewMap()) for test.s.countLogs() < maxBufferSize-1 { _, err := test.s.batchLog(context.Background(), log[0], flds) @@ -528,7 +528,7 @@ func TestInvalidMetricFormat(t *testing.T) { test.s.config.MetricFormat = "invalid" - err := test.s.send(context.Background(), MetricsPipeline, strings.NewReader(""), newFields(pdata.NewAttributeMap())) + err := test.s.send(context.Background(), MetricsPipeline, strings.NewReader(""), newFields(pdata.NewMap())) assert.EqualError(t, err, `unsupported metrics format: invalid`) } @@ -536,7 +536,7 @@ func TestInvalidPipeline(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - err := test.s.send(context.Background(), "invalidPipeline", strings.NewReader(""), newFields(pdata.NewAttributeMap())) + err := test.s.send(context.Background(), "invalidPipeline", strings.NewReader(""), newFields(pdata.NewMap())) assert.EqualError(t, err, `unexpected pipeline`) } @@ -560,7 +560,7 @@ func TestSendCompressGzip(t *testing.T) { test.s.compressor = c reader := strings.NewReader("Some example log") - err = test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewAttributeMap())) + err = test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewMap())) require.NoError(t, err) } @@ -584,7 +584,7 @@ func TestSendCompressDeflate(t *testing.T) { test.s.compressor = c reader := strings.NewReader("Some example log") - err = test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewAttributeMap())) + err = test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewMap())) require.NoError(t, err) } @@ -595,7 +595,7 @@ func TestCompressionError(t *testing.T) { test.s.compressor = getTestCompressor(errors.New("read error"), nil) reader := strings.NewReader("Some example log") - err := test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewAttributeMap())) + err := test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewMap())) assert.EqualError(t, err, "read error") } @@ -606,7 +606,7 @@ func TestInvalidContentEncoding(t *testing.T) { test.s.config.CompressEncoding = "test" reader := strings.NewReader("Some example log") - err := test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewAttributeMap())) + err := test.s.send(context.Background(), LogsPipeline, reader, newFields(pdata.NewMap())) assert.EqualError(t, err, "invalid content encoding: test") } @@ -659,7 +659,7 @@ gauge_metric_name{foo="bar",remote_name="156955",url="http://another_url"} 245 1 exampleIntGaugeMetric(), } - _, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewAttributeMap())) + _, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewMap())) assert.NoError(t, err) } @@ -687,7 +687,7 @@ gauge_metric_name{foo="bar",remote_name="156955",url="http://another_url"} 245 1 exampleIntGaugeMetric(), } - dropped, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewMap())) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") assert.Equal(t, test.s.metricBuffer[0:1], dropped) } @@ -718,7 +718,7 @@ gauge_metric_name{foo="bar",remote_name="156955",url="http://another_url"} 245 1 exampleIntGaugeMetric(), } - dropped, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewMap())) assert.EqualError( t, err, @@ -739,7 +739,7 @@ func TestSendMetricsUnexpectedFormat(t *testing.T) { } test.s.metricBuffer = metrics - dropped, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewAttributeMap())) + dropped, err := test.s.sendMetrics(context.Background(), newFields(pdata.NewMap())) assert.EqualError(t, err, "unexpected metric format: invalid") assert.Equal(t, dropped, metrics) } @@ -754,13 +754,13 @@ func TestMetricsBuffer(t *testing.T) { exampleIntGaugeMetric(), } - droppedMetrics, err := test.s.batchMetric(context.Background(), metrics[0], newFields(pdata.NewAttributeMap())) + droppedMetrics, err := test.s.batchMetric(context.Background(), metrics[0], newFields(pdata.NewMap())) require.NoError(t, err) assert.Nil(t, droppedMetrics) assert.Equal(t, 1, test.s.countMetrics()) assert.Equal(t, metrics[0:1], test.s.metricBuffer) - droppedMetrics, err = test.s.batchMetric(context.Background(), metrics[1], newFields(pdata.NewAttributeMap())) + droppedMetrics, err = test.s.batchMetric(context.Background(), metrics[1], newFields(pdata.NewMap())) require.NoError(t, err) assert.Nil(t, droppedMetrics) assert.Equal(t, 2, test.s.countMetrics()) @@ -780,7 +780,7 @@ func TestMetricsBufferOverflow(t *testing.T) { test.s.config.MetricFormat = PrometheusFormat test.s.config.MaxRequestBodySize = 1024 * 1024 * 1024 * 1024 metric := exampleIntMetric() - flds := newFields(pdata.NewAttributeMap()) + flds := newFields(pdata.NewMap()) for test.s.countMetrics() < maxBufferSize-1 { _, err := test.s.batchMetric(context.Background(), metric, flds) diff --git a/exporter/sumologicexporter/test_data.go b/exporter/sumologicexporter/test_data.go index f6f49b7ee34c..0397ea29cc66 100644 --- a/exporter/sumologicexporter/test_data.go +++ b/exporter/sumologicexporter/test_data.go @@ -34,7 +34,7 @@ func buildExampleIntMetric(fillData bool) metricPair { dp.SetIntVal(14500) } - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.InsertString("test", "test_value") attributes.InsertString("test2", "second_value") @@ -50,7 +50,7 @@ func exampleIntGaugeMetric() metricPair { func buildExampleIntGaugeMetric(fillData bool) metricPair { metric := metricPair{ - attributes: pdata.NewAttributeMap(), + attributes: pdata.NewMap(), metric: pdata.NewMetric(), } @@ -82,7 +82,7 @@ func exampleDoubleGaugeMetric() metricPair { func buildExampleDoubleGaugeMetric(fillData bool) metricPair { metric := metricPair{ - attributes: pdata.NewAttributeMap(), + attributes: pdata.NewMap(), metric: pdata.NewMetric(), } @@ -114,7 +114,7 @@ func exampleIntSumMetric() metricPair { func buildExampleIntSumMetric(fillData bool) metricPair { metric := metricPair{ - attributes: pdata.NewAttributeMap(), + attributes: pdata.NewMap(), metric: pdata.NewMetric(), } @@ -146,7 +146,7 @@ func exampleDoubleSumMetric() metricPair { func buildExampleDoubleSumMetric(fillData bool) metricPair { metric := metricPair{ - attributes: pdata.NewAttributeMap(), + attributes: pdata.NewMap(), metric: pdata.NewMetric(), } @@ -178,7 +178,7 @@ func exampleSummaryMetric() metricPair { func buildExampleSummaryMetric(fillData bool) metricPair { metric := metricPair{ - attributes: pdata.NewAttributeMap(), + attributes: pdata.NewMap(), metric: pdata.NewMetric(), } @@ -220,7 +220,7 @@ func exampleHistogramMetric() metricPair { func buildExampleHistogramMetric(fillData bool) metricPair { metric := metricPair{ - attributes: pdata.NewAttributeMap(), + attributes: pdata.NewMap(), metric: pdata.NewMetric(), } @@ -268,7 +268,7 @@ func metricPairToMetrics(mp []metricPair) pdata.Metrics { } func fieldsFromMap(s map[string]string) fields { - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() for k, v := range s { attrMap.InsertString(k, v) } diff --git a/exporter/tanzuobservabilityexporter/exporter_test.go b/exporter/tanzuobservabilityexporter/exporter_test.go index 7e3960d94a14..b0aadd3a57d3 100644 --- a/exporter/tanzuobservabilityexporter/exporter_test.go +++ b/exporter/tanzuobservabilityexporter/exporter_test.go @@ -94,7 +94,7 @@ func TestExportTraceDataFullTrace(t *testing.T) { status.SetMessage("an error event occurred") status.CopyTo(clientSpan.Status()) - clientAttrs := pdata.NewAttributeMap() + clientAttrs := pdata.NewMap() clientAttrs.InsertString(labelApplication, "test-app") clientAttrs.CopyTo(clientSpan.Attributes()) @@ -106,7 +106,7 @@ func TestExportTraceDataFullTrace(t *testing.T) { ) serverSpan.SetKind(pdata.SpanKindServer) serverSpan.SetTraceState("key=val") - serverAttrs := pdata.NewAttributeMap() + serverAttrs := pdata.NewMap() serverAttrs.InsertString(conventions.AttributeServiceName, "the-server") serverAttrs.InsertString(conventions.AttributeHTTPMethod, "POST") serverAttrs.InsertInt(conventions.AttributeHTTPStatusCode, 403) @@ -114,7 +114,7 @@ func TestExportTraceDataFullTrace(t *testing.T) { serverAttrs.CopyTo(serverSpan.Attributes()) traces := constructTraces([]pdata.Span{rootSpan, clientSpan, serverSpan}) - resourceAttrs := pdata.NewAttributeMap() + resourceAttrs := pdata.NewMap() resourceAttrs.InsertString("resource", "R1") resourceAttrs.InsertString(conventions.AttributeServiceName, "test-service") resourceAttrs.InsertString(labelSource, "test-source") diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 454ea919a4f6..e2f2d3eceb1f 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 github.com/wavefronthq/wavefront-sdk-go v0.9.10 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -35,10 +35,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index 76c1bda3d46d..446b34f80825 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -190,24 +190,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/exporter/tanzuobservabilityexporter/metrics.go b/exporter/tanzuobservabilityexporter/metrics.go index a4df81478271..8f348eb034ce 100644 --- a/exporter/tanzuobservabilityexporter/metrics.go +++ b/exporter/tanzuobservabilityexporter/metrics.go @@ -569,7 +569,7 @@ type histogramDataPoint interface { Count() uint64 ExplicitBounds() []float64 BucketCounts() []uint64 - Attributes() pdata.AttributeMap + Attributes() pdata.Map Timestamp() pdata.Timestamp } diff --git a/exporter/tanzuobservabilityexporter/metrics_test.go b/exporter/tanzuobservabilityexporter/metrics_test.go index ee01e3ffcf44..eedabb9d7e59 100644 --- a/exporter/tanzuobservabilityexporter/metrics_test.go +++ b/exporter/tanzuobservabilityexporter/metrics_test.go @@ -713,7 +713,7 @@ func TestCumulativeHistogramDataPointConsumer(t *testing.T) { // Creates bounds of -Inf to <=2.0; >2.0 to <=5.0; >5.0 to <=10.0; >10.0 to +Inf histogramDataPoint.SetExplicitBounds([]float64{2.0, 5.0, 10.0}) histogramDataPoint.SetBucketCounts([]uint64{5, 1, 3, 2}) - setTags(map[string]interface{}{"foo": "bar"}, histogramDataPoint.Attributes()) + histogramDataPoint.Attributes().UpsertString("foo", "bar") sender := &mockGaugeSender{} report := newHistogramReporting(componenttest.NewNopTelemetrySettings()) consumer := newCumulativeHistogramDataPointConsumer(sender) @@ -761,7 +761,8 @@ func TestCumulativeHistogramDataPointConsumerWithSourceInDataPoint(t *testing.T) // Creates bounds of -Inf to <=2.0; >2.0 to <=5.0; >5.0 to <=10.0; >10.0 to +Inf histogramDataPoint.SetExplicitBounds([]float64{2.0, 5.0, 10.0}) histogramDataPoint.SetBucketCounts([]uint64{5, 1, 3, 2}) - setTags(map[string]interface{}{"foo": "bar", "source": "dp_source"}, histogramDataPoint.Attributes()) + histogramDataPoint.Attributes().UpsertString("foo", "bar") + histogramDataPoint.Attributes().UpsertString("source", "dp_source") sender := &mockGaugeSender{} report := newHistogramReporting(componenttest.NewNopTelemetrySettings()) consumer := newCumulativeHistogramDataPointConsumer(sender) @@ -826,7 +827,7 @@ func TestCumulativeHistogramDataPointConsumerLeInUse(t *testing.T) { histogramDataPoint := pdata.NewHistogramDataPoint() histogramDataPoint.SetExplicitBounds([]float64{10.0}) histogramDataPoint.SetBucketCounts([]uint64{4, 12}) - setTags(map[string]interface{}{"le": 8}, histogramDataPoint.Attributes()) + histogramDataPoint.Attributes().UpsertInt("le", 8) sender := &mockGaugeSender{} report := newHistogramReporting(componenttest.NewNopTelemetrySettings()) consumer := newCumulativeHistogramDataPointConsumer(sender) @@ -879,9 +880,7 @@ func TestDeltaHistogramDataPointConsumer(t *testing.T) { histogramDataPoint.SetExplicitBounds([]float64{2.0, 5.0, 10.0}) histogramDataPoint.SetBucketCounts([]uint64{5, 1, 3, 2}) setDataPointTimestamp(1631234567, histogramDataPoint) - setTags( - map[string]interface{}{"bar": "baz"}, - histogramDataPoint.Attributes()) + histogramDataPoint.Attributes().UpsertString("bar", "baz") sender := &mockDistributionSender{} report := newHistogramReporting(componenttest.NewNopTelemetrySettings()) consumer := newDeltaHistogramDataPointConsumer(sender) @@ -920,9 +919,8 @@ func TestDeltaHistogramDataPointConsumerWithSourceInDataPoint(t *testing.T) { histogramDataPoint.SetExplicitBounds([]float64{2.0, 5.0, 10.0}) histogramDataPoint.SetBucketCounts([]uint64{5, 1, 3, 2}) setDataPointTimestamp(1631234567, histogramDataPoint) - setTags( - map[string]interface{}{"bar": "baz", "source": "dp_source"}, - histogramDataPoint.Attributes()) + histogramDataPoint.Attributes().UpsertString("bar", "baz") + histogramDataPoint.Attributes().UpsertString("source", "dp_source") sender := &mockDistributionSender{} report := newHistogramReporting(componenttest.NewNopTelemetrySettings()) consumer := newDeltaHistogramDataPointConsumer(sender) @@ -1029,14 +1027,14 @@ func TestSummaries(t *testing.T) { mi := createMetricInfo(summaryMetric) dataPoint := dataPoints.AppendEmpty() setQuantileValues(dataPoint, 0.1, 100.0, 0.5, 200.0, 0.9, 300.0, 0.99, 400.0) - setTags(map[string]interface{}{"foo": "bar"}, dataPoint.Attributes()) + dataPoint.Attributes().UpsertString("foo", "bar") dataPoint.SetCount(10) dataPoint.SetSum(5000.0) setDataPointTimestamp(1645123456, dataPoint) dataPoint = dataPoints.AppendEmpty() setQuantileValues(dataPoint, 0.2, 75.0, 0.5, 125.0, 0.8, 175.0, 0.95, 225.0) - setTags(map[string]interface{}{"bar": "baz"}, dataPoint.Attributes()) + dataPoint.Attributes().UpsertString("bar", "baz") dataPoint.SetCount(15) dataPoint.SetSum(3000.0) setDataPointTimestamp(1645123556, dataPoint) @@ -1149,7 +1147,7 @@ func TestSummaries_QuantileTagExists(t *testing.T) { mi := createMetricInfo(summaryMetric) dataPoint := dataPoints.AppendEmpty() setQuantileValues(dataPoint, 0.5, 300.0) - setTags(map[string]interface{}{"quantile": "exists"}, dataPoint.Attributes()) + dataPoint.Attributes().UpsertString("quantile", "exists") dataPoint.SetCount(12) dataPoint.SetSum(4000.0) setDataPointTimestamp(1650123456, dataPoint) @@ -1195,7 +1193,7 @@ func TestSummariesSourceInDataPoint(t *testing.T) { mi := createMetricInfo(summaryMetric) dataPoint := dataPoints.AppendEmpty() setQuantileValues(dataPoint, 0.5, 300.0) - setTags(map[string]interface{}{"source": "dp_source"}, dataPoint.Attributes()) + dataPoint.Attributes().UpsertString("source", "dp_source") dataPoint.SetCount(12) dataPoint.SetSum(4000.0) setDataPointTimestamp(1650123456, dataPoint) @@ -1285,7 +1283,8 @@ func TestExponentialHistogramDataPoint(t *testing.T) { dataPoint.Positive().SetOffset(3) dataPoint.Positive().SetBucketCounts([]uint64{5, 6, 7, 8}) dataPoint.SetZeroCount(2) - setTags(map[string]interface{}{"foo": "bar", "baz": "7"}, dataPoint.Attributes()) + dataPoint.Attributes().UpsertString("foo", "bar") + dataPoint.Attributes().UpsertString("baz", "7") setDataPointTimestamp(1640198765, dataPoint) h := newExponentialHistogramDataPoint(dataPoint) assert.Equal(t, []uint64{0, 17, 16, 15, 2, 5, 6, 7, 8, 0}, h.BucketCounts()) @@ -1439,7 +1438,7 @@ func addDataPoint( setDataPointValue(value, dataPoint) } setDataPointTimestamp(ts, dataPoint) - setTags(tags, dataPoint.Attributes()) + pdata.NewMapFromRaw(tags).CopyTo(dataPoint.Attributes()) } type dataPointWithTimestamp interface { @@ -1464,26 +1463,6 @@ func setDataPointValue(value interface{}, dataPoint pdata.NumberDataPoint) { } } -func setTags(tags map[string]interface{}, attributes pdata.AttributeMap) { - valueMap := make(map[string]pdata.Value, len(tags)) - for key, value := range tags { - switch v := value.(type) { - case int: - valueMap[key] = pdata.NewValueInt(int64(v)) - case int64: - valueMap[key] = pdata.NewValueInt(v) - case float64: - valueMap[key] = pdata.NewValueDouble(v) - case string: - valueMap[key] = pdata.NewValueString(v) - default: - panic("Invalid value type") - } - } - attributeMap := pdata.NewAttributeMapFromMap(valueMap) - attributeMap.CopyTo(attributes) -} - type tobsMetric struct { Name string Value float64 diff --git a/exporter/tanzuobservabilityexporter/transformer.go b/exporter/tanzuobservabilityexporter/transformer.go index 52a20f966b0f..81ffe3c03376 100644 --- a/exporter/tanzuobservabilityexporter/transformer.go +++ b/exporter/tanzuobservabilityexporter/transformer.go @@ -28,7 +28,7 @@ import ( ) type traceTransformer struct { - resAttrs pdata.AttributeMap + resAttrs pdata.Map } func newTraceTransformer(resource pdata.Resource) *traceTransformer { @@ -108,7 +108,7 @@ func (t *traceTransformer) Span(orig pdata.Span) (span, error) { }, nil } -func getSourceAndResourceTags(attributes pdata.AttributeMap) (string, map[string]string) { +func getSourceAndResourceTags(attributes pdata.Map) (string, map[string]string) { candidateKeys := []string{labelSource, conventions.AttributeHostName, "hostname", conventions.AttributeHostID} attributesWithoutSource := map[string]string{} @@ -192,7 +192,7 @@ func calculateTimes(span pdata.Span) (int64, int64) { return startMillis, durationMillis } -func attributesToTags(attributesWithoutSource map[string]string, attributes pdata.AttributeMap) map[string]string { +func attributesToTags(attributesWithoutSource map[string]string, attributes pdata.Map) map[string]string { tags := make(map[string]string) for key, val := range attributesWithoutSource { diff --git a/exporter/tanzuobservabilityexporter/transformer_test.go b/exporter/tanzuobservabilityexporter/transformer_test.go index ec0a42efda90..3d3b25f7fcdc 100644 --- a/exporter/tanzuobservabilityexporter/transformer_test.go +++ b/exporter/tanzuobservabilityexporter/transformer_test.go @@ -26,7 +26,7 @@ import ( func TestSpanStartTimeIsConvertedToMilliseconds(t *testing.T) { inNanos := int64(50000000) - att := pdata.NewAttributeMap() + att := pdata.NewMap() transform := transformerFromAttributes(att) span := pdata.NewSpan() span.SetSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) @@ -42,7 +42,7 @@ func TestSpanStartTimeIsConvertedToMilliseconds(t *testing.T) { func TestSpanDurationIsCalculatedFromStartAndEndTimes(t *testing.T) { startNanos := int64(50000000) endNanos := int64(60000000) - att := pdata.NewAttributeMap() + att := pdata.NewMap() transform := transformerFromAttributes(att) span := pdata.NewSpan() span.SetSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) @@ -58,7 +58,7 @@ func TestSpanDurationIsCalculatedFromStartAndEndTimes(t *testing.T) { func TestSpanDurationIsZeroIfEndTimeIsUnset(t *testing.T) { startNanos := int64(50000000) - att := pdata.NewAttributeMap() + att := pdata.NewMap() transform := transformerFromAttributes(att) span := pdata.NewSpan() span.SetSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) @@ -72,7 +72,7 @@ func TestSpanDurationIsZeroIfEndTimeIsUnset(t *testing.T) { } func TestSpanStatusCodeErrorAddsErrorTag(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) actual, err := transform.Span(spanWithStatus(pdata.StatusCodeError, "")) require.NoError(t, err, "transforming span to wavefront format") @@ -82,7 +82,7 @@ func TestSpanStatusCodeErrorAddsErrorTag(t *testing.T) { } func TestSpanStatusCodeOkDoesNotAddErrorTag(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) actual, err := transform.Span(spanWithStatus(pdata.StatusCodeOk, "")) require.NoError(t, err, "transforming span to wavefront format") @@ -91,7 +91,7 @@ func TestSpanStatusCodeOkDoesNotAddErrorTag(t *testing.T) { } func TestSpanStatusCodeUnsetDoesNotAddErrorTag(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) actual, err := transform.Span(spanWithStatus(pdata.StatusCodeUnset, "")) require.NoError(t, err, "transforming span to wavefront format") @@ -100,7 +100,7 @@ func TestSpanStatusCodeUnsetDoesNotAddErrorTag(t *testing.T) { } func TestSpanStatusMessageIsConvertedToTag(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) message := "some error message" actual, err := transform.Span(spanWithStatus(pdata.StatusCodeError, message)) @@ -112,7 +112,7 @@ func TestSpanStatusMessageIsConvertedToTag(t *testing.T) { } func TestSpanStatusMessageIsIgnoredIfStatusIsNotError(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) actual, err := transform.Span(spanWithStatus(pdata.StatusCodeOk, "not a real error message")) require.NoError(t, err, "transforming span to wavefront format") @@ -128,7 +128,7 @@ func TestSpanStatusMessageIsTruncatedToValidLength(t *testing.T) { * Keep the number of distinct time series per metric and host to under 1000. * -- https://docs.wavefront.com/wavefront_data_format.html */ - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) message := "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" message += "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" message += "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" @@ -142,7 +142,7 @@ func TestSpanStatusMessageIsTruncatedToValidLength(t *testing.T) { } func TestSpanEventsAreTranslatedToSpanLogs(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) now := time.Now() span := pdata.NewSpan() span.SetSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) @@ -150,7 +150,7 @@ func TestSpanEventsAreTranslatedToSpanLogs(t *testing.T) { event := pdata.NewSpanEvent() event.SetName("eventName") event.SetTimestamp(pdata.NewTimestampFromTime(now)) - eventAttrs := pdata.NewAttributeMap() + eventAttrs := pdata.NewMap() eventAttrs.InsertString("attrKey", "attrVal") eventAttrs.CopyTo(event.Attributes()) event.CopyTo(span.Events().AppendEmpty()) @@ -170,7 +170,7 @@ func TestSpanEventsAreTranslatedToSpanLogs(t *testing.T) { } func TestSpanKindIsTranslatedToTag(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) internalSpan, err := transform.Span(spanWithKind(pdata.SpanKindInternal)) require.NoError(t, err, "transforming span to wavefront format") @@ -210,7 +210,7 @@ func TestSpanKindIsTranslatedToTag(t *testing.T) { } func TestTraceStateTranslatedToTag(t *testing.T) { - transform := transformerFromAttributes(pdata.NewAttributeMap()) + transform := transformerFromAttributes(pdata.NewMap()) spanWithState, err := transform.Span(spanWithTraceState("key=val")) require.NoError(t, err, "transforming span to wavefront format") @@ -228,7 +228,7 @@ func TestSpanForSourceTag(t *testing.T) { inNanos := int64(50000000) //TestCase1: default value for source - resAttrs := pdata.NewAttributeMap() + resAttrs := pdata.NewMap() transform := transformerFromAttributes(resAttrs) span := pdata.NewSpan() span.SetSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) @@ -240,7 +240,7 @@ func TestSpanForSourceTag(t *testing.T) { assert.Equal(t, "", actual.Source) //TestCase2: source value from resAttrs.source - resAttrs = pdata.NewAttributeMap() + resAttrs = pdata.NewMap() resAttrs.InsertString(labelSource, "test_source") resAttrs.InsertString(conventions.AttributeHostName, "test_host.name") transform = transformerFromAttributes(resAttrs) @@ -259,7 +259,7 @@ func TestSpanForSourceTag(t *testing.T) { } //TestCase2: source value from resAttrs.host.name when source is not present - resAttrs = pdata.NewAttributeMap() + resAttrs = pdata.NewMap() resAttrs.InsertString("hostname", "test_hostname") resAttrs.InsertString(conventions.AttributeHostName, "test_host.name") transform = transformerFromAttributes(resAttrs) @@ -278,7 +278,7 @@ func TestSpanForSourceTag(t *testing.T) { } //TestCase4: source value from resAttrs.source when spanAttrs.source is present - resAttrs = pdata.NewAttributeMap() + resAttrs = pdata.NewMap() span.Attributes().InsertString(labelSource, "source_from_span_attribute") resAttrs.InsertString(labelSource, "test_source") resAttrs.InsertString(conventions.AttributeHostName, "test_host.name") @@ -298,7 +298,7 @@ func TestSpanForDroppedCount(t *testing.T) { inNanos := int64(50000000) //TestCase: 1 count tags are not set - resAttrs := pdata.NewAttributeMap() + resAttrs := pdata.NewMap() transform := transformerFromAttributes(resAttrs) span := pdata.NewSpan() span.SetSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) @@ -324,7 +324,7 @@ func TestSpanForDroppedCount(t *testing.T) { } func TestGetSourceAndResourceTags(t *testing.T) { - resAttrs := pdata.NewAttributeMap() + resAttrs := pdata.NewMap() resAttrs.InsertString(labelSource, "test_source") resAttrs.InsertString(conventions.AttributeHostName, "test_host.name") @@ -352,7 +352,7 @@ func spanWithTraceState(state pdata.TraceState) pdata.Span { return span } -func transformerFromAttributes(attrs pdata.AttributeMap) *traceTransformer { +func transformerFromAttributes(attrs pdata.Map) *traceTransformer { return &traceTransformer{ resAttrs: attrs, } diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index a571bbb27c5d..34cf9f0deba7 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.7.1 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.370 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -29,9 +29,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index 95753242b8a5..3c1d68ee624f 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -174,23 +174,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 58e9327f3790..f44d6448d7e9 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.47.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -41,10 +41,10 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 8c4e2970465d..520a2bf0fc0c 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -245,24 +245,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 0561c6748107..f64d058e2daf 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,7 +6,7 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.6.0 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.45.0 ) @@ -29,10 +29,10 @@ require ( github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/zap v1.21.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 8ba0d2020e73..dd790617e395 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -190,22 +190,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 9d98d13db826..c3b9ccce7318 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -23,10 +23,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index d42815dd1ba7..ff4d87a9340f 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -139,22 +139,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index ff796daa931c..3a160e534830 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -24,10 +24,10 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index 727d76899dd8..7ab1b0e6aabb 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -175,20 +175,20 @@ github.com/tg123/go-htpasswd v1.2.0/go.mod h1:h7IzlfpvIWnVJhNZ0nQ9HaFxHb7pn5uFJY github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index b9bbf6f6a4b2..dd021360c186 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 ) @@ -24,10 +24,10 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index 2c8207ac96ab..88f63aee1a43 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -179,22 +179,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index 694b6237017f..27ce4b9e114a 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -6,7 +6,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil/v3 v3.22.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -30,10 +30,10 @@ require ( github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 16a231a3dc30..67026a20f6b6 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -154,22 +154,22 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 93fad83bff66..9ad632b7ab9d 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -22,10 +22,10 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 7a7f1e85f571..5023aef0953b 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -159,22 +159,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index c23fa011390c..7f252f94f519 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -30,12 +30,12 @@ require ( github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 4dba5f68b565..f9b2e5ae062b 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -177,22 +177,22 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index def3eb7f0b13..37b50e5078e4 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/jaegertracing/jaeger v1.32.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -29,13 +29,13 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 0419ff4dec38..203b77b1dd38 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -325,25 +325,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 256c2d7c75b9..04d9568315ed 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 google.golang.org/grpc v1.45.0 @@ -32,12 +32,12 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index cf2d23049b53..68e2685a1239 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -307,23 +307,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index b17053a08e8e..fc47f602dd79 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -40,10 +40,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 6a7d2052938b..8e68aa0b4682 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -706,22 +706,22 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 2e75cde3a33c..9e89d50c7418 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.43.23 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 gopkg.in/yaml.v2 v2.4.0 @@ -26,10 +26,10 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index de1b9bfcea7d..47b46e333851 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -146,22 +146,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index bfe58ae61a29..1a91ecf1701c 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -28,12 +28,12 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index e4a3a65bc27c..9d1ffdd1bd3f 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -175,23 +175,23 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index b27222d05e7d..f5377387ab08 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.47.0 github.com/shirou/gopsutil/v3 v3.22.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -31,10 +31,10 @@ require ( github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 16a231a3dc30..67026a20f6b6 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -154,22 +154,22 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 9a5ddf93b587..3890eb753dfa 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 k8s.io/api v0.23.5 k8s.io/apimachinery v0.23.5 @@ -38,10 +38,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 7a0928d8403e..bcce3b1be42c 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -366,22 +366,22 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 6ddbfa195a27..9e13efe78e03 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -25,10 +25,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index c4d6efe62e89..53b24af46170 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -253,20 +253,20 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index d6baef4b4fa4..c9c25bc3cce0 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -23,10 +23,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 327d26e06f11..85eb45990ab1 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -140,22 +140,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 07d58218205e..65c58cee15cc 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.4.3 github.com/aws/aws-sdk-go-v2/service/sts v1.7.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 ) @@ -30,10 +30,10 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 86ed87e5bd34..4674b3ab7026 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -180,22 +180,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index 26c3dc4c62ff..9fee6ff03208 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -37,10 +37,10 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index c384de535c33..1d2d9c65d4c1 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -233,22 +233,22 @@ github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxt go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/go.mod b/go.mod index e2b78f880d98..0a097fb0ceca 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.47.0 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 ) @@ -436,7 +436,7 @@ require ( go.etcd.io/bbolt v1.3.6 // indirect go.mongodb.org/atlas v0.15.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect go.opentelemetry.io/contrib/zpages v0.29.0 // indirect diff --git a/go.sum b/go.sum index 3503fbbf3784..cdea4314c957 100644 --- a/go.sum +++ b/go.sum @@ -2278,18 +2278,15 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9 h1:Ge6PYtsfU2OYOeSHw/jSg1bX6HE7hjOpJ8rnKyl+lpc= -go.opentelemetry.io/collector v0.47.1-0.20220321233732-3cec6d3d98d9/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9 h1:fhA7W2RJYNZkhDfdLJHW2H24CrlI7cy8pJn3CxucUeY= -go.opentelemetry.io/collector/model v0.47.1-0.20220321233732-3cec6d3d98d9/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index e531ab63eebe..852d8752f64e 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index f0d72f9a309f..aae6af6a5ab6 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -26,8 +26,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4= go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 8963ec16c355..bb003aaba037 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/aws/aws-sdk-go v1.43.23 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -23,10 +23,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/stretchr/objx v0.1.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 0fb549fc71ee..2afeef9a9914 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -135,20 +135,20 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 8b17f8cf63fe..3b957b8685cd 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -29,12 +29,12 @@ require ( github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 4dba5f68b565..f9b2e5ae062b 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -177,22 +177,22 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 5475e66f277a..ac5a98b5a97a 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.43.23 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index e6393589e848..546541514dcc 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -30,8 +30,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/common/maps/maps.go b/internal/common/maps/maps.go index 18539b0dc0df..b45d79ba3059 100644 --- a/internal/common/maps/maps.go +++ b/internal/common/maps/maps.go @@ -14,6 +14,19 @@ package maps // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/maps" +// MergeRawMaps merges n maps with a later map's keys overriding earlier maps. +func MergeRawMaps(maps ...map[string]interface{}) map[string]interface{} { + ret := map[string]interface{}{} + + for _, m := range maps { + for k, v := range m { + ret[k] = v + } + } + + return ret +} + // MergeStringMaps merges n maps with a later map's keys overriding earlier maps. func MergeStringMaps(maps ...map[string]string) map[string]string { ret := map[string]string{} @@ -27,6 +40,15 @@ func MergeStringMaps(maps ...map[string]string) map[string]string { return ret } +// CloneRawMap makes a shallow copy of a map[string]interface{}. +func CloneRawMap(m map[string]interface{}) map[string]interface{} { + m2 := make(map[string]interface{}, len(m)) + for k, v := range m { + m2[k] = v + } + return m2 +} + // CloneStringMap makes a shallow copy of a map[string]string. func CloneStringMap(m map[string]string) map[string]string { m2 := make(map[string]string, len(m)) diff --git a/internal/coreinternal/attraction/attraction.go b/internal/coreinternal/attraction/attraction.go index 00e5f5742d93..83c3ff0c513c 100644 --- a/internal/coreinternal/attraction/attraction.go +++ b/internal/coreinternal/attraction/attraction.go @@ -273,7 +273,7 @@ func NewAttrProc(settings *Settings) (*AttrProc, error) { } // Process applies the AttrProc to an attribute map. -func (ap *AttrProc) Process(ctx context.Context, logger *zap.Logger, attrs pdata.AttributeMap) { +func (ap *AttrProc) Process(ctx context.Context, logger *zap.Logger, attrs pdata.Map) { for _, action := range ap.actions { // TODO https://go.opentelemetry.io/collector/issues/296 // Do benchmark testing between having action be of type string vs integer. @@ -321,7 +321,7 @@ func getAttributeValueFromContext(ctx context.Context, key string) (pdata.Value, return pdata.NewValueString(strings.Join(vals, ";")), true } -func getSourceAttributeValue(ctx context.Context, action attributeAction, attrs pdata.AttributeMap) (pdata.Value, bool) { +func getSourceAttributeValue(ctx context.Context, action attributeAction, attrs pdata.Map) (pdata.Value, bool) { // Set the key with a value from the configuration. if action.AttributeValue != nil { return *action.AttributeValue, true @@ -334,19 +334,19 @@ func getSourceAttributeValue(ctx context.Context, action attributeAction, attrs return attrs.Get(action.FromAttribute) } -func hashAttribute(action attributeAction, attrs pdata.AttributeMap) { +func hashAttribute(action attributeAction, attrs pdata.Map) { if value, exists := attrs.Get(action.Key); exists { sha1Hasher(value) } } -func convertAttribute(logger *zap.Logger, action attributeAction, attrs pdata.AttributeMap) { +func convertAttribute(logger *zap.Logger, action attributeAction, attrs pdata.Map) { if value, exists := attrs.Get(action.Key); exists { convertValue(logger, action.Key, action.ConvertedType, value) } } -func extractAttributes(action attributeAction, attrs pdata.AttributeMap) { +func extractAttributes(action attributeAction, attrs pdata.Map) { value, found := attrs.Get(action.Key) // Extracting values only functions on strings. diff --git a/internal/coreinternal/attraction/attraction_test.go b/internal/coreinternal/attraction/attraction_test.go index 762bf7070695..fefa93c62cd0 100644 --- a/internal/coreinternal/attraction/attraction_test.go +++ b/internal/coreinternal/attraction/attraction_test.go @@ -33,17 +33,17 @@ import ( // Common structure for all the Tests type testCase struct { name string - inputAttributes map[string]pdata.Value - expectedAttributes map[string]pdata.Value + inputAttributes map[string]interface{} + expectedAttributes map[string]interface{} } // runIndividualTestCase is the common logic of passing trace data through a configured attributes processor. func runIndividualTestCase(t *testing.T, tt testCase, ap *AttrProc) { t.Run(tt.name, func(t *testing.T) { - attrMap := pdata.NewAttributeMapFromMap(tt.inputAttributes) + attrMap := pdata.NewMapFromRaw(tt.inputAttributes) ap.Process(context.TODO(), nil, attrMap) attrMap.Sort() - require.Equal(t, pdata.NewAttributeMapFromMap(tt.expectedAttributes).Sort(), attrMap) + require.Equal(t, pdata.NewMapFromRaw(tt.expectedAttributes).Sort(), attrMap) }) } @@ -52,30 +52,30 @@ func TestAttributes_InsertValue(t *testing.T) { // Ensure `attribute1` is set for spans with no attributes. { name: "InsertEmptyAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, // Ensure `attribute1` is set. { name: "InsertKeyNoExists", - inputAttributes: map[string]pdata.Value{ - "anotherkey": pdata.NewValueString("bob"), + inputAttributes: map[string]interface{}{ + "anotherkey": "bob", }, - expectedAttributes: map[string]pdata.Value{ - "anotherkey": pdata.NewValueString("bob"), - "attribute1": pdata.NewValueInt(123), + expectedAttributes: map[string]interface{}{ + "anotherkey": "bob", + "attribute1": 123, }, }, // Ensures no insert is performed because the keys `attribute1` already exists. { name: "InsertKeyExists", - inputAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueString("bob"), + inputAttributes: map[string]interface{}{ + "attribute1": "bob", }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueString("bob"), + expectedAttributes: map[string]interface{}{ + "attribute1": "bob", }, }, } @@ -101,40 +101,40 @@ func TestAttributes_InsertFromAttribute(t *testing.T) { // Ensure no attribute is inserted because because attributes do not exist. { name: "InsertEmptyAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, // Ensure no attribute is inserted because because from_attribute `string_key` does not exist. { name: "InsertMissingFromAttribute", - inputAttributes: map[string]pdata.Value{ - "bob": pdata.NewValueInt(1), + inputAttributes: map[string]interface{}{ + "bob": 1, }, - expectedAttributes: map[string]pdata.Value{ - "bob": pdata.NewValueInt(1), + expectedAttributes: map[string]interface{}{ + "bob": 1, }, }, // Ensure `string key` is set. { name: "InsertAttributeExists", - inputAttributes: map[string]pdata.Value{ - "anotherkey": pdata.NewValueInt(8892342), + inputAttributes: map[string]interface{}{ + "anotherkey": 8892342, }, - expectedAttributes: map[string]pdata.Value{ - "anotherkey": pdata.NewValueInt(8892342), - "string key": pdata.NewValueInt(8892342), + expectedAttributes: map[string]interface{}{ + "anotherkey": 8892342, + "string key": 8892342, }, }, // Ensures no insert is performed because the keys `string key` already exist. { name: "InsertKeysExists", - inputAttributes: map[string]pdata.Value{ - "anotherkey": pdata.NewValueInt(8892342), - "string key": pdata.NewValueString("here"), + inputAttributes: map[string]interface{}{ + "anotherkey": 8892342, + "string key": "here", }, - expectedAttributes: map[string]pdata.Value{ - "anotherkey": pdata.NewValueInt(8892342), - "string key": pdata.NewValueString("here"), + expectedAttributes: map[string]interface{}{ + "anotherkey": 8892342, + "string key": "here", }, }, } @@ -159,27 +159,27 @@ func TestAttributes_UpdateValue(t *testing.T) { // Ensure no changes to the span as there is no attributes map. { name: "UpdateNoAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, // Ensure no changes to the span as the key does not exist. { name: "UpdateKeyNoExist", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("foo"), + inputAttributes: map[string]interface{}{ + "boo": "foo", }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("foo"), + expectedAttributes: map[string]interface{}{ + "boo": "foo", }, }, // Ensure the attribute `db.secret` is updated. { name: "UpdateAttributes", - inputAttributes: map[string]pdata.Value{ - "db.secret": pdata.NewValueString("password1234"), + inputAttributes: map[string]interface{}{ + "db.secret": "password1234", }, - expectedAttributes: map[string]pdata.Value{ - "db.secret": pdata.NewValueString("redacted"), + expectedAttributes: map[string]interface{}{ + "db.secret": "redacted", }, }, } @@ -205,39 +205,39 @@ func TestAttributes_UpdateFromAttribute(t *testing.T) { // Ensure no changes to the span as there is no attributes map. { name: "UpdateNoAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, // Ensure the attribute `boo` isn't updated because attribute `foo` isn't present in the span. { name: "UpdateKeyNoExistFromAttribute", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("bob"), + inputAttributes: map[string]interface{}{ + "boo": "bob", }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("bob"), + expectedAttributes: map[string]interface{}{ + "boo": "bob", }, }, // Ensure no updates as the target key `boo` doesn't exists. { name: "UpdateKeyNoExistMainAttributed", - inputAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("over there"), + inputAttributes: map[string]interface{}{ + "foo": "over there", }, - expectedAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("over there"), + expectedAttributes: map[string]interface{}{ + "foo": "over there", }, }, // Ensure no updates as the target key `boo` doesn't exists. { name: "UpdateKeyFromExistingAttribute", - inputAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("there is a party over here"), - "boo": pdata.NewValueString("not here"), + inputAttributes: map[string]interface{}{ + "foo": "there is a party over here", + "boo": "not here", }, - expectedAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("there is a party over here"), - "boo": pdata.NewValueString("there is a party over here"), + expectedAttributes: map[string]interface{}{ + "foo": "there is a party over here", + "boo": "there is a party over here", }, }, } @@ -262,32 +262,32 @@ func TestAttributes_UpsertValue(t *testing.T) { // Ensure `region` is set for spans with no attributes. { name: "UpsertNoAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "region": pdata.NewValueString("planet-earth"), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "region": "planet-earth", }, }, // Ensure `region` is inserted for spans with some attributes(the key doesn't exist). { name: "UpsertAttributeNoExist", - inputAttributes: map[string]pdata.Value{ - "mission": pdata.NewValueString("to mars"), + inputAttributes: map[string]interface{}{ + "mission": "to mars", }, - expectedAttributes: map[string]pdata.Value{ - "mission": pdata.NewValueString("to mars"), - "region": pdata.NewValueString("planet-earth"), + expectedAttributes: map[string]interface{}{ + "mission": "to mars", + "region": "planet-earth", }, }, // Ensure `region` is updated for spans with the attribute key `region`. { name: "UpsertAttributeExists", - inputAttributes: map[string]pdata.Value{ - "mission": pdata.NewValueString("to mars"), - "region": pdata.NewValueString("solar system"), + inputAttributes: map[string]interface{}{ + "mission": "to mars", + "region": "solar system", }, - expectedAttributes: map[string]pdata.Value{ - "mission": pdata.NewValueString("to mars"), - "region": pdata.NewValueString("planet-earth"), + expectedAttributes: map[string]interface{}{ + "mission": "to mars", + "region": "planet-earth", }, }, } @@ -312,42 +312,42 @@ func TestAttributes_Extract(t *testing.T) { // Ensure `new_user_key` is not set for spans with no attributes. { name: "UpsertEmptyAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, // Ensure `new_user_key` is not inserted for spans with missing attribute `user_key`. { name: "No extract with no target key", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + inputAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + expectedAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, }, // Ensure `new_user_key` is not inserted for spans with missing attribute `user_key`. { name: "No extract with non string target key", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), - "user_key": pdata.NewValueInt(1234), + inputAttributes: map[string]interface{}{ + "boo": "ghosts are scary", + "user_key": 1234, }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), - "user_key": pdata.NewValueInt(1234), + expectedAttributes: map[string]interface{}{ + "boo": "ghosts are scary", + "user_key": 1234, }, }, // Ensure `new_user_key` is not updated for spans with attribute // `user_key` because `user_key` does not match the regular expression. { name: "No extract with no pattern matching", - inputAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("does not match"), - "boo": pdata.NewValueString("ghosts are scary"), + inputAttributes: map[string]interface{}{ + "user_key": "does not match", + "boo": "ghosts are scary", }, - expectedAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("does not match"), - "boo": pdata.NewValueString("ghosts are scary"), + expectedAttributes: map[string]interface{}{ + "user_key": "does not match", + "boo": "ghosts are scary", }, }, // Ensure `new_user_key` is not updated for spans with attribute @@ -355,58 +355,58 @@ func TestAttributes_Extract(t *testing.T) { // expression. { name: "No extract with no pattern matching", - inputAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update"), - "boo": pdata.NewValueString("ghosts are scary"), + inputAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update", + "boo": "ghosts are scary", }, - expectedAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update"), - "boo": pdata.NewValueString("ghosts are scary"), + expectedAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update", + "boo": "ghosts are scary", }, }, // Ensure `new_user_key` and `version` is inserted for spans with attribute `user_key`. { name: "Extract insert new values.", - inputAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update/v1"), - "foo": pdata.NewValueString("casper the friendly ghost"), + inputAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update/v1", + "foo": "casper the friendly ghost", }, - expectedAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update/v1"), - "new_user_key": pdata.NewValueString("12345678"), - "version": pdata.NewValueString("v1"), - "foo": pdata.NewValueString("casper the friendly ghost"), + expectedAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update/v1", + "new_user_key": "12345678", + "version": "v1", + "foo": "casper the friendly ghost", }, }, // Ensure `new_user_key` and `version` is updated for spans with attribute `user_key`. { name: "Extract updates existing values ", - inputAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update/v1"), - "new_user_key": pdata.NewValueString("2321"), - "version": pdata.NewValueString("na"), - "foo": pdata.NewValueString("casper the friendly ghost"), + inputAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update/v1", + "new_user_key": "2321", + "version": "na", + "foo": "casper the friendly ghost", }, - expectedAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update/v1"), - "new_user_key": pdata.NewValueString("12345678"), - "version": pdata.NewValueString("v1"), - "foo": pdata.NewValueString("casper the friendly ghost"), + expectedAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update/v1", + "new_user_key": "12345678", + "version": "v1", + "foo": "casper the friendly ghost", }, }, // Ensure `new_user_key` is updated and `version` is inserted for spans with attribute `user_key`. { name: "Extract upserts values", - inputAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update/v1"), - "new_user_key": pdata.NewValueString("2321"), - "foo": pdata.NewValueString("casper the friendly ghost"), + inputAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update/v1", + "new_user_key": "2321", + "foo": "casper the friendly ghost", }, - expectedAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueString("/api/v1/document/12345678/update/v1"), - "new_user_key": pdata.NewValueString("12345678"), - "version": pdata.NewValueString("v1"), - "foo": pdata.NewValueString("casper the friendly ghost"), + expectedAttributes: map[string]interface{}{ + "user_key": "/api/v1/document/12345678/update/v1", + "new_user_key": "12345678", + "version": "v1", + "foo": "casper the friendly ghost", }, }, } @@ -433,44 +433,44 @@ func TestAttributes_UpsertFromAttribute(t *testing.T) { // Ensure `new_user_key` is not set for spans with no attributes. { name: "UpsertEmptyAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, // Ensure `new_user_key` is not inserted for spans with missing attribute `user_key`. { name: "UpsertFromAttributeNoExist", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + inputAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + expectedAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, }, // Ensure `new_user_key` is inserted for spans with attribute `user_key`. { name: "UpsertFromAttributeExistsInsert", - inputAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueInt(2245), - "foo": pdata.NewValueString("casper the friendly ghost"), + inputAttributes: map[string]interface{}{ + "user_key": 2245, + "foo": "casper the friendly ghost", }, - expectedAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueInt(2245), - "new_user_key": pdata.NewValueInt(2245), - "foo": pdata.NewValueString("casper the friendly ghost"), + expectedAttributes: map[string]interface{}{ + "user_key": 2245, + "new_user_key": 2245, + "foo": "casper the friendly ghost", }, }, // Ensure `new_user_key` is updated for spans with attribute `user_key`. { name: "UpsertFromAttributeExistsUpdate", - inputAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueInt(2245), - "new_user_key": pdata.NewValueInt(5422), - "foo": pdata.NewValueString("casper the friendly ghost"), + inputAttributes: map[string]interface{}{ + "user_key": 2245, + "new_user_key": 5422, + "foo": "casper the friendly ghost", }, - expectedAttributes: map[string]pdata.Value{ - "user_key": pdata.NewValueInt(2245), - "new_user_key": pdata.NewValueInt(2245), - "foo": pdata.NewValueString("casper the friendly ghost"), + expectedAttributes: map[string]interface{}{ + "user_key": 2245, + "new_user_key": 2245, + "foo": "casper the friendly ghost", }, }, } @@ -495,28 +495,28 @@ func TestAttributes_Delete(t *testing.T) { // Ensure the span contains no changes. { name: "DeleteEmptyAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, // Ensure the span contains no changes because the key doesn't exist. { name: "DeleteAttributeNoExist", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + inputAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + expectedAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, }, // Ensure `duplicate_key` is deleted for spans with the attribute set. { name: "DeleteAttributeExists", - inputAttributes: map[string]pdata.Value{ - "duplicate_key": pdata.NewValueDouble(3245.6), - "original_key": pdata.NewValueDouble(3245.6), + inputAttributes: map[string]interface{}{ + "duplicate_key": 3245.6, + "original_key": 3245.6, }, - expectedAttributes: map[string]pdata.Value{ - "original_key": pdata.NewValueDouble(3245.6), + expectedAttributes: map[string]interface{}{ + "original_key": 3245.6, }, }, } @@ -550,67 +550,67 @@ func TestAttributes_HashValue(t *testing.T) { // Ensure no changes to the span as there is no attributes map. { name: "HashNoAttributes", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, // Ensure no changes to the span as the key does not exist. { name: "HashKeyNoExist", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("foo"), + inputAttributes: map[string]interface{}{ + "boo": "foo", }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("foo"), + expectedAttributes: map[string]interface{}{ + "boo": "foo", }, }, // Ensure string data types are hashed correctly { name: "HashString", - inputAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueString("foo"), + inputAttributes: map[string]interface{}{ + "updateme": "foo", }, - expectedAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueString(sha1Hash([]byte("foo"))), + expectedAttributes: map[string]interface{}{ + "updateme": sha1Hash([]byte("foo")), }, }, // Ensure int data types are hashed correctly { name: "HashInt", - inputAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueInt(intVal), + inputAttributes: map[string]interface{}{ + "updateme": intVal, }, - expectedAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueString(sha1Hash(intBytes)), + expectedAttributes: map[string]interface{}{ + "updateme": sha1Hash(intBytes), }, }, // Ensure double data types are hashed correctly { name: "HashDouble", - inputAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueDouble(doubleVal), + inputAttributes: map[string]interface{}{ + "updateme": doubleVal, }, - expectedAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueString(sha1Hash(doubleBytes)), + expectedAttributes: map[string]interface{}{ + "updateme": sha1Hash(doubleBytes), }, }, // Ensure bool data types are hashed correctly { name: "HashBoolTrue", - inputAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "updateme": true, }, - expectedAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueString(sha1Hash([]byte{1})), + expectedAttributes: map[string]interface{}{ + "updateme": sha1Hash([]byte{1}), }, }, // Ensure bool data types are hashed correctly { name: "HashBoolFalse", - inputAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "updateme": false, }, - expectedAttributes: map[string]pdata.Value{ - "updateme": pdata.NewValueString(sha1Hash([]byte{0})), + expectedAttributes: map[string]interface{}{ + "updateme": sha1Hash([]byte{0}), }, }, } @@ -633,11 +633,11 @@ func TestAttributes_HashValue(t *testing.T) { func TestAttributes_FromAttributeNoChange(t *testing.T) { tc := testCase{ name: "FromAttributeNoChange", - inputAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + inputAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, - expectedAttributes: map[string]pdata.Value{ - "boo": pdata.NewValueString("ghosts are scary"), + expectedAttributes: map[string]interface{}{ + "boo": "ghosts are scary", }, } @@ -664,12 +664,12 @@ func TestAttributes_Ordering(t *testing.T) { // 3. delete `operation`. { name: "OrderingApplyAllSteps", - inputAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), + inputAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", }, - expectedAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), - "svc.operation": pdata.NewValueString("default"), + expectedAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", + "svc.operation": "default", }, }, // For this example, the operations performed are @@ -678,13 +678,13 @@ func TestAttributes_Ordering(t *testing.T) { // 3. delete `operation`. { name: "OrderingOperationExists", - inputAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), - "operation": pdata.NewValueString("arithmetic"), + inputAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", + "operation": "arithmetic", }, - expectedAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), - "svc.operation": pdata.NewValueString("arithmetic"), + expectedAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", + "svc.operation": "arithmetic", }, }, @@ -694,13 +694,13 @@ func TestAttributes_Ordering(t *testing.T) { // 3. delete `operation`. { name: "OrderingSvcOperationExists", - inputAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), - "svc.operation": pdata.NewValueString("some value"), + inputAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", + "svc.operation": "some value", }, - expectedAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), - "svc.operation": pdata.NewValueString("default"), + expectedAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", + "svc.operation": "default", }, }, @@ -710,14 +710,14 @@ func TestAttributes_Ordering(t *testing.T) { // 3. delete `operation`. { name: "OrderingBothAttributesExist", - inputAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), - "operation": pdata.NewValueString("arithmetic"), - "svc.operation": pdata.NewValueString("add"), + inputAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", + "operation": "arithmetic", + "svc.operation": "add", }, - expectedAttributes: map[string]pdata.Value{ - "foo": pdata.NewValueString("casper the friendly ghost"), - "svc.operation": pdata.NewValueString("arithmetic"), + expectedAttributes: map[string]interface{}{ + "foo": "casper the friendly ghost", + "svc.operation": "arithmetic", }, }, } @@ -893,31 +893,31 @@ func TestFromContext(t *testing.T) { testCases := []struct { name string ctx context.Context - expectedAttributes map[string]pdata.Value + expectedAttributes map[string]interface{} action *ActionKeyValue }{ { name: "no_metadata", ctx: context.TODO(), - expectedAttributes: map[string]pdata.Value{}, + expectedAttributes: map[string]interface{}{}, action: &ActionKeyValue{Key: "dest", FromContext: "source", Action: INSERT}, }, { name: "no_value", ctx: mdCtx, - expectedAttributes: map[string]pdata.Value{}, + expectedAttributes: map[string]interface{}{}, action: &ActionKeyValue{Key: "dest", FromContext: "source", Action: INSERT}, }, { name: "single_value", ctx: mdCtx, - expectedAttributes: map[string]pdata.Value{"dest": pdata.NewValueString("single_val")}, + expectedAttributes: map[string]interface{}{"dest": "single_val"}, action: &ActionKeyValue{Key: "dest", FromContext: "source_single_val", Action: INSERT}, }, { name: "multiple_values", ctx: mdCtx, - expectedAttributes: map[string]pdata.Value{"dest": pdata.NewValueString("first_val;second_val")}, + expectedAttributes: map[string]interface{}{"dest": "first_val;second_val"}, action: &ActionKeyValue{Key: "dest", FromContext: "source_multiple_val", Action: INSERT}, }, } @@ -929,10 +929,10 @@ func TestFromContext(t *testing.T) { }) require.Nil(t, err) require.NotNil(t, ap) - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() ap.Process(tc.ctx, nil, attrMap) attrMap.Sort() - require.Equal(t, pdata.NewAttributeMapFromMap(tc.expectedAttributes).Sort(), attrMap) + require.Equal(t, pdata.NewMapFromRaw(tc.expectedAttributes).Sort(), attrMap) }) } } diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 4c1679542d59..cc266ac38685 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -8,8 +8,8 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 4ad5d058739e..ff853687c452 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -151,10 +151,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/coreinternal/goldendataset/metrics_gen.go b/internal/coreinternal/goldendataset/metrics_gen.go index 3e9532b53f01..63259f04de3e 100644 --- a/internal/coreinternal/goldendataset/metrics_gen.go +++ b/internal/coreinternal/goldendataset/metrics_gen.go @@ -200,7 +200,7 @@ func addDoubleHistogramVal(hdp pdata.HistogramDataPoint, val float64) { } } -func populatePtAttributes(cfg MetricsCfg, lm pdata.AttributeMap) { +func populatePtAttributes(cfg MetricsCfg, lm pdata.Map) { for i := 0; i < cfg.NumPtLabels; i++ { k := fmt.Sprintf("pt-label-key-%d", i) v := fmt.Sprintf("pt-label-val-%d", i) diff --git a/internal/coreinternal/goldendataset/resource_generator.go b/internal/coreinternal/goldendataset/resource_generator.go index 3578ee3b7d1c..cd5eaea9bcd9 100644 --- a/internal/coreinternal/goldendataset/resource_generator.go +++ b/internal/coreinternal/goldendataset/resource_generator.go @@ -42,7 +42,7 @@ func GenerateResource(rscID PICTInputResource) pdata.Resource { return resource } -func appendOnpremVMAttributes(attrMap pdata.AttributeMap) { +func appendOnpremVMAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeServiceName, "customers") attrMap.UpsertString(conventions.AttributeServiceNamespace, "production") attrMap.UpsertString(conventions.AttributeServiceVersion, "semver:0.7.3") @@ -56,7 +56,7 @@ func appendOnpremVMAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeTelemetrySDKVersion, "0.3.0") } -func appendCloudVMAttributes(attrMap pdata.AttributeMap) { +func appendCloudVMAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeServiceName, "shoppingcart") attrMap.UpsertString(conventions.AttributeServiceName, "customers") attrMap.UpsertString(conventions.AttributeServiceNamespace, "production") @@ -73,7 +73,7 @@ func appendCloudVMAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeCloudRegion, "South Central US") } -func appendOnpremK8sAttributes(attrMap pdata.AttributeMap) { +func appendOnpremK8sAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeContainerName, "cert-manager") attrMap.UpsertString(conventions.AttributeContainerImageName, "quay.io/jetstack/cert-manager-controller") attrMap.UpsertString(conventions.AttributeContainerImageTag, "v0.14.2") @@ -84,7 +84,7 @@ func appendOnpremK8sAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeHostName, "docker-desktop") } -func appendCloudK8sAttributes(attrMap pdata.AttributeMap) { +func appendCloudK8sAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeContainerName, "otel-collector") attrMap.UpsertString(conventions.AttributeContainerImageName, "otel/opentelemetry-collector-contrib") attrMap.UpsertString(conventions.AttributeContainerImageTag, "0.4.0") @@ -106,7 +106,7 @@ func appendCloudK8sAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeCloudAvailabilityZone, "us-east-1c") } -func appendFassAttributes(attrMap pdata.AttributeMap) { +func appendFassAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeFaaSID, "https://us-central1-dist-system-demo.cloudfunctions.net/env-vars-print") attrMap.UpsertString(conventions.AttributeFaaSName, "env-vars-print") attrMap.UpsertString(conventions.AttributeFaaSVersion, "semver:1.0.0") @@ -116,7 +116,7 @@ func appendFassAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeCloudAvailabilityZone, "us-central1-a") } -func appendExecAttributes(attrMap pdata.AttributeMap) { +func appendExecAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeProcessExecutableName, "otelcol") parts := pdata.NewValueArray() parts.SliceVal().AppendEmpty().SetStringVal("otelcol") diff --git a/internal/coreinternal/goldendataset/span_generator.go b/internal/coreinternal/goldendataset/span_generator.go index 46d832fc3c71..3249187568e1 100644 --- a/internal/coreinternal/goldendataset/span_generator.go +++ b/internal/coreinternal/goldendataset/span_generator.go @@ -149,7 +149,7 @@ func lookupSpanKind(kind PICTInputKind) pdata.SpanKind { } } -func appendSpanAttributes(spanTypeID PICTInputAttributes, statusStr PICTInputStatus, attrMap pdata.AttributeMap) { +func appendSpanAttributes(spanTypeID PICTInputAttributes, statusStr PICTInputStatus, attrMap pdata.Map) { includeStatus := statusStr != SpanStatusUnset switch spanTypeID { case SpanAttrEmpty: @@ -197,7 +197,7 @@ func fillStatus(statusStr PICTInputStatus, spanStatus pdata.SpanStatus) { spanStatus.SetMessage(statusMsgMap[statusStr]) } -func appendDatabaseSQLAttributes(attrMap pdata.AttributeMap) { +func appendDatabaseSQLAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeDBSystem, "mysql") attrMap.UpsertString(conventions.AttributeDBConnectionString, "Server=shopdb.example.com;Database=ShopDb;Uid=billing_user;TableCache=true;UseCompression=True;MinimumPoolSize=10;MaximumPoolSize=50;") attrMap.UpsertString(conventions.AttributeDBUser, "billing_user") @@ -212,7 +212,7 @@ func appendDatabaseSQLAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendDatabaseNoSQLAttributes(attrMap pdata.AttributeMap) { +func appendDatabaseNoSQLAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeDBSystem, "mongodb") attrMap.UpsertString(conventions.AttributeDBUser, "the_user") attrMap.UpsertString(conventions.AttributeNetPeerName, "mongodb0.example.com") @@ -225,7 +225,7 @@ func appendDatabaseNoSQLAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendFaaSDatasourceAttributes(attrMap pdata.AttributeMap) { +func appendFaaSDatasourceAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeFaaSTrigger, conventions.AttributeFaaSTriggerDatasource) attrMap.UpsertString(conventions.AttributeFaaSExecution, "DB85AF51-5E13-473D-8454-1E2D59415EAB") attrMap.UpsertString(conventions.AttributeFaaSDocumentCollection, "faa-flight-delay-information-incoming") @@ -235,7 +235,7 @@ func appendFaaSDatasourceAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendFaaSHTTPAttributes(includeStatus bool, attrMap pdata.AttributeMap) { +func appendFaaSHTTPAttributes(includeStatus bool, attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeFaaSTrigger, conventions.AttributeFaaSTriggerHTTP) attrMap.UpsertString(conventions.AttributeHTTPMethod, "POST") attrMap.UpsertString(conventions.AttributeHTTPScheme, "https") @@ -250,7 +250,7 @@ func appendFaaSHTTPAttributes(includeStatus bool, attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendFaaSPubSubAttributes(attrMap pdata.AttributeMap) { +func appendFaaSPubSubAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeFaaSTrigger, conventions.AttributeFaaSTriggerPubsub) attrMap.UpsertString(conventions.AttributeMessagingSystem, "sqs") attrMap.UpsertString(conventions.AttributeMessagingDestination, "video-views-au") @@ -258,7 +258,7 @@ func appendFaaSPubSubAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendFaaSTimerAttributes(attrMap pdata.AttributeMap) { +func appendFaaSTimerAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeFaaSTrigger, conventions.AttributeFaaSTriggerTimer) attrMap.UpsertString(conventions.AttributeFaaSExecution, "73103A4C-E22F-4493-BDE8-EAE5CAB37B50") attrMap.UpsertString(conventions.AttributeFaaSTime, "2020-05-09T20:00:08Z") @@ -266,7 +266,7 @@ func appendFaaSTimerAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendFaaSOtherAttributes(attrMap pdata.AttributeMap) { +func appendFaaSOtherAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeFaaSTrigger, conventions.AttributeFaaSTriggerOther) attrMap.UpsertInt("processed.count", 256) attrMap.UpsertDouble("processed.data", 14.46) @@ -274,7 +274,7 @@ func appendFaaSOtherAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendHTTPClientAttributes(includeStatus bool, attrMap pdata.AttributeMap) { +func appendHTTPClientAttributes(includeStatus bool, attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeHTTPMethod, "GET") attrMap.UpsertString(conventions.AttributeHTTPURL, "https://opentelemetry.io/registry/") if includeStatus { @@ -284,7 +284,7 @@ func appendHTTPClientAttributes(includeStatus bool, attrMap pdata.AttributeMap) attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendHTTPServerAttributes(includeStatus bool, attrMap pdata.AttributeMap) { +func appendHTTPServerAttributes(includeStatus bool, attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeHTTPMethod, "POST") attrMap.UpsertString(conventions.AttributeHTTPScheme, "https") attrMap.UpsertString(conventions.AttributeHTTPServerName, "api22.opentelemetry.io") @@ -301,7 +301,7 @@ func appendHTTPServerAttributes(includeStatus bool, attrMap pdata.AttributeMap) attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendMessagingProducerAttributes(attrMap pdata.AttributeMap) { +func appendMessagingProducerAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeMessagingSystem, "nats") attrMap.UpsertString(conventions.AttributeMessagingDestination, "time.us.east.atlanta") attrMap.UpsertString(conventions.AttributeMessagingDestinationKind, "topic") @@ -311,7 +311,7 @@ func appendMessagingProducerAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendMessagingConsumerAttributes(attrMap pdata.AttributeMap) { +func appendMessagingConsumerAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeMessagingSystem, "kafka") attrMap.UpsertString(conventions.AttributeMessagingDestination, "infrastructure-events-zone1") attrMap.UpsertString(conventions.AttributeMessagingOperation, "receive") @@ -319,25 +319,25 @@ func appendMessagingConsumerAttributes(attrMap pdata.AttributeMap) { attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendGRPCClientAttributes(attrMap pdata.AttributeMap) { +func appendGRPCClientAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeRPCService, "PullRequestsService") attrMap.UpsertString(conventions.AttributeNetPeerIP, "2600:1700:1f00:11c0:4de0:c223:a800:4e87") attrMap.UpsertInt(conventions.AttributeNetHostPort, 8443) attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendGRPCServerAttributes(attrMap pdata.AttributeMap) { +func appendGRPCServerAttributes(attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeRPCService, "PullRequestsService") attrMap.UpsertString(conventions.AttributeNetPeerIP, "192.168.1.70") attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendInternalAttributes(attrMap pdata.AttributeMap) { +func appendInternalAttributes(attrMap pdata.Map) { attrMap.UpsertString("parameters", "account=7310,amount=1817.10") attrMap.UpsertString(conventions.AttributeEnduserID, "unittest") } -func appendMaxCountAttributes(includeStatus bool, attrMap pdata.AttributeMap) { +func appendMaxCountAttributes(includeStatus bool, attrMap pdata.Map) { attrMap.UpsertString(conventions.AttributeHTTPMethod, "POST") attrMap.UpsertString(conventions.AttributeHTTPScheme, "https") attrMap.UpsertString(conventions.AttributeHTTPHost, "api.opentelemetry.io") diff --git a/internal/coreinternal/processor/filterexpr/matcher.go b/internal/coreinternal/processor/filterexpr/matcher.go index e342f492f5ea..568d311b706b 100644 --- a/internal/coreinternal/processor/filterexpr/matcher.go +++ b/internal/coreinternal/processor/filterexpr/matcher.go @@ -27,7 +27,7 @@ type Matcher struct { type env struct { MetricName string - attributes pdata.AttributeMap + attributes pdata.Map } func (e *env) HasLabel(key string) bool { @@ -104,11 +104,11 @@ func (m *Matcher) matchDoubleHistogram(metricName string, histogram pdata.Histog return false, nil } -func (m *Matcher) matchEnv(metricName string, attributes pdata.AttributeMap) (bool, error) { +func (m *Matcher) matchEnv(metricName string, attributes pdata.Map) (bool, error) { return m.match(createEnv(metricName, attributes)) } -func createEnv(metricName string, attributes pdata.AttributeMap) *env { +func createEnv(metricName string, attributes pdata.Map) *env { return &env{ MetricName: metricName, attributes: attributes, diff --git a/internal/coreinternal/processor/filterexpr/matcher_test.go b/internal/coreinternal/processor/filterexpr/matcher_test.go index 1b205fd2e708..e5d27d6ec140 100644 --- a/internal/coreinternal/processor/filterexpr/matcher_test.go +++ b/internal/coreinternal/processor/filterexpr/matcher_test.go @@ -139,20 +139,20 @@ func TestNonMatchGaugeDataPointByMetricAndHasLabel(t *testing.T) { func TestMatchGaugeDataPointByMetricAndHasLabel(t *testing.T) { expression := `MetricName == 'my.metric' && HasLabel("foo")` - assert.True(t, testMatchGauge(t, "my.metric", expression, map[string]pdata.Value{"foo": pdata.NewValueString("")})) + assert.True(t, testMatchGauge(t, "my.metric", expression, map[string]interface{}{"foo": ""})) } func TestMatchGaugeDataPointByMetricAndLabelValue(t *testing.T) { expression := `MetricName == 'my.metric' && Label("foo") == "bar"` - assert.False(t, testMatchGauge(t, "my.metric", expression, map[string]pdata.Value{"foo": pdata.NewValueString("")})) + assert.False(t, testMatchGauge(t, "my.metric", expression, map[string]interface{}{"foo": ""})) } func TestNonMatchGaugeDataPointByMetricAndLabelValue(t *testing.T) { expression := `MetricName == 'my.metric' && Label("foo") == "bar"` - assert.False(t, testMatchGauge(t, "my.metric", expression, map[string]pdata.Value{"foo": pdata.NewValueString("")})) + assert.False(t, testMatchGauge(t, "my.metric", expression, map[string]interface{}{"foo": ""})) } -func testMatchGauge(t *testing.T, metricName, expression string, lbls map[string]pdata.Value) bool { +func testMatchGauge(t *testing.T, metricName, expression string, lbls map[string]interface{}) bool { matcher, err := NewMatcher(expression) require.NoError(t, err) m := pdata.NewMetric() @@ -161,7 +161,7 @@ func testMatchGauge(t *testing.T, metricName, expression string, lbls map[string dps := m.Gauge().DataPoints() pt := dps.AppendEmpty() if lbls != nil { - pdata.NewAttributeMapFromMap(lbls).CopyTo(pt.Attributes()) + pdata.NewMapFromRaw(lbls).CopyTo(pt.Attributes()) } match, err := matcher.MatchMetric(m) assert.NoError(t, err) diff --git a/internal/coreinternal/processor/filtermatcher/attributematcher.go b/internal/coreinternal/processor/filtermatcher/attributematcher.go index 51f9c83514ea..f8a2ac56a659 100644 --- a/internal/coreinternal/processor/filtermatcher/attributematcher.go +++ b/internal/coreinternal/processor/filtermatcher/attributematcher.go @@ -83,7 +83,7 @@ func NewAttributesMatcher(config filterset.Config, attributes []filterconfig.Att } // Match attributes specification against a span/log. -func (ma AttributesMatcher) Match(attrs pdata.AttributeMap) bool { +func (ma AttributesMatcher) Match(attrs pdata.Map) bool { // If there are no attributes to match against, the span/log matches. if len(ma) == 0 { return true diff --git a/internal/coreinternal/processor/filtermatcher/filtermatcher.go b/internal/coreinternal/processor/filtermatcher/filtermatcher.go index e4e4198f5b72..b1e7c6b1bf77 100644 --- a/internal/coreinternal/processor/filtermatcher/filtermatcher.go +++ b/internal/coreinternal/processor/filtermatcher/filtermatcher.go @@ -86,7 +86,7 @@ func NewMatcher(mp *filterconfig.MatchProperties) (PropertiesMatcher, error) { } // Match matches a span or log to a set of properties. -func (mp *PropertiesMatcher) Match(attributes pdata.AttributeMap, resource pdata.Resource, library pdata.InstrumentationLibrary) bool { +func (mp *PropertiesMatcher) Match(attributes pdata.Map, resource pdata.Resource, library pdata.InstrumentationLibrary) bool { for _, matcher := range mp.libraries { if !matcher.Name.Matches(library.Name()) { return false diff --git a/internal/coreinternal/processor/filtermatcher/filtermatcher_test.go b/internal/coreinternal/processor/filtermatcher/filtermatcher_test.go index 352957e9922b..41e3bd0dbc47 100644 --- a/internal/coreinternal/processor/filtermatcher/filtermatcher_test.go +++ b/internal/coreinternal/processor/filtermatcher/filtermatcher_test.go @@ -204,9 +204,9 @@ func Test_Matching_False(t *testing.T) { }, } - atts := pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "keyInt": pdata.NewValueInt(123), - "keyMap": pdata.NewValueMap(), + atts := pdata.NewMapFromRaw(map[string]interface{}{ + "keyInt": 123, + "keyMap": map[string]interface{}{}, }) library := pdata.NewInstrumentationLibrary() @@ -239,7 +239,7 @@ func Test_MatchingCornerCases(t *testing.T) { assert.Nil(t, err) assert.NotNil(t, mp) - assert.False(t, mp.Match(pdata.NewAttributeMap(), resource("svcA"), pdata.NewInstrumentationLibrary())) + assert.False(t, mp.Match(pdata.NewMap(), resource("svcA"), pdata.NewInstrumentationLibrary())) } func Test_Matching_True(t *testing.T) { @@ -358,12 +358,12 @@ func Test_Matching_True(t *testing.T) { }, } - atts := pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "keyString": pdata.NewValueString("arithmetic"), - "keyInt": pdata.NewValueInt(123), - "keyDouble": pdata.NewValueDouble(3245.6), - "keyBool": pdata.NewValueBool(true), - "keyExists": pdata.NewValueString("present"), + atts := pdata.NewMapFromRaw(map[string]interface{}{ + "keyString": "arithmetic", + "keyInt": 123, + "keyDouble": 3245.6, + "keyBool": true, + "keyExists": "present", }) resource := pdata.NewResource() diff --git a/internal/coreinternal/testdata/common.go b/internal/coreinternal/testdata/common.go index b1eadc77271f..46e62c11908b 100644 --- a/internal/coreinternal/testdata/common.go +++ b/internal/coreinternal/testdata/common.go @@ -19,11 +19,11 @@ import ( ) var ( - resourceAttributes1 = map[string]pdata.Value{"resource-attr": pdata.NewValueString("resource-attr-val-1")} - resourceAttributes2 = map[string]pdata.Value{"resource-attr": pdata.NewValueString("resource-attr-val-2")} - spanEventAttributes = map[string]pdata.Value{"span-event-attr": pdata.NewValueString("span-event-attr-val")} - spanLinkAttributes = map[string]pdata.Value{"span-link-attr": pdata.NewValueString("span-link-attr-val")} - spanAttributes = map[string]pdata.Value{"span-attr": pdata.NewValueString("span-attr-val")} + resourceAttributes1 = map[string]interface{}{"resource-attr": "resource-attr-val-1"} + resourceAttributes2 = map[string]interface{}{"resource-attr": "resource-attr-val-2"} + spanEventAttributes = map[string]interface{}{"span-event-attr": "span-event-attr-val"} + spanLinkAttributes = map[string]interface{}{"span-link-attr": "span-link-attr-val"} + spanAttributes = map[string]interface{}{"span-attr": "span-attr-val"} ) const ( @@ -37,46 +37,46 @@ const ( TestAttachmentValue = "exemplar-attachment-value" ) -func initResourceAttributes1(dest pdata.AttributeMap) { - pdata.NewAttributeMapFromMap(resourceAttributes1).CopyTo(dest) +func initResourceAttributes1(dest pdata.Map) { + pdata.NewMapFromRaw(resourceAttributes1).CopyTo(dest) } -func initResourceAttributes2(dest pdata.AttributeMap) { - pdata.NewAttributeMapFromMap(resourceAttributes2).CopyTo(dest) +func initResourceAttributes2(dest pdata.Map) { + pdata.NewMapFromRaw(resourceAttributes2).CopyTo(dest) } -func initSpanAttributes(dest pdata.AttributeMap) { - pdata.NewAttributeMapFromMap(spanAttributes).CopyTo(dest) +func initSpanAttributes(dest pdata.Map) { + pdata.NewMapFromRaw(spanAttributes).CopyTo(dest) } -func initSpanEventAttributes(dest pdata.AttributeMap) { - pdata.NewAttributeMapFromMap(spanEventAttributes).CopyTo(dest) +func initSpanEventAttributes(dest pdata.Map) { + pdata.NewMapFromRaw(spanEventAttributes).CopyTo(dest) } -func initSpanLinkAttributes(dest pdata.AttributeMap) { - pdata.NewAttributeMapFromMap(spanLinkAttributes).CopyTo(dest) +func initSpanLinkAttributes(dest pdata.Map) { + pdata.NewMapFromRaw(spanLinkAttributes).CopyTo(dest) } -func initMetricAttachment(dest pdata.AttributeMap) { +func initMetricAttachment(dest pdata.Map) { dest.UpsertString(TestAttachmentKey, TestAttachmentValue) } -func initMetricAttributes1(dest pdata.AttributeMap) { +func initMetricAttributes1(dest pdata.Map) { dest.UpsertString(TestLabelKey1, TestLabelValue1) } -func initMetricAttributes12(dest pdata.AttributeMap) { +func initMetricAttributes12(dest pdata.Map) { dest.UpsertString(TestLabelKey1, TestLabelValue1) dest.UpsertString(TestLabelKey2, TestLabelValue2) dest.Sort() } -func initMetricAttributes13(dest pdata.AttributeMap) { +func initMetricAttributes13(dest pdata.Map) { dest.UpsertString(TestLabelKey1, TestLabelValue1) dest.UpsertString(TestLabelKey3, TestLabelValue3) dest.Sort() } -func initMetricAttributes2(dest pdata.AttributeMap) { +func initMetricAttributes2(dest pdata.Map) { dest.UpsertString(TestLabelKey2, TestLabelValue2) } diff --git a/internal/coreinternal/testdata/metric.go b/internal/coreinternal/testdata/metric.go index 4a20b3159237..3147f52d46d5 100644 --- a/internal/coreinternal/testdata/metric.go +++ b/internal/coreinternal/testdata/metric.go @@ -94,8 +94,8 @@ func GenerateMetricsOneCounterOneSummaryMetrics() pdata.Metrics { func GenerateMetricsOneMetricNoAttributes() pdata.Metrics { md := GenerateMetricsOneMetric() dps := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Sum().DataPoints() - pdata.NewAttributeMap().CopyTo(dps.At(0).Attributes()) - pdata.NewAttributeMap().CopyTo(dps.At(1).Attributes()) + pdata.NewMap().CopyTo(dps.At(0).Attributes()) + pdata.NewMap().CopyTo(dps.At(1).Attributes()) return md } diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 2c8e52ace9d2..fae1eac39847 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index c69c1910210d..c3627bb82c8b 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -277,8 +277,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/scrapertest/go.mod b/internal/scrapertest/go.mod index e8a6c95dbe96..d8611a008909 100644 --- a/internal/scrapertest/go.mod +++ b/internal/scrapertest/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) diff --git a/internal/scrapertest/go.sum b/internal/scrapertest/go.sum index 9213f29eb1be..6ef5807f0fa1 100644 --- a/internal/scrapertest/go.sum +++ b/internal/scrapertest/go.sum @@ -24,8 +24,8 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= diff --git a/internal/scrapertest/golden/golden_test.go b/internal/scrapertest/golden/golden_test.go index ce898609e483..72771f1f2cc0 100644 --- a/internal/scrapertest/golden/golden_test.go +++ b/internal/scrapertest/golden/golden_test.go @@ -76,13 +76,13 @@ func testMetrics() pdata.MetricSlice { dps := metric.Gauge().DataPoints() dp := dps.AppendEmpty() - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.Insert("testKey1", pdata.NewValueString("teststringvalue1")) attributes.Insert("testKey2", pdata.NewValueString("testvalue1")) setDPDoubleVal(dp, 2, attributes, time.Time{}) dp = dps.AppendEmpty() - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() attributes.Insert("testKey1", pdata.NewValueString("teststringvalue2")) attributes.Insert("testKey2", pdata.NewValueString("testvalue2")) setDPDoubleVal(dp, 2, attributes, time.Time{}) @@ -93,7 +93,7 @@ func testMetrics() pdata.MetricSlice { dps = metric.Gauge().DataPoints() dp = dps.AppendEmpty() - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() attributes.Insert("testKey2", pdata.NewValueString("teststringvalue2")) setDPIntVal(dp, 2, attributes, time.Time{}) @@ -103,12 +103,12 @@ func testMetrics() pdata.MetricSlice { dps = metric.Sum().DataPoints() dp = dps.AppendEmpty() - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() attributes.Insert("testKey2", pdata.NewValueString("teststringvalue2")) setDPIntVal(dp, 2, attributes, time.Time{}) dp = dps.AppendEmpty() - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() attributes.Insert("testKey2", pdata.NewValueString("teststringvalue2")) setDPIntVal(dp, 2, attributes, time.Time{}) @@ -118,18 +118,18 @@ func testMetrics() pdata.MetricSlice { dps = metric.Sum().DataPoints() dp = dps.AppendEmpty() - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() setDPDoubleVal(dp, 2, attributes, time.Date(1997, 07, 27, 1, 1, 1, 1, &time.Location{})) return slice } -func setDPDoubleVal(dp pdata.NumberDataPoint, value float64, attributes pdata.AttributeMap, timeStamp time.Time) { +func setDPDoubleVal(dp pdata.NumberDataPoint, value float64, attributes pdata.Map, timeStamp time.Time) { dp.SetDoubleVal(value) dp.SetTimestamp(pdata.NewTimestampFromTime(timeStamp)) attributes.CopyTo(dp.Attributes()) } -func setDPIntVal(dp pdata.NumberDataPoint, value int64, attributes pdata.AttributeMap, timeStamp time.Time) { +func setDPIntVal(dp pdata.NumberDataPoint, value int64, attributes pdata.Map, timeStamp time.Time) { dp.SetIntVal(value) dp.SetTimestamp(pdata.NewTimestampFromTime(timeStamp)) attributes.CopyTo(dp.Attributes()) diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 0aba0732721c..ba22fc233b62 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -20,10 +20,10 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index 93e516916be5..68b4e4ab7737 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -129,20 +129,20 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 146f19d02230..6cc54e0d86c7 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) @@ -24,9 +24,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/zap v1.21.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index bbf95275c7f9..dc4ce181b972 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -157,21 +157,21 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/splunk/hostid.go b/internal/splunk/hostid.go index 03db09f02b07..09f0d2746223 100644 --- a/internal/splunk/hostid.go +++ b/internal/splunk/hostid.go @@ -113,7 +113,7 @@ func ResourceToHostID(res pdata.Resource) (HostID, bool) { return HostID{}, false } -func azureID(attrs pdata.AttributeMap, cloudAccount string) string { +func azureID(attrs pdata.Map, cloudAccount string) string { var resourceGroupName string if attr, ok := attrs.Get("azure.resourcegroup.name"); ok { resourceGroupName = attr.StringVal() diff --git a/internal/splunk/hostid_test.go b/internal/splunk/hostid_test.go index d90ba016aecb..fb55f2666733 100644 --- a/internal/splunk/hostid_test.go +++ b/internal/splunk/hostid_test.go @@ -258,7 +258,7 @@ func TestResourceToHostID(t *testing.T) { } func TestAzureID(t *testing.T) { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.Insert("azure.resourcegroup.name", pdata.NewValueString("myResourceGroup")) attrs.Insert("azure.vm.scaleset.name", pdata.NewValueString("myScalesetName")) attrs.Insert(conventions.AttributeHostName, pdata.NewValueString("myScalesetName_1")) diff --git a/internal/stanza/converter.go b/internal/stanza/converter.go index ed268c245b38..49b5aeecf50a 100644 --- a/internal/stanza/converter.go +++ b/internal/stanza/converter.go @@ -407,7 +407,7 @@ func toAttributeMap(obsMap map[string]interface{}) pdata.Value { return attVal } -func insertToAttributeMap(obsMap map[string]interface{}, dest pdata.AttributeMap) { +func insertToAttributeMap(obsMap map[string]interface{}, dest pdata.Map) { dest.EnsureCapacity(len(obsMap)) for k, v := range obsMap { switch t := v.(type) { diff --git a/internal/stanza/converter_test.go b/internal/stanza/converter_test.go index f1faf66db353..5ea47cebc78f 100644 --- a/internal/stanza/converter_test.go +++ b/internal/stanza/converter_test.go @@ -181,7 +181,7 @@ func TestConvert(t *testing.T) { rls := pLogs.ResourceLogs().At(0) if resAtts := rls.Resource().Attributes(); assert.Equal(t, 5, resAtts.Len()) { - m := pdata.NewAttributeMap() + m := pdata.NewMap() m.InsertBool("bool", true) m.InsertInt("int", 123) m.InsertDouble("double", 12.34) @@ -202,7 +202,7 @@ func TestConvert(t *testing.T) { assert.Equal(t, "Error", lr.SeverityText()) if atts := lr.Attributes(); assert.Equal(t, 5, atts.Len()) { - m := pdata.NewAttributeMap() + m := pdata.NewMap() m.InsertBool("bool", true) m.InsertInt("int", 123) m.InsertDouble("double", 12.34) @@ -212,7 +212,7 @@ func TestConvert(t *testing.T) { } if assert.Equal(t, pdata.ValueTypeMap, lr.Body().Type()) { - m := pdata.NewAttributeMap() + m := pdata.NewMap() // Don't include a nested object because AttributeValueMap sorting // doesn't sort recursively. m.InsertBool("bool", true) diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index 3d87e94c8445..d4ebcc4ae831 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.47.0 github.com/open-telemetry/opentelemetry-log-collection v0.27.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.opentelemetry.io/otel/metric v0.27.0 go.opentelemetry.io/otel/trace v1.5.0 go.uber.org/multierr v1.8.0 diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index f73967de8088..adbff9c465a8 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -185,10 +185,10 @@ go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= @@ -196,7 +196,7 @@ go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbD go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index a379545489c9..c15dff6c6ed1 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index bc3f7221860b..8d09a40f2174 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -25,10 +25,10 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 7bc7e6ce9b8f..9d73ff6cf800 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index a49b0fefdafc..d93ade51a30b 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -12,8 +12,8 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= 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/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index f4886e2a14e2..c90e4b94f252 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -20,9 +20,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index f049f096506a..e1a08c59bbcd 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -124,20 +124,20 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/pkg/resourcetotelemetry/resource_to_telemetry.go b/pkg/resourcetotelemetry/resource_to_telemetry.go index 2b08f96b0c86..3c2e07303a16 100644 --- a/pkg/resourcetotelemetry/resource_to_telemetry.go +++ b/pkg/resourcetotelemetry/resource_to_telemetry.go @@ -75,7 +75,7 @@ func convertToMetricsAttributes(md pdata.Metrics) pdata.Metrics { } // addAttributesToMetric adds additional labels to the given metric -func addAttributesToMetric(metric *pdata.Metric, labelMap pdata.AttributeMap) { +func addAttributesToMetric(metric *pdata.Metric, labelMap pdata.Map) { switch metric.DataType() { case pdata.MetricDataTypeGauge: addAttributesToNumberDataPoints(metric.Gauge().DataPoints(), labelMap) @@ -90,31 +90,31 @@ func addAttributesToMetric(metric *pdata.Metric, labelMap pdata.AttributeMap) { } } -func addAttributesToNumberDataPoints(ps pdata.NumberDataPointSlice, newAttributeMap pdata.AttributeMap) { +func addAttributesToNumberDataPoints(ps pdata.NumberDataPointSlice, newAttributeMap pdata.Map) { for i := 0; i < ps.Len(); i++ { joinAttributeMaps(newAttributeMap, ps.At(i).Attributes()) } } -func addAttributesToHistogramDataPoints(ps pdata.HistogramDataPointSlice, newAttributeMap pdata.AttributeMap) { +func addAttributesToHistogramDataPoints(ps pdata.HistogramDataPointSlice, newAttributeMap pdata.Map) { for i := 0; i < ps.Len(); i++ { joinAttributeMaps(newAttributeMap, ps.At(i).Attributes()) } } -func addAttributesToSummaryDataPoints(ps pdata.SummaryDataPointSlice, newAttributeMap pdata.AttributeMap) { +func addAttributesToSummaryDataPoints(ps pdata.SummaryDataPointSlice, newAttributeMap pdata.Map) { for i := 0; i < ps.Len(); i++ { joinAttributeMaps(newAttributeMap, ps.At(i).Attributes()) } } -func addAttributesToExponentialHistogramDataPoints(ps pdata.ExponentialHistogramDataPointSlice, newAttributeMap pdata.AttributeMap) { +func addAttributesToExponentialHistogramDataPoints(ps pdata.ExponentialHistogramDataPointSlice, newAttributeMap pdata.Map) { for i := 0; i < ps.Len(); i++ { joinAttributeMaps(newAttributeMap, ps.At(i).Attributes()) } } -func joinAttributeMaps(from, to pdata.AttributeMap) { +func joinAttributeMaps(from, to pdata.Map) { from.Range(func(k string, v pdata.Value) bool { to.Upsert(k, v) return true diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index e916dc5b2011..c0f082f46b90 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,7 +6,7 @@ require ( github.com/jaegertracing/jaeger v1.32.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 19d3a4037121..8e0a15d569fb 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -40,8 +40,8 @@ github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/pkg/translator/jaeger/jaegerproto_to_traces.go b/pkg/translator/jaeger/jaegerproto_to_traces.go index a95062f25882..67c3b1db584a 100644 --- a/pkg/translator/jaeger/jaegerproto_to_traces.go +++ b/pkg/translator/jaeger/jaegerproto_to_traces.go @@ -101,7 +101,7 @@ func jProcessToInternalResource(process *model.Process, dest pdata.Resource) { } // translateHostnameAttr translates "hostname" atttribute -func translateHostnameAttr(attrs pdata.AttributeMap) { +func translateHostnameAttr(attrs pdata.Map) { hostname, hostnameFound := attrs.Get("hostname") _, convHostNameFound := attrs.Get(conventions.AttributeHostName) if hostnameFound && !convHostNameFound { @@ -111,7 +111,7 @@ func translateHostnameAttr(attrs pdata.AttributeMap) { } // translateHostnameAttr translates "jaeger.version" atttribute -func translateJaegerVersionAttr(attrs pdata.AttributeMap) { +func translateJaegerVersionAttr(attrs pdata.Map) { jaegerVersion, jaegerVersionFound := attrs.Get("jaeger.version") _, exporterVersionFound := attrs.Get(occonventions.AttributeExporterVersion) if jaegerVersionFound && !exporterVersionFound { @@ -176,7 +176,7 @@ func jSpanToInternal(span *model.Span, spansByLibrary map[instrumentationLibrary jReferencesToSpanLinks(span.References, parentSpanID, dest.Links()) } -func jTagsToInternalAttributes(tags []model.KeyValue, dest pdata.AttributeMap) { +func jTagsToInternalAttributes(tags []model.KeyValue, dest pdata.Map) { for _, tag := range tags { switch tag.GetVType() { case model.ValueType_STRING: @@ -195,7 +195,7 @@ func jTagsToInternalAttributes(tags []model.KeyValue, dest pdata.AttributeMap) { } } -func setInternalSpanStatus(attrs pdata.AttributeMap, dest pdata.SpanStatus) { +func setInternalSpanStatus(attrs pdata.Map, dest pdata.SpanStatus) { statusCode := pdata.StatusCodeUnset statusMessage := "" statusExists := false @@ -261,7 +261,7 @@ func setInternalSpanStatus(attrs pdata.AttributeMap, dest pdata.SpanStatus) { // along with true if it is set. Otherwise, an empty string and false are // returned. The OTel status description attribute is deleted from attrs in // the process. -func extractStatusDescFromAttr(attrs pdata.AttributeMap) (string, bool) { +func extractStatusDescFromAttr(attrs pdata.Map) (string, bool) { if msgAttr, ok := attrs.Get(conventions.OtelStatusDescription); ok { msg := msgAttr.StringVal() attrs.Delete(conventions.OtelStatusDescription) @@ -364,7 +364,7 @@ func jReferencesToSpanLinks(refs []model.SpanRef, excludeParentID model.SpanID, } } -func getTraceStateFromAttrs(attrs pdata.AttributeMap) pdata.TraceState { +func getTraceStateFromAttrs(attrs pdata.Map) pdata.TraceState { traceState := pdata.TraceStateEmpty // TODO Bring this inline with solution for jaegertracing/jaeger-client-java #702 once available if attr, ok := attrs.Get(tracetranslator.TagW3CTraceState); ok { diff --git a/pkg/translator/jaeger/jaegerproto_to_traces_test.go b/pkg/translator/jaeger/jaegerproto_to_traces_test.go index 686e932d4dd8..13192efb6641 100644 --- a/pkg/translator/jaeger/jaegerproto_to_traces_test.go +++ b/pkg/translator/jaeger/jaegerproto_to_traces_test.go @@ -162,14 +162,14 @@ func TestJTagsToInternalAttributes(t *testing.T) { }, } - expected := pdata.NewAttributeMap() + expected := pdata.NewMap() expected.InsertBool("bool-val", true) expected.InsertInt("int-val", 123) expected.InsertString("string-val", "abc") expected.InsertDouble("double-val", 1.23) expected.InsertString("binary-val", "AAAAAABkfZg=") - got := pdata.NewAttributeMap() + got := pdata.NewMap() jTagsToInternalAttributes(tags, got) require.EqualValues(t, expected, got) @@ -343,75 +343,75 @@ func TestSetInternalSpanStatus(t *testing.T) { tests := []struct { name string - attrs pdata.AttributeMap + attrs pdata.Map status pdata.SpanStatus attrsModifiedLen int // Length of attributes map after dropping converted fields }{ { name: "No tags set -> OK status", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{}), + attrs: pdata.NewMap(), status: emptyStatus, attrsModifiedLen: 0, }, { name: "error tag set -> Error status", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - tracetranslator.TagError: pdata.NewValueBool(true), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + tracetranslator.TagError: true, }), status: errorStatus, attrsModifiedLen: 0, }, { name: "status.code is set as string", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.OtelStatusCode: pdata.NewValueString(statusOk), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.OtelStatusCode: statusOk, }), status: okStatus, attrsModifiedLen: 0, }, { name: "status.code, status.message and error tags are set", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - tracetranslator.TagError: pdata.NewValueBool(true), - conventions.OtelStatusCode: pdata.NewValueString(statusError), - conventions.OtelStatusDescription: pdata.NewValueString("Error: Invalid argument"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + tracetranslator.TagError: true, + conventions.OtelStatusCode: statusError, + conventions.OtelStatusDescription: "Error: Invalid argument", }), status: errorStatusWithMessage, attrsModifiedLen: 0, }, { name: "http.status_code tag is set as string", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.AttributeHTTPStatusCode: pdata.NewValueString("404"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPStatusCode: "404", }), status: errorStatus, attrsModifiedLen: 1, }, { name: "http.status_code, http.status_message and error tags are set", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - tracetranslator.TagError: pdata.NewValueBool(true), - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(404), - tracetranslator.TagHTTPStatusMsg: pdata.NewValueString("HTTP 404: Not Found"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + tracetranslator.TagError: true, + conventions.AttributeHTTPStatusCode: 404, + tracetranslator.TagHTTPStatusMsg: "HTTP 404: Not Found", }), status: errorStatusWith404Message, attrsModifiedLen: 2, }, { name: "status.code has precedence over http.status_code.", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - conventions.OtelStatusCode: pdata.NewValueString(statusOk), - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(500), - tracetranslator.TagHTTPStatusMsg: pdata.NewValueString("Server Error"), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + conventions.OtelStatusCode: statusOk, + conventions.AttributeHTTPStatusCode: 500, + tracetranslator.TagHTTPStatusMsg: "Server Error", }), status: okStatus, attrsModifiedLen: 2, }, { name: "Ignore http.status_code == 200 if error set to true.", - attrs: pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - tracetranslator.TagError: pdata.NewValueBool(true), - conventions.AttributeHTTPStatusCode: pdata.NewValueInt(200), + attrs: pdata.NewMapFromRaw(map[string]interface{}{ + tracetranslator.TagError: true, + conventions.AttributeHTTPStatusCode: 200, }), status: errorStatus, attrsModifiedLen: 1, diff --git a/pkg/translator/jaeger/jaegerthrift_to_traces.go b/pkg/translator/jaeger/jaegerthrift_to_traces.go index 0230b8d9a033..7290e7b90393 100644 --- a/pkg/translator/jaeger/jaegerthrift_to_traces.go +++ b/pkg/translator/jaeger/jaegerthrift_to_traces.go @@ -122,7 +122,7 @@ func jThriftSpanToInternal(span *jaeger.Span, dest pdata.Span) { } // jThriftTagsToInternalAttributes sets internal span links based on jaeger span references skipping excludeParentID -func jThriftTagsToInternalAttributes(tags []*jaeger.Tag, dest pdata.AttributeMap) { +func jThriftTagsToInternalAttributes(tags []*jaeger.Tag, dest pdata.Map) { for _, tag := range tags { switch tag.GetVType() { case jaeger.TagType_STRING: diff --git a/pkg/translator/jaeger/jaegerthrift_to_traces_test.go b/pkg/translator/jaeger/jaegerthrift_to_traces_test.go index 22dbda9b6dce..af2b0c4ba727 100644 --- a/pkg/translator/jaeger/jaegerthrift_to_traces_test.go +++ b/pkg/translator/jaeger/jaegerthrift_to_traces_test.go @@ -61,14 +61,14 @@ func TestJThriftTagsToInternalAttributes(t *testing.T) { }, } - expected := pdata.NewAttributeMap() + expected := pdata.NewMap() expected.InsertBool("bool-val", true) expected.InsertInt("int-val", 123) expected.InsertString("string-val", "abc") expected.InsertDouble("double-val", 1.23) expected.InsertString("binary-val", "AAAAAABkfZg=") - got := pdata.NewAttributeMap() + got := pdata.NewMap() jThriftTagsToInternalAttributes(tags, got) require.EqualValues(t, expected, got) diff --git a/pkg/translator/jaeger/traces_to_jaegerproto.go b/pkg/translator/jaeger/traces_to_jaegerproto.go index 41935fdc1677..c6f33d039be1 100644 --- a/pkg/translator/jaeger/traces_to_jaegerproto.go +++ b/pkg/translator/jaeger/traces_to_jaegerproto.go @@ -103,7 +103,7 @@ func resourceToJaegerProtoProcess(resource pdata.Resource) *model.Process { } -func appendTagsFromResourceAttributes(dest []model.KeyValue, attrs pdata.AttributeMap) []model.KeyValue { +func appendTagsFromResourceAttributes(dest []model.KeyValue, attrs pdata.Map) []model.KeyValue { if attrs.Len() == 0 { return dest } @@ -118,7 +118,7 @@ func appendTagsFromResourceAttributes(dest []model.KeyValue, attrs pdata.Attribu return dest } -func appendTagsFromAttributes(dest []model.KeyValue, attrs pdata.AttributeMap) []model.KeyValue { +func appendTagsFromAttributes(dest []model.KeyValue, attrs pdata.Map) []model.KeyValue { if attrs.Len() == 0 { return dest } diff --git a/pkg/translator/jaeger/traces_to_jaegerproto_test.go b/pkg/translator/jaeger/traces_to_jaegerproto_test.go index dc926d0e35f3..65178577334c 100644 --- a/pkg/translator/jaeger/traces_to_jaegerproto_test.go +++ b/pkg/translator/jaeger/traces_to_jaegerproto_test.go @@ -175,7 +175,7 @@ func TestGetTagFromSpanKind(t *testing.T) { func TestAttributesToJaegerProtoTags(t *testing.T) { - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.InsertBool("bool-val", true) attributes.InsertInt("int-val", 123) attributes.InsertString("string-val", "abc") diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index 332c0b00894b..f085a9ddd42c 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/protobuf v1.27.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 561a7a3afd72..96954f1b0afe 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -86,8 +86,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= 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= diff --git a/pkg/translator/opencensus/metrics_to_oc.go b/pkg/translator/opencensus/metrics_to_oc.go index c79793a77edb..b9fb6d32e924 100644 --- a/pkg/translator/opencensus/metrics_to_oc.go +++ b/pkg/translator/opencensus/metrics_to_oc.go @@ -159,7 +159,7 @@ func collectLabelKeysSummaryDataPoints(dhdp pdata.SummaryDataPointSlice, keySet } } -func addLabelKeys(keySet map[string]struct{}, attributes pdata.AttributeMap) { +func addLabelKeys(keySet map[string]struct{}, attributes pdata.Map) { attributes.Range(func(k string, v pdata.Value) bool { keySet[k] = struct{}{} return true @@ -381,7 +381,7 @@ func exemplarsToOC(bounds []float64, ocBuckets []*ocmetrics.DistributionValue_Bu } } -func exemplarToOC(filteredLabels pdata.AttributeMap, value float64, timestamp pdata.Timestamp) *ocmetrics.DistributionValue_Exemplar { +func exemplarToOC(filteredLabels pdata.Map, value float64, timestamp pdata.Timestamp) *ocmetrics.DistributionValue_Exemplar { var labels map[string]string if filteredLabels.Len() != 0 { labels = make(map[string]string, filteredLabels.Len()) @@ -398,7 +398,7 @@ func exemplarToOC(filteredLabels pdata.AttributeMap, value float64, timestamp pd } } -func attributeValuesToOC(labels pdata.AttributeMap, labelKeys *labelKeysAndType) []*ocmetrics.LabelValue { +func attributeValuesToOC(labels pdata.Map, labelKeys *labelKeysAndType) []*ocmetrics.LabelValue { if len(labelKeys.keys) == 0 { return nil } diff --git a/pkg/translator/opencensus/oc_to_metrics.go b/pkg/translator/opencensus/oc_to_metrics.go index 68de01a45143..8b820910e729 100644 --- a/pkg/translator/opencensus/oc_to_metrics.go +++ b/pkg/translator/opencensus/oc_to_metrics.go @@ -202,7 +202,7 @@ func setDataPoints(ocMetric *ocmetrics.Metric, metric pdata.Metric, valType pdat } } -func fillAttributesMap(ocLabelsKeys []*ocmetrics.LabelKey, ocLabelValues []*ocmetrics.LabelValue, attributesMap pdata.AttributeMap) { +func fillAttributesMap(ocLabelsKeys []*ocmetrics.LabelKey, ocLabelValues []*ocmetrics.LabelValue, attributesMap pdata.Map) { if len(ocLabelsKeys) == 0 || len(ocLabelValues) == 0 { return } diff --git a/pkg/translator/opencensus/oc_to_traces.go b/pkg/translator/opencensus/oc_to_traces.go index 7909aa6f3621..4a69a8c28df3 100644 --- a/pkg/translator/opencensus/oc_to_traces.go +++ b/pkg/translator/opencensus/oc_to_traces.go @@ -213,7 +213,7 @@ func ocAttrsToDroppedAttributes(ocAttrs *octrace.Span_Attributes) uint32 { } // initAttributeMapFromOC initialize AttributeMap from OC attributes -func initAttributeMapFromOC(ocAttrs *octrace.Span_Attributes, dest pdata.AttributeMap) { +func initAttributeMapFromOC(ocAttrs *octrace.Span_Attributes, dest pdata.Map) { if ocAttrs == nil || len(ocAttrs.AttributeMap) == 0 { return } @@ -347,7 +347,7 @@ func ocLinksToInternal(ocLinks *octrace.Span_Links, dest pdata.Span) { } } -func ocMessageEventToInternalAttrs(msgEvent *octrace.Span_TimeEvent_MessageEvent, dest pdata.AttributeMap) { +func ocMessageEventToInternalAttrs(msgEvent *octrace.Span_TimeEvent_MessageEvent, dest pdata.Map) { if msgEvent == nil { return } diff --git a/pkg/translator/opencensus/oc_to_traces_test.go b/pkg/translator/opencensus/oc_to_traces_test.go index 018859af244d..7978f23de067 100644 --- a/pkg/translator/opencensus/oc_to_traces_test.go +++ b/pkg/translator/opencensus/oc_to_traces_test.go @@ -53,32 +53,32 @@ func TestOcTraceStateToInternal(t *testing.T) { } func TestInitAttributeMapFromOC(t *testing.T) { - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() initAttributeMapFromOC(nil, attrs) - assert.EqualValues(t, pdata.NewAttributeMap(), attrs) + assert.EqualValues(t, pdata.NewMap(), attrs) assert.EqualValues(t, 0, ocAttrsToDroppedAttributes(nil)) ocAttrs := &octrace.Span_Attributes{} - attrs = pdata.NewAttributeMap() + attrs = pdata.NewMap() initAttributeMapFromOC(ocAttrs, attrs) - assert.EqualValues(t, pdata.NewAttributeMap(), attrs) + assert.EqualValues(t, pdata.NewMap(), attrs) assert.EqualValues(t, 0, ocAttrsToDroppedAttributes(ocAttrs)) ocAttrs = &octrace.Span_Attributes{ DroppedAttributesCount: 123, } - attrs = pdata.NewAttributeMap() + attrs = pdata.NewMap() initAttributeMapFromOC(ocAttrs, attrs) - assert.EqualValues(t, pdata.NewAttributeMap(), attrs) + assert.EqualValues(t, pdata.NewMap(), attrs) assert.EqualValues(t, 123, ocAttrsToDroppedAttributes(ocAttrs)) ocAttrs = &octrace.Span_Attributes{ AttributeMap: map[string]*octrace.AttributeValue{}, DroppedAttributesCount: 234, } - attrs = pdata.NewAttributeMap() + attrs = pdata.NewMap() initAttributeMapFromOC(ocAttrs, attrs) - assert.EqualValues(t, pdata.NewAttributeMap(), attrs) + assert.EqualValues(t, pdata.NewMap(), attrs) assert.EqualValues(t, 234, ocAttrsToDroppedAttributes(ocAttrs)) ocAttrs = &octrace.Span_Attributes{ @@ -89,12 +89,12 @@ func TestInitAttributeMapFromOC(t *testing.T) { }, DroppedAttributesCount: 234, } - attrs = pdata.NewAttributeMap() + attrs = pdata.NewMap() initAttributeMapFromOC(ocAttrs, attrs) assert.EqualValues(t, - pdata.NewAttributeMapFromMap( - map[string]pdata.Value{ - "abc": pdata.NewValueString("def"), + pdata.NewMapFromRaw( + map[string]interface{}{ + "abc": "def", }), attrs) assert.EqualValues(t, 234, ocAttrsToDroppedAttributes(ocAttrs)) @@ -108,14 +108,14 @@ func TestInitAttributeMapFromOC(t *testing.T) { ocAttrs.AttributeMap["doubleval"] = &octrace.AttributeValue{ Value: &octrace.AttributeValue_DoubleValue{DoubleValue: 4.5}, } - attrs = pdata.NewAttributeMap() + attrs = pdata.NewMap() initAttributeMapFromOC(ocAttrs, attrs) - expectedAttr := pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "abc": pdata.NewValueString("def"), - "intval": pdata.NewValueInt(345), - "boolval": pdata.NewValueBool(true), - "doubleval": pdata.NewValueDouble(4.5), + expectedAttr := pdata.NewMapFromRaw(map[string]interface{}{ + "abc": "def", + "intval": 345, + "boolval": true, + "doubleval": 4.5, }) assert.EqualValues(t, expectedAttr.Sort(), attrs.Sort()) assert.EqualValues(t, 234, ocAttrsToDroppedAttributes(ocAttrs)) diff --git a/pkg/translator/opencensus/traces_to_oc.go b/pkg/translator/opencensus/traces_to_oc.go index 39fde71f9fd4..166b76296a82 100644 --- a/pkg/translator/opencensus/traces_to_oc.go +++ b/pkg/translator/opencensus/traces_to_oc.go @@ -95,7 +95,7 @@ func spanToOC(span pdata.Span) *octrace.Span { } } -func attributesMapToOCSpanAttributes(attributes pdata.AttributeMap, droppedCount uint32) *octrace.Span_Attributes { +func attributesMapToOCSpanAttributes(attributes pdata.Map, droppedCount uint32) *octrace.Span_Attributes { if attributes.Len() == 0 && droppedCount == 0 { return nil } @@ -106,7 +106,7 @@ func attributesMapToOCSpanAttributes(attributes pdata.AttributeMap, droppedCount } } -func attributesMapToOCAttributeMap(attributes pdata.AttributeMap) map[string]*octrace.AttributeValue { +func attributesMapToOCAttributeMap(attributes pdata.Map) map[string]*octrace.AttributeValue { if attributes.Len() == 0 { return nil } @@ -188,7 +188,7 @@ func stringAttributeValue(val string) *octrace.AttributeValue { } } -func attributesMapToOCSameProcessAsParentSpan(attr pdata.AttributeMap) *wrapperspb.BoolValue { +func attributesMapToOCSameProcessAsParentSpan(attr pdata.Map) *wrapperspb.BoolValue { val, ok := attr.Get(occonventions.AttributeSameProcessAsParentSpan) if !ok || val.Type() != pdata.ValueTypeBool { return nil diff --git a/pkg/translator/opencensus/traces_to_oc_test.go b/pkg/translator/opencensus/traces_to_oc_test.go index 7aec670b1495..1ed7dca058ab 100644 --- a/pkg/translator/opencensus/traces_to_oc_test.go +++ b/pkg/translator/opencensus/traces_to_oc_test.go @@ -54,12 +54,12 @@ func TestInternalTraceStateToOC(t *testing.T) { } func TestAttributesMapToOC(t *testing.T) { - assert.EqualValues(t, (*octrace.Span_Attributes)(nil), attributesMapToOCSpanAttributes(pdata.NewAttributeMap(), 0)) + assert.EqualValues(t, (*octrace.Span_Attributes)(nil), attributesMapToOCSpanAttributes(pdata.NewMap(), 0)) ocAttrs := &octrace.Span_Attributes{ DroppedAttributesCount: 123, } - assert.EqualValues(t, ocAttrs, attributesMapToOCSpanAttributes(pdata.NewAttributeMap(), 123)) + assert.EqualValues(t, ocAttrs, attributesMapToOCSpanAttributes(pdata.NewMap(), 123)) ocAttrs = &octrace.Span_Attributes{ AttributeMap: map[string]*octrace.AttributeValue{ @@ -71,8 +71,8 @@ func TestAttributesMapToOC(t *testing.T) { } assert.EqualValues(t, ocAttrs, attributesMapToOCSpanAttributes( - pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "abc": pdata.NewValueString("def"), + pdata.NewMapFromRaw(map[string]interface{}{ + "abc": "def", }), 234)) @@ -86,12 +86,12 @@ func TestAttributesMapToOC(t *testing.T) { Value: &octrace.AttributeValue_DoubleValue{DoubleValue: 4.5}, } assert.EqualValues(t, ocAttrs, - attributesMapToOCSpanAttributes(pdata.NewAttributeMapFromMap( - map[string]pdata.Value{ - "abc": pdata.NewValueString("def"), - "intval": pdata.NewValueInt(345), - "boolval": pdata.NewValueBool(true), - "doubleval": pdata.NewValueDouble(4.5), + attributesMapToOCSpanAttributes(pdata.NewMapFromRaw( + map[string]interface{}{ + "abc": "def", + "intval": 345, + "boolval": true, + "doubleval": 4.5, }), 234)) } @@ -136,7 +136,7 @@ func TestSpanKindToOC(t *testing.T) { } func TestAttributesMapTOOcSameProcessAsParentSpan(t *testing.T) { - attr := pdata.NewAttributeMap() + attr := pdata.NewMap() assert.Nil(t, attributesMapToOCSameProcessAsParentSpan(attr)) attr.UpsertBool(occonventions.AttributeSameProcessAsParentSpan, true) diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 268a31583791..8fea0ad5066a 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -6,8 +6,8 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index c7a0f6e7dba3..c20e213f5555 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -1232,10 +1232,10 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/pkg/translator/prometheusremotewrite/helper.go b/pkg/translator/prometheusremotewrite/helper.go index 874d6cb7aef8..24eca679db6d 100644 --- a/pkg/translator/prometheusremotewrite/helper.go +++ b/pkg/translator/prometheusremotewrite/helper.go @@ -156,7 +156,7 @@ func timeSeriesSignature(metric pdata.Metric, labels *[]prompb.Label) string { // createAttributes creates a slice of Cortex Label with OTLP attributes and pairs of string values. // Unpaired string value is ignored. String pairs overwrites OTLP labels if collision happens, and the overwrite is // logged. Resultant label names are sanitized. -func createAttributes(resource pdata.Resource, attributes pdata.AttributeMap, externalLabels map[string]string, extras ...string) []prompb.Label { +func createAttributes(resource pdata.Resource, attributes pdata.Map, externalLabels map[string]string, extras ...string) []prompb.Label { // map ensures no duplicate label name l := map[string]prompb.Label{} diff --git a/pkg/translator/prometheusremotewrite/helper_test.go b/pkg/translator/prometheusremotewrite/helper_test.go index 6359c4cf8c51..77d789b6cc6c 100644 --- a/pkg/translator/prometheusremotewrite/helper_test.go +++ b/pkg/translator/prometheusremotewrite/helper_test.go @@ -182,7 +182,7 @@ func Test_createLabelSet(t *testing.T) { tests := []struct { name string resource pdata.Resource - orig pdata.AttributeMap + orig pdata.Map externalLabels map[string]string extras []string want []prompb.Label @@ -236,7 +236,7 @@ func Test_createLabelSet(t *testing.T) { { "no_original_case", getResource(map[string]pdata.Value{}), - pdata.NewAttributeMap(), + pdata.NewMap(), nil, []string{label31, value31, label32, value32}, getPromLabels(label31, value31, label32, value32), diff --git a/pkg/translator/prometheusremotewrite/testutils_test.go b/pkg/translator/prometheusremotewrite/testutils_test.go index 54ac7c48adb3..3127208c89ed 100644 --- a/pkg/translator/prometheusremotewrite/testutils_test.go +++ b/pkg/translator/prometheusremotewrite/testutils_test.go @@ -141,7 +141,7 @@ var ( validHistogram: getHistogramMetric(validHistogram, lbs2, time2, floatVal2, uint64(intVal2), bounds, buckets), validSummary: getSummaryMetric(validSummary, lbs2, time2, floatVal2, uint64(intVal2), quantiles), validIntGaugeDirty: getIntGaugeMetric(validIntGaugeDirty, lbs1, intVal1, time1), - unmatchedBoundBucketHist: getHistogramMetric(unmatchedBoundBucketHist, pdata.NewAttributeMap(), 0, 0, 0, []float64{0.1, 0.2, 0.3}, []uint64{1, 2}), + unmatchedBoundBucketHist: getHistogramMetric(unmatchedBoundBucketHist, pdata.NewMap(), 0, 0, 0, []float64{0.1, 0.2, 0.3}, []uint64{1, 2}), } empty = "empty" @@ -170,8 +170,8 @@ var ( // OTLP metrics // attributes must come in pairs -func getAttributes(labels ...string) pdata.AttributeMap { - attributeMap := pdata.NewAttributeMap() +func getAttributes(labels ...string) pdata.Map { + attributeMap := pdata.NewMap() for i := 0; i < len(labels); i += 2 { attributeMap.UpsertString(labels[i], labels[i+1]) } @@ -278,7 +278,7 @@ func getEmptyGaugeMetric(name string) pdata.Metric { return metric } -func getIntGaugeMetric(name string, attributes pdata.AttributeMap, value int64, ts uint64) pdata.Metric { +func getIntGaugeMetric(name string, attributes pdata.Map, value int64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeGauge) @@ -294,7 +294,7 @@ func getIntGaugeMetric(name string, attributes pdata.AttributeMap, value int64, return metric } -func getDoubleGaugeMetric(name string, attributes pdata.AttributeMap, value float64, ts uint64) pdata.Metric { +func getDoubleGaugeMetric(name string, attributes pdata.Map, value float64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeGauge) @@ -317,7 +317,7 @@ func getEmptySumMetric(name string) pdata.Metric { return metric } -func getIntSumMetric(name string, attributes pdata.AttributeMap, value int64, ts uint64) pdata.Metric { +func getIntSumMetric(name string, attributes pdata.Map, value int64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSum) @@ -342,7 +342,7 @@ func getEmptyCumulativeSumMetric(name string) pdata.Metric { return metric } -func getSumMetric(name string, attributes pdata.AttributeMap, value float64, ts uint64) pdata.Metric { +func getSumMetric(name string, attributes pdata.Map, value float64, ts uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSum) @@ -374,7 +374,7 @@ func getEmptyCumulativeHistogramMetric(name string) pdata.Metric { return metric } -func getHistogramMetric(name string, attributes pdata.AttributeMap, ts uint64, sum float64, count uint64, bounds []float64, buckets []uint64) pdata.Metric { +func getHistogramMetric(name string, attributes pdata.Map, ts uint64, sum float64, count uint64, bounds []float64, buckets []uint64) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeHistogram) @@ -400,7 +400,7 @@ func getEmptySummaryMetric(name string) pdata.Metric { return metric } -func getSummaryMetric(name string, attributes pdata.AttributeMap, ts uint64, sum float64, count uint64, quantiles pdata.ValueAtQuantileSlice) pdata.Metric { +func getSummaryMetric(name string, attributes pdata.Map, ts uint64, sum float64, count uint64, quantiles pdata.ValueAtQuantileSlice) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSummary) diff --git a/pkg/translator/signalfx/from_metrics.go b/pkg/translator/signalfx/from_metrics.go index 269dda9a7144..8a8bcced714f 100644 --- a/pkg/translator/signalfx/from_metrics.go +++ b/pkg/translator/signalfx/from_metrics.go @@ -241,7 +241,7 @@ func convertSummaryDataPoints( return out } -func attributesToDimensions(attributes pdata.AttributeMap, extraDims []*sfxpb.Dimension) []*sfxpb.Dimension { +func attributesToDimensions(attributes pdata.Map, extraDims []*sfxpb.Dimension) []*sfxpb.Dimension { dimensions := make([]*sfxpb.Dimension, len(extraDims), attributes.Len()+len(extraDims)) copy(dimensions, extraDims) if attributes.Len() == 0 { diff --git a/pkg/translator/signalfx/from_metrics_test.go b/pkg/translator/signalfx/from_metrics_test.go index dbcce4e9ba12..603fa6b5a686 100644 --- a/pkg/translator/signalfx/from_metrics_test.go +++ b/pkg/translator/signalfx/from_metrics_test.go @@ -35,7 +35,7 @@ const ( ) func Test_FromMetrics(t *testing.T) { - labelMap := map[string]string{ + labelMap := map[string]interface{}{ "k0": "v0", "k1": "v1", } @@ -50,7 +50,7 @@ func Test_FromMetrics(t *testing.T) { initDoublePtWithLabels := func(doublePtWithLabels pdata.NumberDataPoint) { initDoublePt(doublePtWithLabels) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(doublePtWithLabels.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(doublePtWithLabels.Attributes()) } const int64Val = int64(123) @@ -61,7 +61,7 @@ func Test_FromMetrics(t *testing.T) { initInt64PtWithLabels := func(int64PtWithLabels pdata.NumberDataPoint) { initInt64Pt(int64PtWithLabels) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(int64PtWithLabels.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(int64PtWithLabels.Attributes()) } histBounds := []float64{1, 2, 4} @@ -73,7 +73,7 @@ func Test_FromMetrics(t *testing.T) { histDP.SetSum(100.0) histDP.SetExplicitBounds(histBounds) histDP.SetBucketCounts(histCounts) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(histDP.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(histDP.Attributes()) } histDP := pdata.NewHistogramDataPoint() initHistDP(histDP) @@ -82,7 +82,7 @@ func Test_FromMetrics(t *testing.T) { histDP.SetCount(2) histDP.SetSum(10) histDP.SetTimestamp(ts) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(histDP.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(histDP.Attributes()) } histDPNoBuckets := pdata.NewHistogramDataPoint() initHistDPNoBuckets(histDPNoBuckets) @@ -100,14 +100,14 @@ func Test_FromMetrics(t *testing.T) { qv.SetQuantile(0.25 * float64(i+1)) qv.SetValue(float64(i)) } - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(summaryDP.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(summaryDP.Attributes()) } initEmptySummaryDP := func(summaryDP pdata.SummaryDataPoint) { summaryDP.SetTimestamp(ts) summaryDP.SetSum(summarySumVal) summaryDP.SetCount(summaryCountVal) - pdata.NewAttributeMapFromMap(stringMapToAttributeMap(labelMap)).CopyTo(summaryDP.Attributes()) + pdata.NewMapFromRaw(labelMap).CopyTo(summaryDP.Attributes()) } tests := []struct { @@ -268,7 +268,7 @@ func Test_FromMetrics(t *testing.T) { doubleSFxDataPoint( "gauge_double_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(map[string]string{ + maps.MergeRawMaps(map[string]interface{}{ "k_n0": "v_n0", "k_n1": "v_n1", "k_r0": "v_r0", @@ -278,7 +278,7 @@ func Test_FromMetrics(t *testing.T) { int64SFxDataPoint( "gauge_int_with_dims", &sfxMetricTypeGauge, - maps.MergeStringMaps(map[string]string{ + maps.MergeRawMaps(map[string]interface{}{ "k_n0": "v_n0", "k_n1": "v_n1", "k_r0": "v_r0", @@ -383,7 +383,7 @@ func sortDimensions(points []*sfxpb.DataPoint) { func doubleSFxDataPoint( metric string, metricType *sfxpb.MetricType, - dims map[string]string, + dims map[string]interface{}, val float64, ) *sfxpb.DataPoint { return &sfxpb.DataPoint{ @@ -398,7 +398,7 @@ func doubleSFxDataPoint( func int64SFxDataPoint( metric string, metricType *sfxpb.MetricType, - dims map[string]string, + dims map[string]interface{}, val int64, ) *sfxpb.DataPoint { return &sfxpb.DataPoint{ @@ -410,12 +410,12 @@ func int64SFxDataPoint( } } -func sfxDimensions(m map[string]string) []*sfxpb.Dimension { +func sfxDimensions(m map[string]interface{}) []*sfxpb.Dimension { sfxDims := make([]*sfxpb.Dimension, 0, len(m)) for k, v := range m { sfxDims = append(sfxDims, &sfxpb.Dimension{ Key: k, - Value: v, + Value: v.(string), }) } @@ -424,7 +424,7 @@ func sfxDimensions(m map[string]string) []*sfxpb.Dimension { func expectedFromHistogram( metricName string, - dims map[string]string, + dims map[string]interface{}, histDP pdata.HistogramDataPoint, isDelta bool, ) []*sfxpb.DataPoint { @@ -446,28 +446,28 @@ func expectedFromHistogram( return dps } for i := 0; i < len(explicitBounds); i++ { - dimsCopy := maps.CloneStringMap(dims) + dimsCopy := maps.CloneRawMap(dims) dimsCopy[upperBoundDimensionKey] = float64ToDimValue(explicitBounds[i]) dps = append(dps, int64SFxDataPoint(metricName+"_bucket", typ, dimsCopy, int64(buckets[i]))) } - dimsCopy := maps.CloneStringMap(dims) + dimsCopy := maps.CloneRawMap(dims) dimsCopy[upperBoundDimensionKey] = float64ToDimValue(math.Inf(1)) dps = append(dps, int64SFxDataPoint(metricName+"_bucket", typ, dimsCopy, int64(buckets[len(buckets)-1]))) return dps } -func expectedFromSummary(name string, labelMap map[string]string, count int64, sumVal float64) []*sfxpb.DataPoint { +func expectedFromSummary(name string, labelMap map[string]interface{}, count int64, sumVal float64) []*sfxpb.DataPoint { countName := name + "_count" countPt := int64SFxDataPoint(countName, &sfxMetricTypeCumulativeCounter, labelMap, count) sumPt := doubleSFxDataPoint(name, &sfxMetricTypeCumulativeCounter, labelMap, sumVal) out := []*sfxpb.DataPoint{countPt, sumPt} quantileDimVals := []string{"0.25", "0.5", "0.75", "1"} for i := 0; i < 4; i++ { - qDims := map[string]string{"quantile": quantileDimVals[i]} + qDims := map[string]interface{}{"quantile": quantileDimVals[i]} qPt := doubleSFxDataPoint( name+"_quantile", &sfxMetricTypeGauge, - maps.MergeStringMaps(labelMap, qDims), + maps.MergeRawMaps(labelMap, qDims), float64(i), ) out = append(out, qPt) @@ -475,7 +475,8 @@ func expectedFromSummary(name string, labelMap map[string]string, count int64, s return out } -func expectedFromEmptySummary(name string, labelMap map[string]string, count int64, sumVal float64) []*sfxpb.DataPoint { +func expectedFromEmptySummary(name string, labelMap map[string]interface{}, count int64, + sumVal float64) []*sfxpb.DataPoint { countName := name + "_count" countPt := int64SFxDataPoint(countName, &sfxMetricTypeCumulativeCounter, labelMap, count) sumPt := doubleSFxDataPoint(name, &sfxMetricTypeCumulativeCounter, labelMap, sumVal) @@ -489,11 +490,3 @@ func mergeDPs(dps ...[]*sfxpb.DataPoint) []*sfxpb.DataPoint { } return out } - -func stringMapToAttributeMap(m map[string]string) map[string]pdata.Value { - ret := map[string]pdata.Value{} - for k, v := range m { - ret[k] = pdata.NewValueString(v) - } - return ret -} diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index 4029666e165b..97e3d82a6611 100644 --- a/pkg/translator/signalfx/go.mod +++ b/pkg/translator/signalfx/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 6652c4a62610..47c054c691b6 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -35,8 +35,8 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= diff --git a/pkg/translator/signalfx/to_metrics.go b/pkg/translator/signalfx/to_metrics.go index c7dd41f4c90d..2e3abd4759ca 100644 --- a/pkg/translator/signalfx/to_metrics.go +++ b/pkg/translator/signalfx/to_metrics.go @@ -96,7 +96,7 @@ func fillNumberDataPoint(sfxDataPoint *model.DataPoint, dps pdata.NumberDataPoin func fillInAttributes( dimensions []*model.Dimension, - attributes pdata.AttributeMap, + attributes pdata.Map, ) { attributes.Clear() attributes.EnsureCapacity(len(dimensions)) diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 2b209f59d459..b651cb105b22 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/protobuf v1.27.1 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 11076488da8b..f74801fe5398 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -146,8 +146,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/pkg/translator/zipkin/zipkinv2/from_translator.go b/pkg/translator/zipkin/zipkinv2/from_translator.go index 8d51c3042e89..902f300cbe48 100644 --- a/pkg/translator/zipkin/zipkinv2/from_translator.go +++ b/pkg/translator/zipkin/zipkinv2/from_translator.go @@ -247,7 +247,7 @@ func spanLinksToZipkinTags(links pdata.SpanLinkSlice, zTags map[string]string) e return nil } -func attributeMapToStringMap(attrMap pdata.AttributeMap) map[string]string { +func attributeMapToStringMap(attrMap pdata.Map) map[string]string { rawMap := make(map[string]string) attrMap.Range(func(k string, v pdata.Value) bool { rawMap[k] = v.AsString() diff --git a/pkg/translator/zipkin/zipkinv2/to_translator.go b/pkg/translator/zipkin/zipkinv2/to_translator.go index 38ae2136ae3c..51c71a60fa43 100644 --- a/pkg/translator/zipkin/zipkinv2/to_translator.go +++ b/pkg/translator/zipkin/zipkinv2/to_translator.go @@ -289,7 +289,7 @@ func populateSpanEvents(zspan *zipkinmodel.SpanModel, events pdata.SpanEventSlic return nil } -func jsonMapToAttributeMap(attrs map[string]interface{}, dest pdata.AttributeMap) error { +func jsonMapToAttributeMap(attrs map[string]interface{}, dest pdata.Map) error { for key, val := range attrs { if s, ok := val.(string); ok { dest.InsertString(key, s) @@ -306,7 +306,7 @@ func jsonMapToAttributeMap(attrs map[string]interface{}, dest pdata.AttributeMap return nil } -func zTagsToInternalAttrs(zspan *zipkinmodel.SpanModel, tags map[string]string, dest pdata.AttributeMap, parseStringTags bool) error { +func zTagsToInternalAttrs(zspan *zipkinmodel.SpanModel, tags map[string]string, dest pdata.Map, parseStringTags bool) error { parseErr := tagsToAttributeMap(tags, dest, parseStringTags) if zspan.LocalEndpoint != nil { if zspan.LocalEndpoint.IPv4 != nil { @@ -336,7 +336,7 @@ func zTagsToInternalAttrs(zspan *zipkinmodel.SpanModel, tags map[string]string, return parseErr } -func tagsToAttributeMap(tags map[string]string, dest pdata.AttributeMap, parseStringTags bool) error { +func tagsToAttributeMap(tags map[string]string, dest pdata.Map, parseStringTags bool) error { var parseErr error for key, val := range tags { if _, ok := nonSpanAttributes[key]; ok { @@ -429,7 +429,7 @@ func extractInstrumentationLibrary(zspan *zipkinmodel.SpanModel) string { return zspan.Tags[conventions.OtelLibraryName] } -func setTimestampsV2(zspan *zipkinmodel.SpanModel, dest pdata.Span, destAttrs pdata.AttributeMap) { +func setTimestampsV2(zspan *zipkinmodel.SpanModel, dest pdata.Span, destAttrs pdata.Map) { // zipkin allows timestamp to be unset, but otel span expects startTimestamp to have a value. // unset gets converted to zero on the zspan object during json deserialization because // time.Time (the type of Timestamp field) cannot be nil. If timestamp is zero, the diff --git a/processor/attributesprocessor/attributes_log_test.go b/processor/attributesprocessor/attributes_log_test.go index 24de4b0a9b83..d66918f7d9a2 100644 --- a/processor/attributesprocessor/attributes_log_test.go +++ b/processor/attributesprocessor/attributes_log_test.go @@ -34,8 +34,8 @@ import ( // Common structure for all the Tests type logTestCase struct { name string - inputAttributes map[string]pdata.Value - expectedAttributes map[string]pdata.Value + inputAttributes map[string]interface{} + expectedAttributes map[string]interface{} } // runIndividualLogTestCase is the common logic of passing trace data through a configured attributes processor. @@ -49,13 +49,13 @@ func runIndividualLogTestCase(t *testing.T, tt logTestCase, tp component.LogsPro }) } -func generateLogData(resourceName string, attrs map[string]pdata.Value) pdata.Logs { +func generateLogData(resourceName string, attrs map[string]interface{}) pdata.Logs { td := pdata.NewLogs() res := td.ResourceLogs().AppendEmpty() res.Resource().Attributes().InsertString("name", resourceName) ill := res.InstrumentationLibraryLogs().AppendEmpty() lr := ill.LogRecords().AppendEmpty() - pdata.NewAttributeMapFromMap(attrs).CopyTo(lr.Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(lr.Attributes()) lr.Attributes().Sort() return td } @@ -125,33 +125,33 @@ func TestAttributes_FilterLogs(t *testing.T) { testCases := []logTestCase{ { name: "apply processor", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply processor with different value for exclude property", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect name for include property", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "attribute match for exclude property", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -186,38 +186,38 @@ func TestAttributes_FilterLogsByNameStrict(t *testing.T) { testCases := []logTestCase{ { name: "apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect_log_name", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "dont_apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "incorrect_log_name_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -249,38 +249,38 @@ func TestAttributes_FilterLogsByNameRegexp(t *testing.T) { testCases := []logTestCase{ { name: "apply_to_log_with_no_attrs", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply_to_log_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect_log_name", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "apply_dont_apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "incorrect_log_name_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -312,38 +312,38 @@ func TestLogAttributes_Hash(t *testing.T) { testCases := []logTestCase{ { name: "String", - inputAttributes: map[string]pdata.Value{ - "user.email": pdata.NewValueString("john.doe@example.com"), + inputAttributes: map[string]interface{}{ + "user.email": "john.doe@example.com", }, - expectedAttributes: map[string]pdata.Value{ - "user.email": pdata.NewValueString("73ec53c4ba1747d485ae2a0d7bfafa6cda80a5a9"), + expectedAttributes: map[string]interface{}{ + "user.email": "73ec53c4ba1747d485ae2a0d7bfafa6cda80a5a9", }, }, { name: "Int", - inputAttributes: map[string]pdata.Value{ - "user.id": pdata.NewValueInt(10), + inputAttributes: map[string]interface{}{ + "user.id": 10, }, - expectedAttributes: map[string]pdata.Value{ - "user.id": pdata.NewValueString("71aa908aff1548c8c6cdecf63545261584738a25"), + expectedAttributes: map[string]interface{}{ + "user.id": "71aa908aff1548c8c6cdecf63545261584738a25", }, }, { name: "Double", - inputAttributes: map[string]pdata.Value{ - "user.balance": pdata.NewValueDouble(99.1), + inputAttributes: map[string]interface{}{ + "user.balance": 99.1, }, - expectedAttributes: map[string]pdata.Value{ - "user.balance": pdata.NewValueString("76429edab4855b03073f9429fd5d10313c28655e"), + expectedAttributes: map[string]interface{}{ + "user.balance": "76429edab4855b03073f9429fd5d10313c28655e", }, }, { name: "Bool", - inputAttributes: map[string]pdata.Value{ - "user.authenticated": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "user.authenticated": true, }, - expectedAttributes: map[string]pdata.Value{ - "user.authenticated": pdata.NewValueString("bf8b4530d8d246dd74ac53a13471bba17941dff7"), + expectedAttributes: map[string]interface{}{ + "user.authenticated": "bf8b4530d8d246dd74ac53a13471bba17941dff7", }, }, } @@ -371,56 +371,56 @@ func TestLogAttributes_Convert(t *testing.T) { testCases := []logTestCase{ { name: "int to int", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(1), + inputAttributes: map[string]interface{}{ + "to.int": 1, }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(1), + expectedAttributes: map[string]interface{}{ + "to.int": 1, }, }, { name: "false to int", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "to.int": false, }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(0), + expectedAttributes: map[string]interface{}{ + "to.int": 0, }, }, { name: "String to int (good)", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("123"), + inputAttributes: map[string]interface{}{ + "to.int": "123", }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(123), + expectedAttributes: map[string]interface{}{ + "to.int": 123, }, }, { name: "String to int (bad)", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("int-10"), + inputAttributes: map[string]interface{}{ + "to.int": "int-10", }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("int-10"), + expectedAttributes: map[string]interface{}{ + "to.int": "int-10", }, }, { name: "String to double", - inputAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueString("123.6"), + inputAttributes: map[string]interface{}{ + "to.double": "123.6", }, - expectedAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueDouble(123.6), + expectedAttributes: map[string]interface{}{ + "to.double": 123.6, }, }, { name: "Double to string", - inputAttributes: map[string]pdata.Value{ - "to.string": pdata.NewValueDouble(99.1), + inputAttributes: map[string]interface{}{ + "to.string": 99.1, }, - expectedAttributes: map[string]pdata.Value{ - "to.string": pdata.NewValueString("99.1"), + expectedAttributes: map[string]interface{}{ + "to.string": "99.1", }, }, } @@ -447,25 +447,25 @@ func BenchmarkAttributes_FilterLogsByName(b *testing.B) { testCases := []logTestCase{ { name: "apply_to_log_with_no_attrs", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply_to_log_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "dont_apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, } diff --git a/processor/attributesprocessor/attributes_metric_test.go b/processor/attributesprocessor/attributes_metric_test.go index d982afa6cf31..f94e16bc3413 100644 --- a/processor/attributesprocessor/attributes_metric_test.go +++ b/processor/attributesprocessor/attributes_metric_test.go @@ -34,8 +34,8 @@ import ( // Common structure for all the Tests type metricTestCase struct { name string - inputAttributes map[string]pdata.Value - expectedAttributes map[string]pdata.Value + inputAttributes map[string]interface{} + expectedAttributes map[string]interface{} } // runIndividualMetricTestCase is the common logic of passing metric data through a configured attributes processor. @@ -49,7 +49,7 @@ func runIndividualMetricTestCase(t *testing.T, mt metricTestCase, mp component.M }) } -func generateMetricData(resourceName string, attrs map[string]pdata.Value) pdata.Metrics { +func generateMetricData(resourceName string, attrs map[string]interface{}) pdata.Metrics { md := pdata.NewMetrics() res := md.ResourceMetrics().AppendEmpty() res.Resource().Attributes().InsertString("name", resourceName) @@ -60,31 +60,31 @@ func generateMetricData(resourceName string, attrs map[string]pdata.Value) pdata case pdata.MetricDataTypeGauge: dps := m.Gauge().DataPoints() for i := 0; i < dps.Len(); i++ { - pdata.NewAttributeMapFromMap(attrs).CopyTo(dps.At(i).Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(dps.At(i).Attributes()) dps.At(i).Attributes().Sort() } case pdata.MetricDataTypeSum: dps := m.Sum().DataPoints() for i := 0; i < dps.Len(); i++ { - pdata.NewAttributeMapFromMap(attrs).CopyTo(dps.At(i).Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(dps.At(i).Attributes()) dps.At(i).Attributes().Sort() } case pdata.MetricDataTypeHistogram: dps := m.Histogram().DataPoints() for i := 0; i < dps.Len(); i++ { - pdata.NewAttributeMapFromMap(attrs).CopyTo(dps.At(i).Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(dps.At(i).Attributes()) dps.At(i).Attributes().Sort() } case pdata.MetricDataTypeExponentialHistogram: dps := m.ExponentialHistogram().DataPoints() for i := 0; i < dps.Len(); i++ { - pdata.NewAttributeMapFromMap(attrs).CopyTo(dps.At(i).Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(dps.At(i).Attributes()) dps.At(i).Attributes().Sort() } case pdata.MetricDataTypeSummary: dps := m.Summary().DataPoints() for i := 0; i < dps.Len(); i++ { - pdata.NewAttributeMapFromMap(attrs).CopyTo(dps.At(i).Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(dps.At(i).Attributes()) dps.At(i).Attributes().Sort() } } @@ -189,33 +189,33 @@ func TestAttributes_FilterMetrics(t *testing.T) { testCases := []metricTestCase{ { name: "apply processor", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply processor with different value for exclude property", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect name for include property", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "attribute match for exclude property", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -249,38 +249,38 @@ func TestAttributes_FilterMetricsByNameStrict(t *testing.T) { testCases := []metricTestCase{ { name: "apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect_metric_name", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "dont_apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "incorrect_metric_name_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -312,38 +312,38 @@ func TestAttributes_FilterMetricsByNameRegexp(t *testing.T) { testCases := []metricTestCase{ { name: "apply_to_metric_with_no_attrs", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply_to_metric_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect_metric_name", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "apply_dont_apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "incorrect_metric_name_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -375,38 +375,38 @@ func TestMetricAttributes_Hash(t *testing.T) { testCases := []metricTestCase{ { name: "String", - inputAttributes: map[string]pdata.Value{ - "user.email": pdata.NewValueString("john.doe@example.com"), + inputAttributes: map[string]interface{}{ + "user.email": "john.doe@example.com", }, - expectedAttributes: map[string]pdata.Value{ - "user.email": pdata.NewValueString("73ec53c4ba1747d485ae2a0d7bfafa6cda80a5a9"), + expectedAttributes: map[string]interface{}{ + "user.email": "73ec53c4ba1747d485ae2a0d7bfafa6cda80a5a9", }, }, { name: "Int", - inputAttributes: map[string]pdata.Value{ - "user.id": pdata.NewValueInt(10), + inputAttributes: map[string]interface{}{ + "user.id": 10, }, - expectedAttributes: map[string]pdata.Value{ - "user.id": pdata.NewValueString("71aa908aff1548c8c6cdecf63545261584738a25"), + expectedAttributes: map[string]interface{}{ + "user.id": "71aa908aff1548c8c6cdecf63545261584738a25", }, }, { name: "Double", - inputAttributes: map[string]pdata.Value{ - "user.balance": pdata.NewValueDouble(99.1), + inputAttributes: map[string]interface{}{ + "user.balance": 99.1, }, - expectedAttributes: map[string]pdata.Value{ - "user.balance": pdata.NewValueString("76429edab4855b03073f9429fd5d10313c28655e"), + expectedAttributes: map[string]interface{}{ + "user.balance": "76429edab4855b03073f9429fd5d10313c28655e", }, }, { name: "Bool", - inputAttributes: map[string]pdata.Value{ - "user.authenticated": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "user.authenticated": true, }, - expectedAttributes: map[string]pdata.Value{ - "user.authenticated": pdata.NewValueString("bf8b4530d8d246dd74ac53a13471bba17941dff7"), + expectedAttributes: map[string]interface{}{ + "user.authenticated": "bf8b4530d8d246dd74ac53a13471bba17941dff7", }, }, } @@ -433,38 +433,38 @@ func TestMetricAttributes_Convert(t *testing.T) { testCases := []metricTestCase{ { name: "String to int (good)", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("123"), + inputAttributes: map[string]interface{}{ + "to.int": "123", }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(123), + expectedAttributes: map[string]interface{}{ + "to.int": 123, }, }, { name: "String to int (bad)", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("int-10"), + inputAttributes: map[string]interface{}{ + "to.int": "int-10", }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("int-10"), + expectedAttributes: map[string]interface{}{ + "to.int": "int-10", }, }, { name: "String to double", - inputAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueString("3.141e2"), + inputAttributes: map[string]interface{}{ + "to.double": "3.141e2", }, - expectedAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueDouble(314.1), + expectedAttributes: map[string]interface{}{ + "to.double": 314.1, }, }, { name: "Double to string", - inputAttributes: map[string]pdata.Value{ - "to.string": pdata.NewValueDouble(99.1), + inputAttributes: map[string]interface{}{ + "to.string": 99.1, }, - expectedAttributes: map[string]pdata.Value{ - "to.string": pdata.NewValueString("99.1"), + expectedAttributes: map[string]interface{}{ + "to.string": "99.1", }, }, } @@ -491,25 +491,25 @@ func BenchmarkAttributes_FilterMetricsByName(b *testing.B) { testCases := []metricTestCase{ { name: "apply_to_metric_with_no_attrs", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply_to_metric_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "dont_apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, } diff --git a/processor/attributesprocessor/attributes_trace_test.go b/processor/attributesprocessor/attributes_trace_test.go index b08a1a469d4a..c747720d3af0 100644 --- a/processor/attributesprocessor/attributes_trace_test.go +++ b/processor/attributesprocessor/attributes_trace_test.go @@ -36,8 +36,8 @@ import ( type testCase struct { name string serviceName string - inputAttributes map[string]pdata.Value - expectedAttributes map[string]pdata.Value + inputAttributes map[string]interface{} + expectedAttributes map[string]interface{} } // runIndividualTestCase is the common logic of passing trace data through a configured attributes processor. @@ -51,7 +51,7 @@ func runIndividualTestCase(t *testing.T, tt testCase, tp component.TracesProcess }) } -func generateTraceData(serviceName, spanName string, attrs map[string]pdata.Value) pdata.Traces { +func generateTraceData(serviceName, spanName string, attrs map[string]interface{}) pdata.Traces { td := pdata.NewTraces() rs := td.ResourceSpans().AppendEmpty() if serviceName != "" { @@ -59,7 +59,7 @@ func generateTraceData(serviceName, spanName string, attrs map[string]pdata.Valu } span := rs.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() span.SetName(spanName) - pdata.NewAttributeMapFromMap(attrs).CopyTo(span.Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(span.Attributes()) span.Attributes().Sort() return td } @@ -134,36 +134,36 @@ func TestAttributes_FilterSpans(t *testing.T) { { name: "apply processor", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply processor with different value for exclude property", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect name for include property", serviceName: "noname", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "attribute match for exclude property", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -198,42 +198,42 @@ func TestAttributes_FilterSpansByNameStrict(t *testing.T) { { name: "apply", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect_span_name", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "dont_apply", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "incorrect_span_name_with_attr", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -266,42 +266,42 @@ func TestAttributes_FilterSpansByNameRegexp(t *testing.T) { { name: "apply_to_span_with_no_attrs", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply_to_span_with_attr", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "incorrect_span_name", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "apply_dont_apply", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, { name: "incorrect_span_name_with_attr", serviceName: "svcB", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "NoModification": true, }, - expectedAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(true), + expectedAttributes: map[string]interface{}{ + "NoModification": true, }, }, } @@ -333,38 +333,38 @@ func TestAttributes_Hash(t *testing.T) { testCases := []testCase{ { name: "String", - inputAttributes: map[string]pdata.Value{ - "user.email": pdata.NewValueString("john.doe@example.com"), + inputAttributes: map[string]interface{}{ + "user.email": "john.doe@example.com", }, - expectedAttributes: map[string]pdata.Value{ - "user.email": pdata.NewValueString("73ec53c4ba1747d485ae2a0d7bfafa6cda80a5a9"), + expectedAttributes: map[string]interface{}{ + "user.email": "73ec53c4ba1747d485ae2a0d7bfafa6cda80a5a9", }, }, { name: "Int", - inputAttributes: map[string]pdata.Value{ - "user.id": pdata.NewValueInt(10), + inputAttributes: map[string]interface{}{ + "user.id": 10, }, - expectedAttributes: map[string]pdata.Value{ - "user.id": pdata.NewValueString("71aa908aff1548c8c6cdecf63545261584738a25"), + expectedAttributes: map[string]interface{}{ + "user.id": "71aa908aff1548c8c6cdecf63545261584738a25", }, }, { name: "Double", - inputAttributes: map[string]pdata.Value{ - "user.balance": pdata.NewValueDouble(99.1), + inputAttributes: map[string]interface{}{ + "user.balance": 99.1, }, - expectedAttributes: map[string]pdata.Value{ - "user.balance": pdata.NewValueString("76429edab4855b03073f9429fd5d10313c28655e"), + expectedAttributes: map[string]interface{}{ + "user.balance": "76429edab4855b03073f9429fd5d10313c28655e", }, }, { name: "Bool", - inputAttributes: map[string]pdata.Value{ - "user.authenticated": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "user.authenticated": true, }, - expectedAttributes: map[string]pdata.Value{ - "user.authenticated": pdata.NewValueString("bf8b4530d8d246dd74ac53a13471bba17941dff7"), + expectedAttributes: map[string]interface{}{ + "user.authenticated": "bf8b4530d8d246dd74ac53a13471bba17941dff7", }, }, } @@ -392,83 +392,83 @@ func TestAttributes_Convert(t *testing.T) { testCases := []testCase{ { name: "int to int", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(1), + inputAttributes: map[string]interface{}{ + "to.int": 1, }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(1), + expectedAttributes: map[string]interface{}{ + "to.int": 1, }, }, { name: "true to int", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "to.int": true, }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(1), + expectedAttributes: map[string]interface{}{ + "to.int": 1, }, }, { name: "false to int", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "to.int": false, }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(0), + expectedAttributes: map[string]interface{}{ + "to.int": 0, }, }, { name: "String to int (good)", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("123"), + inputAttributes: map[string]interface{}{ + "to.int": "123", }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueInt(123), + expectedAttributes: map[string]interface{}{ + "to.int": 123, }, }, { name: "String to int (bad)", - inputAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("int-10"), + inputAttributes: map[string]interface{}{ + "to.int": "int-10", }, - expectedAttributes: map[string]pdata.Value{ - "to.int": pdata.NewValueString("int-10"), + expectedAttributes: map[string]interface{}{ + "to.int": "int-10", }, }, { name: "String to double (int-ish)", - inputAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueString("123"), + inputAttributes: map[string]interface{}{ + "to.double": "123", }, - expectedAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueDouble(123), + expectedAttributes: map[string]interface{}{ + "to.double": 123.0, }, }, { name: "String to double (double-ish)", - inputAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueString("123.6"), + inputAttributes: map[string]interface{}{ + "to.double": "123.6", }, - expectedAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueDouble(123.6), + expectedAttributes: map[string]interface{}{ + "to.double": 123.6, }, }, { name: "String to double (bad)", - inputAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueString("int-10"), + inputAttributes: map[string]interface{}{ + "to.double": "int-10", }, - expectedAttributes: map[string]pdata.Value{ - "to.double": pdata.NewValueString("int-10"), + expectedAttributes: map[string]interface{}{ + "to.double": "int-10", }, }, { name: "Double to string", - inputAttributes: map[string]pdata.Value{ - "to.string": pdata.NewValueDouble(99.1), + inputAttributes: map[string]interface{}{ + "to.string": 99.1, }, - expectedAttributes: map[string]pdata.Value{ - "to.string": pdata.NewValueString("99.1"), + expectedAttributes: map[string]interface{}{ + "to.string": "99.1", }, }, } @@ -495,25 +495,25 @@ func BenchmarkAttributes_FilterSpansByName(b *testing.B) { testCases := []testCase{ { name: "apply_to_span_with_no_attrs", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{ + "attribute1": 123, }, }, { name: "apply_to_span_with_attr", - inputAttributes: map[string]pdata.Value{ - "NoModification": pdata.NewValueBool(false), + inputAttributes: map[string]interface{}{ + "NoModification": false, }, - expectedAttributes: map[string]pdata.Value{ - "attribute1": pdata.NewValueInt(123), - "NoModification": pdata.NewValueBool(false), + expectedAttributes: map[string]interface{}{ + "attribute1": 123, + "NoModification": false, }, }, { name: "dont_apply", - inputAttributes: map[string]pdata.Value{}, - expectedAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, + expectedAttributes: map[string]interface{}{}, }, } diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index bab1c41d4098..7ea29f4b73a9 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -25,9 +25,9 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 3261a73b6459..eafdcbabcaf6 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -177,22 +177,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index ed7f729b4624..fc77933b79ec 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -25,9 +25,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 0aab91857bae..aadd435485eb 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -165,22 +165,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/cumulativetodeltaprocessor/internal/tracking/identity.go b/processor/cumulativetodeltaprocessor/internal/tracking/identity.go index 50a00e156220..4b40f9dbd8cd 100644 --- a/processor/cumulativetodeltaprocessor/internal/tracking/identity.go +++ b/processor/cumulativetodeltaprocessor/internal/tracking/identity.go @@ -29,7 +29,7 @@ type MetricIdentity struct { MetricName string MetricUnit string StartTimestamp pdata.Timestamp - Attributes pdata.AttributeMap + Attributes pdata.Map MetricValueType pdata.MetricValueType } diff --git a/processor/cumulativetodeltaprocessor/internal/tracking/identity_test.go b/processor/cumulativetodeltaprocessor/internal/tracking/identity_test.go index 6595043817bb..50e4088cb2c0 100644 --- a/processor/cumulativetodeltaprocessor/internal/tracking/identity_test.go +++ b/processor/cumulativetodeltaprocessor/internal/tracking/identity_test.go @@ -30,7 +30,7 @@ func TestMetricIdentity_Write(t *testing.T) { il.SetName("ilm_name") il.SetVersion("ilm_version") - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.InsertString("label", "value") type fields struct { Resource pdata.Resource @@ -40,7 +40,7 @@ func TestMetricIdentity_Write(t *testing.T) { MetricName string MetricUnit string StartTimestamp pdata.Timestamp - Attributes pdata.AttributeMap + Attributes pdata.Map MetricValueType pdata.MetricValueType } tests := []struct { @@ -126,7 +126,7 @@ func TestMetricIdentity_IsFloatVal(t *testing.T) { mi := &MetricIdentity{ Resource: pdata.NewResource(), InstrumentationLibrary: pdata.NewInstrumentationLibrary(), - Attributes: pdata.NewAttributeMap(), + Attributes: pdata.NewMap(), MetricDataType: pdata.MetricDataTypeSum, MetricValueType: tt.fields.MetricValueType, } @@ -166,7 +166,7 @@ func TestMetricIdentity_IsSupportedMetricType(t *testing.T) { mi := &MetricIdentity{ Resource: pdata.NewResource(), InstrumentationLibrary: pdata.NewInstrumentationLibrary(), - Attributes: pdata.NewAttributeMap(), + Attributes: pdata.NewMap(), MetricDataType: tt.fields.MetricDataType, } if got := mi.IsSupportedMetricType(); got != tt.want { diff --git a/processor/cumulativetodeltaprocessor/internal/tracking/tracker_test.go b/processor/cumulativetodeltaprocessor/internal/tracking/tracker_test.go index d4df6d427161..ba79ecda73b9 100644 --- a/processor/cumulativetodeltaprocessor/internal/tracking/tracker_test.go +++ b/processor/cumulativetodeltaprocessor/internal/tracking/tracker_test.go @@ -33,7 +33,7 @@ func TestMetricTracker_Convert(t *testing.T) { MetricIsMonotonic: true, MetricName: "", MetricUnit: "", - Attributes: pdata.NewAttributeMap(), + Attributes: pdata.NewMap(), } miIntSum := miSum miIntSum.MetricValueType = pdata.MetricValueTypeInt diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index b0185aad3b3f..86ddf15f75ef 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -25,9 +25,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 0aab91857bae..aadd435485eb 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -165,22 +165,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/filterprocessor/expr_test.go b/processor/filterprocessor/expr_test.go index cea2ffc8982b..6ab4e0c29344 100644 --- a/processor/filterprocessor/expr_test.go +++ b/processor/filterprocessor/expr_test.go @@ -116,7 +116,7 @@ func testFilter(t *testing.T, mdType pdata.MetricDataType, mvType pdata.MetricVa assert.Equal(t, expectedMetricCount, filteredMetricCount) } -func assertFiltered(t *testing.T, lm pdata.AttributeMap) { +func assertFiltered(t *testing.T, lm pdata.Map) { lm.Range(func(k string, v pdata.Value) bool { if k == filteredAttrKey && v.Equal(filteredAttrVal) { assert.Fail(t, "found metric that should have been filtered out") diff --git a/processor/filterprocessor/filter_processor_logs_test.go b/processor/filterprocessor/filter_processor_logs_test.go index 693bc489d895..772e91274e41 100644 --- a/processor/filterprocessor/filter_processor_logs_test.go +++ b/processor/filterprocessor/filter_processor_logs_test.go @@ -38,8 +38,8 @@ type logNameTest struct { type logWithResource struct { logNames []string - resourceAttributes map[string]pdata.Value - recordAttributes map[string]pdata.Value + resourceAttributes map[string]interface{} + recordAttributes map[string]interface{} } var ( @@ -51,10 +51,10 @@ var ( inLogForResourceTest = []logWithResource{ { logNames: []string{"log1", "log2"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val1"), - "attr2": pdata.NewValueString("attr2/val2"), - "attr3": pdata.NewValueString("attr3/val3"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val1", + "attr2": "attr2/val2", + "attr3": "attr3/val3", }, }, } @@ -62,14 +62,14 @@ var ( inLogForTwoResource = []logWithResource{ { logNames: []string{"log1", "log2"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val1"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val1", }, }, { logNames: []string{"log3", "log4"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val2"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val2", }, }, } @@ -77,49 +77,49 @@ var ( inLogForTwoResourceWithRecordAttributes = []logWithResource{ { logNames: []string{"log1", "log2"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val1"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val1", }, - recordAttributes: map[string]pdata.Value{ - "rec": pdata.NewValueString("rec/val1"), + recordAttributes: map[string]interface{}{ + "rec": "rec/val1", }, }, { logNames: []string{"log3", "log4"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val2"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val2", }, - recordAttributes: map[string]pdata.Value{ - "rec": pdata.NewValueString("rec/val2"), + recordAttributes: map[string]interface{}{ + "rec": "rec/val2", }, }, } inLogForThreeResourceWithRecordAttributes = []logWithResource{ { logNames: []string{"log1", "log2"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val1"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val1", }, - recordAttributes: map[string]pdata.Value{ - "rec": pdata.NewValueString("rec/val1"), + recordAttributes: map[string]interface{}{ + "rec": "rec/val1", }, }, { logNames: []string{"log3", "log4"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val2"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val2", }, - recordAttributes: map[string]pdata.Value{ - "rec": pdata.NewValueString("rec/val2"), + recordAttributes: map[string]interface{}{ + "rec": "rec/val2", }, }, { logNames: []string{"log5"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val5"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val5", }, - recordAttributes: map[string]pdata.Value{ - "rec": pdata.NewValueString("rec/val5"), + recordAttributes: map[string]interface{}{ + "rec": "rec/val5", }, }, } @@ -127,26 +127,26 @@ var ( inLogForFourResource = []logWithResource{ { logNames: []string{"log1"}, - resourceAttributes: map[string]pdata.Value{ - "attr": pdata.NewValueString("attr/val1"), + resourceAttributes: map[string]interface{}{ + "attr": "attr/val1", }, }, { logNames: []string{"log2"}, - resourceAttributes: map[string]pdata.Value{ - "attr": pdata.NewValueString("attr/val2"), + resourceAttributes: map[string]interface{}{ + "attr": "attr/val2", }, }, { logNames: []string{"log3"}, - resourceAttributes: map[string]pdata.Value{ - "attr": pdata.NewValueString("attr/val3"), + resourceAttributes: map[string]interface{}{ + "attr": "attr/val3", }, }, { logNames: []string{"log4"}, - resourceAttributes: map[string]pdata.Value{ - "attr": pdata.NewValueString("attr/val4"), + resourceAttributes: map[string]interface{}{ + "attr": "attr/val4", }, }, } @@ -389,7 +389,7 @@ func testResourceLogs(lwrs []logWithResource) pdata.Logs { rl := ld.ResourceLogs().AppendEmpty() // Add resource level attribtues - pdata.NewAttributeMapFromMap(lwr.resourceAttributes).CopyTo(rl.Resource().Attributes()) + pdata.NewMapFromRaw(lwr.resourceAttributes).CopyTo(rl.Resource().Attributes()) ls := rl.InstrumentationLibraryLogs().AppendEmpty().LogRecords() for _, name := range lwr.logNames { l := ls.AppendEmpty() @@ -397,7 +397,7 @@ func testResourceLogs(lwrs []logWithResource) pdata.Logs { // Add record level attribtues for k := 0; k < ls.Len(); k++ { - pdata.NewAttributeMapFromMap(lwrs[i].recordAttributes).CopyTo(ls.At(k).Attributes()) + pdata.NewMapFromRaw(lwrs[i].recordAttributes).CopyTo(ls.At(k).Attributes()) } } } diff --git a/processor/filterprocessor/filter_processor_test.go b/processor/filterprocessor/filter_processor_test.go index f3521905c000..2ce1ff3bd80a 100644 --- a/processor/filterprocessor/filter_processor_test.go +++ b/processor/filterprocessor/filter_processor_test.go @@ -43,7 +43,7 @@ type metricNameTest struct { type metricWithResource struct { metricNames []string - resourceAttributes map[string]pdata.Value + resourceAttributes map[string]interface{} } var ( @@ -78,10 +78,10 @@ var ( inMetricForResourceTest = []metricWithResource{ { metricNames: []string{"metric1", "metric2"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val1"), - "attr2": pdata.NewValueString("attr2/val2"), - "attr3": pdata.NewValueString("attr3/val3"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val1", + "attr2": "attr2/val2", + "attr3": "attr3/val3", }, }, } @@ -89,14 +89,14 @@ var ( inMetricForTwoResource = []metricWithResource{ { metricNames: []string{"metric1", "metric2"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val1"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val1", }, }, { metricNames: []string{"metric3", "metric4"}, - resourceAttributes: map[string]pdata.Value{ - "attr1": pdata.NewValueString("attr1/val2"), + resourceAttributes: map[string]interface{}{ + "attr1": "attr1/val2", }, }, } @@ -384,7 +384,7 @@ func testResourceMetrics(mwrs []metricWithResource) pdata.Metrics { for _, mwr := range mwrs { rm := md.ResourceMetrics().AppendEmpty() - pdata.NewAttributeMapFromMap(mwr.resourceAttributes).CopyTo(rm.Resource().Attributes()) + pdata.NewMapFromRaw(mwr.resourceAttributes).CopyTo(rm.Resource().Attributes()) ms := rm.InstrumentationLibraryMetrics().AppendEmpty().Metrics() for _, name := range mwr.metricNames { m := ms.AppendEmpty() diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index aef2ef205c6e..d8822e09274a 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -25,9 +25,9 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 3261a73b6459..eafdcbabcaf6 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -177,22 +177,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/groupbyattrsprocessor/attribute_groups.go b/processor/groupbyattrsprocessor/attribute_groups.go index 11056f7e71fe..9f25ef18796b 100644 --- a/processor/groupbyattrsprocessor/attribute_groups.go +++ b/processor/groupbyattrsprocessor/attribute_groups.go @@ -105,8 +105,8 @@ func newMetricsGroupedByAttrs() *metricsGroupedByAttrs { // Build the Attributes that we'll be looking for in existing Resources as a merge of the Attributes // of the original Resource with the requested Attributes -func buildReferenceAttributes(originResource pdata.Resource, requiredAttributes pdata.AttributeMap) pdata.AttributeMap { - referenceAttributes := pdata.NewAttributeMap() +func buildReferenceAttributes(originResource pdata.Resource, requiredAttributes pdata.Map) pdata.Map { + referenceAttributes := pdata.NewMap() originResource.Attributes().CopyTo(referenceAttributes) requiredAttributes.Range(func(k string, v pdata.Value) bool { referenceAttributes.Upsert(k, v) @@ -117,7 +117,7 @@ func buildReferenceAttributes(originResource pdata.Resource, requiredAttributes // resourceMatches verifies if given pdata.Resource attributes strictly match with the specified // reference Attributes (all attributes must match strictly) -func resourceMatches(resource pdata.Resource, referenceAttributes pdata.AttributeMap) bool { +func resourceMatches(resource pdata.Resource, referenceAttributes pdata.Map) bool { // If not the same number of attributes, it doesn't match if referenceAttributes.Len() != resource.Attributes().Len() { @@ -141,7 +141,7 @@ func resourceMatches(resource pdata.Resource, referenceAttributes pdata.Attribut // findResource searches for an existing pdata.ResourceLogs that strictly matches with the specified reference // Attributes. Returns the matching pdata.ResourceLogs and bool value which is set to true if found -func (lgba logsGroupedByAttrs) findResource(referenceAttributes pdata.AttributeMap) (pdata.ResourceLogs, bool) { +func (lgba logsGroupedByAttrs) findResource(referenceAttributes pdata.Map) (pdata.ResourceLogs, bool) { for i := 0; i < lgba.Len(); i++ { if resourceMatches(lgba.At(i).Resource(), referenceAttributes) { return lgba.At(i), true @@ -152,7 +152,7 @@ func (lgba logsGroupedByAttrs) findResource(referenceAttributes pdata.AttributeM // findResource searches for an existing pdata.ResourceLogs that strictly matches with the specified reference // Attributes. Returns the matching pdata.ResourceLogs and bool value which is set to true if found -func (sgba spansGroupedByAttrs) findResource(referenceAttributes pdata.AttributeMap) (pdata.ResourceSpans, bool) { +func (sgba spansGroupedByAttrs) findResource(referenceAttributes pdata.Map) (pdata.ResourceSpans, bool) { for i := 0; i < sgba.Len(); i++ { if resourceMatches(sgba.At(i).Resource(), referenceAttributes) { return sgba.At(i), true @@ -163,7 +163,7 @@ func (sgba spansGroupedByAttrs) findResource(referenceAttributes pdata.Attribute // findResource searches for an existing pdata.ResourceMetrics that strictly matches with the specified reference // Attributes. Returns the matching pdata.ResourceMetrics and bool value which is set to true if found -func (mgba metricsGroupedByAttrs) findResource(referenceAttributes pdata.AttributeMap) (pdata.ResourceMetrics, bool) { +func (mgba metricsGroupedByAttrs) findResource(referenceAttributes pdata.Map) (pdata.ResourceMetrics, bool) { for i := 0; i < mgba.Len(); i++ { if resourceMatches(mgba.At(i).Resource(), referenceAttributes) { @@ -175,7 +175,7 @@ func (mgba metricsGroupedByAttrs) findResource(referenceAttributes pdata.Attribu // Update the specified (and new) Resource with the properties of the original Resource, and with the // required Attributes -func updateResourceToMatch(newResource pdata.Resource, originResource pdata.Resource, requiredAttributes pdata.AttributeMap) { +func updateResourceToMatch(newResource pdata.Resource, originResource pdata.Resource, requiredAttributes pdata.Map) { originResource.CopyTo(newResource) @@ -189,7 +189,7 @@ func updateResourceToMatch(newResource pdata.Resource, originResource pdata.Reso } // findOrCreateResource searches for a Resource with matching attributes and returns it. If nothing is found, it is being created -func (sgba *spansGroupedByAttrs) findOrCreateResource(originResource pdata.Resource, requiredAttributes pdata.AttributeMap) pdata.ResourceSpans { +func (sgba *spansGroupedByAttrs) findOrCreateResource(originResource pdata.Resource, requiredAttributes pdata.Map) pdata.ResourceSpans { // Build the reference attributes that we're looking for in Resources referenceAttributes := buildReferenceAttributes(originResource, requiredAttributes) @@ -208,7 +208,7 @@ func (sgba *spansGroupedByAttrs) findOrCreateResource(originResource pdata.Resou } // findResourceOrElseCreate searches for a Resource with matching attributes and returns it. If nothing is found, it is being created -func (lgba *logsGroupedByAttrs) findResourceOrElseCreate(originResource pdata.Resource, requiredAttributes pdata.AttributeMap) pdata.ResourceLogs { +func (lgba *logsGroupedByAttrs) findResourceOrElseCreate(originResource pdata.Resource, requiredAttributes pdata.Map) pdata.ResourceLogs { // Build the reference attributes that we're looking for in Resources referenceAttributes := buildReferenceAttributes(originResource, requiredAttributes) @@ -227,7 +227,7 @@ func (lgba *logsGroupedByAttrs) findResourceOrElseCreate(originResource pdata.Re } // findResourceOrElseCreate searches for a Resource with matching attributes and returns it. If nothing is found, it is being created -func (mgba *metricsGroupedByAttrs) findResourceOrElseCreate(originResource pdata.Resource, requiredAttributes pdata.AttributeMap) pdata.ResourceMetrics { +func (mgba *metricsGroupedByAttrs) findResourceOrElseCreate(originResource pdata.Resource, requiredAttributes pdata.Map) pdata.ResourceMetrics { // Build the reference attributes that we're looking for in Resources referenceAttributes := buildReferenceAttributes(originResource, requiredAttributes) diff --git a/processor/groupbyattrsprocessor/attribute_groups_test.go b/processor/groupbyattrsprocessor/attribute_groups_test.go index 9d256b6a3e30..3e4694e8d747 100644 --- a/processor/groupbyattrsprocessor/attribute_groups_test.go +++ b/processor/groupbyattrsprocessor/attribute_groups_test.go @@ -35,8 +35,8 @@ func simpleResource() pdata.Resource { return rs } -func randomAttributeMap() pdata.AttributeMap { - attrs := pdata.NewAttributeMap() +func randomAttributeMap() pdata.Map { + attrs := pdata.NewMap() for i := 0; i < 10; i++ { k := fmt.Sprint("key-", i) v := fmt.Sprint("value-", rand.Intn(500000)) @@ -45,8 +45,8 @@ func randomAttributeMap() pdata.AttributeMap { return attrs } -func randomGroups(count int) []pdata.AttributeMap { - entries := make([]pdata.AttributeMap, count) +func randomGroups(count int) []pdata.Map { + entries := make([]pdata.Map, count) for i := 0; i < count; i++ { entries[i] = randomAttributeMap() } @@ -64,13 +64,13 @@ func TestResourceAttributeScenarios(t *testing.T) { tests := []struct { name string baseResource pdata.Resource - fillRecordAttributesFun func(attributeMap pdata.AttributeMap) + fillRecordAttributesFun func(attributeMap pdata.Map) fillExpectedResourceFun func(baseResource pdata.Resource, expectedResource pdata.Resource) }{ { name: "When the same key is present at Resource and Record level, the latter value should be used", baseResource: simpleResource(), - fillRecordAttributesFun: func(attributeMap pdata.AttributeMap) { + fillRecordAttributesFun: func(attributeMap pdata.Map) { attributeMap.InsertString("somekey1", "replaced-value") }, fillExpectedResourceFun: func(baseResource pdata.Resource, expectedResource pdata.Resource) { @@ -87,7 +87,7 @@ func TestResourceAttributeScenarios(t *testing.T) { { name: "Empty Resource", baseResource: pdata.NewResource(), - fillRecordAttributesFun: func(attributeMap pdata.AttributeMap) { + fillRecordAttributesFun: func(attributeMap pdata.Map) { attributeMap.InsertString("somekey1", "some-value") }, fillExpectedResourceFun: func(_ pdata.Resource, expectedResource pdata.Resource) { @@ -106,7 +106,7 @@ func TestResourceAttributeScenarios(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - recordAttributeMap := pdata.NewAttributeMap() + recordAttributeMap := pdata.NewMap() if tt.fillRecordAttributesFun != nil { tt.fillRecordAttributesFun(recordAttributeMap) } diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 676ea8144aee..4d85a1c71bf9 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -24,9 +24,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 9babb5857c63..137211339b25 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -160,23 +160,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/groupbyattrsprocessor/processor.go b/processor/groupbyattrsprocessor/processor.go index 409883e88763..71fc7e906d25 100644 --- a/processor/groupbyattrsprocessor/processor.go +++ b/processor/groupbyattrsprocessor/processor.go @@ -172,7 +172,7 @@ func (gap *groupByAttrsProcessor) processMetrics(ctx context.Context, md pdata.M return groupedMetrics, nil } -func deleteAttributes(attrsForRemoval, targetAttrs pdata.AttributeMap) { +func deleteAttributes(attrsForRemoval, targetAttrs pdata.Map) { attrsForRemoval.Range(func(key string, _ pdata.Value) bool { targetAttrs.Delete(key) return true @@ -184,9 +184,9 @@ func deleteAttributes(attrsForRemoval, targetAttrs pdata.AttributeMap) { // Returns: // - whether any attribute matched (true) or none (false) // - the extracted AttributeMap of matching keys and their corresponding values -func (gap *groupByAttrsProcessor) extractGroupingAttributes(attrMap pdata.AttributeMap) (bool, pdata.AttributeMap) { +func (gap *groupByAttrsProcessor) extractGroupingAttributes(attrMap pdata.Map) (bool, pdata.Map) { - groupingAttributes := pdata.NewAttributeMap() + groupingAttributes := pdata.NewMap() foundMatch := false for _, attrKey := range gap.groupByKeys { @@ -229,7 +229,7 @@ func (gap *groupByAttrsProcessor) getGroupedMetricsFromAttributes( originResourceMetrics pdata.ResourceMetrics, ilm pdata.InstrumentationLibraryMetrics, metric pdata.Metric, - attributes pdata.AttributeMap, + attributes pdata.Map, ) pdata.Metric { toBeGrouped, requiredAttributes := gap.extractGroupingAttributes(attributes) diff --git a/processor/groupbyattrsprocessor/processor_test.go b/processor/groupbyattrsprocessor/processor_test.go index 52bde815b139..e2b0bb1a80ee 100644 --- a/processor/groupbyattrsprocessor/processor_test.go +++ b/processor/groupbyattrsprocessor/processor_test.go @@ -29,20 +29,20 @@ var ( attrMap = prepareAttributeMap() ) -func prepareAttributeMap() pdata.AttributeMap { - attributeValues := map[string]pdata.Value{ - "xx": pdata.NewValueString("aa"), - "yy": pdata.NewValueInt(11), +func prepareAttributeMap() pdata.Map { + attributeValues := map[string]interface{}{ + "xx": "aa", + "yy": 11, } - am := pdata.NewAttributeMap() - pdata.NewAttributeMapFromMap(attributeValues).CopyTo(am) + am := pdata.NewMap() + pdata.NewMapFromRaw(attributeValues).CopyTo(am) am.Sort() return am } -func prepareResource(attrMap pdata.AttributeMap, selectedKeys []string) pdata.Resource { +func prepareResource(attrMap pdata.Map, selectedKeys []string) pdata.Resource { res := pdata.NewResource() for _, key := range selectedKeys { val, found := attrMap.Get(key) @@ -54,8 +54,8 @@ func prepareResource(attrMap pdata.AttributeMap, selectedKeys []string) pdata.Re return res } -func filterAttributeMap(attrMap pdata.AttributeMap, selectedKeys []string) pdata.AttributeMap { - filteredAttrMap := pdata.NewAttributeMap() +func filterAttributeMap(attrMap pdata.Map, selectedKeys []string) pdata.Map { + filteredAttrMap := pdata.NewMap() if len(selectedKeys) == 0 { return filteredAttrMap } @@ -136,7 +136,7 @@ func someComplexMetrics(withResourceAttrIndex bool, rmCount int, ilmCount int, d return metrics } -func assertResourceContainsAttributes(t *testing.T, resource pdata.Resource, attributeMap pdata.AttributeMap) { +func assertResourceContainsAttributes(t *testing.T, resource pdata.Resource, attributeMap pdata.Map) { attributeMap.Range(func(k string, v pdata.Value) bool { rv, found := resource.Attributes().Get(k) assert.True(t, found) @@ -240,8 +240,8 @@ func TestComplexAttributeGrouping(t *testing.T) { assert.NoError(t, err) // Following are record-level attributes that should be preserved after processing - outputRecordAttrs := pdata.NewAttributeMap() - outputResourceAttrs := pdata.NewAttributeMap() + outputRecordAttrs := pdata.NewMap() + outputResourceAttrs := pdata.NewMap() if tt.shouldMoveCommonGroupedAttr { // This was present at record level and should be found on Resource level after the processor outputResourceAttrs.InsertString("commonGroupedAttr", "abc") @@ -460,7 +460,7 @@ func TestAttributeGrouping(t *testing.T) { } } -func someSpans(attrs pdata.AttributeMap, instrumentationLibraryCount int, spanCount int) pdata.Traces { +func someSpans(attrs pdata.Map, instrumentationLibraryCount int, spanCount int) pdata.Traces { traces := pdata.NewTraces() for i := 0; i < instrumentationLibraryCount; i++ { ilName := fmt.Sprint("ils-", i) @@ -476,7 +476,7 @@ func someSpans(attrs pdata.AttributeMap, instrumentationLibraryCount int, spanCo return traces } -func someLogs(attrs pdata.AttributeMap, instrumentationLibraryCount int, logCount int) pdata.Logs { +func someLogs(attrs pdata.Map, instrumentationLibraryCount int, logCount int) pdata.Logs { logs := pdata.NewLogs() for i := 0; i < instrumentationLibraryCount; i++ { ilName := fmt.Sprint("ils-", i) @@ -492,7 +492,7 @@ func someLogs(attrs pdata.AttributeMap, instrumentationLibraryCount int, logCoun return logs } -func someGaugeMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount int, metricCount int) pdata.Metrics { +func someGaugeMetrics(attrs pdata.Map, instrumentationLibraryCount int, metricCount int) pdata.Metrics { metrics := pdata.NewMetrics() for i := 0; i < instrumentationLibraryCount; i++ { ilName := fmt.Sprint("ils-", i) @@ -510,7 +510,7 @@ func someGaugeMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount int, return metrics } -func someSumMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount int, metricCount int) pdata.Metrics { +func someSumMetrics(attrs pdata.Map, instrumentationLibraryCount int, metricCount int) pdata.Metrics { metrics := pdata.NewMetrics() for i := 0; i < instrumentationLibraryCount; i++ { ilName := fmt.Sprint("ils-", i) @@ -528,7 +528,7 @@ func someSumMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount int, m return metrics } -func someSummaryMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount int, metricCount int) pdata.Metrics { +func someSummaryMetrics(attrs pdata.Map, instrumentationLibraryCount int, metricCount int) pdata.Metrics { metrics := pdata.NewMetrics() for i := 0; i < instrumentationLibraryCount; i++ { ilName := fmt.Sprint("ils-", i) @@ -546,7 +546,7 @@ func someSummaryMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount in return metrics } -func someHistogramMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount int, metricCount int) pdata.Metrics { +func someHistogramMetrics(attrs pdata.Map, instrumentationLibraryCount int, metricCount int) pdata.Metrics { metrics := pdata.NewMetrics() for i := 0; i < instrumentationLibraryCount; i++ { ilName := fmt.Sprint("ils-", i) @@ -564,7 +564,7 @@ func someHistogramMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount return metrics } -func someExponentialHistogramMetrics(attrs pdata.AttributeMap, instrumentationLibraryCount int, metricCount int) pdata.Metrics { +func someExponentialHistogramMetrics(attrs pdata.Map, instrumentationLibraryCount int, metricCount int) pdata.Metrics { metrics := pdata.NewMetrics() for i := 0; i < instrumentationLibraryCount; i++ { ilName := fmt.Sprint("ils-", i) diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index ccb98a0fd4fe..57cc8130668f 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -25,9 +25,9 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index fd777de37a54..9f39e4b79be6 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -155,21 +155,21 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 2a924810c4f7..57b283fc01b5 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 k8s.io/api v0.23.5 k8s.io/apimachinery v0.23.5 @@ -44,9 +44,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 3d127194a9f8..5f96ec2239ed 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -370,22 +370,22 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/k8sattributesprocessor/pod_association.go b/processor/k8sattributesprocessor/pod_association.go index 0157da73457d..027494208d71 100644 --- a/processor/k8sattributesprocessor/pod_association.go +++ b/processor/k8sattributesprocessor/pod_association.go @@ -29,7 +29,7 @@ import ( // extractPodIds extracts IP and pod UID from attributes or request context. // It returns a value pair containing configured label and IP Address and/or Pod UID. // If empty value in return it means that attributes does not contains configured label to match resources for Pod. -func extractPodID(ctx context.Context, attrs pdata.AttributeMap, associations []kube.Association) (string, kube.PodIdentifier) { +func extractPodID(ctx context.Context, attrs pdata.Map, associations []kube.Association) (string, kube.PodIdentifier) { // If pod association is not set if len(associations) == 0 { return extractPodIDNoAssociations(ctx, attrs) @@ -62,7 +62,7 @@ func extractPodID(ctx context.Context, attrs pdata.AttributeMap, associations [] return "", "" } -func extractPodIDNoAssociations(ctx context.Context, attrs pdata.AttributeMap) (string, kube.PodIdentifier) { +func extractPodIDNoAssociations(ctx context.Context, attrs pdata.Map) (string, kube.PodIdentifier) { var podIP, labelIP kube.PodIdentifier podIP = kube.PodIdentifier(stringAttributeFromMap(attrs, k8sIPLabelName)) if podIP != "" { @@ -117,7 +117,7 @@ func getConnectionIP(ctx context.Context) kube.PodIdentifier { } -func stringAttributeFromMap(attrs pdata.AttributeMap, key string) string { +func stringAttributeFromMap(attrs pdata.Map, key string) string { if val, ok := attrs.Get(key); ok { if val.Type() == pdata.ValueTypeString { return val.StringVal() diff --git a/processor/k8sattributesprocessor/processor.go b/processor/k8sattributesprocessor/processor.go index 25ecb047c6cf..0b4d50372531 100644 --- a/processor/k8sattributesprocessor/processor.go +++ b/processor/k8sattributesprocessor/processor.go @@ -132,7 +132,7 @@ func (kp *kubernetesprocessor) processResource(ctx context.Context, resource pda } // addContainerAttributes looks if pod has any container identifiers and adds additional container attributes -func (kp *kubernetesprocessor) addContainerAttributes(attrs pdata.AttributeMap, pod *kube.Pod) { +func (kp *kubernetesprocessor) addContainerAttributes(attrs pdata.Map, pod *kube.Pod) { containerName := stringAttributeFromMap(attrs, conventions.AttributeK8SContainerName) if containerName == "" { return diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 6ec038a7b10a..00962c356bf3 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -25,9 +25,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 0aab91857bae..aadd435485eb 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -165,22 +165,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 9bd04ddbd033..21dd12e3afd9 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/go-cmp v0.5.7 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 @@ -29,9 +29,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 882749b05877..2a7467143a42 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -185,22 +185,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 704fff80c65e..8e8b5fe1ba4d 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -22,9 +22,9 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index b2b60df5fdf3..0e07ad73547e 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -160,22 +160,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go index 57ab12bb133d..e5cdd43ac199 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go @@ -427,7 +427,8 @@ func getSpanWithAttributes(key string, value pdata.Value) pdata.Span { func initSpanWithAttributes(key string, value pdata.Value, dest pdata.Span) { dest.SetName("spanName") - pdata.NewAttributeMapFromMap(map[string]pdata.Value{key: value}).CopyTo(dest.Attributes()) + dest.Attributes().Clear() + dest.Attributes().Insert(key, value) } // Test_hash ensures that the hash function supports different key lengths even if in @@ -469,10 +470,8 @@ func genRandomTestData(numBatches, numTracesPerBatch int, serviceName string, re span := ils.Spans().AppendEmpty() span.SetTraceID(idutils.UInt64ToTraceID(r.Uint64(), r.Uint64())) span.SetSpanID(idutils.UInt64ToSpanID(r.Uint64())) - attributes := make(map[string]pdata.Value) - attributes[conventions.AttributeHTTPStatusCode] = pdata.NewValueInt(404) - attributes["http.status_text"] = pdata.NewValueString("Not Found") - pdata.NewAttributeMapFromMap(attributes).CopyTo(span.Attributes()) + span.Attributes().UpsertInt(conventions.AttributeHTTPStatusCode, 404) + span.Attributes().UpsertString("http.status_text", "Not Found") } } traceBatches = append(traceBatches, traces) diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index c1134bcdf4c8..48fc0eb0b2ab 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -25,9 +25,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index f87e98311fff..e1ac2a14b337 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -1,47 +1,5 @@ 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= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc= -contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= 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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -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= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= @@ -57,28 +15,11 @@ github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -86,107 +27,50 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= -github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= -github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -209,32 +93,15 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/knadh/koanf v1.4.0 h1:/k0Bh49SqLyLNfte9r6cvuZWrApOQhglOmhIU3L/zDw= github.com/knadh/koanf v1.4.0/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= @@ -243,14 +110,11 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= @@ -265,126 +129,59 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mostynb/go-grpc-compression v1.1.16 h1:D9tGUINmcII049pxOj9dl32Fzhp26TrDVQXECoKJqQg= -github.com/mostynb/go-grpc-compression v1.1.16/go.mod h1:xxa6UoYynYS2h+5HB/Hglu81iYAp87ARaNmhhwi0s1s= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v3 v3.3.4/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= -github.com/schollz/progressbar/v2 v2.13.2/go.mod h1:6YZjqdthH6SCZKv2rqGryrxPtfmRB/DWZxSMfCXPyD8= -github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= -go.opentelemetry.io/contrib/zpages v0.29.0/go.mod h1:iHy2K1Cjz1Ss0Sv6cQPEExP0nD+gj7gAF024foxzFFE= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= -go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= -go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -395,201 +192,64 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 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= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -597,83 +257,21 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -682,42 +280,20 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/processor/redactionprocessor/processor.go b/processor/redactionprocessor/processor.go index 8c7991f75d0a..8292a7cd41cf 100644 --- a/processor/redactionprocessor/processor.go +++ b/processor/redactionprocessor/processor.go @@ -91,7 +91,7 @@ func (s *redaction) processResourceSpan(ctx context.Context, rs pdata.ResourceSp } // processAttrs redacts the attributes of a resource span or a span -func (s *redaction) processAttrs(_ context.Context, attributes *pdata.AttributeMap) { +func (s *redaction) processAttrs(_ context.Context, attributes *pdata.Map) { // TODO: Use the context for recording metrics var toDelete []string var toBlock []string @@ -147,7 +147,7 @@ func (s *redaction) ConsumeTraces(ctx context.Context, batch pdata.Traces) error } // summarizeRedactedSpan adds diagnostic information about redacted attribute keys -func (s *redaction) summarizeRedactedSpan(toDelete []string, attributes *pdata.AttributeMap) { +func (s *redaction) summarizeRedactedSpan(toDelete []string, attributes *pdata.Map) { redactedSpanCount := int64(len(toDelete)) if redactedSpanCount == 0 { return @@ -163,7 +163,7 @@ func (s *redaction) summarizeRedactedSpan(toDelete []string, attributes *pdata.A } // summarizeMaskedSpan adds diagnostic information about masked attribute values -func (s *redaction) summarizeMaskedSpan(toBlock []string, attributes *pdata.AttributeMap) { +func (s *redaction) summarizeMaskedSpan(toBlock []string, attributes *pdata.Map) { maskedSpanCount := int64(len(toBlock)) if maskedSpanCount == 0 { return diff --git a/processor/redactionprocessor/processor_test.go b/processor/redactionprocessor/processor_test.go index 12b6e3322f14..558c9b93a350 100644 --- a/processor/redactionprocessor/processor_test.go +++ b/processor/redactionprocessor/processor_test.go @@ -307,18 +307,16 @@ func runTest( span.SetTraceID(pdata.NewTraceID([16]byte{1, 2, 3, 4})) length := len(allowed) + len(masked) + len(redacted) - attrMap := make(map[string]pdata.Value, length) for k, v := range allowed { - attrMap[k] = v + span.Attributes().Upsert(k, v) } for k, v := range masked { - attrMap[k] = v + span.Attributes().Upsert(k, v) } for k, v := range redacted { - attrMap[k] = v + span.Attributes().Upsert(k, v) } - pdata.NewAttributeMapFromMap(attrMap).CopyTo(span.Attributes()) assert.Equal(t, span.Attributes().Len(), length) assert.Equal(t, ils.Spans().At(0).Attributes().Len(), length) assert.Equal(t, inBatch.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).Attributes().Len(), length) @@ -409,18 +407,15 @@ func runBenchmark( span.SetName("first-batch-first-span") span.SetTraceID(pdata.NewTraceID([16]byte{1, 2, 3, 4})) - length := len(allowed) + len(masked) + len(redacted) - attrMap := make(map[string]pdata.Value, length) for k, v := range allowed { - attrMap[k] = v + span.Attributes().Upsert(k, v) } for k, v := range masked { - attrMap[k] = v + span.Attributes().Upsert(k, v) } for k, v := range redacted { - attrMap[k] = v + span.Attributes().Upsert(k, v) } - pdata.NewAttributeMapFromMap(attrMap).CopyTo(span.Attributes()) _ = processor.ConsumeTraces(context.Background(), inBatch) } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index aa9088a38f35..786e2523b25a 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -12,8 +12,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 k8s.io/apimachinery v0.23.5 @@ -72,10 +72,10 @@ require ( github.com/stretchr/objx v0.2.0 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 830dfbde6527..a8c9625f6d96 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -872,23 +872,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/processor/resourcedetectionprocessor/internal/env/env.go b/processor/resourcedetectionprocessor/internal/env/env.go index b2022e1d321d..51925562cb71 100644 --- a/processor/resourcedetectionprocessor/internal/env/env.go +++ b/processor/resourcedetectionprocessor/internal/env/env.go @@ -76,7 +76,7 @@ func (d *Detector) Detect(context.Context) (resource pdata.Resource, schemaURL s // string. Captures the trimmed key & value parts, and ignores any superfluous spaces. var labelRegex = regexp.MustCompile(`\s*([[:ascii:]]{1,256}?)\s*=\s*([[:ascii:]]{0,256}?)\s*(?:,|$)`) -func initializeAttributeMap(am pdata.AttributeMap, s string) error { +func initializeAttributeMap(am pdata.Map, s string) error { matches := labelRegex.FindAllStringSubmatchIndex(s, -1) for len(matches) == 0 { diff --git a/processor/resourcedetectionprocessor/internal/env/env_test.go b/processor/resourcedetectionprocessor/internal/env/env_test.go index 88384f72cf76..86eb90d93b51 100644 --- a/processor/resourcedetectionprocessor/internal/env/env_test.go +++ b/processor/resourcedetectionprocessor/internal/env/env_test.go @@ -78,7 +78,7 @@ func TestInitializeAttributeMap(t *testing.T) { cases := []struct { name string encoded string - expectedAttributes pdata.AttributeMap + expectedAttributes pdata.Map expectedError string }{ { @@ -114,7 +114,7 @@ func TestInitializeAttributeMap(t *testing.T) { for _, c := range cases { t.Run(c.name, func(t *testing.T) { - am := pdata.NewAttributeMap() + am := pdata.NewMap() err := initializeAttributeMap(am, c.encoded) if c.expectedError != "" { diff --git a/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go b/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go index cbc5316d6c68..e749ed7715d8 100644 --- a/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go +++ b/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go @@ -54,7 +54,7 @@ func (d *Detector) Detect(context.Context) (resource pdata.Resource, schemaURL s return res, conventions.SchemaURL, multierr.Append(cloudErr, hostErr) } -func (d *Detector) initializeCloudAttributes(attr pdata.AttributeMap) []error { +func (d *Detector) initializeCloudAttributes(attr pdata.Map) []error { attr.InsertString(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderGCP) attr.InsertString(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformGCPComputeEngine) @@ -77,7 +77,7 @@ func (d *Detector) initializeCloudAttributes(attr pdata.AttributeMap) []error { return errors } -func (d *Detector) initializeHostAttributes(attr pdata.AttributeMap) []error { +func (d *Detector) initializeHostAttributes(attr pdata.Map) []error { var errors []error hostname, err := d.metadata.Hostname() diff --git a/processor/resourcedetectionprocessor/internal/resourcedetection.go b/processor/resourcedetectionprocessor/internal/resourcedetection.go index 356f9c4586ec..0f40268bb0b5 100644 --- a/processor/resourcedetectionprocessor/internal/resourcedetection.go +++ b/processor/resourcedetectionprocessor/internal/resourcedetection.go @@ -156,7 +156,7 @@ func (p *ResourceProvider) detectResource(ctx context.Context) { p.detectedResource.schemaURL = mergedSchemaURL } -func AttributesToMap(am pdata.AttributeMap) map[string]interface{} { +func AttributesToMap(am pdata.Map) map[string]interface{} { mp := make(map[string]interface{}, am.Len()) am.Range(func(k string, v pdata.Value) bool { mp[k] = UnwrapAttribute(v) @@ -184,7 +184,7 @@ func UnwrapAttribute(v pdata.Value) interface{} { } } -func getSerializableArray(inArr pdata.AttributeValueSlice) []interface{} { +func getSerializableArray(inArr pdata.Slice) []interface{} { var outArr []interface{} for i := 0; i < inArr.Len(); i++ { outArr = append(outArr, UnwrapAttribute(inArr.At(i))) @@ -208,7 +208,7 @@ func MergeSchemaURL(currentSchemaURL string, newSchemaURL string) string { return currentSchemaURL } -func filterAttributes(am pdata.AttributeMap, attributesToKeep map[string]struct{}) []string { +func filterAttributes(am pdata.Map, attributesToKeep map[string]struct{}) []string { if len(attributesToKeep) > 0 { droppedAttributes := make([]string, 0) am.RemoveIf(func(k string, v pdata.Value) bool { diff --git a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go index e2b1df2cdf68..ba5b12575c8a 100644 --- a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go +++ b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go @@ -253,7 +253,7 @@ func TestFilterAttributes_Match(t *testing.T) { "host.name": {}, "host.id": {}, } - attr := pdata.NewAttributeMap() + attr := pdata.NewMap() attr.InsertString("host.name", "test") attr.InsertString("host.id", "test") attr.InsertString("drop.this", "test") @@ -276,7 +276,7 @@ func TestFilterAttributes_NoMatch(t *testing.T) { m := map[string]struct{}{ "cloud.region": {}, } - attr := pdata.NewAttributeMap() + attr := pdata.NewMap() attr.InsertString("host.name", "test") attr.InsertString("host.id", "test") @@ -293,7 +293,7 @@ func TestFilterAttributes_NoMatch(t *testing.T) { func TestFilterAttributes_NilAttributes(t *testing.T) { var m map[string]struct{} - attr := pdata.NewAttributeMap() + attr := pdata.NewMap() attr.InsertString("host.name", "test") attr.InsertString("host.id", "test") @@ -310,7 +310,7 @@ func TestFilterAttributes_NilAttributes(t *testing.T) { func TestFilterAttributes_NoAttributes(t *testing.T) { m := make(map[string]struct{}) - attr := pdata.NewAttributeMap() + attr := pdata.NewMap() attr.InsertString("host.name", "test") attr.InsertString("host.id", "test") @@ -339,7 +339,7 @@ func TestAttributesToMap(t *testing.T) { int64(42), }, } - attr := pdata.NewAttributeMap() + attr := pdata.NewMap() attr.InsertString("str", "a") attr.InsertInt("int", 5) attr.InsertDouble("double", 5.0) diff --git a/processor/resourcedetectionprocessor/internal/testutils.go b/processor/resourcedetectionprocessor/internal/testutils.go index 405849414e87..9026fc6dd387 100644 --- a/processor/resourcedetectionprocessor/internal/testutils.go +++ b/processor/resourcedetectionprocessor/internal/testutils.go @@ -23,13 +23,13 @@ func NewResource(mp map[string]interface{}) pdata.Resource { return res } -func NewAttributeMap(mp map[string]interface{}) pdata.AttributeMap { - attr := pdata.NewAttributeMap() +func NewAttributeMap(mp map[string]interface{}) pdata.Map { + attr := pdata.NewMap() fillAttributeMap(mp, attr) return attr } -func fillAttributeMap(mp map[string]interface{}, attr pdata.AttributeMap) { +func fillAttributeMap(mp map[string]interface{}, attr pdata.Map) { attr.Clear() attr.EnsureCapacity(len(mp)) for k, v := range mp { diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 7a7288783341..4db7775eb237 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -23,9 +23,9 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index b2b60df5fdf3..0e07ad73547e 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -160,22 +160,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 4400c8ed60d3..5675414fdbbc 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 ) @@ -38,10 +38,10 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 29bd4c06eac8..105419b3fa19 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -331,24 +331,24 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index bb0fdb01a912..780d97c902dd 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 ) @@ -62,12 +62,12 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index f00867ac0827..eeb0e43453ff 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -387,25 +387,25 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index 420de2b8e1ad..141d56799865 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -337,9 +337,9 @@ func (p *processorImp) collectCallMetrics(ilm pdata.InstrumentationLibraryMetric } // getDimensionsByMetricKey gets dimensions from `metricKeyToDimensions` cache. -func (p *processorImp) getDimensionsByMetricKey(k metricKey) (*pdata.AttributeMap, error) { +func (p *processorImp) getDimensionsByMetricKey(k metricKey) (*pdata.Map, error) { if item, ok := p.metricKeyToDimensions.Get(k); ok { - if attributeMap, ok := item.(pdata.AttributeMap); ok { + if attributeMap, ok := item.(pdata.Map); ok { return &attributeMap, nil } return nil, fmt.Errorf("type assertion of metricKeyToDimensions attributes failed, the key is %q", k) @@ -378,7 +378,7 @@ func (p *processorImp) aggregateMetricsForServiceSpans(rspans pdata.ResourceSpan } } -func (p *processorImp) aggregateMetricsForSpan(serviceName string, span pdata.Span, resourceAttr pdata.AttributeMap) { +func (p *processorImp) aggregateMetricsForSpan(serviceName string, span pdata.Span, resourceAttr pdata.Map) { latencyInMilliseconds := float64(span.EndTimestamp()-span.StartTimestamp()) / float64(time.Millisecond.Nanoseconds()) // Binary search to find the latencyInMilliseconds bucket index. @@ -439,8 +439,8 @@ func (p *processorImp) updateLatencyMetrics(key metricKey, latency float64, inde p.latencyBucketCounts[key][index]++ } -func (p *processorImp) buildDimensionKVs(serviceName string, span pdata.Span, optionalDims []Dimension, resourceAttrs pdata.AttributeMap) pdata.AttributeMap { - dims := pdata.NewAttributeMap() +func (p *processorImp) buildDimensionKVs(serviceName string, span pdata.Span, optionalDims []Dimension, resourceAttrs pdata.Map) pdata.Map { + dims := pdata.NewMap() dims.UpsertString(serviceNameKey, serviceName) dims.UpsertString(operationKey, span.Name()) dims.UpsertString(spanKindKey, span.Kind().String()) @@ -467,7 +467,7 @@ func concatDimensionValue(metricKeyBuilder *strings.Builder, value string, prefi // or resource attributes. If the dimension exists in both, the span's attributes, being the most specific, takes precedence. // // The metric key is a simple concatenation of dimension values, delimited by a null character. -func buildKey(serviceName string, span pdata.Span, optionalDims []Dimension, resourceAttrs pdata.AttributeMap) metricKey { +func buildKey(serviceName string, span pdata.Span, optionalDims []Dimension, resourceAttrs pdata.Map) metricKey { var metricKeyBuilder strings.Builder concatDimensionValue(&metricKeyBuilder, serviceName, false) concatDimensionValue(&metricKeyBuilder, span.Name(), true) @@ -491,7 +491,7 @@ func buildKey(serviceName string, span pdata.Span, optionalDims []Dimension, res // // The ok flag indicates if a dimension value was fetched in order to differentiate // an empty string value from a state where no value was found. -func getDimensionValue(d Dimension, spanAttr pdata.AttributeMap, resourceAttr pdata.AttributeMap) (v pdata.Value, ok bool) { +func getDimensionValue(d Dimension, spanAttr pdata.Map, resourceAttr pdata.Map) (v pdata.Value, ok bool) { // The more specific span attribute should take precedence. if attr, exists := spanAttr.Get(d.Name); exists { return attr, true @@ -509,7 +509,7 @@ func getDimensionValue(d Dimension, spanAttr pdata.AttributeMap, resourceAttr pd // cache the dimension key-value map for the metricKey if there is a cache miss. // This enables a lookup of the dimension key-value map when constructing the metric like so: // LabelsMap().InitFromMap(p.metricKeyToDimensions[key]) -func (p *processorImp) cache(serviceName string, span pdata.Span, k metricKey, resourceAttrs pdata.AttributeMap) { +func (p *processorImp) cache(serviceName string, span pdata.Span, k metricKey, resourceAttrs pdata.Map) { p.metricKeyToDimensions.ContainsOrAdd(k, p.buildDimensionKVs(serviceName, span, p.dimensions, resourceAttrs)) } diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index e45a03c0de4d..e1336c609d55 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -65,7 +65,7 @@ type metricID struct { } type metricDataPoint interface { - Attributes() pdata.AttributeMap + Attributes() pdata.Map } type serviceSpans struct { @@ -596,11 +596,11 @@ func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExpo func TestBuildKeySameServiceOperationCharSequence(t *testing.T) { span0 := pdata.NewSpan() span0.SetName("c") - k0 := buildKey("ab", span0, nil, pdata.NewAttributeMap()) + k0 := buildKey("ab", span0, nil, pdata.NewMap()) span1 := pdata.NewSpan() span1.SetName("bc") - k1 := buildKey("a", span1, nil, pdata.NewAttributeMap()) + k1 := buildKey("a", span1, nil, pdata.NewMap()) assert.NotEqual(t, k0, k1) assert.Equal(t, metricKey("ab\u0000c\u0000SPAN_KIND_UNSPECIFIED\u0000STATUS_CODE_UNSET"), k0) @@ -612,8 +612,8 @@ func TestBuildKeyWithDimensions(t *testing.T) { for _, tc := range []struct { name string optionalDims []Dimension - resourceAttrMap map[string]pdata.Value - spanAttrMap map[string]pdata.Value + resourceAttrMap map[string]interface{} + spanAttrMap map[string]interface{} wantKey string }{ { @@ -639,8 +639,8 @@ func TestBuildKeyWithDimensions(t *testing.T) { optionalDims: []Dimension{ {Name: "foo"}, }, - spanAttrMap: map[string]pdata.Value{ - "foo": pdata.NewValueInt(99), + spanAttrMap: map[string]interface{}{ + "foo": 99, }, wantKey: "ab\u0000c\u0000SPAN_KIND_UNSPECIFIED\u0000STATUS_CODE_UNSET\u000099", }, @@ -649,8 +649,8 @@ func TestBuildKeyWithDimensions(t *testing.T) { optionalDims: []Dimension{ {Name: "foo"}, }, - resourceAttrMap: map[string]pdata.Value{ - "foo": pdata.NewValueInt(99), + resourceAttrMap: map[string]interface{}{ + "foo": 99, }, wantKey: "ab\u0000c\u0000SPAN_KIND_UNSPECIFIED\u0000STATUS_CODE_UNSET\u000099", }, @@ -659,19 +659,19 @@ func TestBuildKeyWithDimensions(t *testing.T) { optionalDims: []Dimension{ {Name: "foo"}, }, - spanAttrMap: map[string]pdata.Value{ - "foo": pdata.NewValueInt(100), + spanAttrMap: map[string]interface{}{ + "foo": 100, }, - resourceAttrMap: map[string]pdata.Value{ - "foo": pdata.NewValueInt(99), + resourceAttrMap: map[string]interface{}{ + "foo": 99, }, wantKey: "ab\u0000c\u0000SPAN_KIND_UNSPECIFIED\u0000STATUS_CODE_UNSET\u0000100", }, } { t.Run(tc.name, func(t *testing.T) { - resAttr := pdata.NewAttributeMapFromMap(tc.resourceAttrMap) + resAttr := pdata.NewMapFromRaw(tc.resourceAttrMap) span0 := pdata.NewSpan() - pdata.NewAttributeMapFromMap(tc.spanAttrMap).CopyTo(span0.Attributes()) + pdata.NewMapFromRaw(tc.spanAttrMap).CopyTo(span0.Attributes()) span0.SetName("c") k := buildKey("ab", span0, tc.optionalDims, resAttr) diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 3658ccdf241f..ea03ec0a71cf 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -23,9 +23,9 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 4c639c88d63f..5c573453a935 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -161,22 +161,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/spanprocessor/span_test.go b/processor/spanprocessor/span_test.go index e62a8dca9414..5c6090550f03 100644 --- a/processor/spanprocessor/span_test.go +++ b/processor/spanprocessor/span_test.go @@ -50,9 +50,9 @@ func TestNewTracesProcessor(t *testing.T) { type testCase struct { serviceName string inputName string - inputAttributes map[string]pdata.Value + inputAttributes map[string]interface{} outputName string - outputAttributes map[string]pdata.Value + outputAttributes map[string]interface{} } // runIndividualTestCase is the common logic of passing trace data through a configured attributes processor. @@ -78,7 +78,7 @@ func runIndividualTestCase(t *testing.T, tt testCase, tp component.TracesProcess }) } -func generateTraceData(serviceName, inputName string, attrs map[string]pdata.Value) pdata.Traces { +func generateTraceData(serviceName, inputName string, attrs map[string]interface{}) pdata.Traces { td := pdata.NewTraces() rs := td.ResourceSpans().AppendEmpty() if serviceName != "" { @@ -86,7 +86,7 @@ func generateTraceData(serviceName, inputName string, attrs map[string]pdata.Val } span := rs.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() span.SetName(inputName) - pdata.NewAttributeMapFromMap(attrs).CopyTo(span.Attributes()) + pdata.NewMapFromRaw(attrs).CopyTo(span.Attributes()) span.Attributes().Sort() return td } @@ -160,48 +160,48 @@ func TestSpanProcessor_Values(t *testing.T) { }, { inputName: "empty-attributes", - inputAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, outputName: "empty-attributes", - outputAttributes: map[string]pdata.Value{}, + outputAttributes: map[string]interface{}{}, }, { inputName: "string-type", - inputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), + inputAttributes: map[string]interface{}{ + "key1": "bob", }, outputName: "bob", - outputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), + outputAttributes: map[string]interface{}{ + "key1": "bob", }, }, { inputName: "int-type", - inputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueInt(123), + inputAttributes: map[string]interface{}{ + "key1": 123, }, outputName: "123", - outputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueInt(123), + outputAttributes: map[string]interface{}{ + "key1": 123, }, }, { inputName: "double-type", - inputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueDouble(234.129312), + inputAttributes: map[string]interface{}{ + "key1": 234.129312, }, outputName: "234.129312", - outputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueDouble(234.129312), + outputAttributes: map[string]interface{}{ + "key1": 234.129312, }, }, { inputName: "bool-type", - inputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "key1": true, }, outputName: "true", - outputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueBool(true), + outputAttributes: map[string]interface{}{ + "key1": true, }, }, // TODO: What do we do when AttributeMap contains a nil entry? Is that possible? @@ -247,60 +247,60 @@ func TestSpanProcessor_MissingKeys(t *testing.T) { testCases := []testCase{ { inputName: "first-keys-missing", - inputAttributes: map[string]pdata.Value{ - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), - "key4": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "key2": 123, + "key3": 234.129312, + "key4": true, }, outputName: "first-keys-missing", - outputAttributes: map[string]pdata.Value{ - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), - "key4": pdata.NewValueBool(true), + outputAttributes: map[string]interface{}{ + "key2": 123, + "key3": 234.129312, + "key4": true, }, }, { inputName: "middle-key-missing", - inputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key4": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key4": true, }, outputName: "middle-key-missing", - outputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key4": pdata.NewValueBool(true), + outputAttributes: map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key4": true, }, }, { inputName: "last-key-missing", - inputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), + inputAttributes: map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key3": 234.129312, }, outputName: "last-key-missing", - outputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), + outputAttributes: map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key3": 234.129312, }, }, { inputName: "all-keys-exists", - inputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), - "key4": pdata.NewValueBool(true), + inputAttributes: map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key3": 234.129312, + "key4": true, }, outputName: "bob::123::234.129312::true", - outputAttributes: map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), - "key4": pdata.NewValueBool(true), + outputAttributes: map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key3": 234.129312, + "key4": true, }, }, } @@ -335,16 +335,16 @@ func TestSpanProcessor_Separator(t *testing.T) { traceData := generateTraceData( "", "ensure no separator in the rename with one key", - map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), + map[string]interface{}{ + "key1": "bob", }) assert.NoError(t, tp.ConsumeTraces(context.Background(), traceData)) assert.Equal(t, generateTraceData( "", "bob", - map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), + map[string]interface{}{ + "key1": "bob", }), traceData) } @@ -363,18 +363,18 @@ func TestSpanProcessor_NoSeparatorMultipleKeys(t *testing.T) { traceData := generateTraceData( "", - "ensure no separator in the rename with two keys", map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), + "ensure no separator in the rename with two keys", map[string]interface{}{ + "key1": "bob", + "key2": 123, }) assert.NoError(t, tp.ConsumeTraces(context.Background(), traceData)) assert.Equal(t, generateTraceData( "", "bob123", - map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), + map[string]interface{}{ + "key1": "bob", + "key2": 123, }), traceData) } @@ -394,22 +394,22 @@ func TestSpanProcessor_SeparatorMultipleKeys(t *testing.T) { traceData := generateTraceData( "", "rename with separators and multiple keys", - map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), - "key4": pdata.NewValueBool(true), + map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key3": 234.129312, + "key4": true, }) assert.NoError(t, tp.ConsumeTraces(context.Background(), traceData)) assert.Equal(t, generateTraceData( "", "bob::123::234.129312::true", - map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), - "key2": pdata.NewValueInt(123), - "key3": pdata.NewValueDouble(234.129312), - "key4": pdata.NewValueBool(true), + map[string]interface{}{ + "key1": "bob", + "key2": 123, + "key3": 234.129312, + "key4": true, }), traceData) } @@ -429,16 +429,16 @@ func TestSpanProcessor_NilName(t *testing.T) { traceData := generateTraceData( "", "", - map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), + map[string]interface{}{ + "key1": "bob", }) assert.NoError(t, tp.ConsumeTraces(context.Background(), traceData)) assert.Equal(t, generateTraceData( "", "bob", - map[string]pdata.Value{ - "key1": pdata.NewValueString("bob"), + map[string]interface{}{ + "key1": "bob", }), traceData) } @@ -454,10 +454,10 @@ func TestSpanProcessor_ToAttributes(t *testing.T) { rules: []string{`^\/api\/v1\/document\/(?P.*)\/update\/1$`}, testCase: testCase{ inputName: "/api/v1/document/321083210/update/1", - inputAttributes: map[string]pdata.Value{}, + inputAttributes: map[string]interface{}{}, outputName: "/api/v1/document/{documentId}/update/1", - outputAttributes: map[string]pdata.Value{ - "documentId": pdata.NewValueString("321083210"), + outputAttributes: map[string]interface{}{ + "documentId": "321083210", }, }, }, @@ -467,9 +467,9 @@ func TestSpanProcessor_ToAttributes(t *testing.T) { testCase: testCase{ inputName: "/api/v1/document/321083210/update/2", outputName: "/api/{version}/document/{documentId}/update/2", - outputAttributes: map[string]pdata.Value{ - "documentId": pdata.NewValueString("321083210"), - "version": pdata.NewValueString("v1"), + outputAttributes: map[string]interface{}{ + "documentId": "321083210", + "version": "v1", }, }, }, @@ -480,9 +480,9 @@ func TestSpanProcessor_ToAttributes(t *testing.T) { testCase: testCase{ inputName: "/api/v1/document/321083210/update/3", outputName: "/api/{version}/document/{documentId}/update/3", - outputAttributes: map[string]pdata.Value{ - "documentId": pdata.NewValueString("321083210"), - "version": pdata.NewValueString("v1"), + outputAttributes: map[string]interface{}{ + "documentId": "321083210", + "version": "v1", }, }, breakAfterMatch: false, @@ -494,8 +494,8 @@ func TestSpanProcessor_ToAttributes(t *testing.T) { testCase: testCase{ inputName: "/api/v1/document/321083210/update/4", outputName: "/api/v1/document/{documentId}/update/4", - outputAttributes: map[string]pdata.Value{ - "documentId": pdata.NewValueString("321083210"), + outputAttributes: map[string]interface{}{ + "documentId": "321083210", }, }, breakAfterMatch: true, @@ -543,30 +543,30 @@ func TestSpanProcessor_skipSpan(t *testing.T) { serviceName: "banks", inputName: "www.test.com/code", outputName: "{operation_website}", - outputAttributes: map[string]pdata.Value{ - "operation_website": pdata.NewValueString("www.test.com/code"), + outputAttributes: map[string]interface{}{ + "operation_website": "www.test.com/code", }, }, { serviceName: "banks", inputName: "donot/", - inputAttributes: map[string]pdata.Value{ - "operation_website": pdata.NewValueString("www.test.com/code"), + inputAttributes: map[string]interface{}{ + "operation_website": "www.test.com/code", }, outputName: "{operation_website}", - outputAttributes: map[string]pdata.Value{ - "operation_website": pdata.NewValueString("donot/"), + outputAttributes: map[string]interface{}{ + "operation_website": "donot/", }, }, { serviceName: "banks", inputName: "donot/change", - inputAttributes: map[string]pdata.Value{ - "operation_website": pdata.NewValueString("www.test.com/code"), + inputAttributes: map[string]interface{}{ + "operation_website": "www.test.com/code", }, outputName: "donot/change", - outputAttributes: map[string]pdata.Value{ - "operation_website": pdata.NewValueString("www.test.com/code"), + outputAttributes: map[string]interface{}{ + "operation_website": "www.test.com/code", }, }, } @@ -595,13 +595,13 @@ func TestSpanProcessor_skipSpan(t *testing.T) { } } -func generateTraceDataSetStatus(code pdata.StatusCode, description string, attrs map[string]pdata.Value) pdata.Traces { +func generateTraceDataSetStatus(code pdata.StatusCode, description string, attrs map[string]interface{}) pdata.Traces { td := pdata.NewTraces() rs := td.ResourceSpans().AppendEmpty() span := rs.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() span.Status().SetCode(code) span.Status().SetMessage(description) - pdata.NewAttributeMapFromMap(attrs).Sort().CopyTo(span.Attributes()) + pdata.NewMapFromRaw(attrs).Sort().CopyTo(span.Attributes()) return td } @@ -618,7 +618,6 @@ func TestSpanProcessor_setStatusCode(t *testing.T) { require.NotNil(t, tp) td := generateTraceDataSetStatus(pdata.StatusCodeUnset, "foobar", nil) - td.InternalRep() assert.NoError(t, tp.ConsumeTraces(context.Background(), td)) @@ -647,7 +646,7 @@ func TestSpanProcessor_setStatusCodeConditionally(t *testing.T) { require.NotNil(t, tp) testCases := []struct { - inputAttributes map[string]pdata.Value + inputAttributes map[string]interface{} inputStatusCode pdata.StatusCode outputStatusCode pdata.StatusCode outputStatusDescription string @@ -658,8 +657,8 @@ func TestSpanProcessor_setStatusCodeConditionally(t *testing.T) { outputStatusCode: pdata.StatusCodeOk, }, { - inputAttributes: map[string]pdata.Value{ - "http.status_code": pdata.NewValueInt(400), + inputAttributes: map[string]interface{}{ + "http.status_code": 400, }, inputStatusCode: pdata.StatusCodeOk, outputStatusCode: pdata.StatusCodeError, @@ -670,7 +669,6 @@ func TestSpanProcessor_setStatusCodeConditionally(t *testing.T) { for _, tc := range testCases { t.Run("set-status-test", func(t *testing.T) { td := generateTraceDataSetStatus(tc.inputStatusCode, "", tc.inputAttributes) - td.InternalRep() assert.NoError(t, tp.ConsumeTraces(context.Background(), td)) diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index fd715a2cd6bb..08f781e341ec 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -27,9 +27,9 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 18eceedc2fdc..0964888ec2f3 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -168,23 +168,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go b/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go index b14ffdc320e1..cb040afc43d6 100644 --- a/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go @@ -24,7 +24,8 @@ import ( func TestEvaluate_AlwaysSample(t *testing.T) { filter := NewAlwaysSample(zap.NewNop()) - decision, err := filter.Evaluate(pdata.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), newTraceStringAttrs(map[string]pdata.Value{}, "example", "value")) + decision, err := filter.Evaluate(pdata.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16}), newTraceStringAttrs(pdata.NewMap(), "example", "value")) assert.Nil(t, err) assert.Equal(t, decision, Sampled) } diff --git a/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go b/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go index 9bb05dce0013..ee5f82f50807 100644 --- a/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go @@ -26,11 +26,11 @@ import ( func TestNumericTagFilter(t *testing.T) { - var empty = map[string]pdata.Value{} + var empty = map[string]interface{}{} filter := NewNumericAttributeFilter(zap.NewNop(), "example", math.MinInt32, math.MaxInt32) - resAttr := map[string]pdata.Value{} - resAttr["example"] = pdata.NewValueInt(8) + resAttr := map[string]interface{}{} + resAttr["example"] = 8 cases := []struct { Desc string @@ -74,18 +74,16 @@ func TestNumericTagFilter(t *testing.T) { } } -func newTraceIntAttrs(nodeAttrs map[string]pdata.Value, spanAttrKey string, spanAttrValue int64) *TraceData { +func newTraceIntAttrs(nodeAttrs map[string]interface{}, spanAttrKey string, spanAttrValue int64) *TraceData { var traceBatches []pdata.Traces traces := pdata.NewTraces() rs := traces.ResourceSpans().AppendEmpty() - pdata.NewAttributeMapFromMap(nodeAttrs).CopyTo(rs.Resource().Attributes()) + pdata.NewMapFromRaw(nodeAttrs).CopyTo(rs.Resource().Attributes()) ils := rs.InstrumentationLibrarySpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(pdata.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) span.SetSpanID(pdata.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) - attributes := make(map[string]pdata.Value) - attributes[spanAttrKey] = pdata.NewValueInt(spanAttrValue) - pdata.NewAttributeMapFromMap(attributes).CopyTo(span.Attributes()) + span.Attributes().InsertInt(spanAttrKey, spanAttrValue) traceBatches = append(traceBatches, traces) return &TraceData{ ReceivedBatches: traceBatches, diff --git a/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go b/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go index 217492e7441c..8eed286d38a5 100644 --- a/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go @@ -78,13 +78,11 @@ func TestProbabilisticSampling(t *testing.T) { t.Run(tt.name, func(t *testing.T) { traceCount := 100_000 - var emptyAttrs = map[string]pdata.Value{} - probabilisticSampler := NewProbabilisticSampler(zap.NewNop(), tt.hashSalt, tt.samplingPercentage) sampled := 0 for _, traceID := range genRandomTraceIDs(traceCount) { - trace := newTraceStringAttrs(emptyAttrs, "example", "value") + trace := newTraceStringAttrs(pdata.NewMap(), "example", "value") decision, err := probabilisticSampler.Evaluate(traceID, trace) assert.NoError(t, err) diff --git a/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go b/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go index ed7c9842da10..a39575d39ce1 100644 --- a/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go @@ -23,9 +23,7 @@ import ( ) func TestRateLimiter(t *testing.T) { - var empty = map[string]pdata.Value{} - - trace := newTraceStringAttrs(empty, "example", "value") + trace := newTraceStringAttrs(pdata.NewMap(), "example", "value") traceID := pdata.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) rateLimiter := NewRateLimiting(zap.NewNop(), 3) diff --git a/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go b/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go index ab1c93634123..dabce07c8845 100644 --- a/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go @@ -33,8 +33,6 @@ type TestStringAttributeCfg struct { func TestStringTagFilter(t *testing.T) { - var empty = map[string]pdata.Value{} - cases := []struct { Desc string Trace *TraceData @@ -43,169 +41,169 @@ func TestStringTagFilter(t *testing.T) { }{ { Desc: "nonmatching node attribute key", - Trace: newTraceStringAttrs(map[string]pdata.Value{"non_matching": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"non_matching": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize}, Decision: NotSampled, }, { Desc: "nonmatching node attribute value", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("non_matching")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "non_matching"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize}, Decision: NotSampled, }, { Desc: "matching node attribute", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize}, Decision: Sampled, }, { Desc: "nonmatching span attribute key", - Trace: newTraceStringAttrs(empty, "nonmatching", "value"), + Trace: newTraceStringAttrs(pdata.NewMap(), "nonmatching", "value"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize}, Decision: NotSampled, }, { Desc: "nonmatching span attribute value", - Trace: newTraceStringAttrs(empty, "example", "nonmatching"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "nonmatching"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize}, Decision: NotSampled, }, { Desc: "matching span attribute", - Trace: newTraceStringAttrs(empty, "example", "value"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "value"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize}, Decision: Sampled, }, { Desc: "matching span attribute with regex", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"v[0-9]+.HealthCheck$"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize}, Decision: Sampled, }, { Desc: "nonmatching span attribute with regex", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"v[a-z]+.HealthCheck$"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize}, Decision: NotSampled, }, { Desc: "matching span attribute with regex without CacheSize provided in config", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"v[0-9]+.HealthCheck$"}, EnabledRegexMatching: true}, Decision: Sampled, }, { Desc: "matching plain text node attribute in regex", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize}, Decision: Sampled, }, { Desc: "nonmatching span attribute on empty filter list", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{}, EnabledRegexMatching: true}, Decision: NotSampled, }, { Desc: "invert nonmatching node attribute key", - Trace: newTraceStringAttrs(map[string]pdata.Value{"non_matching": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"non_matching": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert nonmatching node attribute value", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("non_matching")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "non_matching"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert nonmatching node attribute list", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("non_matching")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "non_matching"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"first_value", "value", "last_value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert matching node attribute", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert matching node attribute list", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"first_value", "value", "last_value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert nonmatching span attribute key", - Trace: newTraceStringAttrs(empty, "nonmatching", "value"), + Trace: newTraceStringAttrs(pdata.NewMap(), "nonmatching", "value"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert nonmatching span attribute value", - Trace: newTraceStringAttrs(empty, "example", "nonmatching"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "nonmatching"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert nonmatching span attribute list", - Trace: newTraceStringAttrs(empty, "example", "nonmatching"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "nonmatching"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"first_value", "value", "last_value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert matching span attribute", - Trace: newTraceStringAttrs(empty, "example", "value"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "value"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert matching span attribute list", - Trace: newTraceStringAttrs(empty, "example", "value"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "value"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"first_value", "value", "last_value"}, EnabledRegexMatching: false, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert matching span attribute with regex", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"v[0-9]+.HealthCheck$"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert matching span attribute with regex list", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"^http", "v[0-9]+.HealthCheck$", "metrics$"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert nonmatching span attribute with regex", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"v[a-z]+.HealthCheck$"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert nonmatching span attribute with regex list", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"^http", "v[a-z]+.HealthCheck$", "metrics$"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertSampled, }, { Desc: "invert matching plain text node attribute in regex", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"value"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert matching plain text node attribute in regex list", - Trace: newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("value")}, "", ""), + Trace: newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "value"}), "", ""), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{"first_value", "value", "last_value"}, EnabledRegexMatching: true, CacheMaxSize: defaultCacheSize, InvertMatch: true}, Decision: InvertNotSampled, }, { Desc: "invert nonmatching span attribute on empty filter list", - Trace: newTraceStringAttrs(empty, "example", "grpc.health.v1.HealthCheck"), + Trace: newTraceStringAttrs(pdata.NewMap(), "example", "grpc.health.v1.HealthCheck"), filterCfg: &TestStringAttributeCfg{Key: "example", Values: []string{}, EnabledRegexMatching: true, InvertMatch: true}, Decision: InvertSampled, }, @@ -222,7 +220,7 @@ func TestStringTagFilter(t *testing.T) { } func BenchmarkStringTagFilterEvaluatePlainText(b *testing.B) { - trace := newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("value")}, "", "") + trace := newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "value"}), "", "") filter := NewStringAttributeFilter(zap.NewNop(), "example", []string{"value"}, false, 0, false) b.ResetTimer() for i := 0; i < b.N; i++ { @@ -231,7 +229,7 @@ func BenchmarkStringTagFilterEvaluatePlainText(b *testing.B) { } func BenchmarkStringTagFilterEvaluateRegex(b *testing.B) { - trace := newTraceStringAttrs(map[string]pdata.Value{"example": pdata.NewValueString("grpc.health.v1.HealthCheck")}, "", "") + trace := newTraceStringAttrs(pdata.NewMapFromRaw(map[string]interface{}{"example": "grpc.health.v1.HealthCheck"}), "", "") filter := NewStringAttributeFilter(zap.NewNop(), "example", []string{"v[0-9]+.HealthCheck$"}, true, 0, false) b.ResetTimer() for i := 0; i < b.N; i++ { @@ -239,18 +237,16 @@ func BenchmarkStringTagFilterEvaluateRegex(b *testing.B) { } } -func newTraceStringAttrs(nodeAttrs map[string]pdata.Value, spanAttrKey string, spanAttrValue string) *TraceData { +func newTraceStringAttrs(nodeAttrs pdata.Map, spanAttrKey string, spanAttrValue string) *TraceData { var traceBatches []pdata.Traces traces := pdata.NewTraces() rs := traces.ResourceSpans().AppendEmpty() - pdata.NewAttributeMapFromMap(nodeAttrs).CopyTo(rs.Resource().Attributes()) + nodeAttrs.CopyTo(rs.Resource().Attributes()) ils := rs.InstrumentationLibrarySpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(pdata.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) span.SetSpanID(pdata.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) - attributes := make(map[string]pdata.Value) - attributes[spanAttrKey] = pdata.NewValueString(spanAttrValue) - pdata.NewAttributeMapFromMap(attributes).CopyTo(span.Attributes()) + span.Attributes().InsertString(spanAttrKey, spanAttrValue) traceBatches = append(traceBatches, traces) return &TraceData{ ReceivedBatches: traceBatches, diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index e499dca14baf..6004142de9a8 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/alecthomas/participle/v2 v2.0.0-alpha7 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -26,9 +26,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index b5d12880349b..9a0a1a370861 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -170,22 +170,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/processor/transformprocessor/internal/traces/functions.go b/processor/transformprocessor/internal/traces/functions.go index d2011ab15461..46090e0f6b9f 100644 --- a/processor/transformprocessor/internal/traces/functions.go +++ b/processor/transformprocessor/internal/traces/functions.go @@ -54,9 +54,9 @@ func keepKeys(target getSetter, keys []string) exprFunc { return nil } - if attrs, ok := val.(pdata.AttributeMap); ok { + if attrs, ok := val.(pdata.Map); ok { // TODO(anuraaga): Avoid copying when filtering keys https://github.com/open-telemetry/opentelemetry-collector/issues/4756 - filtered := pdata.NewAttributeMap() + filtered := pdata.NewMap() filtered.EnsureCapacity(attrs.Len()) attrs.Range(func(key string, val pdata.Value) bool { if _, ok := keySet[key]; ok { diff --git a/processor/transformprocessor/internal/traces/functions_test.go b/processor/transformprocessor/internal/traces/functions_test.go index 79cfadfe0f71..5738ef9a7782 100644 --- a/processor/transformprocessor/internal/traces/functions_test.go +++ b/processor/transformprocessor/internal/traces/functions_test.go @@ -26,7 +26,7 @@ import ( func Test_newFunctionCall(t *testing.T) { input := pdata.NewSpan() input.SetName("bear") - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString("test", "1") attrs.InsertInt("test2", 3) attrs.InsertBool("test3", true) @@ -110,7 +110,7 @@ func Test_newFunctionCall(t *testing.T) { want: func(span pdata.Span) { input.CopyTo(span) span.Attributes().Clear() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString("test", "1") attrs.CopyTo(span.Attributes()) }, @@ -140,7 +140,7 @@ func Test_newFunctionCall(t *testing.T) { want: func(span pdata.Span) { input.CopyTo(span) span.Attributes().Clear() - attrs := pdata.NewAttributeMap() + attrs := pdata.NewMap() attrs.InsertString("test", "1") attrs.InsertInt("test2", 3) attrs.CopyTo(span.Attributes()) diff --git a/processor/transformprocessor/internal/traces/traces.go b/processor/transformprocessor/internal/traces/traces.go index 8639f7ca6323..42c427fdac5b 100644 --- a/processor/transformprocessor/internal/traces/traces.go +++ b/processor/transformprocessor/internal/traces/traces.go @@ -139,7 +139,7 @@ func accessResourceAttributes() pathGetSetter { return resource.Attributes() }, setter: func(span pdata.Span, il pdata.InstrumentationLibrary, resource pdata.Resource, val interface{}) { - if attrs, ok := val.(pdata.AttributeMap); ok { + if attrs, ok := val.(pdata.Map); ok { resource.Attributes().Clear() attrs.CopyTo(resource.Attributes()) } @@ -316,7 +316,7 @@ func accessAttributes() pathGetSetter { return span.Attributes() }, setter: func(span pdata.Span, il pdata.InstrumentationLibrary, resource pdata.Resource, val interface{}) { - if attrs, ok := val.(pdata.AttributeMap); ok { + if attrs, ok := val.(pdata.Map); ok { span.Attributes().Clear() attrs.CopyTo(span.Attributes()) } @@ -445,7 +445,7 @@ func accessStatusMessage() pathGetSetter { } } -func getAttr(attrs pdata.AttributeMap, mapKey string) interface{} { +func getAttr(attrs pdata.Map, mapKey string) interface{} { val, ok := attrs.Get(mapKey) if !ok { return nil @@ -469,7 +469,7 @@ func getAttr(attrs pdata.AttributeMap, mapKey string) interface{} { return nil } -func setAttr(attrs pdata.AttributeMap, mapKey string, val interface{}) { +func setAttr(attrs pdata.Map, mapKey string, val interface{}) { switch v := val.(type) { case string: attrs.UpsertString(mapKey, v) diff --git a/processor/transformprocessor/internal/traces/traces_test.go b/processor/transformprocessor/internal/traces/traces_test.go index faa36740c0d7..00687e773151 100644 --- a/processor/transformprocessor/internal/traces/traces_test.go +++ b/processor/transformprocessor/internal/traces/traces_test.go @@ -35,7 +35,7 @@ var ( func Test_newPathGetSetter(t *testing.T) { refSpan, _, _ := createTelemetry() - newAttrs := pdata.NewAttributeMap() + newAttrs := pdata.NewMap() newAttrs.UpsertString("hello", "world") newEvents := pdata.NewSpanEventSlice() @@ -265,7 +265,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_str"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_str") return val.SliceVal() }(), @@ -282,7 +282,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_bool"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_bool") return val.SliceVal() }(), @@ -299,7 +299,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_int"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_int") return val.SliceVal() }(), @@ -316,7 +316,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_float"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_float") return val.SliceVal() }(), @@ -333,7 +333,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_bytes"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_bytes") return val.SliceVal() }(), @@ -571,7 +571,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_str"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_str") return val.SliceVal() }(), @@ -591,7 +591,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_bool"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_bool") return val.SliceVal() }(), @@ -611,7 +611,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_int"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_int") return val.SliceVal() }(), @@ -631,7 +631,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_float"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_float") return val.SliceVal() }(), @@ -651,7 +651,7 @@ func Test_newPathGetSetter(t *testing.T) { MapKey: strp("arr_bytes"), }, }, - orig: func() pdata.AttributeValueSlice { + orig: func() pdata.Slice { val, _ := refSpan.Attributes().Get("arr_bytes") return val.SliceVal() }(), diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index f9fa2f2dec46..990f31f24714 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -54,10 +54,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211108170745-6635138e15ea // indirect diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 5312ad03866f..11d3e35676ae 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -675,23 +675,23 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 3a380dfeb22e..112670d36f61 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,8 +13,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.47.0 github.com/shirou/gopsutil/v3 v3.22.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 k8s.io/api v0.23.5 k8s.io/apimachinery v0.23.5 diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 6ea666e7d33d..2656dcfd6459 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -862,11 +862,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index f99a0f650aa9..95b3cbdac446 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -30,10 +30,10 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index e4a3a65bc27c..9d1ffdd1bd3f 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -175,23 +175,23 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go b/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go index 1dae93bcc2dd..2d91a9542505 100644 --- a/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go +++ b/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go @@ -169,7 +169,7 @@ func TestTaskResourceWithClusterARN(t *testing.T) { verifyAttributeMap(t, expected, attrMap) } -func verifyAttributeMap(t *testing.T, expected map[string]string, found pdata.AttributeMap) { +func verifyAttributeMap(t *testing.T, expected map[string]string, found pdata.Map) { for key, val := range expected { attributeVal, found := found.Get(key) require.EqualValues(t, true, found) diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 14299e8dc6a6..8905eef3d7bc 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -31,10 +31,10 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 2d63e7741085..0b9357b67661 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -182,23 +182,23 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 570df367ed3a..acbd63a06be4 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -29,9 +29,9 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect @@ -41,7 +41,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 - go.opentelemetry.io/otel/sdk v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => ./../../internal/aws/proxy diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 5af368f5c860..66505ec4578e 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -165,24 +165,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/awsxrayreceiver/internal/translator/addtoattrs.go b/receiver/awsxrayreceiver/internal/translator/addtoattrs.go index a4adae4db038..136638de0587 100644 --- a/receiver/awsxrayreceiver/internal/translator/addtoattrs.go +++ b/receiver/awsxrayreceiver/internal/translator/addtoattrs.go @@ -18,19 +18,19 @@ import ( "go.opentelemetry.io/collector/model/pdata" ) -func addBool(val *bool, attrKey string, attrs *pdata.AttributeMap) { +func addBool(val *bool, attrKey string, attrs *pdata.Map) { if val != nil { attrs.UpsertBool(attrKey, *val) } } -func addString(val *string, attrKey string, attrs *pdata.AttributeMap) { +func addString(val *string, attrKey string, attrs *pdata.Map) { if val != nil { attrs.UpsertString(attrKey, *val) } } -func addInt64(val *int64, attrKey string, attrs *pdata.AttributeMap) { +func addInt64(val *int64, attrKey string, attrs *pdata.Map) { if val != nil { attrs.UpsertInt(attrKey, *val) } diff --git a/receiver/awsxrayreceiver/internal/translator/annotations.go b/receiver/awsxrayreceiver/internal/translator/annotations.go index a9d201a819e1..c29ae7f5c4d3 100644 --- a/receiver/awsxrayreceiver/internal/translator/annotations.go +++ b/receiver/awsxrayreceiver/internal/translator/annotations.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/model/pdata" ) -func addAnnotations(annos map[string]interface{}, attrs *pdata.AttributeMap) { +func addAnnotations(annos map[string]interface{}, attrs *pdata.Map) { for k, v := range annos { switch t := v.(type) { case int: diff --git a/receiver/awsxrayreceiver/internal/translator/annotations_test.go b/receiver/awsxrayreceiver/internal/translator/annotations_test.go index aa3bb65a262d..b8f0f2431396 100644 --- a/receiver/awsxrayreceiver/internal/translator/annotations_test.go +++ b/receiver/awsxrayreceiver/internal/translator/annotations_test.go @@ -30,18 +30,18 @@ func TestAddAnnotations(t *testing.T) { input["float32"] = float32(4.5) input["float64"] = 5.5 - attrMap := pdata.NewAttributeMap() + attrMap := pdata.NewMap() attrMap.EnsureCapacity(initAttrCapacity) addAnnotations(input, &attrMap) - expectedAttrMap := pdata.NewAttributeMapFromMap( - map[string]pdata.Value{ - "int": pdata.NewValueInt(int64(0)), - "int32": pdata.NewValueInt(int64(1)), - "int64": pdata.NewValueInt(int64(2)), - "bool": pdata.NewValueBool(false), - "float32": pdata.NewValueDouble(4.5), - "float64": pdata.NewValueDouble(5.5), + expectedAttrMap := pdata.NewMapFromRaw( + map[string]interface{}{ + "int": 0, + "int32": int32(1), + "int64": int64(2), + "bool": false, + "float32": 4.5, + "float64": 5.5, }, ) assert.Equal(t, expectedAttrMap.Sort(), attrMap.Sort(), "attribute maps differ") diff --git a/receiver/awsxrayreceiver/internal/translator/aws.go b/receiver/awsxrayreceiver/internal/translator/aws.go index 0927f192fa31..4cfbcc2a9891 100644 --- a/receiver/awsxrayreceiver/internal/translator/aws.go +++ b/receiver/awsxrayreceiver/internal/translator/aws.go @@ -23,7 +23,7 @@ import ( awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" ) -func addAWSToResource(aws *awsxray.AWSData, attrs *pdata.AttributeMap) { +func addAWSToResource(aws *awsxray.AWSData, attrs *pdata.Map) { if aws == nil { // https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/c615d2db351929b99e46f7b427f39c12afe15b54/exporter/awsxrayexporter/translator/aws.go#L121 // this implies that the current segment being processed is not generated @@ -66,7 +66,7 @@ func addAWSToResource(aws *awsxray.AWSData, attrs *pdata.AttributeMap) { } } -func addAWSToSpan(aws *awsxray.AWSData, attrs *pdata.AttributeMap) { +func addAWSToSpan(aws *awsxray.AWSData, attrs *pdata.Map) { if aws != nil { addString(aws.AccountID, awsxray.AWSAccountAttribute, attrs) addString(aws.Operation, awsxray.AWSOperationAttribute, attrs) diff --git a/receiver/awsxrayreceiver/internal/translator/metadata.go b/receiver/awsxrayreceiver/internal/translator/metadata.go index fc4cfeb901c9..c8358c7a41f0 100644 --- a/receiver/awsxrayreceiver/internal/translator/metadata.go +++ b/receiver/awsxrayreceiver/internal/translator/metadata.go @@ -22,7 +22,7 @@ import ( awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" ) -func addMetadata(meta map[string]map[string]interface{}, attrs *pdata.AttributeMap) error { +func addMetadata(meta map[string]map[string]interface{}, attrs *pdata.Map) error { for k, v := range meta { val, err := json.Marshal(v) if err != nil { diff --git a/receiver/awsxrayreceiver/internal/translator/sdk.go b/receiver/awsxrayreceiver/internal/translator/sdk.go index c50630c0748a..72a809d65e12 100644 --- a/receiver/awsxrayreceiver/internal/translator/sdk.go +++ b/receiver/awsxrayreceiver/internal/translator/sdk.go @@ -23,7 +23,7 @@ import ( awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" ) -func addSdkToResource(seg *awsxray.Segment, attrs *pdata.AttributeMap) { +func addSdkToResource(seg *awsxray.Segment, attrs *pdata.Map) { if seg.AWS != nil && seg.AWS.XRay != nil { xr := seg.AWS.XRay addString(xr.SDKVersion, conventions.AttributeTelemetrySDKVersion, attrs) diff --git a/receiver/awsxrayreceiver/internal/translator/sql.go b/receiver/awsxrayreceiver/internal/translator/sql.go index 8858b8079762..62d5b52dd101 100644 --- a/receiver/awsxrayreceiver/internal/translator/sql.go +++ b/receiver/awsxrayreceiver/internal/translator/sql.go @@ -24,7 +24,7 @@ import ( awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" ) -func addSQLToSpan(sql *awsxray.SQLData, attrs *pdata.AttributeMap) error { +func addSQLToSpan(sql *awsxray.SQLData, attrs *pdata.Map) error { if sql == nil { return nil } diff --git a/receiver/awsxrayreceiver/internal/translator/translator_test.go b/receiver/awsxrayreceiver/internal/translator/translator_test.go index c627ea69e4dc..fc02506d6c0c 100644 --- a/receiver/awsxrayreceiver/internal/translator/translator_test.go +++ b/receiver/awsxrayreceiver/internal/translator/translator_test.go @@ -39,7 +39,7 @@ type perSpanProperties struct { spanKind pdata.SpanKind spanStatus spanSt eventsProps []eventProps - attrs map[string]pdata.Value + attrs pdata.Map } type spanSt struct { @@ -49,33 +49,26 @@ type spanSt struct { type eventProps struct { name string - attrs map[string]pdata.Value + attrs pdata.Map } func TestTranslation(t *testing.T) { - var defaultServerSpanAttrs = func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeHTTPMethod] = pdata.NewValueString( - *seg.HTTP.Request.Method) - attrs[conventions.AttributeHTTPClientIP] = pdata.NewValueString( - *seg.HTTP.Request.ClientIP) - attrs[conventions.AttributeHTTPUserAgent] = pdata.NewValueString( - *seg.HTTP.Request.UserAgent) - attrs[awsxray.AWSXRayXForwardedForAttribute] = pdata.NewValueBool( - *seg.HTTP.Request.XForwardedFor) - attrs[conventions.AttributeHTTPStatusCode] = pdata.NewValueInt( - *seg.HTTP.Response.Status) - attrs[conventions.AttributeHTTPURL] = pdata.NewValueString( - *seg.HTTP.Request.URL) - - return attrs + var defaultServerSpanAttrs = func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPMethod: *seg.HTTP.Request.Method, + conventions.AttributeHTTPClientIP: *seg.HTTP.Request.ClientIP, + conventions.AttributeHTTPUserAgent: *seg.HTTP.Request.UserAgent, + awsxray.AWSXRayXForwardedForAttribute: *seg.HTTP.Request.XForwardedFor, + conventions.AttributeHTTPStatusCode: *seg.HTTP.Response.Status, + conventions.AttributeHTTPURL: *seg.HTTP.Request.URL, + }) } tests := []struct { testCase string expectedUnmarshallFailure bool samplePath string - expectedResourceAttrs func(seg *awsxray.Segment) map[string]pdata.Value + expectedResourceAttrs func(seg *awsxray.Segment) pdata.Map propsPerSpan func(testCase string, t *testing.T, seg *awsxray.Segment) []perSpanProperties verification func(testCase string, actualSeg *awsxray.Segment, @@ -86,21 +79,16 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateInstrumentedServerSegment", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "serverSample.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString(conventions.AttributeCloudProviderAWS) - attrs[conventions.AttributeTelemetrySDKVersion] = pdata.NewValueString( - *seg.AWS.XRay.SDKVersion) - attrs[conventions.AttributeTelemetrySDKName] = pdata.NewValueString( - *seg.AWS.XRay.SDK) - attrs[conventions.AttributeTelemetrySDKLanguage] = pdata.NewValueString("Go") - attrs[conventions.AttributeK8SClusterName] = pdata.NewValueString( - *seg.AWS.EKS.ClusterName) - attrs[conventions.AttributeK8SPodName] = pdata.NewValueString( - *seg.AWS.EKS.Pod) - attrs[conventions.AttributeContainerID] = pdata.NewValueString( - *seg.AWS.EKS.ContainerID) - return attrs + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeCloudProvider: conventions.AttributeCloudProviderAWS, + conventions.AttributeTelemetrySDKVersion: *seg.AWS.XRay.SDKVersion, + conventions.AttributeTelemetrySDKName: *seg.AWS.XRay.SDK, + conventions.AttributeTelemetrySDKLanguage: "Go", + conventions.AttributeK8SClusterName: *seg.AWS.EKS.ClusterName, + conventions.AttributeK8SPodName: *seg.AWS.EKS.Pod, + conventions.AttributeContainerID: *seg.AWS.EKS.ContainerID, + }) }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { attrs := defaultServerSpanAttrs(seg) @@ -132,20 +120,17 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateInstrumentedClientSegment", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "ddbSample.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString(conventions.AttributeCloudProviderAWS) - attrs[conventions.AttributeTelemetrySDKVersion] = pdata.NewValueString( - *seg.AWS.XRay.SDKVersion) - attrs[conventions.AttributeTelemetrySDKName] = pdata.NewValueString( - *seg.AWS.XRay.SDK) - attrs[conventions.AttributeTelemetrySDKLanguage] = pdata.NewValueString("java") - - return attrs + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeCloudProvider: conventions.AttributeCloudProviderAWS, + conventions.AttributeTelemetrySDKVersion: *seg.AWS.XRay.SDKVersion, + conventions.AttributeTelemetrySDKName: *seg.AWS.XRay.SDK, + conventions.AttributeTelemetrySDKLanguage: "java", + }) }, propsPerSpan: func(testCase string, t *testing.T, seg *awsxray.Segment) []perSpanProperties { - rootSpanAttrs := make(map[string]pdata.Value) - rootSpanAttrs[conventions.AttributeEnduserID] = pdata.NewValueString(*seg.User) + rootSpanAttrs := pdata.NewMap() + rootSpanAttrs.UpsertString(conventions.AttributeEnduserID, *seg.User) rootSpanEvts := initExceptionEvents(seg) assert.Len(t, rootSpanEvts, 1, testCase+": rootSpanEvts has incorrect size") rootSpan := perSpanProperties{ @@ -164,18 +149,16 @@ func TestTranslation(t *testing.T) { // this is the subsegment with ID that starts with 7df6 subseg7df6 := seg.Subsegments[0] - childSpan7df6Attrs := make(map[string]pdata.Value) + childSpan7df6Attrs := pdata.NewMap() for k, v := range subseg7df6.Annotations { - childSpan7df6Attrs[k] = pdata.NewValueString( - v.(string)) + childSpan7df6Attrs.UpsertString(k, v.(string)) } for k, v := range subseg7df6.Metadata { m, err := json.Marshal(v) assert.NoError(t, err, "metadata marshaling failed") - childSpan7df6Attrs[awsxray.AWSXraySegmentMetadataAttributePrefix+k] = pdata.NewValueString( - string(m)) + childSpan7df6Attrs.UpsertString(awsxray.AWSXraySegmentMetadataAttributePrefix+k, string(m)) } - assert.Len(t, childSpan7df6Attrs, 2, testCase+": childSpan7df6Attrs has incorrect size") + assert.Equal(t, 2, childSpan7df6Attrs.Len(), testCase+": childSpan7df6Attrs has incorrect size") childSpan7df6Evts := initExceptionEvents(&subseg7df6) assert.Len(t, childSpan7df6Evts, 1, testCase+": childSpan7df6Evts has incorrect size") childSpan7df6 := perSpanProperties{ @@ -194,24 +177,16 @@ func TestTranslation(t *testing.T) { } subseg7318 := seg.Subsegments[0].Subsegments[0] - childSpan7318Attrs := make(map[string]pdata.Value) - childSpan7318Attrs[awsxray.AWSServiceAttribute] = pdata.NewValueString( - *subseg7318.Name) - childSpan7318Attrs[conventions.AttributeHTTPStatusCode] = pdata.NewValueInt( - *subseg7318.HTTP.Response.Status) - - contentLength := subseg7318.HTTP.Response.ContentLength.(float64) - childSpan7318Attrs[conventions.AttributeHTTPResponseContentLength] = pdata.NewValueInt(int64(contentLength)) - childSpan7318Attrs[awsxray.AWSOperationAttribute] = pdata.NewValueString( - *subseg7318.AWS.Operation) - childSpan7318Attrs[awsxray.AWSRegionAttribute] = pdata.NewValueString( - *subseg7318.AWS.RemoteRegion) - childSpan7318Attrs[awsxray.AWSRequestIDAttribute] = pdata.NewValueString( - *subseg7318.AWS.RequestID) - childSpan7318Attrs[awsxray.AWSTableNameAttribute] = pdata.NewValueString( - *subseg7318.AWS.TableName) - childSpan7318Attrs[awsxray.AWSXrayRetriesAttribute] = pdata.NewValueInt( - *subseg7318.AWS.Retries) + childSpan7318Attrs := pdata.NewMapFromRaw(map[string]interface{}{ + awsxray.AWSServiceAttribute: *subseg7318.Name, + conventions.AttributeHTTPResponseContentLength: int64(subseg7318.HTTP.Response.ContentLength.(float64)), + conventions.AttributeHTTPStatusCode: *subseg7318.HTTP.Response.Status, + awsxray.AWSOperationAttribute: *subseg7318.AWS.Operation, + awsxray.AWSRegionAttribute: *subseg7318.AWS.RemoteRegion, + awsxray.AWSRequestIDAttribute: *subseg7318.AWS.RequestID, + awsxray.AWSTableNameAttribute: *subseg7318.AWS.TableName, + awsxray.AWSXrayRetriesAttribute: *subseg7318.AWS.Retries, + }) childSpan7318 := perSpanProperties{ traceID: *seg.TraceID, @@ -241,7 +216,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subseg23cf := seg.Subsegments[0].Subsegments[0].Subsegments[1] @@ -257,16 +232,15 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subseg417b := seg.Subsegments[0].Subsegments[0].Subsegments[1].Subsegments[0] - childSpan417bAttrs := make(map[string]pdata.Value) + childSpan417bAttrs := pdata.NewMap() for k, v := range subseg417b.Metadata { m, err := json.Marshal(v) assert.NoError(t, err, "metadata marshaling failed") - childSpan417bAttrs[awsxray.AWSXraySegmentMetadataAttributePrefix+k] = pdata.NewValueString( - string(m)) + childSpan417bAttrs.UpsertString(awsxray.AWSXraySegmentMetadataAttributePrefix+k, string(m)) } childSpan417b := perSpanProperties{ traceID: *seg.TraceID, @@ -284,12 +258,11 @@ func TestTranslation(t *testing.T) { } subseg0cab := seg.Subsegments[0].Subsegments[0].Subsegments[1].Subsegments[0].Subsegments[0] - childSpan0cabAttrs := make(map[string]pdata.Value) + childSpan0cabAttrs := pdata.NewMap() for k, v := range subseg0cab.Metadata { m, err := json.Marshal(v) assert.NoError(t, err, "metadata marshaling failed") - childSpan0cabAttrs[awsxray.AWSXraySegmentMetadataAttributePrefix+k] = pdata.NewValueString( - string(m)) + childSpan0cabAttrs.UpsertString(awsxray.AWSXraySegmentMetadataAttributePrefix+k, string(m)) } childSpan0cab := perSpanProperties{ traceID: *seg.TraceID, @@ -307,12 +280,11 @@ func TestTranslation(t *testing.T) { } subsegF8db := seg.Subsegments[0].Subsegments[0].Subsegments[1].Subsegments[0].Subsegments[1] - childSpanF8dbAttrs := make(map[string]pdata.Value) + childSpanF8dbAttrs := pdata.NewMap() for k, v := range subsegF8db.Metadata { m, err := json.Marshal(v) assert.NoError(t, err, "metadata marshaling failed") - childSpanF8dbAttrs[awsxray.AWSXraySegmentMetadataAttributePrefix+k] = pdata.NewValueString( - string(m)) + childSpanF8dbAttrs.UpsertString(awsxray.AWSXraySegmentMetadataAttributePrefix+k, string(m)) } childSpanF8db := perSpanProperties{ traceID: *seg.TraceID, @@ -330,12 +302,11 @@ func TestTranslation(t *testing.T) { } subsegE2de := seg.Subsegments[0].Subsegments[0].Subsegments[1].Subsegments[0].Subsegments[2] - childSpanE2deAttrs := make(map[string]pdata.Value) + childSpanE2deAttrs := pdata.NewMap() for k, v := range subsegE2de.Metadata { m, err := json.Marshal(v) assert.NoError(t, err, "metadata marshaling failed") - childSpanE2deAttrs[awsxray.AWSXraySegmentMetadataAttributePrefix+k] = pdata.NewValueString( - string(m)) + childSpanE2deAttrs.UpsertString(awsxray.AWSXraySegmentMetadataAttributePrefix+k, string(m)) } childSpanE2de := perSpanProperties{ traceID: *seg.TraceID, @@ -365,7 +336,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subsegC053 := seg.Subsegments[0].Subsegments[0].Subsegments[1].Subsegments[2] @@ -381,7 +352,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subseg5fca := seg.Subsegments[0].Subsegments[0].Subsegments[2] @@ -397,27 +368,20 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subseg7163 := seg.Subsegments[0].Subsegments[1] - childSpan7163Attrs := make(map[string]pdata.Value) - childSpan7163Attrs[awsxray.AWSServiceAttribute] = pdata.NewValueString( - *subseg7163.Name) - childSpan7163Attrs[conventions.AttributeHTTPStatusCode] = pdata.NewValueInt( - *subseg7163.HTTP.Response.Status) - contentLength = subseg7163.HTTP.Response.ContentLength.(float64) - childSpan7163Attrs[conventions.AttributeHTTPResponseContentLength] = pdata.NewValueInt(int64(contentLength)) - childSpan7163Attrs[awsxray.AWSOperationAttribute] = pdata.NewValueString( - *subseg7163.AWS.Operation) - childSpan7163Attrs[awsxray.AWSRegionAttribute] = pdata.NewValueString( - *subseg7163.AWS.RemoteRegion) - childSpan7163Attrs[awsxray.AWSRequestIDAttribute] = pdata.NewValueString( - *subseg7163.AWS.RequestID) - childSpan7163Attrs[awsxray.AWSTableNameAttribute] = pdata.NewValueString( - *subseg7163.AWS.TableName) - childSpan7163Attrs[awsxray.AWSXrayRetriesAttribute] = pdata.NewValueInt( - *subseg7163.AWS.Retries) + childSpan7163Attrs := pdata.NewMapFromRaw(map[string]interface{}{ + awsxray.AWSServiceAttribute: *subseg7163.Name, + conventions.AttributeHTTPStatusCode: *subseg7163.HTTP.Response.Status, + conventions.AttributeHTTPResponseContentLength: int64(subseg7163.HTTP.Response.ContentLength.(float64)), + awsxray.AWSOperationAttribute: *subseg7163.AWS.Operation, + awsxray.AWSRegionAttribute: *subseg7163.AWS.RemoteRegion, + awsxray.AWSRequestIDAttribute: *subseg7163.AWS.RequestID, + awsxray.AWSTableNameAttribute: *subseg7163.AWS.TableName, + awsxray.AWSXrayRetriesAttribute: *subseg7163.AWS.Retries, + }) childSpan7163Evts := initExceptionEvents(&subseg7163) assert.Len(t, childSpan7163Evts, 1, testCase+": childSpan7163Evts has incorrect size") @@ -449,7 +413,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subseg56b1 := seg.Subsegments[0].Subsegments[1].Subsegments[1] @@ -467,7 +431,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeError, }, eventsProps: childSpan56b1Evts, - attrs: nil, + attrs: pdata.NewMap(), } subseg6f90 := seg.Subsegments[0].Subsegments[1].Subsegments[1].Subsegments[0] @@ -483,7 +447,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subsegAcfa := seg.Subsegments[0].Subsegments[1].Subsegments[1].Subsegments[1] @@ -499,7 +463,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeUnset, }, eventsProps: nil, - attrs: nil, + attrs: pdata.NewMap(), } subsegBa8d := seg.Subsegments[0].Subsegments[1].Subsegments[2] @@ -517,7 +481,7 @@ func TestTranslation(t *testing.T) { code: pdata.StatusCodeError, }, eventsProps: childSpanBa8dEvts, - attrs: nil, + attrs: pdata.NewMap(), } return []perSpanProperties{rootSpan, @@ -554,9 +518,9 @@ func TestTranslation(t *testing.T) { { testCase: "[aws] TranslateMissingAWSFieldSegment", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "awsMissingAwsField.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString("unknown") + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + attrs := pdata.NewMap() + attrs.UpsertString(conventions.AttributeCloudProvider, "unknown") return attrs }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { @@ -589,42 +553,27 @@ func TestTranslation(t *testing.T) { { testCase: "[aws] TranslateEC2AWSFieldsSegment", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "awsValidAwsFields.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString(conventions.AttributeCloudProviderAWS) - attrs[conventions.AttributeCloudAccountID] = pdata.NewValueString( - *seg.AWS.AccountID) - attrs[conventions.AttributeCloudAvailabilityZone] = pdata.NewValueString( - *seg.AWS.EC2.AvailabilityZone) - attrs[conventions.AttributeHostID] = pdata.NewValueString( - *seg.AWS.EC2.InstanceID) - attrs[conventions.AttributeHostType] = pdata.NewValueString( - *seg.AWS.EC2.InstanceSize) - attrs[conventions.AttributeHostImageID] = pdata.NewValueString( - *seg.AWS.EC2.AmiID) - attrs[conventions.AttributeContainerName] = pdata.NewValueString( - *seg.AWS.ECS.ContainerName) - attrs[conventions.AttributeContainerID] = pdata.NewValueString( - *seg.AWS.ECS.ContainerID) - attrs[conventions.AttributeCloudAvailabilityZone] = pdata.NewValueString( - *seg.AWS.ECS.AvailabilityZone) - attrs[conventions.AttributeServiceNamespace] = pdata.NewValueString( - *seg.AWS.Beanstalk.Environment) - attrs[conventions.AttributeServiceInstanceID] = pdata.NewValueString( - "32") - attrs[conventions.AttributeServiceVersion] = pdata.NewValueString( - *seg.AWS.Beanstalk.VersionLabel) - attrs[conventions.AttributeTelemetrySDKVersion] = pdata.NewValueString( - *seg.AWS.XRay.SDKVersion) - attrs[conventions.AttributeTelemetrySDKName] = pdata.NewValueString( - *seg.AWS.XRay.SDK) - attrs[conventions.AttributeTelemetrySDKLanguage] = pdata.NewValueString("Go") - return attrs + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeCloudProvider: conventions.AttributeCloudProviderAWS, + conventions.AttributeCloudAccountID: *seg.AWS.AccountID, + conventions.AttributeCloudAvailabilityZone: *seg.AWS.EC2.AvailabilityZone, + conventions.AttributeHostID: *seg.AWS.EC2.InstanceID, + conventions.AttributeHostType: *seg.AWS.EC2.InstanceSize, + conventions.AttributeHostImageID: *seg.AWS.EC2.AmiID, + conventions.AttributeContainerName: *seg.AWS.ECS.ContainerName, + conventions.AttributeContainerID: *seg.AWS.ECS.ContainerID, + conventions.AttributeServiceNamespace: *seg.AWS.Beanstalk.Environment, + conventions.AttributeServiceInstanceID: "32", + conventions.AttributeServiceVersion: *seg.AWS.Beanstalk.VersionLabel, + conventions.AttributeTelemetrySDKVersion: *seg.AWS.XRay.SDKVersion, + conventions.AttributeTelemetrySDKName: *seg.AWS.XRay.SDK, + conventions.AttributeTelemetrySDKLanguage: "Go", + }) }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { attrs := defaultServerSpanAttrs(seg) - attrs[awsxray.AWSAccountAttribute] = pdata.NewValueString( - *seg.AWS.AccountID) + attrs.UpsertString(awsxray.AWSAccountAttribute, *seg.AWS.AccountID) res := perSpanProperties{ traceID: *seg.TraceID, spanID: *seg.ID, @@ -653,9 +602,9 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateCauseIsExceptionId", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "minCauseIsExceptionId.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString("unknown") + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + attrs := pdata.NewMap() + attrs.UpsertString(conventions.AttributeCloudProvider, "unknown") return attrs }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { @@ -670,7 +619,7 @@ func TestTranslation(t *testing.T) { message: *seg.Cause.ExceptionID, code: pdata.StatusCodeError, }, - attrs: nil, + attrs: pdata.NewMap(), } return []perSpanProperties{res} }, @@ -688,8 +637,8 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateInvalidNamespace", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "invalidNamespace.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - return nil + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMap() }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { return nil @@ -706,22 +655,19 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateIndepSubsegment", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "indepSubsegment.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString("unknown") + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + attrs := pdata.NewMap() + attrs.UpsertString(conventions.AttributeCloudProvider, "unknown") return attrs }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeHTTPMethod] = pdata.NewValueString( - *seg.HTTP.Request.Method) - attrs[conventions.AttributeHTTPStatusCode] = pdata.NewValueInt( - *seg.HTTP.Response.Status) - attrs[conventions.AttributeHTTPURL] = pdata.NewValueString( - *seg.HTTP.Request.URL) - contentLength := seg.HTTP.Response.ContentLength.(float64) - attrs[conventions.AttributeHTTPResponseContentLength] = pdata.NewValueInt(int64(contentLength)) - attrs[awsxray.AWSXRayTracedAttribute] = pdata.NewValueBool(true) + attrs := pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPMethod: *seg.HTTP.Request.Method, + conventions.AttributeHTTPStatusCode: *seg.HTTP.Response.Status, + conventions.AttributeHTTPURL: *seg.HTTP.Request.URL, + conventions.AttributeHTTPResponseContentLength: int64(seg.HTTP.Response.ContentLength.(float64)), + awsxray.AWSXRayTracedAttribute: true, + }) res := perSpanProperties{ traceID: *seg.TraceID, spanID: *seg.ID, @@ -751,24 +697,20 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateIndepSubsegmentForContentLengthString", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "indepSubsegmentWithContentLengthString.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString("unknown") + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + attrs := pdata.NewMap() + attrs.UpsertString(conventions.AttributeCloudProvider, "unknown") return attrs }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeHTTPMethod] = pdata.NewValueString( - *seg.HTTP.Request.Method) - attrs[conventions.AttributeHTTPStatusCode] = pdata.NewValueInt( - *seg.HTTP.Response.Status) - attrs[conventions.AttributeHTTPURL] = pdata.NewValueString( - *seg.HTTP.Request.URL) - - contentLength := seg.HTTP.Response.ContentLength.(string) - attrs[conventions.AttributeHTTPResponseContentLength] = pdata.NewValueString(contentLength) - - attrs[awsxray.AWSXRayTracedAttribute] = pdata.NewValueBool(true) + attrs := pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeHTTPMethod: *seg.HTTP.Request.Method, + conventions.AttributeHTTPStatusCode: *seg.HTTP.Response.Status, + conventions.AttributeHTTPURL: *seg.HTTP.Request.URL, + conventions.AttributeHTTPResponseContentLength: seg.HTTP.Response.ContentLength.(string), + awsxray.AWSXRayTracedAttribute: true, + }) + res := perSpanProperties{ traceID: *seg.TraceID, spanID: *seg.ID, @@ -798,22 +740,20 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateSql", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "indepSubsegmentWithSql.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeCloudProvider] = pdata.NewValueString("unknown") + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + attrs := pdata.NewMap() + attrs.UpsertString(conventions.AttributeCloudProvider, "unknown") return attrs }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { - attrs := make(map[string]pdata.Value) - attrs[conventions.AttributeDBConnectionString] = pdata.NewValueString( - "jdbc:postgresql://aawijb5u25wdoy.cpamxznpdoq8.us-west-2.rds.amazonaws.com:5432") - attrs[conventions.AttributeDBName] = pdata.NewValueString("ebdb") - attrs[conventions.AttributeDBSystem] = pdata.NewValueString( - *seg.SQL.DatabaseType) - attrs[conventions.AttributeDBStatement] = pdata.NewValueString( - *seg.SQL.SanitizedQuery) - attrs[conventions.AttributeDBUser] = pdata.NewValueString( - *seg.SQL.User) + attrs := pdata.NewMapFromRaw(map[string]interface{}{ + conventions.AttributeDBConnectionString: "jdbc:postgresql://aawijb5u25wdoy.cpamxznpdoq8.us-west-2." + + "rds.amazonaws.com:5432", + conventions.AttributeDBName: "ebdb", + conventions.AttributeDBSystem: *seg.SQL.DatabaseType, + conventions.AttributeDBStatement: *seg.SQL.SanitizedQuery, + conventions.AttributeDBUser: *seg.SQL.User, + }) res := perSpanProperties{ traceID: *seg.TraceID, spanID: *seg.ID, @@ -843,8 +783,8 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateInvalidSqlUrl", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "indepSubsegmentWithInvalidSqlUrl.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - return nil + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMap() }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { return nil @@ -864,8 +804,8 @@ func TestTranslation(t *testing.T) { testCase: "TranslateJsonUnmarshallFailed", expectedUnmarshallFailure: true, samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "minCauseIsInvalid.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - return nil + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMap() }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { return nil @@ -884,8 +824,8 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateRootSegValidationFailed", samplePath: filepath.Join("../../../../internal/aws/xray", "testdata", "segmentValidationFailed.txt"), - expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.Value { - return nil + expectedResourceAttrs: func(seg *awsxray.Segment) pdata.Map { + return pdata.NewMap() }, propsPerSpan: func(_ string, _ *testing.T, seg *awsxray.Segment) []perSpanProperties { return nil @@ -935,42 +875,34 @@ func TestTranslation(t *testing.T) { func initExceptionEvents(expectedSeg *awsxray.Segment) []eventProps { res := make([]eventProps, 0, len(expectedSeg.Cause.Exceptions)) for _, excp := range expectedSeg.Cause.Exceptions { - attrs := make(map[string]pdata.Value) - attrs[awsxray.AWSXrayExceptionIDAttribute] = pdata.NewValueString( - *excp.ID) + attrs := pdata.NewMap() + attrs.UpsertString(awsxray.AWSXrayExceptionIDAttribute, *excp.ID) if excp.Message != nil { - attrs[conventions.AttributeExceptionMessage] = pdata.NewValueString( - *excp.Message) + attrs.UpsertString(conventions.AttributeExceptionMessage, *excp.Message) } if excp.Type != nil { - attrs[conventions.AttributeExceptionType] = pdata.NewValueString( - *excp.Type) + attrs.UpsertString(conventions.AttributeExceptionType, *excp.Type) } if excp.Remote != nil { - attrs[awsxray.AWSXrayExceptionRemoteAttribute] = pdata.NewValueBool( - *excp.Remote) + attrs.UpsertBool(awsxray.AWSXrayExceptionRemoteAttribute, *excp.Remote) } if excp.Truncated != nil { - attrs[awsxray.AWSXrayExceptionTruncatedAttribute] = pdata.NewValueInt( - *excp.Truncated) + attrs.UpsertInt(awsxray.AWSXrayExceptionTruncatedAttribute, *excp.Truncated) } if excp.Skipped != nil { - attrs[awsxray.AWSXrayExceptionSkippedAttribute] = pdata.NewValueInt( - *excp.Skipped) + attrs.UpsertInt(awsxray.AWSXrayExceptionSkippedAttribute, *excp.Skipped) } if excp.Cause != nil { - attrs[awsxray.AWSXrayExceptionCauseAttribute] = pdata.NewValueString( - *excp.Cause) + attrs.UpsertString(awsxray.AWSXrayExceptionCauseAttribute, *excp.Cause) } if len(excp.Stack) > 0 { - attrs[conventions.AttributeExceptionStacktrace] = pdata.NewValueString( - convertStackFramesToStackTraceStr(excp)) + attrs.UpsertString(conventions.AttributeExceptionStacktrace, convertStackFramesToStackTraceStr(excp)) } res = append(res, eventProps{ name: ExceptionEventName, @@ -981,7 +913,7 @@ func initExceptionEvents(expectedSeg *awsxray.Segment) []eventProps { } func initResourceSpans(expectedSeg *awsxray.Segment, - resourceAttrs map[string]pdata.Value, + resourceAttrs pdata.Map, propsPerSpan []perSpanProperties, ) *pdata.ResourceSpans { if expectedSeg == nil { @@ -990,8 +922,8 @@ func initResourceSpans(expectedSeg *awsxray.Segment, rs := pdata.NewResourceSpans() - if len(resourceAttrs) > 0 { - pdata.NewAttributeMapFromMap(resourceAttrs).CopyTo(rs.Resource().Attributes()) + if resourceAttrs.Len() > 0 { + resourceAttrs.CopyTo(rs.Resource().Attributes()) } else { rs.Resource().Attributes().Clear() rs.Resource().Attributes().EnsureCapacity(initAttrCapacity) @@ -1028,12 +960,12 @@ func initResourceSpans(expectedSeg *awsxray.Segment, for _, evtProps := range props.eventsProps { spEvt := sp.Events().AppendEmpty() spEvt.SetName(evtProps.name) - pdata.NewAttributeMapFromMap(evtProps.attrs).CopyTo(spEvt.Attributes()) + evtProps.attrs.CopyTo(spEvt.Attributes()) } } - if len(props.attrs) > 0 { - pdata.NewAttributeMapFromMap(props.attrs).CopyTo(sp.Attributes()) + if props.attrs.Len() > 0 { + props.attrs.CopyTo(sp.Attributes()) } else { sp.Attributes().Clear() sp.Attributes().EnsureCapacity(initAttrCapacity) diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index f8a3f7723f8a..e032ffd6feff 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 @@ -29,11 +29,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.4.1 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 5cddfdb0efde..02870671deee 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -164,24 +164,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/cloudfoundryreceiver/converter.go b/receiver/cloudfoundryreceiver/converter.go index 8e3c0a4800c4..868f1f3fdb31 100644 --- a/receiver/cloudfoundryreceiver/converter.go +++ b/receiver/cloudfoundryreceiver/converter.go @@ -53,7 +53,7 @@ func convertEnvelopeToMetrics(envelope *loggregator_v2.Envelope, metricSlice pda } } -func copyEnvelopeAttributes(attributes pdata.AttributeMap, envelope *loggregator_v2.Envelope) { +func copyEnvelopeAttributes(attributes pdata.Map, envelope *loggregator_v2.Envelope) { for key, value := range envelope.Tags { attributes.InsertString(attributeNamePrefix+key, value) } diff --git a/receiver/cloudfoundryreceiver/converter_test.go b/receiver/cloudfoundryreceiver/converter_test.go index a27ae599f659..871f3fd9adb4 100644 --- a/receiver/cloudfoundryreceiver/converter_test.go +++ b/receiver/cloudfoundryreceiver/converter_test.go @@ -152,7 +152,7 @@ func TestConvertGaugeEnvelope(t *testing.T) { assertAttributes(t, dataPoint.Attributes(), expectedAttributes) } -func assertAttributes(t *testing.T, attributes pdata.AttributeMap, expected map[string]string) { +func assertAttributes(t *testing.T, attributes pdata.Map, expected map[string]string) { assert.Equal(t, len(expected), attributes.Len()) for key, expectedValue := range expected { diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index bb6784d2e193..1a5b90d0b54e 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,8 +6,8 @@ require ( code.cloudfoundry.org/go-loggregator v7.4.0+incompatible github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -38,10 +38,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 02a17cf10ed3..71ea7ae8e921 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -218,24 +218,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 030ebc43f853..9a6ed63f281e 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 ) @@ -27,10 +27,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 882749b05877..2a7467143a42 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -185,22 +185,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/couchbasereceiver/go.mod b/receiver/couchbasereceiver/go.mod index 53c17beb49c6..43c754cc838f 100644 --- a/receiver/couchbasereceiver/go.mod +++ b/receiver/couchbasereceiver/go.mod @@ -4,11 +4,11 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) -require go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 +require go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d require go.uber.org/zap v1.21.0 @@ -34,10 +34,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/receiver/couchbasereceiver/go.sum b/receiver/couchbasereceiver/go.sum index 6561992a74ca..e602e0d353c8 100644 --- a/receiver/couchbasereceiver/go.sum +++ b/receiver/couchbasereceiver/go.sum @@ -183,23 +183,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index e2f6b34d84a7..47b21b2ae794 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchd go 1.17 require ( - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) @@ -11,7 +11,7 @@ require github.com/stretchr/testify v1.7.1 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -39,10 +39,10 @@ require ( github.com/stretchr/objx v0.1.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 65b6d3638037..498f9b7cb3a5 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -184,23 +184,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 10a17a388eca..4f603e8c9fec 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -43,9 +43,9 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 95b70239a69f..344bc23d74f0 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -710,23 +710,23 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/dockerstatsreceiver/metrics.go b/receiver/dockerstatsreceiver/metrics.go index 8751e4a73750..fa0cf4e64353 100644 --- a/receiver/dockerstatsreceiver/metrics.go +++ b/receiver/dockerstatsreceiver/metrics.go @@ -57,7 +57,7 @@ func ContainerStatsToMetrics( return md } -func updateConfiguredResourceAttributes(resourceAttr pdata.AttributeMap, container docker.Container, config *Config) { +func updateConfiguredResourceAttributes(resourceAttr pdata.Map, container docker.Container, config *Config) { for k, label := range config.EnvVarsToMetricLabels { if v := container.EnvMap[k]; v != "" { resourceAttr.UpsertString(label, v) @@ -276,7 +276,7 @@ func populateMetricMetadata(dest pdata.Metric, name string, unit string, ty pdat dest.SetDataType(ty) } -func populateAttributes(dest pdata.AttributeMap, labelKeys []string, labelValues []string) { +func populateAttributes(dest pdata.Map, labelKeys []string, labelValues []string) { for i := range labelKeys { dest.UpsertString(labelKeys[i], labelValues[i]) } diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index e37f7afb1475..83d7c1baa8ca 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -24,9 +24,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 499cfe42091e..326d41ce3580 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -165,23 +165,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 24d1d7063f72..2a96dde95a17 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -35,10 +35,10 @@ require ( github.com/stretchr/objx v0.1.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 122080752c29..8cbe59dc6b28 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -189,24 +189,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 9ebb736cd6d8..37f10b91bd03 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.47.0 github.com/open-telemetry/opentelemetry-log-collection v0.27.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 548862d3d37f..e7e5e71403f6 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -194,11 +194,11 @@ go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= @@ -207,7 +207,7 @@ go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbD go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= diff --git a/receiver/fluentforwardreceiver/conversion_test.go b/receiver/fluentforwardreceiver/conversion_test.go index 9263aeb73041..3aa0602d96a4 100644 --- a/receiver/fluentforwardreceiver/conversion_test.go +++ b/receiver/fluentforwardreceiver/conversion_test.go @@ -40,11 +40,11 @@ func TestMessageEventConversion(t *testing.T) { Log{ Timestamp: 1593031012000000000, Body: pdata.NewValueString("..."), - Attributes: map[string]pdata.Value{ - "container_id": pdata.NewValueString("b00a67eb645849d6ab38ff8beb4aad035cc7e917bf123c3e9057c7e89fc73d2d"), - "container_name": pdata.NewValueString("/unruffled_cannon"), - "fluent.tag": pdata.NewValueString("b00a67eb6458"), - "source": pdata.NewValueString("stdout"), + Attributes: map[string]interface{}{ + "container_id": "b00a67eb645849d6ab38ff8beb4aad035cc7e917bf123c3e9057c7e89fc73d2d", + "container_name": "/unruffled_cannon", + "fluent.tag": "b00a67eb6458", + "source": "stdout", }, }, ) @@ -104,33 +104,28 @@ func TestAttributeTypeConversion(t *testing.T) { le := event.LogRecords().At(0) le.Attributes().Sort() - nv := pdata.NewValueArray() - nv.SliceVal().EnsureCapacity(2) - nv.SliceVal().AppendEmpty().SetStringVal("first") - nv.SliceVal().AppendEmpty().SetStringVal("second") - require.EqualValues(t, Logs( Log{ Timestamp: 5000000000000, Body: pdata.NewValueEmpty(), - Attributes: map[string]pdata.Value{ - "a": pdata.NewValueDouble(5.0), - "b": pdata.NewValueDouble(6.0), - "c": pdata.NewValueBool(true), - "d": pdata.NewValueInt(1), - "e": pdata.NewValueInt(2), - "f": pdata.NewValueInt(3), - "fluent.tag": pdata.NewValueString("my-tag"), - "g": pdata.NewValueInt(4), - "h": pdata.NewValueInt(255), - "i": pdata.NewValueInt(65535), - "j": pdata.NewValueInt(4294967295), - "k": pdata.NewValueInt(-1), - "l": pdata.NewValueString("(0+0i)"), - "m": pdata.NewValueString("\001e\002"), - "n": nv, - "o": pdata.NewValueString("cde"), - "p": pdata.NewValueEmpty(), + Attributes: map[string]interface{}{ + "a": 5.0, + "b": 6.0, + "c": true, + "d": 1, + "e": 2, + "f": 3, + "fluent.tag": "my-tag", + "g": 4, + "h": 255, + "i": 65535, + "j": 4294967295, + "k": -1, + "l": "(0+0i)", + "m": "\001e\002", + "n": []interface{}{"first", "second"}, + "o": "cde", + "p": nil, }, }, ).ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).LogRecords().At(0), le) @@ -277,8 +272,8 @@ func TestBodyConversion(t *testing.T) { Log{ Timestamp: 5000000000000, Body: body, - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("my-tag"), + Attributes: map[string]interface{}{ + "fluent.tag": "my-tag", }, }, ).ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).LogRecords().At(0), le) diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index f47c3fde532b..1a1946f3b895 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.7.1 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -27,9 +27,9 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 1679d43ecdaa..a45cca19ac95 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -169,22 +169,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/fluentforwardreceiver/receiver_test.go b/receiver/fluentforwardreceiver/receiver_test.go index e785b31cf7bd..601912879a72 100644 --- a/receiver/fluentforwardreceiver/receiver_test.go +++ b/receiver/fluentforwardreceiver/receiver_test.go @@ -118,11 +118,11 @@ func TestMessageEvent(t *testing.T) { require.EqualValues(t, Logs(Log{ Timestamp: 1593031012000000000, Body: pdata.NewValueString("..."), - Attributes: map[string]pdata.Value{ - "container_id": pdata.NewValueString("b00a67eb645849d6ab38ff8beb4aad035cc7e917bf123c3e9057c7e89fc73d2d"), - "container_name": pdata.NewValueString("/unruffled_cannon"), - "fluent.tag": pdata.NewValueString("b00a67eb6458"), - "source": pdata.NewValueString("stdout"), + Attributes: map[string]interface{}{ + "container_id": "b00a67eb645849d6ab38ff8beb4aad035cc7e917bf123c3e9057c7e89fc73d2d", + "container_name": "/unruffled_cannon", + "fluent.tag": "b00a67eb6458", + "source": "stdout", }, }, ), converted[0]) @@ -153,27 +153,27 @@ func TestForwardEvent(t *testing.T) { Log{ Timestamp: 1593032377776693638, Body: pdata.NewValueEmpty(), - Attributes: map[string]pdata.Value{ - "Mem.free": pdata.NewValueInt(848908), - "Mem.total": pdata.NewValueInt(7155496), - "Mem.used": pdata.NewValueInt(6306588), - "Swap.free": pdata.NewValueInt(0), - "Swap.total": pdata.NewValueInt(0), - "Swap.used": pdata.NewValueInt(0), - "fluent.tag": pdata.NewValueString("mem.0"), + Attributes: map[string]interface{}{ + "Mem.free": 848908, + "Mem.total": 7155496, + "Mem.used": 6306588, + "Swap.free": 0, + "Swap.total": 0, + "Swap.used": 0, + "fluent.tag": "mem.0", }, }, Log{ Timestamp: 1593032378756829346, Body: pdata.NewValueEmpty(), - Attributes: map[string]pdata.Value{ - "Mem.free": pdata.NewValueInt(848908), - "Mem.total": pdata.NewValueInt(7155496), - "Mem.used": pdata.NewValueInt(6306588), - "Swap.free": pdata.NewValueInt(0), - "Swap.total": pdata.NewValueInt(0), - "Swap.used": pdata.NewValueInt(0), - "fluent.tag": pdata.NewValueString("mem.0"), + Attributes: map[string]interface{}{ + "Mem.free": 848908, + "Mem.total": 7155496, + "Mem.used": 6306588, + "Swap.free": 0, + "Swap.total": 0, + "Swap.used": 0, + "fluent.tag": "mem.0", }, }, ), converted[0]) @@ -236,41 +236,41 @@ func TestForwardPackedEvent(t *testing.T) { Log{ Timestamp: 1593032517024597622, Body: pdata.NewValueString("starting fluentd worker pid=17 ppid=7 worker=0"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), - "pid": pdata.NewValueInt(17), - "ppid": pdata.NewValueInt(7), - "worker": pdata.NewValueInt(0), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", + "pid": 17, + "ppid": 7, + "worker": 0, }, }, Log{ Timestamp: 1593032517028573686, Body: pdata.NewValueString("delayed_commit_timeout is overwritten by ack_response_timeout"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", }, }, Log{ Timestamp: 1593032517028815948, Body: pdata.NewValueString("following tail of /var/log/kern.log"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", }, }, Log{ Timestamp: 1593032517031174229, Body: pdata.NewValueString("fluentd worker is now running worker=0"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), - "worker": pdata.NewValueInt(0), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", + "worker": 0, }, }, Log{ Timestamp: 1593032522187382822, Body: pdata.NewValueString("fluentd worker is now stopping worker=0"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), - "worker": pdata.NewValueInt(0), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", + "worker": 0, }, }, ), converted[0]) @@ -302,41 +302,41 @@ func TestForwardPackedCompressedEvent(t *testing.T) { Log{ Timestamp: 1593032426012197420, Body: pdata.NewValueString("starting fluentd worker pid=17 ppid=7 worker=0"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), - "pid": pdata.NewValueInt(17), - "ppid": pdata.NewValueInt(7), - "worker": pdata.NewValueInt(0), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", + "pid": 17, + "ppid": 7, + "worker": 0, }, }, Log{ Timestamp: 1593032426013724933, Body: pdata.NewValueString("delayed_commit_timeout is overwritten by ack_response_timeout"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", }, }, Log{ Timestamp: 1593032426020510455, Body: pdata.NewValueString("following tail of /var/log/kern.log"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", }, }, Log{ Timestamp: 1593032426024346580, Body: pdata.NewValueString("fluentd worker is now running worker=0"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), - "worker": pdata.NewValueInt(0), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", + "worker": 0, }, }, Log{ Timestamp: 1593032434346935532, Body: pdata.NewValueString("fluentd worker is now stopping worker=0"), - Attributes: map[string]pdata.Value{ - "fluent.tag": pdata.NewValueString("fluent.info"), - "worker": pdata.NewValueInt(0), + Attributes: map[string]interface{}{ + "fluent.tag": "fluent.info", + "worker": 0, }, }, ), converted[0]) diff --git a/receiver/fluentforwardreceiver/util_test.go b/receiver/fluentforwardreceiver/util_test.go index 156a7c97e9a3..0279baa1e888 100644 --- a/receiver/fluentforwardreceiver/util_test.go +++ b/receiver/fluentforwardreceiver/util_test.go @@ -23,7 +23,7 @@ import ( type Log struct { Timestamp int64 Body pdata.Value - Attributes map[string]pdata.Value + Attributes map[string]interface{} } // Logs is a convenience function for constructing logs for tests in a way that is @@ -38,7 +38,7 @@ func Logs(recs ...Log) pdata.Logs { l := logSlice.AppendEmpty() recs[i].Body.CopyTo(l.Body()) l.SetTimestamp(pdata.Timestamp(recs[i].Timestamp)) - pdata.NewAttributeMapFromMap(recs[i].Attributes).CopyTo(l.Attributes()) + pdata.NewMapFromRaw(recs[i].Attributes).CopyTo(l.Attributes()) l.Attributes().Sort() } diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 67166791e86f..cb9c59338f96 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( cloud.google.com/go/pubsub v1.19.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 google.golang.org/api v0.73.0 @@ -38,9 +38,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index c9426d86937d..819ae8c44b85 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -315,23 +315,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 03b65e0f0655..6ef86634a27e 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( cloud.google.com/go/spanner v1.30.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/api v0.73.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b @@ -52,9 +52,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/stretchr/objx v0.1.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index f41272f2c89b..6458395dfa07 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -335,23 +335,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue.go b/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue.go index 30bb71b26f6b..d32468016970 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue.go @@ -33,7 +33,7 @@ type LabelValueMetadata interface { type LabelValue interface { Metadata() LabelValueMetadata Value() interface{} - SetValueTo(attributes pdata.AttributeMap) + SetValueTo(attributes pdata.Map) } type queryLabelValueMetadata struct { @@ -102,7 +102,7 @@ func (v stringLabelValue) Value() interface{} { return v.value } -func (v stringLabelValue) SetValueTo(attributes pdata.AttributeMap) { +func (v stringLabelValue) SetValueTo(attributes pdata.Map) { attributes.InsertString(v.metadata.Name(), v.value) } @@ -121,7 +121,7 @@ func (v int64LabelValue) Value() interface{} { return v.value } -func (v int64LabelValue) SetValueTo(attributes pdata.AttributeMap) { +func (v int64LabelValue) SetValueTo(attributes pdata.Map) { attributes.InsertInt(v.metadata.Name(), v.value) } @@ -140,7 +140,7 @@ func (v boolLabelValue) Value() interface{} { return v.value } -func (v boolLabelValue) SetValueTo(attributes pdata.AttributeMap) { +func (v boolLabelValue) SetValueTo(attributes pdata.Map) { attributes.InsertBool(v.metadata.Name(), v.value) } @@ -159,7 +159,7 @@ func (v stringSliceLabelValue) Value() interface{} { return v.value } -func (v stringSliceLabelValue) SetValueTo(attributes pdata.AttributeMap) { +func (v stringSliceLabelValue) SetValueTo(attributes pdata.Map) { attributes.InsertString(v.metadata.Name(), v.value) } @@ -184,7 +184,7 @@ func (v byteSliceLabelValue) Value() interface{} { return v.value } -func (v byteSliceLabelValue) SetValueTo(attributes pdata.AttributeMap) { +func (v byteSliceLabelValue) SetValueTo(attributes pdata.Map) { attributes.InsertString(v.metadata.Name(), v.value) } @@ -203,7 +203,7 @@ func (v lockRequestSliceLabelValue) Value() interface{} { return v.value } -func (v lockRequestSliceLabelValue) SetValueTo(attributes pdata.AttributeMap) { +func (v lockRequestSliceLabelValue) SetValueTo(attributes pdata.Map) { attributes.InsertString(v.metadata.Name(), v.value) } diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go b/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go index c5469942d4c1..38594ef3748b 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go @@ -111,7 +111,7 @@ func TestStringLabelValue(t *testing.T) { assert.Equal(t, StringValueType, labelValue.Metadata().ValueType()) assert.Equal(t, stringValue, labelValue.Value()) - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() labelValue.SetValueTo(attributes) @@ -131,7 +131,7 @@ func TestInt64LabelValue(t *testing.T) { assert.Equal(t, IntValueType, labelValue.Metadata().ValueType()) assert.Equal(t, int64Value, labelValue.Value()) - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() labelValue.SetValueTo(attributes) @@ -151,7 +151,7 @@ func TestBoolLabelValue(t *testing.T) { assert.Equal(t, BoolValueType, labelValue.Metadata().ValueType()) assert.Equal(t, boolValue, labelValue.Value()) - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() labelValue.SetValueTo(attributes) @@ -171,7 +171,7 @@ func TestStringSliceLabelValue(t *testing.T) { assert.Equal(t, StringSliceValueType, labelValue.Metadata().ValueType()) assert.Equal(t, stringValue, labelValue.Value()) - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() labelValue.SetValueTo(attributes) @@ -191,7 +191,7 @@ func TestByteSliceLabelValue(t *testing.T) { assert.Equal(t, ByteSliceValueType, labelValue.Metadata().ValueType()) assert.Equal(t, stringValue, labelValue.Value()) - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() labelValue.SetValueTo(attributes) @@ -211,7 +211,7 @@ func TestLockRequestSliceLabelValue(t *testing.T) { assert.Equal(t, LockRequestSliceValueType, labelValue.Metadata().ValueType()) assert.Equal(t, stringValue, labelValue.Value()) - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() labelValue.SetValueTo(attributes) diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go b/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go index e99119a75315..c9738af2241a 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go @@ -170,19 +170,19 @@ func allPossibleMetricValues(metricDataType pdata.MetricDataType) []MetricValue } } -func assertDefaultLabels(t *testing.T, attributesMap pdata.AttributeMap, databaseID *datasource.DatabaseID) { +func assertDefaultLabels(t *testing.T, attributesMap pdata.Map, databaseID *datasource.DatabaseID) { assertStringLabelValue(t, attributesMap, projectIDLabelName, databaseID.ProjectID()) assertStringLabelValue(t, attributesMap, instanceIDLabelName, databaseID.InstanceID()) assertStringLabelValue(t, attributesMap, databaseLabelName, databaseID.DatabaseName()) } -func assertNonDefaultLabels(t *testing.T, attributesMap pdata.AttributeMap, labelValues []LabelValue) { +func assertNonDefaultLabels(t *testing.T, attributesMap pdata.Map, labelValues []LabelValue) { for _, labelValue := range labelValues { assertLabelValue(t, attributesMap, labelValue) } } -func assertLabelValue(t *testing.T, attributesMap pdata.AttributeMap, labelValue LabelValue) { +func assertLabelValue(t *testing.T, attributesMap pdata.Map, labelValue LabelValue) { value, exists := attributesMap.Get(labelValue.Metadata().Name()) assert.True(t, exists) @@ -198,7 +198,7 @@ func assertLabelValue(t *testing.T, attributesMap pdata.AttributeMap, labelValue } } -func assertStringLabelValue(t *testing.T, attributesMap pdata.AttributeMap, labelName string, expectedValue interface{}) { +func assertStringLabelValue(t *testing.T, attributesMap pdata.Map, labelName string, expectedValue interface{}) { value, exists := attributesMap.Get(labelName) assert.True(t, exists) diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 5a9dd05f7763..f001770ea9e8 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 github.com/shirou/gopsutil/v3 v3.22.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 @@ -35,9 +35,9 @@ require ( github.com/tklauser/numcpus v0.3.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index 86ac76fdd352..9739bfd06c7d 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -200,23 +200,23 @@ github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPR github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/hostmetricsreceiver/internal/testutils.go b/receiver/hostmetricsreceiver/internal/testutils.go index 66b024e5d93b..3cdc6e293a4e 100644 --- a/receiver/hostmetricsreceiver/internal/testutils.go +++ b/receiver/hostmetricsreceiver/internal/testutils.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/model/pdata" ) -func AssertContainsAttribute(t *testing.T, attr pdata.AttributeMap, key string) { +func AssertContainsAttribute(t *testing.T, attr pdata.Map, key string) { _, ok := attr.Get(key) assert.True(t, ok) } diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 74d1283c164f..405853b77653 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.16 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -29,12 +29,12 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 0e301f15d627..e3a1c2288ef4 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -194,24 +194,24 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 4e76aea9d4a9..a30d79cc5cd1 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/stretchr/testify v1.7.1 github.com/uber/jaeger-lib v2.4.1+incompatible - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 google.golang.org/grpc v1.45.0 @@ -48,12 +48,12 @@ require ( github.com/subosito/gotenv v1.2.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 7ae9e5b2a646..ed772dbbf888 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -247,25 +247,25 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= @@ -375,7 +375,6 @@ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 7e7d3d784078..f9ad39cfbb89 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/shirou/gopsutil/v3 v3.22.2 github.com/stretchr/testify v1.7.1 github.com/testcontainers/testcontainers-go v0.12.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 @@ -66,12 +66,12 @@ require ( github.com/tklauser/numcpus v0.3.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index d7f24293996e..6ab8630c4aec 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -823,25 +823,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index b68a093825ac..5cfcdece0d41 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.47.0 github.com/open-telemetry/opentelemetry-log-collection v0.27.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d gopkg.in/yaml.v2 v2.4.0 ) @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect go.opentelemetry.io/otel/trace v1.5.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 7fc85352ccac..02ebec8728af 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -189,11 +189,11 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= @@ -202,7 +202,7 @@ go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbD go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 4f885d821633..2d9d10739898 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,8 +12,8 @@ require ( github.com/openshift/api v0.0.0-20210521075222-e273a339932a github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 @@ -51,10 +51,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.4.1 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 0dd14ed37a38..778d34e922ef 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -384,24 +384,24 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index b6c565c5dce5..6de6f63aa4bf 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 k8s.io/api v0.23.5 k8s.io/apimachinery v0.23.5 @@ -41,9 +41,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index bf3155e812e5..f9848635da35 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -368,23 +368,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/kafkametricsreceiver/broker_scraper.go b/receiver/kafkametricsreceiver/broker_scraper.go index 57d7f7eceedf..8614a5935023 100644 --- a/receiver/kafkametricsreceiver/broker_scraper.go +++ b/receiver/kafkametricsreceiver/broker_scraper.go @@ -61,7 +61,7 @@ func (s *brokerScraper) scrape(context.Context) (pdata.Metrics, error) { md := pdata.NewMetrics() ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName(instrumentationLibName) - addIntGauge(ilm.Metrics(), metadata.M.KafkaBrokers.Name(), pdata.NewTimestampFromTime(time.Now()), pdata.NewAttributeMap(), int64(len(brokers))) + addIntGauge(ilm.Metrics(), metadata.M.KafkaBrokers.Name(), pdata.NewTimestampFromTime(time.Now()), pdata.NewMap(), int64(len(brokers))) return md, nil } diff --git a/receiver/kafkametricsreceiver/consumer_scraper.go b/receiver/kafkametricsreceiver/consumer_scraper.go index 6d0dfe8ca6fd..9d6a21be7abe 100644 --- a/receiver/kafkametricsreceiver/consumer_scraper.go +++ b/receiver/kafkametricsreceiver/consumer_scraper.go @@ -125,7 +125,7 @@ func (s *consumerScraper) scrape(context.Context) (pdata.Metrics, error) { ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName(instrumentationLibName) for _, group := range consumerGroups { - labels := pdata.NewAttributeMap() + labels := pdata.NewMap() labels.UpsertString(metadata.A.Group, group.GroupId) addIntGauge(ilm.Metrics(), metadata.M.KafkaConsumerGroupMembers.Name(), now, labels, int64(len(group.Members))) groupOffsetFetchResponse, err := s.clusterAdmin.ListConsumerGroupOffsets(group.GroupId, topicPartitions) diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 57bbbd268759..f825b8b72c6d 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -64,9 +64,9 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index c4d16c581454..144a13a50305 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -769,23 +769,23 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/kafkametricsreceiver/topic_scraper.go b/receiver/kafkametricsreceiver/topic_scraper.go index 3136078421b4..1a757e08ab1d 100644 --- a/receiver/kafkametricsreceiver/topic_scraper.go +++ b/receiver/kafkametricsreceiver/topic_scraper.go @@ -80,7 +80,7 @@ func (s *topicScraper) scrape(context.Context) (pdata.Metrics, error) { scrapeErrors.Add(err) continue } - labels := pdata.NewAttributeMap() + labels := pdata.NewMap() labels.UpsertString(metadata.A.Topic, topic) addIntGauge(ilm.Metrics(), metadata.M.KafkaTopicPartitions.Name(), now, labels, int64(len(partitions))) for _, partition := range partitions { @@ -133,7 +133,7 @@ func createTopicsScraper(_ context.Context, cfg Config, saramaConfig *sarama.Con ) } -func addIntGauge(ms pdata.MetricSlice, name string, now pdata.Timestamp, labels pdata.AttributeMap, value int64) { +func addIntGauge(ms pdata.MetricSlice, name string, now pdata.Timestamp, labels pdata.Map, value int64) { m := ms.AppendEmpty() m.SetName(name) m.SetDataType(pdata.MetricDataTypeGauge) diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 3e288bb51c2e..a8618374a1d1 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,8 +14,8 @@ require ( github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -54,9 +54,9 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index de2dc91b9a18..79cda1f95512 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -273,23 +273,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 25fee9ed3876..04c22b24fc5c 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 k8s.io/api v0.23.5 k8s.io/apimachinery v0.23.5 @@ -45,9 +45,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index b0659ff3cc70..96ec91ecee44 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -479,19 +479,19 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= @@ -500,13 +500,13 @@ go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1s go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/kubeletstatsreceiver/internal/kubelet/volume_test.go b/receiver/kubeletstatsreceiver/internal/kubelet/volume_test.go index b516e28b1e46..9d917a7efbcd 100644 --- a/receiver/kubeletstatsreceiver/internal/kubelet/volume_test.go +++ b/receiver/kubeletstatsreceiver/internal/kubelet/volume_test.go @@ -39,7 +39,7 @@ func TestDetailedPVCLabels(t *testing.T) { volumeSource v1.VolumeSource pod pod detailedPVCLabelsSetterOverride func(volCacheID, volumeClaim, namespace string, labels map[string]string) error - want map[string]pdata.Value + want map[string]interface{} }{ { name: "persistentVolumeClaim - with detailed PVC labels (AWS)", @@ -60,16 +60,16 @@ func TestDetailedPVCLabels(t *testing.T) { }, labels) return nil }, - want: map[string]pdata.Value{ - "k8s.volume.name": pdata.NewValueString("volume0"), - "k8s.volume.type": pdata.NewValueString("awsElasticBlockStore"), - "aws.volume.id": pdata.NewValueString("volume_id"), - "fs.type": pdata.NewValueString("fs_type"), - "partition": pdata.NewValueString("10"), - "k8s.persistentvolumeclaim.name": pdata.NewValueString("claim-name"), - "k8s.pod.uid": pdata.NewValueString("uid-1234"), - "k8s.pod.name": pdata.NewValueString("pod-name"), - "k8s.namespace.name": pdata.NewValueString("pod-namespace"), + want: map[string]interface{}{ + "k8s.volume.name": "volume0", + "k8s.volume.type": "awsElasticBlockStore", + "aws.volume.id": "volume_id", + "fs.type": "fs_type", + "partition": "10", + "k8s.persistentvolumeclaim.name": "claim-name", + "k8s.pod.uid": "uid-1234", + "k8s.pod.name": "pod-name", + "k8s.namespace.name": "pod-namespace", }, }, { @@ -91,16 +91,16 @@ func TestDetailedPVCLabels(t *testing.T) { }, labels) return nil }, - want: map[string]pdata.Value{ - "k8s.volume.name": pdata.NewValueString("volume0"), - "k8s.volume.type": pdata.NewValueString("gcePersistentDisk"), - "gce.pd.name": pdata.NewValueString("pd_name"), - "fs.type": pdata.NewValueString("fs_type"), - "partition": pdata.NewValueString("10"), - "k8s.persistentvolumeclaim.name": pdata.NewValueString("claim-name"), - "k8s.pod.uid": pdata.NewValueString("uid-1234"), - "k8s.pod.name": pdata.NewValueString("pod-name"), - "k8s.namespace.name": pdata.NewValueString("pod-namespace"), + want: map[string]interface{}{ + "k8s.volume.name": "volume0", + "k8s.volume.type": "gcePersistentDisk", + "gce.pd.name": "pd_name", + "fs.type": "fs_type", + "partition": "10", + "k8s.persistentvolumeclaim.name": "claim-name", + "k8s.pod.uid": "uid-1234", + "k8s.pod.name": "pod-name", + "k8s.namespace.name": "pod-namespace", }, }, { @@ -121,15 +121,15 @@ func TestDetailedPVCLabels(t *testing.T) { }, labels) return nil }, - want: map[string]pdata.Value{ - "k8s.volume.name": pdata.NewValueString("volume0"), - "k8s.volume.type": pdata.NewValueString("glusterfs"), - "glusterfs.endpoints.name": pdata.NewValueString("endpoints_name"), - "glusterfs.path": pdata.NewValueString("path"), - "k8s.persistentvolumeclaim.name": pdata.NewValueString("claim-name"), - "k8s.pod.uid": pdata.NewValueString("uid-1234"), - "k8s.pod.name": pdata.NewValueString("pod-name"), - "k8s.namespace.name": pdata.NewValueString("pod-namespace"), + want: map[string]interface{}{ + "k8s.volume.name": "volume0", + "k8s.volume.type": "glusterfs", + "glusterfs.endpoints.name": "endpoints_name", + "glusterfs.path": "path", + "k8s.persistentvolumeclaim.name": "claim-name", + "k8s.pod.uid": "uid-1234", + "k8s.pod.name": "pod-name", + "k8s.namespace.name": "pod-namespace", }, }, { @@ -149,13 +149,13 @@ func TestDetailedPVCLabels(t *testing.T) { }, labels) return nil }, - want: map[string]pdata.Value{ - "k8s.volume.name": pdata.NewValueString("volume0"), - "k8s.volume.type": pdata.NewValueString("local"), - "k8s.persistentvolumeclaim.name": pdata.NewValueString("claim-name"), - "k8s.pod.uid": pdata.NewValueString("uid-1234"), - "k8s.pod.name": pdata.NewValueString("pod-name"), - "k8s.namespace.name": pdata.NewValueString("pod-namespace"), + want: map[string]interface{}{ + "k8s.volume.name": "volume0", + "k8s.volume.type": "local", + "k8s.persistentvolumeclaim.name": "claim-name", + "k8s.pod.uid": "uid-1234", + "k8s.pod.name": "pod-name", + "k8s.namespace.name": "pod-namespace", }, }, } @@ -192,7 +192,7 @@ func TestDetailedPVCLabels(t *testing.T) { volumeResource := pdata.NewResource() err := fillVolumeResource(volumeResource, podStats, stats.VolumeStats{Name: tt.volumeName}, metadata) require.NoError(t, err) - require.Equal(t, pdata.NewAttributeMapFromMap(tt.want).Sort(), volumeResource.Attributes().Sort()) + require.Equal(t, pdata.NewMapFromRaw(tt.want).Sort(), volumeResource.Attributes().Sort()) }) } } diff --git a/receiver/kubeletstatsreceiver/scraper_test.go b/receiver/kubeletstatsreceiver/scraper_test.go index d42461ecc599..fe16abe8172f 100644 --- a/receiver/kubeletstatsreceiver/scraper_test.go +++ b/receiver/kubeletstatsreceiver/scraper_test.go @@ -389,7 +389,7 @@ func requireExpectedVolume(t *testing.T, ev expectedVolume, resource pdata.Resou } } -func requireAttribute(t *testing.T, attr pdata.AttributeMap, key string, value string) { +func requireAttribute(t *testing.T, attr pdata.Map, key string, value string) { val, ok := attr.Get(key) require.True(t, ok) require.Equal(t, value, val.StringVal()) diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 083203601db7..892ec1e27ce4 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -40,9 +40,9 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index fbbcc77b5272..e58fd386d004 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -703,21 +703,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/memcachedreceiver/scraper.go b/receiver/memcachedreceiver/scraper.go index 83f5f9624541..71c4a113634b 100644 --- a/receiver/memcachedreceiver/scraper.go +++ b/receiver/memcachedreceiver/scraper.go @@ -76,7 +76,7 @@ func (r *memcachedScraper) scrape(_ context.Context) (pdata.Metrics, error) { for _, stats := range allServerStats { for k, v := range stats.Stats { - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() switch k { case "bytes": if parsedV, ok := r.parseInt(k, v); ok { @@ -185,7 +185,7 @@ func (r *memcachedScraper) scrape(_ context.Context) (pdata.Metrics, error) { } // Calculated Metrics - attributes := pdata.NewAttributeMap() + attributes := pdata.NewMap() attributes.Insert(metadata.A.Operation, pdata.NewValueString("increment")) parsedHit, okHit := r.parseInt("incr_hits", stats.Stats["incr_hits"]) parsedMiss, okMiss := r.parseInt("incr_misses", stats.Stats["incr_misses"]) @@ -193,7 +193,7 @@ func (r *memcachedScraper) scrape(_ context.Context) (pdata.Metrics, error) { r.addToDoubleMetric(hitRatio, attributes, calculateHitRatio(parsedHit, parsedMiss), now) } - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() attributes.Insert(metadata.A.Operation, pdata.NewValueString("decrement")) parsedHit, okHit = r.parseInt("decr_hits", stats.Stats["decr_hits"]) parsedMiss, okMiss = r.parseInt("decr_misses", stats.Stats["decr_misses"]) @@ -201,7 +201,7 @@ func (r *memcachedScraper) scrape(_ context.Context) (pdata.Metrics, error) { r.addToDoubleMetric(hitRatio, attributes, calculateHitRatio(parsedHit, parsedMiss), now) } - attributes = pdata.NewAttributeMap() + attributes = pdata.NewMap() attributes.Insert(metadata.A.Operation, pdata.NewValueString("get")) parsedHit, okHit = r.parseInt("get_hits", stats.Stats["get_hits"]) parsedMiss, okMiss = r.parseInt("get_misses", stats.Stats["get_misses"]) @@ -256,7 +256,7 @@ func (r *memcachedScraper) logInvalid(expectedType, key, value string) { ) } -func (r *memcachedScraper) addToDoubleMetric(metric pdata.NumberDataPointSlice, attributes pdata.AttributeMap, value float64, now pdata.Timestamp) { +func (r *memcachedScraper) addToDoubleMetric(metric pdata.NumberDataPointSlice, attributes pdata.Map, value float64, now pdata.Timestamp) { dataPoint := metric.AppendEmpty() dataPoint.SetTimestamp(now) dataPoint.SetDoubleVal(value) @@ -265,7 +265,7 @@ func (r *memcachedScraper) addToDoubleMetric(metric pdata.NumberDataPointSlice, } } -func (r *memcachedScraper) addToIntMetric(metric pdata.NumberDataPointSlice, attributes pdata.AttributeMap, value int64, now pdata.Timestamp) { +func (r *memcachedScraper) addToIntMetric(metric pdata.NumberDataPointSlice, attributes pdata.Map, value int64, now pdata.Timestamp) { dataPoint := metric.AppendEmpty() dataPoint.SetTimestamp(now) dataPoint.SetIntVal(value) diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index e62b33ecfdca..f9a7e747b80d 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/mongodb-forks/digest v1.0.3 github.com/pkg/errors v0.9.1 go.mongodb.org/atlas v0.15.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -29,9 +29,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index e73bc9ba151d..a19bf4127a79 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -170,21 +170,21 @@ go.mongodb.org/atlas v0.15.0 h1:YyOBdBIuI//krRITf4r7PSirJ3YDNNUfNmapxwSyDow= go.mongodb.org/atlas v0.15.0/go.mod h1:lQhRHIxc6jQHEK3/q9WLu/SdBkPj2fQYhjLGUF6Z3U8= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/mongodbatlasreceiver/receiver.go b/receiver/mongodbatlasreceiver/receiver.go index 70e8d6890f92..26dfe2395983 100644 --- a/receiver/mongodbatlasreceiver/receiver.go +++ b/receiver/mongodbatlasreceiver/receiver.go @@ -79,7 +79,7 @@ func (s *receiver) shutdown(context.Context) error { } func (s *receiver) poll(ctx context.Context, time timeconstraints) (pdata.Metrics, error) { - resourceAttributes := pdata.NewAttributeMap() + resourceAttributes := pdata.NewMap() allMetrics := pdata.NewMetrics() orgs, err := s.client.Organizations(ctx) if err != nil { diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index c2d2c6a57298..4a37ca1ca0a1 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 ) @@ -40,9 +40,9 @@ require ( github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 0af64852bc38..1fbcce97d1b8 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -181,21 +181,21 @@ go.mongodb.org/mongo-driver v1.8.4 h1:NruvZPPL0PBcRJKmbswoWSrmHeUvzdxA3GCPfD/NEO go.mongodb.org/mongo-driver v1.8.4/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 9b6d8072e702..86d8c0f6ece6 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -51,9 +51,9 @@ require ( github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211108170745-6635138e15ea // indirect diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 8813828fd38c..c79bd7a6b434 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -727,21 +727,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index df1b043e46cb..1fe89f5c353a 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 github.com/stretchr/testify v1.7.1 github.com/testcontainers/testcontainers-go v0.12.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect @@ -59,10 +59,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20211108170745-6635138e15ea // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index bce3c7bba2de..acd09007fa8e 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -744,23 +744,23 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 3ba1fe1f5008..4abfd622401d 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,8 +12,8 @@ require ( github.com/rs/cors v1.8.2 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 go.opentelemetry.io/otel v1.5.0 go.opentelemetry.io/otel/trace v1.5.0 diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index 88cf255168ca..b00a5366cac6 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -323,10 +323,10 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index e70f0daa4178..1f02021c9430 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 ) @@ -25,9 +25,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index 9dffe6e348c0..cca6ea4c4376 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -165,23 +165,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index e191b670dd64..1b732d4c0831 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -6,12 +6,12 @@ require ( github.com/lib/pq v1.10.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) -require go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 +require go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d require github.com/testcontainers/testcontainers-go v0.12.0 @@ -54,9 +54,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/stretchr/objx v0.2.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/net v0.0.0-20211108170745-6635138e15ea // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 1bc353c376b6..1fd9d7087957 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -670,21 +670,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 0776be1ae845..c4b83abb124e 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -99,9 +99,9 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index 3bd80d298478..bd046d01d747 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -1434,26 +1434,26 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/zpages v0.29.0 h1:rUnBzAxPP58lP7BApL21Ac2Fx8/5OflQa3sirlX0nQQ= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0 h1:HcGi6HmYRuszR3stcvN2GctJjQtvp44nw/VdfJCo/Ec= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/sdk/metric v0.27.0 h1:CDEu96Js5IP7f4bJ8eimxF09V5hKYmE7CeyKSjmAL1s= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 1feb3688e32d..b8bcc6cc6dea 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v2 v2.4.0 @@ -128,13 +128,13 @@ require ( go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect go.opentelemetry.io/contrib/zpages v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.27.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 9dfbe5e41a6e..0c7befc09a4c 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -1452,18 +1452,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/zpages v0.29.0 h1:rUnBzAxPP58lP7BApL21Ac2Fx8/5OflQa3sirlX0nQQ= go.opentelemetry.io/contrib/zpages v0.29.0/go.mod h1:iHy2K1Cjz1Ss0Sv6cQPEExP0nD+gj7gAF024foxzFFE= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0 h1:HcGi6HmYRuszR3stcvN2GctJjQtvp44nw/VdfJCo/Ec= go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= @@ -1471,13 +1471,13 @@ go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/on go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/sdk/metric v0.27.0 h1:CDEu96Js5IP7f4bJ8eimxF09V5hKYmE7CeyKSjmAL1s= go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/prometheusreceiver/internal/otlp_metricfamily.go b/receiver/prometheusreceiver/internal/otlp_metricfamily.go index e8ff0936ec74..6a4473e1cd5e 100644 --- a/receiver/prometheusreceiver/internal/otlp_metricfamily.go +++ b/receiver/prometheusreceiver/internal/otlp_metricfamily.go @@ -244,7 +244,7 @@ func (mg *metricGroupPdata) toNumberDataPoint(orderedLabelKeys []string, dest *p return true } -func populateAttributesPdata(orderedKeys []string, ls labels.Labels, dest pdata.AttributeMap) { +func populateAttributesPdata(orderedKeys []string, ls labels.Labels, dest pdata.Map) { src := ls.Map() for _, key := range orderedKeys { if src[key] == "" { diff --git a/receiver/prometheusreceiver/internal/otlp_metrics_adjuster.go b/receiver/prometheusreceiver/internal/otlp_metrics_adjuster.go index 41da9def8947..1771c69011da 100644 --- a/receiver/prometheusreceiver/internal/otlp_metrics_adjuster.go +++ b/receiver/prometheusreceiver/internal/otlp_metrics_adjuster.go @@ -78,7 +78,7 @@ type timeseriesMapPdata struct { } // Get the timeseriesinfo for the timeseries associated with the metric and label values. -func (tsm *timeseriesMapPdata) get(metric *pdata.Metric, kv pdata.AttributeMap) *timeseriesinfoPdata { +func (tsm *timeseriesMapPdata) get(metric *pdata.Metric, kv pdata.Map) *timeseriesinfoPdata { // This should only be invoked be functions called (directly or indirectly) by AdjustMetricSlice(). // The lock protecting tsm.tsiMap is acquired there. name := metric.Name() @@ -101,7 +101,7 @@ func (tsm *timeseriesMapPdata) get(metric *pdata.Metric, kv pdata.AttributeMap) } // Create a unique timeseries signature consisting of the metric name and label values. -func getTimeseriesSignaturePdata(name string, kv pdata.AttributeMap) string { +func getTimeseriesSignaturePdata(name string, kv pdata.Map) string { labelValues := make([]string, 0, kv.Len()) kv.Sort().Range(func(_ string, attrValue pdata.Value) bool { value := attrValue.StringVal() diff --git a/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index 7e0fc70e951a..37bed9382f16 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -114,7 +114,7 @@ var ( type testData struct { name string pages []mockPrometheusResponse - attributes pdata.AttributeMap + attributes pdata.Map validateScrapes bool validateFunc func(t *testing.T, td *testData, result []*pdata.ResourceMetrics) } @@ -319,7 +319,7 @@ type dataPointExpectation struct { type testExpectation func(*testing.T, *pdata.ResourceMetrics) -func doCompare(t *testing.T, name string, want pdata.AttributeMap, got *pdata.ResourceMetrics, expectations []testExpectation) { +func doCompare(t *testing.T, name string, want pdata.Map, got *pdata.ResourceMetrics, expectations []testExpectation) { t.Run(name, func(t *testing.T) { assert.Equal(t, expectedScrapeMetricCount, countScrapeMetricsRM(got)) assert.Equal(t, want.Len(), got.Resource().Attributes().Len()) diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 72e68006c47e..2ba4a409585e 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -35,10 +35,10 @@ require ( github.com/stretchr/objx v0.1.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index 65b6d3638037..498f9b7cb3a5 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -184,23 +184,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 93a3b9e1327f..1db755c9617d 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 ) @@ -29,9 +29,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.1.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index 899738fcee8b..657841ac6409 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -182,22 +182,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index da9587f83cda..b72a41336bb7 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/go-redis/redis/v7 v7.4.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -38,9 +38,9 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index c01befecbf8e..b2578f780676 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -707,21 +707,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index db8ff9687a33..ea764af95a1e 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 github.com/signalfx/sapm-proto v0.9.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d ) require ( @@ -39,10 +39,10 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index bf9c37e11430..d25c77b99a38 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -836,34 +836,36 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/zpages v0.29.0/go.mod h1:iHy2K1Cjz1Ss0Sv6cQPEExP0nD+gj7gAF024foxzFFE= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 8996b11b5784..c36e8640a7a0 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,8 +11,8 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -59,10 +59,10 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 58ff9bad44ad..6a80b9f70bc8 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -275,24 +275,24 @@ go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 69ddacc29f34..6fb3cc3701a4 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d k8s.io/client-go v0.23.5 ) @@ -99,10 +99,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 9b640e8b107a..7e1cb5649da2 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1436,26 +1436,26 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/zpages v0.29.0 h1:rUnBzAxPP58lP7BApL21Ac2Fx8/5OflQa3sirlX0nQQ= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/exporters/prometheus v0.27.0 h1:HcGi6HmYRuszR3stcvN2GctJjQtvp44nw/VdfJCo/Ec= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/sdk/metric v0.27.0 h1:CDEu96Js5IP7f4bJ8eimxF09V5hKYmE7CeyKSjmAL1s= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index 69e98b53eed1..0ac383b2ebde 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/gorilla/mux v1.8.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.45.0 google.golang.org/protobuf v1.27.1 @@ -36,12 +36,12 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/zap v1.21.0 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index 19bd606777b6..a5df6465e0c8 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -318,25 +318,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/skywalkingreceiver/skywalkingproto_to_traces.go b/receiver/skywalkingreceiver/skywalkingproto_to_traces.go index 87032c248fd9..7c1d4181a09e 100644 --- a/receiver/skywalkingreceiver/skywalkingproto_to_traces.go +++ b/receiver/skywalkingreceiver/skywalkingproto_to_traces.go @@ -219,7 +219,7 @@ func swLogsToSpanEvents(logs []*agentV3.Log, dest pdata.SpanEventSlice) { } } -func swKvPairsToInternalAttributes(pairs []*common.KeyStringValuePair, dest pdata.AttributeMap) { +func swKvPairsToInternalAttributes(pairs []*common.KeyStringValuePair, dest pdata.Map) { if pairs == nil { return } diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index d2d24de9c920..48544a1c569e 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -38,10 +38,10 @@ require ( github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 78866064918d..84cb1866f9c6 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -193,24 +193,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/splunkhecreceiver/splunkhec_to_metricdata.go b/receiver/splunkhecreceiver/splunkhec_to_metricdata.go index 79d9198f72d9..4d4357d7befa 100644 --- a/receiver/splunkhecreceiver/splunkhec_to_metricdata.go +++ b/receiver/splunkhecreceiver/splunkhec_to_metricdata.go @@ -91,7 +91,7 @@ func splunkHecToMetricsData(logger *zap.Logger, events []*splunk.Event, resource return md, numDroppedTimeSeries } -func convertString(logger *zap.Logger, numDroppedTimeSeries *int, metrics pdata.MetricSlice, metricName string, pointTimestamp pdata.Timestamp, s string, attributes pdata.AttributeMap) { +func convertString(logger *zap.Logger, numDroppedTimeSeries *int, metrics pdata.MetricSlice, metricName string, pointTimestamp pdata.Timestamp, s string, attributes pdata.Map) { // best effort, cast to string and turn into a number dbl, err := strconv.ParseFloat(s, 64) if err != nil { @@ -103,7 +103,7 @@ func convertString(logger *zap.Logger, numDroppedTimeSeries *int, metrics pdata. } } -func addIntGauge(metrics pdata.MetricSlice, metricName string, value int64, ts pdata.Timestamp, attributes pdata.AttributeMap) { +func addIntGauge(metrics pdata.MetricSlice, metricName string, value int64, ts pdata.Timestamp, attributes pdata.Map) { metric := metrics.AppendEmpty() metric.SetName(metricName) metric.SetDataType(pdata.MetricDataTypeGauge) @@ -113,7 +113,7 @@ func addIntGauge(metrics pdata.MetricSlice, metricName string, value int64, ts p attributes.CopyTo(intPt.Attributes()) } -func addDoubleGauge(metrics pdata.MetricSlice, metricName string, value float64, ts pdata.Timestamp, attributes pdata.AttributeMap) { +func addDoubleGauge(metrics pdata.MetricSlice, metricName string, value float64, ts pdata.Timestamp, attributes pdata.Map) { metric := metrics.AppendEmpty() metric.SetName(metricName) metric.SetDataType(pdata.MetricDataTypeGauge) @@ -132,8 +132,8 @@ func convertTimestamp(sec *float64) pdata.Timestamp { } // Extract dimensions from the Splunk event fields to populate metric data point attributes. -func buildAttributes(dimensions map[string]interface{}) pdata.AttributeMap { - attributes := pdata.NewAttributeMap() +func buildAttributes(dimensions map[string]interface{}) pdata.Map { + attributes := pdata.NewMap() attributes.EnsureCapacity(len(dimensions)) for key, val := range dimensions { diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 78cfabd7f31c..108f69266580 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.opentelemetry.io/otel v1.5.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/sdk v1.4.1 // indirect + go.opentelemetry.io/otel/sdk v1.5.0 // indirect go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index f108c66f7e21..a945a6a28705 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -167,24 +167,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= +go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index c6aaef13f349..77cf679f88ca 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.47.0 github.com/open-telemetry/opentelemetry-log-collection v0.27.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index d3128768fcec..288234aba865 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -194,11 +194,11 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= @@ -207,7 +207,7 @@ go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbD go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index f81687e98319..6464fa04b951 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.47.0 github.com/open-telemetry/opentelemetry-log-collection v0.27.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d gopkg.in/yaml.v2 v2.4.0 ) @@ -28,7 +28,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect go.opentelemetry.io/otel/trace v1.5.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 7b90c00fb795..8131b70ba160 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -191,11 +191,11 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= @@ -204,7 +204,7 @@ go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbD go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 7985b57efad8..bc61ec1d6e5a 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.47.0 github.com/open-telemetry/opentelemetry-log-collection v0.27.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d gopkg.in/yaml.v2 v2.4.0 ) @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect go.opentelemetry.io/otel/trace v1.5.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 7fc85352ccac..02ebec8728af 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -189,11 +189,11 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= @@ -202,7 +202,7 @@ go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbD go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 74c1e272690a..8a21c8510682 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/protobuf v1.27.1 ) @@ -27,10 +27,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 914955041e7b..7d6e7f1fc338 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -164,23 +164,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 12f6ebc64b15..78f56396badd 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 @@ -26,9 +26,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index d6c97df3f335..b66675c93484 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -166,23 +166,23 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 1895e903aa4d..e09f16480016 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.47.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d google.golang.org/protobuf v1.27.1 ) @@ -39,10 +39,10 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 1bee3fbcbb88..8fb36e1dbe68 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -244,24 +244,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index 37d348fdca8b..0b895f78e250 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -403,17 +403,17 @@ func TestReceiverConvertsStringsToTypes(t *testing.T) { td := next.AllTraces()[0] span := td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0) - expected := pdata.NewAttributeMapFromMap(map[string]pdata.Value{ - "cache_hit": pdata.NewValueBool(true), - "ping_count": pdata.NewValueInt(25), - "timeout": pdata.NewValueDouble(12.3), - "clnt/finagle.version": pdata.NewValueString("6.45.0"), - "http.path": pdata.NewValueString("/api"), - "http.status_code": pdata.NewValueInt(500), - "net.host.ip": pdata.NewValueString("7::80:807f"), - "peer.service": pdata.NewValueString("backend"), - "net.peer.ip": pdata.NewValueString("192.168.99.101"), - "net.peer.port": pdata.NewValueInt(9000), + expected := pdata.NewMapFromRaw(map[string]interface{}{ + "cache_hit": true, + "ping_count": 25, + "timeout": 12.3, + "clnt/finagle.version": "6.45.0", + "http.path": "/api", + "http.status_code": 500, + "net.host.ip": "7::80:807f", + "peer.service": "backend", + "net.peer.ip": "192.168.99.101", + "net.peer.port": 9000, }).Sort() actual := span.Attributes().Sort() diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 8bd506bda89a..1b0b9d2c09ae 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.47.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.47.0 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -39,9 +39,9 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index 4f56a5cdc366..2d126e15a1e5 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -697,21 +697,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/testbed/correctnesstests/metrics/metric_diff.go b/testbed/correctnesstests/metrics/metric_diff.go index 942156b71979..40f14b708322 100644 --- a/testbed/correctnesstests/metrics/metric_diff.go +++ b/testbed/correctnesstests/metrics/metric_diff.go @@ -209,7 +209,7 @@ func diffResource(diffs []*MetricDiff, expected pdata.Resource, actual pdata.Res return diffAttrs(diffs, expected.Attributes(), actual.Attributes()) } -func diffAttrs(diffs []*MetricDiff, expected pdata.AttributeMap, actual pdata.AttributeMap) []*MetricDiff { +func diffAttrs(diffs []*MetricDiff, expected pdata.Map, actual pdata.Map) []*MetricDiff { if !reflect.DeepEqual(expected, actual) { diffs = append(diffs, &MetricDiff{ ExpectedValue: attrMapToString(expected), @@ -241,7 +241,7 @@ func diffValues( return diffs, false } -func attrMapToString(m pdata.AttributeMap) string { +func attrMapToString(m pdata.Map) string { out := "" m.Range(func(k string, v pdata.Value) bool { out += "[" + k + "=" + v.StringVal() + "]" diff --git a/testbed/go.mod b/testbed/go.mod index 1c66bfc7305c..cf12d4fb73bc 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -26,8 +26,8 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/shirou/gopsutil/v3 v3.22.2 github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 golang.org/x/text v0.3.7 diff --git a/testbed/go.sum b/testbed/go.sum index a102bfcc1a0c..d97de14110c0 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1680,15 +1680,14 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.46.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.47.0/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0 h1:3rCOYB0P/u0/MXyLGuRuc/VdBsQuxKgj/dvIpVI0lS4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= @@ -1706,7 +1705,6 @@ go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/on go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= -go.opentelemetry.io/otel/sdk v1.4.1/go.mod h1:NBwHDgDIBYjwK2WNu1OPgsIc2IJzmBXNnvIJxJc8BpE= go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= go.opentelemetry.io/otel/sdk/metric v0.27.0 h1:CDEu96Js5IP7f4bJ8eimxF09V5hKYmE7CeyKSjmAL1s= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 2525170f0e3f..4f59f3fdacaf 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 - go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 + go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d + go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d go.uber.org/zap v1.21.0 ) @@ -21,9 +21,9 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect + go.opentelemetry.io/otel v1.5.0 // indirect go.opentelemetry.io/otel/metric v0.27.0 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect + go.opentelemetry.io/otel/trace v1.5.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index 6daf237ddf4c..bf610f19482f 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -141,28 +141,28 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8 h1:PKsGQ0x3HubXExLAm1M/b8/0xC7FqYXoJg3kNsviY8M= -go.opentelemetry.io/collector v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:jIdx4BySsmKANBZYlTsigZT/I+vGsAhJIHTYjsx7/O8= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8 h1:XqAgf8uUyJ5zZnjcx623Ip53JPOwaL68F7SjYNAALfI= -go.opentelemetry.io/collector/model v0.47.1-0.20220316214317-e6ea17cf27a8/go.mod h1:tyZ1XdPtljZ9I09pJGcz5ktV9G1AAZ/HDmf6YOMHebc= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d h1:ihJIF/K2gHugtV1fRoDNUw/RCQpJgJlUU8XarO/DFj0= +go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:Tvs4ENTWbcw7QwYGwjt/6qbo50aC4fZhdUM6rGFZP/g= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d h1:8WCd6n3UAW46NLsDjYd9q76LlKQdwKO//RMjaA54zik= +go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d/go.mod h1:t1yrdghbK9nzhJSCRvFbgtpEiC3kcplkbtJpgMXc2X8= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= +go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= +go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= go.opentelemetry.io/otel/internal/metric v0.27.0 h1:9dAVGAfFiiEq5NVB9FUJ5et+btbDQAUIJehJ+ikyryk= go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= go.opentelemetry.io/otel/metric v0.27.0 h1:HhJPsGhJoKRSegPQILFbODU56NS/L1UE4fS1sC5kIwQ= go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= -go.opentelemetry.io/otel/sdk v1.4.1 h1:J7EaW71E0v87qflB4cDolaqq3AcujGrtyIPGQoZOB0Y= +go.opentelemetry.io/otel/sdk v1.5.0 h1:QKhWBbcOC9fDCZKCfPFjWTWpfIlJR+i9xiUDYrLVmZs= go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/testbed/testbed/validator.go b/testbed/testbed/validator.go index dea2567e3e00..eca4a083c4f0 100644 --- a/testbed/testbed/validator.go +++ b/testbed/testbed/validator.go @@ -415,7 +415,7 @@ func (v *CorrectnessTestValidator) diffSpanStatus(sentSpan pdata.Span, recdSpan } func (v *CorrectnessTestValidator) diffAttributeMap(spanName string, - sentAttrs pdata.AttributeMap, recdAttrs pdata.AttributeMap, fmtStr string) { + sentAttrs pdata.Map, recdAttrs pdata.Map, fmtStr string) { sentAttrs.Range(func(sentKey string, sentVal pdata.Value) bool { recdVal, ok := recdAttrs.Get(sentKey) if !ok {