diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 6842c9b44f1d..4e216cafcc71 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 golang.org/x/text v0.3.7 ) @@ -563,8 +563,8 @@ require ( go.mongodb.org/atlas v0.16.0 // indirect go.mongodb.org/mongo-driver v1.10.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/contrib/zpages v0.36.0 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 871c24221e81..9e53090731fc 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2038,18 +2038,18 @@ 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.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.60.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.60.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index a73d9d0e8934..29a2b932df45 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.11.1 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 8232558bb0fb..363e66cad929 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -274,10 +274,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= 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.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/cmd/mdatagen/loader.go b/cmd/mdatagen/loader.go index 8042ad0c24f4..98f712b3fd29 100644 --- a/cmd/mdatagen/loader.go +++ b/cmd/mdatagen/loader.go @@ -61,7 +61,7 @@ func (mvt *ValueType) UnmarshalText(text []byte) error { case "": mvt.ValueType = pcommon.ValueTypeEmpty case "string": - mvt.ValueType = pcommon.ValueTypeString + mvt.ValueType = pcommon.ValueTypeStr case "int": mvt.ValueType = pcommon.ValueTypeInt case "double": @@ -84,7 +84,7 @@ func (mvt ValueType) String() string { // Primitive returns name of primitive type for the ValueType. func (mvt ValueType) Primitive() string { switch mvt.ValueType { - case pcommon.ValueTypeString: + case pcommon.ValueTypeStr: return "string" case pcommon.ValueTypeInt: return "int64" diff --git a/confmap/provider/s3mapprovider/go.mod b/confmap/provider/s3mapprovider/go.mod index a37012bf8485..056b84e31d8c 100644 --- a/confmap/provider/s3mapprovider/go.mod +++ b/confmap/provider/s3mapprovider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.10.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/confmap/provider/s3mapprovider/go.sum b/confmap/provider/s3mapprovider/go.sum index 4a600bc05557..205efadde103 100644 --- a/confmap/provider/s3mapprovider/go.sum +++ b/confmap/provider/s3mapprovider/go.sum @@ -270,8 +270,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 4cefd2b384ad..4c3de56f9665 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,9 +7,9 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index df5157f802de..6bc60fa515c6 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -409,12 +409,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go index c1ffb6d7b36c..62993abe4e98 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go @@ -39,7 +39,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs { for i := 0; i < numberOfLogs; i++ { ts := pcommon.Timestamp(int64(i) * time.Millisecond.Nanoseconds()) logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(conventions.AttributeServiceName, "myapp") logRecord.Attributes().PutString("my-label", "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go index b83b10c61c8e..e4b83889cee8 100644 --- a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go @@ -32,7 +32,7 @@ func fillComplexAttributeValueMap(m pcommon.Map) { m.PutDouble("value", 1.3) m.PutInt("code", 200) m.PutEmpty("null") - m.PutEmptySlice("array").AppendEmpty().SetStringVal("array") + m.PutEmptySlice("array").AppendEmpty().SetStr("array") m.PutEmptyMap("map").PutString("data", "hello world") m.PutString("status", "ok") } @@ -55,21 +55,21 @@ func createLogData(numberOfLogs int) plog.Logs { case 0: // do nothing, left body null case 1: - logRecord.Body().SetBoolVal(true) + logRecord.Body().SetBool(true) case 2: - logRecord.Body().SetIntVal(2.0) + logRecord.Body().SetInt(2.0) case 3: - logRecord.Body().SetDoubleVal(3.0) + logRecord.Body().SetDouble(3.0) case 4: - logRecord.Body().SetStringVal("4") + logRecord.Body().SetStr("4") case 5: fillComplexAttributeValueMap(logRecord.Attributes().PutEmptyMap("map-value")) - logRecord.Body().SetStringVal("log contents") + logRecord.Body().SetStr("log contents") case 6: - logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStringVal("array") - logRecord.Body().SetStringVal("log contents") + logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStr("array") + logRecord.Body().SetStr("log contents") default: - logRecord.Body().SetStringVal("log contents") + logRecord.Body().SetStr("log contents") } logRecord.Attributes().PutString(conventions.AttributeServiceName, "myapp") logRecord.Attributes().PutString("my-label", "myapp-type") diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go index 7def446392e6..eae429a463f4 100644 --- a/exporter/awscloudwatchlogsexporter/exporter.go +++ b/exporter/awscloudwatchlogsexporter/exporter.go @@ -226,22 +226,22 @@ func attrsValue(attrs pcommon.Map) map[string]interface{} { func attrValue(value pcommon.Value) interface{} { switch value.Type() { case pcommon.ValueTypeInt: - return value.IntVal() + return value.Int() case pcommon.ValueTypeBool: - return value.BoolVal() + return value.Bool() case pcommon.ValueTypeDouble: - return value.DoubleVal() - case pcommon.ValueTypeString: - return value.StringVal() + return value.Double() + case pcommon.ValueTypeStr: + return value.Str() case pcommon.ValueTypeMap: values := map[string]interface{}{} - value.MapVal().Range(func(k string, v pcommon.Value) bool { + value.Map().Range(func(k string, v pcommon.Value) bool { values[k] = attrValue(v) return true }) return values case pcommon.ValueTypeSlice: - arrayVal := value.SliceVal() + arrayVal := value.Slice() values := make([]interface{}, arrayVal.Len()) for i := 0; i < arrayVal.Len(); i++ { values[i] = attrValue(arrayVal.At(i)) diff --git a/exporter/awscloudwatchlogsexporter/exporter_test.go b/exporter/awscloudwatchlogsexporter/exporter_test.go index 506ce430ac86..db903ce74b9a 100644 --- a/exporter/awscloudwatchlogsexporter/exporter_test.go +++ b/exporter/awscloudwatchlogsexporter/exporter_test.go @@ -129,7 +129,7 @@ func testLogRecord() plog.LogRecord { record.SetSeverityNumber(5) record.SetSeverityText("debug") record.SetDroppedAttributesCount(4) - record.Body().SetStringVal("hello world") + record.Body().SetStr("hello world") record.Attributes().PutInt("key1", 1) record.Attributes().PutString("key2", "attr2") record.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) @@ -144,7 +144,7 @@ func testLogRecordWithoutTrace() plog.LogRecord { record.SetSeverityNumber(5) record.SetSeverityText("debug") record.SetDroppedAttributesCount(4) - record.Body().SetStringVal("hello world") + record.Body().SetStr("hello world") record.Attributes().PutInt("key1", 1) record.Attributes().PutString("key2", "attr2") record.SetTimestamp(1609719139000000) @@ -181,7 +181,7 @@ func TestAttrValue(t *testing.T) { name: "map", value: func() pcommon.Value { mAttr := pcommon.NewValueMap() - m := mAttr.MapVal() + m := mAttr.Map() m.PutString("key1", "value1") m.PutEmpty("key2") m.PutBool("key3", true) @@ -201,7 +201,7 @@ func TestAttrValue(t *testing.T) { name: "array", value: func() pcommon.Value { arrAttr := pcommon.NewValueSlice() - arr := arrAttr.SliceVal() + arr := arrAttr.Slice() for _, av := range []pcommon.Value{ pcommon.NewValueDouble(1.2), pcommon.NewValueDouble(1.6), diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index a0030676baff..15de6d009c5b 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 004510d19281..dba1c758560c 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -275,10 +275,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go index 7b3dafeeec65..6c9f4c117b38 100644 --- a/exporter/awsemfexporter/emf_exporter.go +++ b/exporter/awsemfexporter/emf_exporter.go @@ -125,7 +125,7 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pmetric.Metrics) e am := rm.Resource().Attributes() if am.Len() > 0 { am.Range(func(k string, v pcommon.Value) bool { - labels[k] = v.StringVal() + labels[k] = v.Str() return true }) } diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 9761e81c05ff..25156cb59517 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -13,9 +13,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 9ecb21d1b1ee..124695537aa7 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -275,12 +275,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/awsemfexporter/metric_translator.go b/exporter/awsemfexporter/metric_translator.go index 006a0c9cce54..76c641a1ee73 100644 --- a/exporter/awsemfexporter/metric_translator.go +++ b/exporter/awsemfexporter/metric_translator.go @@ -108,7 +108,7 @@ func (mt metricTranslator) translateOTelToGroupedMetric(rm pmetric.ResourceMetri ilms := rm.ScopeMetrics() var metricReceiver string if receiver, ok := rm.Resource().Attributes().Get(attributeReceiver); ok { - metricReceiver = receiver.StringVal() + metricReceiver = receiver.Str() } for j := 0; j < ilms.Len(); j++ { ilm := ilms.At(j) diff --git a/exporter/awsemfexporter/util.go b/exporter/awsemfexporter/util.go index b5252801cb16..fb294ef6de0e 100644 --- a/exporter/awsemfexporter/util.go +++ b/exporter/awsemfexporter/util.go @@ -74,12 +74,12 @@ func getNamespace(rm pmetric.ResourceMetrics, namespace string) string { serviceName, svcNameOk := rm.Resource().Attributes().Get(conventions.AttributeServiceName) serviceNamespace, svcNsOk := rm.Resource().Attributes().Get(conventions.AttributeServiceNamespace) switch { - case svcNameOk && svcNsOk && serviceName.Type() == pcommon.ValueTypeString && serviceNamespace.Type() == pcommon.ValueTypeString: - namespace = fmt.Sprintf("%s/%s", serviceNamespace.StringVal(), serviceName.StringVal()) - case svcNameOk && serviceName.Type() == pcommon.ValueTypeString: - namespace = serviceName.StringVal() - case svcNsOk && serviceNamespace.Type() == pcommon.ValueTypeString: - namespace = serviceNamespace.StringVal() + case svcNameOk && svcNsOk && serviceName.Type() == pcommon.ValueTypeStr && serviceNamespace.Type() == pcommon.ValueTypeStr: + namespace = fmt.Sprintf("%s/%s", serviceNamespace.Str(), serviceName.Str()) + case svcNameOk && serviceName.Type() == pcommon.ValueTypeStr: + namespace = serviceName.Str() + case svcNsOk && serviceNamespace.Type() == pcommon.ValueTypeStr: + namespace = serviceNamespace.Str() } } diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index a41ba2d8d570..341c229ebc73 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -14,8 +14,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -50,7 +50,7 @@ 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/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 77c961b3383a..e8a0b5ed9525 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -356,12 +356,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 99a9e32fe409..bfe0585454ac 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index e57521c5a088..769e6d55289c 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -277,12 +277,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/awsxrayexporter/internal/translator/aws.go b/exporter/awsxrayexporter/internal/translator/aws.go index 9aabd005244b..90586a942e0e 100644 --- a/exporter/awsxrayexporter/internal/translator/aws.go +++ b/exporter/awsxrayexporter/internal/translator/aws.go @@ -69,65 +69,65 @@ func makeAws(attributes map[string]pcommon.Value, resource pcommon.Resource) (ma resource.Attributes().Range(func(key string, value pcommon.Value) bool { switch key { case conventions.AttributeCloudProvider: - cloud = value.StringVal() + cloud = value.Str() case conventions.AttributeCloudPlatform: - service = value.StringVal() + service = value.Str() case conventions.AttributeCloudAccountID: - account = value.StringVal() + account = value.Str() case conventions.AttributeCloudAvailabilityZone: - zone = value.StringVal() + zone = value.Str() case conventions.AttributeHostID: - hostID = value.StringVal() + hostID = value.Str() case conventions.AttributeHostType: - hostType = value.StringVal() + hostType = value.Str() case conventions.AttributeHostImageID: - amiID = value.StringVal() + amiID = value.Str() case conventions.AttributeContainerName: if container == "" { - container = value.StringVal() + container = value.Str() } case conventions.AttributeK8SPodName: - podUID = value.StringVal() + podUID = value.Str() case conventions.AttributeServiceNamespace: - namespace = value.StringVal() + namespace = value.Str() case conventions.AttributeServiceInstanceID: - deployID = value.StringVal() + deployID = value.Str() case conventions.AttributeServiceVersion: - versionLabel = value.StringVal() + versionLabel = value.Str() case conventions.AttributeTelemetrySDKName: - sdkName = value.StringVal() + sdkName = value.Str() case conventions.AttributeTelemetrySDKLanguage: - sdkLanguage = value.StringVal() + sdkLanguage = value.Str() case conventions.AttributeTelemetrySDKVersion: - sdkVersion = value.StringVal() + sdkVersion = value.Str() case conventions.AttributeTelemetryAutoVersion: - autoVersion = value.StringVal() + autoVersion = value.Str() case conventions.AttributeContainerID: - containerID = value.StringVal() + containerID = value.Str() case conventions.AttributeK8SClusterName: - clusterName = value.StringVal() + clusterName = value.Str() case conventions.AttributeAWSECSClusterARN: - clusterArn = value.StringVal() + clusterArn = value.Str() case conventions.AttributeAWSECSContainerARN: - containerArn = value.StringVal() + containerArn = value.Str() case conventions.AttributeAWSECSTaskARN: - taskArn = value.StringVal() + taskArn = value.Str() case conventions.AttributeAWSECSTaskFamily: - taskFamily = value.StringVal() + taskFamily = value.Str() case conventions.AttributeAWSECSLaunchtype: - launchType = value.StringVal() + launchType = value.Str() case conventions.AttributeAWSLogGroupNames: - logGroups = value.SliceVal() + logGroups = value.Slice() case conventions.AttributeAWSLogGroupARNs: - logGroupArns = value.SliceVal() + logGroupArns = value.Slice() } return true }) if awsOperation, ok := attributes[awsxray.AWSOperationAttribute]; ok { - operation = awsOperation.StringVal() + operation = awsOperation.Str() } else if rpcMethod, ok := attributes[conventions.AttributeRPCMethod]; ok { - operation = rpcMethod.StringVal() + operation = rpcMethod.Str() } for key, value := range attributes { @@ -138,22 +138,22 @@ func makeAws(attributes map[string]pcommon.Value, resource pcommon.Resource) (ma // Determinstically handled with if else above case awsxray.AWSAccountAttribute: if value.Type() != pcommon.ValueTypeEmpty { - account = value.StringVal() + account = value.Str() } case awsxray.AWSRegionAttribute: - remoteRegion = value.StringVal() + remoteRegion = value.Str() case awsxray.AWSRequestIDAttribute: fallthrough case awsxray.AWSRequestIDAttribute2: - requestID = value.StringVal() + requestID = value.Str() case awsxray.AWSQueueURLAttribute: fallthrough case awsxray.AWSQueueURLAttribute2: - queueURL = value.StringVal() + queueURL = value.Str() case awsxray.AWSTableNameAttribute: fallthrough case awsxray.AWSTableNameAttribute2: - tableName = value.StringVal() + tableName = value.Str() default: filtered[key] = value } @@ -256,12 +256,12 @@ func getLogGroupMetadata(logGroups pcommon.Slice, isArn bool) []awsxray.LogGroup for i := 0; i < logGroups.Len(); i++ { if isArn { lgm = append(lgm, awsxray.LogGroupMetadata{ - Arn: awsxray.String(logGroups.At(i).StringVal()), - LogGroup: awsxray.String(parseLogGroup(logGroups.At(i).StringVal())), + Arn: awsxray.String(logGroups.At(i).Str()), + LogGroup: awsxray.String(parseLogGroup(logGroups.At(i).Str())), }) } else { lgm = append(lgm, awsxray.LogGroupMetadata{ - LogGroup: awsxray.String(logGroups.At(i).StringVal()), + LogGroup: awsxray.String(logGroups.At(i).Str()), }) } } diff --git a/exporter/awsxrayexporter/internal/translator/aws_test.go b/exporter/awsxrayexporter/internal/translator/aws_test.go index a4d1c0b82f76..3bb5d7d29447 100644 --- a/exporter/awsxrayexporter/internal/translator/aws_test.go +++ b/exporter/awsxrayexporter/internal/translator/aws_test.go @@ -376,8 +376,8 @@ func TestLogGroups(t *testing.T) { resource := pcommon.NewResource() ava := resource.Attributes().PutEmptySlice(conventions.AttributeAWSLogGroupNames) ava.EnsureCapacity(2) - ava.AppendEmpty().SetStringVal("group1") - ava.AppendEmpty().SetStringVal("group2") + ava.AppendEmpty().SetStr("group1") + ava.AppendEmpty().SetStr("group2") filtered, awsData := makeAws(attributes, resource) @@ -404,8 +404,8 @@ func TestLogGroupsFromArns(t *testing.T) { resource := pcommon.NewResource() ava := resource.Attributes().PutEmptySlice(conventions.AttributeAWSLogGroupARNs) ava.EnsureCapacity(2) - ava.AppendEmpty().SetStringVal(group1) - ava.AppendEmpty().SetStringVal(group2) + ava.AppendEmpty().SetStr(group1) + ava.AppendEmpty().SetStr(group2) filtered, awsData := makeAws(attributes, resource) diff --git a/exporter/awsxrayexporter/internal/translator/cause.go b/exporter/awsxrayexporter/internal/translator/cause.go index 4bc675cecfe7..1029b1eb054d 100644 --- a/exporter/awsxrayexporter/internal/translator/cause.go +++ b/exporter/awsxrayexporter/internal/translator/cause.go @@ -57,7 +57,7 @@ func makeCause(span ptrace.Span, attributes map[string]pcommon.Value, resource p case hasExceptions: language := "" if val, ok := resource.Attributes().Get(conventions.AttributeTelemetrySDKLanguage); ok { - language = val.StringVal() + language = val.Str() } var exceptions []awsxray.Exception @@ -69,15 +69,15 @@ func makeCause(span ptrace.Span, attributes map[string]pcommon.Value, resource p stacktrace := "" if val, ok := event.Attributes().Get(conventions.AttributeExceptionType); ok { - exceptionType = val.StringVal() + exceptionType = val.Str() } if val, ok := event.Attributes().Get(conventions.AttributeExceptionMessage); ok { - message = val.StringVal() + message = val.Str() } if val, ok := event.Attributes().Get(conventions.AttributeExceptionStacktrace); ok { - stacktrace = val.StringVal() + stacktrace = val.Str() } parsed := parseException(exceptionType, message, stacktrace, language) @@ -100,7 +100,7 @@ func makeCause(span ptrace.Span, attributes map[string]pcommon.Value, resource p switch key { case "http.status_text": if message == "" { - message = value.StringVal() + message = value.Str() } default: filtered[key] = value @@ -134,7 +134,7 @@ func makeCause(span ptrace.Span, attributes map[string]pcommon.Value, resource p isThrottle = false isFault = false case ok: - code := val.IntVal() + code := val.Int() // We only differentiate between faults (server errors) and errors (client errors) for HTTP spans. if code >= 400 && code <= 499 { isError = true diff --git a/exporter/awsxrayexporter/internal/translator/http.go b/exporter/awsxrayexporter/internal/translator/http.go index 25432b7daf70..09383542a67e 100644 --- a/exporter/awsxrayexporter/internal/translator/http.go +++ b/exporter/awsxrayexporter/internal/translator/http.go @@ -45,61 +45,61 @@ func makeHTTP(span ptrace.Span) (map[string]pcommon.Value, *awsxray.HTTPData) { span.Attributes().Range(func(key string, value pcommon.Value) bool { switch key { case conventions.AttributeHTTPMethod: - info.Request.Method = awsxray.String(value.StringVal()) + info.Request.Method = awsxray.String(value.Str()) hasHTTP = true case conventions.AttributeHTTPClientIP: - info.Request.ClientIP = awsxray.String(value.StringVal()) + info.Request.ClientIP = awsxray.String(value.Str()) info.Request.XForwardedFor = aws.Bool(true) hasHTTP = true case conventions.AttributeHTTPUserAgent: - info.Request.UserAgent = awsxray.String(value.StringVal()) + info.Request.UserAgent = awsxray.String(value.Str()) hasHTTP = true case conventions.AttributeHTTPStatusCode: - info.Response.Status = aws.Int64(value.IntVal()) + info.Response.Status = aws.Int64(value.Int()) hasHTTP = true case conventions.AttributeHTTPURL: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTP = true hasHTTPRequestURLAttributes = true case conventions.AttributeHTTPScheme: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTP = true case conventions.AttributeHTTPHost: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTP = true hasHTTPRequestURLAttributes = true case conventions.AttributeHTTPTarget: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTP = true case conventions.AttributeHTTPServerName: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTP = true hasHTTPRequestURLAttributes = true case conventions.AttributeNetHostPort: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTP = true if len(urlParts[key]) == 0 { - urlParts[key] = strconv.FormatInt(value.IntVal(), 10) + urlParts[key] = strconv.FormatInt(value.Int(), 10) } case conventions.AttributeHostName: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTPRequestURLAttributes = true case conventions.AttributeNetHostName: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTPRequestURLAttributes = true case conventions.AttributeNetPeerName: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() case conventions.AttributeNetPeerPort: - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() if len(urlParts[key]) == 0 { - urlParts[key] = strconv.FormatInt(value.IntVal(), 10) + urlParts[key] = strconv.FormatInt(value.Int(), 10) } case conventions.AttributeNetPeerIP: // Prefer HTTP forwarded information (AttributeHTTPClientIP) when present. if info.Request.ClientIP == nil { - info.Request.ClientIP = awsxray.String(value.StringVal()) + info.Request.ClientIP = awsxray.String(value.Str()) } - urlParts[key] = value.StringVal() + urlParts[key] = value.Str() hasHTTPRequestURLAttributes = true default: filtered[key] = value @@ -143,9 +143,9 @@ func extractResponseSizeFromEvents(span ptrace.Span) int64 { func extractResponseSizeFromAttributes(attributes pcommon.Map) int64 { typeVal, ok := attributes.Get("message.type") - if ok && typeVal.StringVal() == "RECEIVED" { + if ok && typeVal.Str() == "RECEIVED" { if sizeVal, ok := attributes.Get(conventions.AttributeMessagingMessagePayloadSizeBytes); ok { - return sizeVal.IntVal() + return sizeVal.Int() } } return 0 diff --git a/exporter/awsxrayexporter/internal/translator/segment.go b/exporter/awsxrayexporter/internal/translator/segment.go index f5c8402c458b..b2ca8baa1055 100644 --- a/exporter/awsxrayexporter/internal/translator/segment.go +++ b/exporter/awsxrayexporter/internal/translator/segment.go @@ -118,12 +118,12 @@ func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []str // peer.service should always be prioritized for segment names when set because it is what the user decided. if peerService, ok := attributes.Get(conventions.AttributePeerService); ok { - name = peerService.StringVal() + name = peerService.Str() } if namespace == "" { if rpcSystem, ok := attributes.Get(conventions.AttributeRPCSystem); ok { - if rpcSystem.StringVal() == "aws-api" { + if rpcSystem.Str() == "aws-api" { namespace = conventions.AttributeCloudProviderAWS } } @@ -133,7 +133,7 @@ func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []str if awsService, ok := attributes.Get(awsxray.AWSServiceAttribute); ok { // Generally spans are named something like "Method" or "Service.Method" but for AWS spans, X-Ray expects spans // to be named "Service" - name = awsService.StringVal() + name = awsService.Str() if namespace == "" { namespace = conventions.AttributeCloudProviderAWS @@ -144,9 +144,9 @@ func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []str if name == "" { if dbInstance, ok := attributes.Get(conventions.AttributeDBName); ok { // For database queries, the segment name convention is @ - name = dbInstance.StringVal() + name = dbInstance.Str() if dbURL, ok := attributes.Get(conventions.AttributeDBConnectionString); ok { - if parsed, _ := url.Parse(dbURL.StringVal()); parsed != nil { + if parsed, _ := url.Parse(dbURL.Str()); parsed != nil { if parsed.Hostname() != "" { name += "@" + parsed.Hostname() } @@ -158,25 +158,25 @@ func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []str if name == "" && span.Kind() == ptrace.SpanKindServer { // Only for a server span, we can use the resource. if service, ok := resource.Attributes().Get(conventions.AttributeServiceName); ok { - name = service.StringVal() + name = service.Str() } } if name == "" { if rpcservice, ok := attributes.Get(conventions.AttributeRPCService); ok { - name = rpcservice.StringVal() + name = rpcservice.Str() } } if name == "" { if host, ok := attributes.Get(conventions.AttributeHTTPHost); ok { - name = host.StringVal() + name = host.Str() } } if name == "" { if peer, ok := attributes.Get(conventions.AttributeNetPeerName); ok { - name = peer.StringVal() + name = peer.Str() } } @@ -228,13 +228,13 @@ func determineAwsOrigin(resource pcommon.Resource) string { } if provider, ok := resource.Attributes().Get(conventions.AttributeCloudProvider); ok { - if provider.StringVal() != conventions.AttributeCloudProviderAWS { + if provider.Str() != conventions.AttributeCloudProviderAWS { return "" } } if is, present := resource.Attributes().Get(conventions.AttributeCloudPlatform); present { - switch is.StringVal() { + switch is.Str() { case conventions.AttributeCloudPlatformAWSAppRunner: return OriginAppRunner case conventions.AttributeCloudPlatformAWSEKS: @@ -246,7 +246,7 @@ func determineAwsOrigin(resource pcommon.Resource) string { if !present { return OriginECS } - switch lt.StringVal() { + switch lt.Str() { case conventions.AttributeAWSECSLaunchtypeEC2: return OriginECSEC2 case conventions.AttributeAWSECSLaunchtypeFargate: @@ -328,7 +328,7 @@ func makeXRayAttributes(attributes map[string]pcommon.Value, resource pcommon.Re ) userid, ok := attributes[conventions.AttributeEnduserID] if ok { - user = userid.StringVal() + user = userid.Str() delete(attributes, conventions.AttributeEnduserID) } @@ -397,37 +397,37 @@ func makeXRayAttributes(attributes map[string]pcommon.Value, resource pcommon.Re func annotationValue(value pcommon.Value) interface{} { switch value.Type() { - case pcommon.ValueTypeString: - return value.StringVal() + case pcommon.ValueTypeStr: + return value.Str() case pcommon.ValueTypeInt: - return value.IntVal() + return value.Int() case pcommon.ValueTypeDouble: - return value.DoubleVal() + return value.Double() case pcommon.ValueTypeBool: - return value.BoolVal() + return value.Bool() } return nil } func metadataValue(value pcommon.Value) interface{} { switch value.Type() { - case pcommon.ValueTypeString: - return value.StringVal() + case pcommon.ValueTypeStr: + return value.Str() case pcommon.ValueTypeInt: - return value.IntVal() + return value.Int() case pcommon.ValueTypeDouble: - return value.DoubleVal() + return value.Double() case pcommon.ValueTypeBool: - return value.BoolVal() + return value.Bool() case pcommon.ValueTypeMap: converted := map[string]interface{}{} - value.MapVal().Range(func(key string, value pcommon.Value) bool { + value.Map().Range(func(key string, value pcommon.Value) bool { converted[key] = metadataValue(value) return true }) return converted case pcommon.ValueTypeSlice: - arrVal := value.SliceVal() + arrVal := value.Slice() converted := make([]interface{}, arrVal.Len()) for i := 0; i < arrVal.Len(); i++ { converted[i] = metadataValue(arrVal.At(i)) diff --git a/exporter/awsxrayexporter/internal/translator/segment_test.go b/exporter/awsxrayexporter/internal/translator/segment_test.go index c85e198e316e..282a589307f3 100644 --- a/exporter/awsxrayexporter/internal/translator/segment_test.go +++ b/exporter/awsxrayexporter/internal/translator/segment_test.go @@ -741,9 +741,9 @@ func TestFilteredAttributesMetadata(t *testing.T) { attrs.PutEmpty("null_value") arrayValue := attrs.PutEmptySlice("array_value") - arrayValue.AppendEmpty().SetIntVal(12) - arrayValue.AppendEmpty().SetIntVal(34) - arrayValue.AppendEmpty().SetIntVal(56) + arrayValue.AppendEmpty().SetInt(12) + arrayValue.AppendEmpty().SetInt(34) + arrayValue.AppendEmpty().SetInt(56) mapValue := attrs.PutEmptyMap("map_value") mapValue.PutDouble("value1", -987.65) @@ -858,8 +858,8 @@ func constructDefaultResource() pcommon.Resource { resourceMap.PutString("key2", "value") resourceArray := attrs.PutEmptySlice(resourceArrayKey) - resourceArray.AppendEmpty().SetStringVal("foo") - resourceArray.AppendEmpty().SetStringVal("bar") + resourceArray.AppendEmpty().SetStr("foo") + resourceArray.AppendEmpty().SetStr("bar") return resource } diff --git a/exporter/awsxrayexporter/internal/translator/service.go b/exporter/awsxrayexporter/internal/translator/service.go index a4bdc680eede..ea3d81f5aa10 100644 --- a/exporter/awsxrayexporter/internal/translator/service.go +++ b/exporter/awsxrayexporter/internal/translator/service.go @@ -30,7 +30,7 @@ func makeService(resource pcommon.Resource) *awsxray.ServiceData { } if ok { service = &awsxray.ServiceData{ - Version: awsxray.String(verStr.StringVal()), + Version: awsxray.String(verStr.Str()), } } return service diff --git a/exporter/awsxrayexporter/internal/translator/sql.go b/exporter/awsxrayexporter/internal/translator/sql.go index ec953db8c709..4e3df142b4bf 100644 --- a/exporter/awsxrayexporter/internal/translator/sql.go +++ b/exporter/awsxrayexporter/internal/translator/sql.go @@ -35,15 +35,15 @@ func makeSQL(attributes map[string]pcommon.Value) (map[string]pcommon.Value, *aw for key, value := range attributes { switch key { case conventions.AttributeDBConnectionString: - dbURL = value.StringVal() + dbURL = value.Str() case conventions.AttributeDBSystem: - dbSystem = value.StringVal() + dbSystem = value.Str() case conventions.AttributeDBName: - dbInstance = value.StringVal() + dbInstance = value.Str() case conventions.AttributeDBStatement: - dbStatement = value.StringVal() + dbStatement = value.Str() case conventions.AttributeDBUser: - dbUser = value.StringVal() + dbUser = value.Str() default: filtered[key] = value } diff --git a/exporter/azuremonitorexporter/conventions.go b/exporter/azuremonitorexporter/conventions.go index 06e454bf2775..fabd23d0af0c 100644 --- a/exporter/azuremonitorexporter/conventions.go +++ b/exporter/azuremonitorexporter/conventions.go @@ -48,23 +48,23 @@ type NetworkAttributes struct { func (attrs *NetworkAttributes) MapAttribute(k string, v pcommon.Value) bool { switch k { case conventions.AttributeNetTransport: - attrs.NetTransport = v.StringVal() + attrs.NetTransport = v.Str() case conventions.AttributeNetPeerIP: - attrs.NetPeerIP = v.StringVal() + attrs.NetPeerIP = v.Str() case conventions.AttributeNetPeerPort: if val, err := getAttributeValueAsInt(v); err == nil { attrs.NetPeerPort = val } case conventions.AttributeNetPeerName: - attrs.NetPeerName = v.StringVal() + attrs.NetPeerName = v.Str() case conventions.AttributeNetHostIP: - attrs.NetHostIP = v.StringVal() + attrs.NetHostIP = v.Str() case conventions.AttributeNetHostPort: if val, err := getAttributeValueAsInt(v); err == nil { attrs.NetHostPort = val } case conventions.AttributeNetHostName: - attrs.NetHostName = v.StringVal() + attrs.NetHostName = v.Str() } return true } @@ -101,25 +101,25 @@ type HTTPAttributes struct { func (attrs *HTTPAttributes) MapAttribute(k string, v pcommon.Value) bool { switch k { case conventions.AttributeHTTPMethod: - attrs.HTTPMethod = v.StringVal() + attrs.HTTPMethod = v.Str() case conventions.AttributeHTTPURL: - attrs.HTTPURL = v.StringVal() + attrs.HTTPURL = v.Str() case conventions.AttributeHTTPTarget: - attrs.HTTPTarget = v.StringVal() + attrs.HTTPTarget = v.Str() case conventions.AttributeHTTPHost: - attrs.HTTPHost = v.StringVal() + attrs.HTTPHost = v.Str() case conventions.AttributeHTTPScheme: - attrs.HTTPScheme = v.StringVal() + attrs.HTTPScheme = v.Str() case conventions.AttributeHTTPStatusCode: if val, err := getAttributeValueAsInt(v); err == nil { attrs.HTTPStatusCode = val } case "http.status_text": - attrs.HTTPStatusText = v.StringVal() + attrs.HTTPStatusText = v.Str() case conventions.AttributeHTTPFlavor: - attrs.HTTPFlavor = v.StringVal() + attrs.HTTPFlavor = v.Str() case conventions.AttributeHTTPUserAgent: - attrs.HTTPUserAgent = v.StringVal() + attrs.HTTPUserAgent = v.Str() case conventions.AttributeHTTPRequestContentLength: if val, err := getAttributeValueAsInt(v); err == nil { attrs.HTTPRequestContentLength = val @@ -138,11 +138,11 @@ func (attrs *HTTPAttributes) MapAttribute(k string, v pcommon.Value) bool { } case conventions.AttributeHTTPRoute: - attrs.HTTPRoute = v.StringVal() + attrs.HTTPRoute = v.Str() case conventions.AttributeHTTPServerName: - attrs.HTTPServerName = v.StringVal() + attrs.HTTPServerName = v.Str() case conventions.AttributeHTTPClientIP: - attrs.HTTPClientIP = v.StringVal() + attrs.HTTPClientIP = v.Str() default: attrs.NetworkAttributes.MapAttribute(k, v) @@ -164,13 +164,13 @@ type RPCAttributes struct { func (attrs *RPCAttributes) MapAttribute(k string, v pcommon.Value) bool { switch k { case conventions.AttributeRPCSystem: - attrs.RPCSystem = v.StringVal() + attrs.RPCSystem = v.Str() case conventions.AttributeRPCService: - attrs.RPCService = v.StringVal() + attrs.RPCService = v.Str() case conventions.AttributeRPCMethod: - attrs.RPCMethod = v.StringVal() + attrs.RPCMethod = v.Str() case attributeRPCGRPCStatusCode: - attrs.RPCGRPCStatusCode = v.IntVal() + attrs.RPCGRPCStatusCode = v.Int() default: attrs.NetworkAttributes.MapAttribute(k, v) @@ -199,27 +199,27 @@ type DatabaseAttributes struct { func (attrs *DatabaseAttributes) MapAttribute(k string, v pcommon.Value) bool { switch k { case conventions.AttributeDBSystem: - attrs.DBSystem = v.StringVal() + attrs.DBSystem = v.Str() case conventions.AttributeDBConnectionString: - attrs.DBConnectionString = v.StringVal() + attrs.DBConnectionString = v.Str() case conventions.AttributeDBUser: - attrs.DBUser = v.StringVal() + attrs.DBUser = v.Str() case conventions.AttributeDBStatement: - attrs.DBStatement = v.StringVal() + attrs.DBStatement = v.Str() case conventions.AttributeDBOperation: - attrs.DBOperation = v.StringVal() + attrs.DBOperation = v.Str() case conventions.AttributeDBMSSQLInstanceName: - attrs.DBMSSQLInstanceName = v.StringVal() + attrs.DBMSSQLInstanceName = v.Str() case conventions.AttributeDBJDBCDriverClassname: - attrs.DBJDBCDriverClassName = v.StringVal() + attrs.DBJDBCDriverClassName = v.Str() case conventions.AttributeDBCassandraKeyspace: - attrs.DBCassandraKeyspace = v.StringVal() + attrs.DBCassandraKeyspace = v.Str() case conventions.AttributeDBHBaseNamespace: - attrs.DBHBaseNamespace = v.StringVal() + attrs.DBHBaseNamespace = v.Str() case conventions.AttributeDBRedisDBIndex: - attrs.DBRedisDatabaseIndex = v.StringVal() + attrs.DBRedisDatabaseIndex = v.Str() case conventions.AttributeDBMongoDBCollection: - attrs.DBMongoDBCollection = v.StringVal() + attrs.DBMongoDBCollection = v.Str() default: attrs.NetworkAttributes.MapAttribute(k, v) @@ -248,23 +248,23 @@ type MessagingAttributes struct { func (attrs *MessagingAttributes) MapAttribute(k string, v pcommon.Value) bool { switch k { case conventions.AttributeMessagingSystem: - attrs.MessagingSystem = v.StringVal() + attrs.MessagingSystem = v.Str() case conventions.AttributeMessagingDestination: - attrs.MessagingDestination = v.StringVal() + attrs.MessagingDestination = v.Str() case conventions.AttributeMessagingDestinationKind: - attrs.MessagingDestinationKind = v.StringVal() + attrs.MessagingDestinationKind = v.Str() case conventions.AttributeMessagingTempDestination: - attrs.MessagingTempDestination = v.StringVal() + attrs.MessagingTempDestination = v.Str() case conventions.AttributeMessagingProtocol: - attrs.MessagingProtocol = v.StringVal() + attrs.MessagingProtocol = v.Str() case conventions.AttributeMessagingProtocolVersion: - attrs.MessagingProtocolVersion = v.StringVal() + attrs.MessagingProtocolVersion = v.Str() case conventions.AttributeMessagingURL: - attrs.MessagingURL = v.StringVal() + attrs.MessagingURL = v.Str() case conventions.AttributeMessagingMessageID: - attrs.MessagingMessageID = v.StringVal() + attrs.MessagingMessageID = v.Str() case conventions.AttributeMessagingConversationID: - attrs.MessagingConversationID = v.StringVal() + attrs.MessagingConversationID = v.Str() case conventions.AttributeMessagingMessagePayloadSizeBytes: if val, err := getAttributeValueAsInt(v); err == nil { attrs.MessagingMessagePayloadSize = val @@ -274,7 +274,7 @@ func (attrs *MessagingAttributes) MapAttribute(k string, v pcommon.Value) bool { attrs.MessagingMessagePayloadCompressedSize = val } case conventions.AttributeMessagingOperation: - attrs.MessagingOperation = v.StringVal() + attrs.MessagingOperation = v.Str() default: attrs.NetworkAttributes.MapAttribute(k, v) @@ -285,13 +285,13 @@ func (attrs *MessagingAttributes) MapAttribute(k string, v pcommon.Value) bool { // Tries to return the value of the attribute as an int64 func getAttributeValueAsInt(attributeValue pcommon.Value) (int64, error) { switch attributeValue.Type() { - case pcommon.ValueTypeString: + case pcommon.ValueTypeStr: // try to cast the string values to int64 - if val, err := strconv.Atoi(attributeValue.StringVal()); err == nil { + if val, err := strconv.Atoi(attributeValue.Str()); err == nil { return int64(val), nil } case pcommon.ValueTypeInt: - return attributeValue.IntVal(), nil + return attributeValue.Int(), nil } return int64(0), errUnexpectedAttributeValueType diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 048df1ad2950..373a5f8ec083 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 golang.org/x/net v0.0.0-20220225172249-27dd8689420f ) diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 62ae0ac1a586..f8f803efb2da 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -288,12 +288,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/azuremonitorexporter/log_to_envelope.go b/exporter/azuremonitorexporter/log_to_envelope.go index 47c85d98222a..8e09647411bf 100644 --- a/exporter/azuremonitorexporter/log_to_envelope.go +++ b/exporter/azuremonitorexporter/log_to_envelope.go @@ -47,7 +47,7 @@ func (packer *logPacker) LogRecordToEnvelope(logRecord plog.LogRecord) *contract messageData.SeverityLevel = packer.toAiSeverityLevel(logRecord.SeverityText()) - messageData.Message = logRecord.Body().StringVal() + messageData.Message = logRecord.Body().Str() envelope.Tags[contracts.OperationId] = logRecord.TraceID().HexString() envelope.Tags[contracts.OperationParentId] = logRecord.SpanID().HexString() diff --git a/exporter/azuremonitorexporter/logexporter_test.go b/exporter/azuremonitorexporter/logexporter_test.go index c2f6a137fac1..5c05802ef40b 100644 --- a/exporter/azuremonitorexporter/logexporter_test.go +++ b/exporter/azuremonitorexporter/logexporter_test.go @@ -80,7 +80,7 @@ func TestLogRecordToEnvelope(t *testing.T) { require.NotNil(t, envelopeData.BaseData) messageData := envelopeData.BaseData.(*contracts.MessageData) - assert.Equal(t, messageData.Message, logRecord.Body().StringVal()) + assert.Equal(t, messageData.Message, logRecord.Body().Str()) assert.Equal(t, messageData.SeverityLevel, contracts.Information) hexTraceID := logRecord.TraceID().HexString() diff --git a/exporter/azuremonitorexporter/trace_to_envelope.go b/exporter/azuremonitorexporter/trace_to_envelope.go index bf3f68576d89..3aed1519758e 100644 --- a/exporter/azuremonitorexporter/trace_to_envelope.go +++ b/exporter/azuremonitorexporter/trace_to_envelope.go @@ -118,7 +118,7 @@ func spanToEnvelope( // Copy all the resource labels into the base data properties. Resource values are always strings resourceAttributes.Range(func(k string, v pcommon.Value) bool { - dataProperties[k] = v.StringVal() + dataProperties[k] = v.Str() return true }) @@ -134,17 +134,17 @@ func spanToEnvelope( // Extract key service.* labels from the Resource labels and construct CloudRole and CloudRoleInstance envelope tags // https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/resource/semantic_conventions if serviceName, serviceNameExists := resourceAttributes.Get(conventions.AttributeServiceName); serviceNameExists { - cloudRole := serviceName.StringVal() + cloudRole := serviceName.Str() if serviceNamespace, serviceNamespaceExists := resourceAttributes.Get(conventions.AttributeServiceNamespace); serviceNamespaceExists { - cloudRole = serviceNamespace.StringVal() + "." + cloudRole + cloudRole = serviceNamespace.Str() + "." + cloudRole } envelope.Tags[contracts.CloudRole] = cloudRole } if serviceInstance, exists := resourceAttributes.Get(conventions.AttributeServiceInstanceID); exists { - envelope.Tags[contracts.CloudRoleInstance] = serviceInstance.StringVal() + envelope.Tags[contracts.CloudRoleInstance] = serviceInstance.Str() } // Sanitize the base data, the envelope and envelope tags @@ -650,16 +650,16 @@ func setAttributeValueAsPropertyOrMeasurement( switch attributeValue.Type() { case pcommon.ValueTypeBool: - properties[key] = strconv.FormatBool(attributeValue.BoolVal()) + properties[key] = strconv.FormatBool(attributeValue.Bool()) - case pcommon.ValueTypeString: - properties[key] = attributeValue.StringVal() + case pcommon.ValueTypeStr: + properties[key] = attributeValue.Str() case pcommon.ValueTypeInt: - measurements[key] = float64(attributeValue.IntVal()) + measurements[key] = float64(attributeValue.Int()) case pcommon.ValueTypeDouble: - measurements[key] = attributeValue.DoubleVal() + measurements[key] = attributeValue.Double() } } diff --git a/exporter/azuremonitorexporter/trace_to_envelope_test.go b/exporter/azuremonitorexporter/trace_to_envelope_test.go index 0168507eecd8..71fab59fdbe0 100644 --- a/exporter/azuremonitorexporter/trace_to_envelope_test.go +++ b/exporter/azuremonitorexporter/trace_to_envelope_test.go @@ -658,22 +658,22 @@ func assertAttributesCopiedToPropertiesOrMeasurements( attributeMap.Range(func(k string, v pcommon.Value) bool { switch v.Type() { - case pcommon.ValueTypeString: + case pcommon.ValueTypeStr: p, exists := properties[k] assert.True(t, exists) - assert.Equal(t, v.StringVal(), p) + assert.Equal(t, v.Str(), p) case pcommon.ValueTypeBool: p, exists := properties[k] assert.True(t, exists) - assert.Equal(t, strconv.FormatBool(v.BoolVal()), p) + assert.Equal(t, strconv.FormatBool(v.Bool()), p) case pcommon.ValueTypeInt: m, exists := measurements[k] assert.True(t, exists) - assert.Equal(t, float64(v.IntVal()), m) + assert.Equal(t, float64(v.Int()), m) case pcommon.ValueTypeDouble: m, exists := measurements[k] assert.True(t, exists) - assert.Equal(t, v.DoubleVal(), m) + assert.Equal(t, v.Double(), m) } return true }) diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 8953d1cd83ba..cc9b9e595185 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 google.golang.org/protobuf v1.28.1 @@ -31,7 +31,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 43dc6d005b28..c915fcc29167 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -265,12 +265,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/clickhouseexporter/exporter.go b/exporter/clickhouseexporter/exporter.go index 06d4330436fb..47884aaa6b42 100644 --- a/exporter/clickhouseexporter/exporter.go +++ b/exporter/clickhouseexporter/exporter.go @@ -79,7 +79,7 @@ func (e *clickhouseExporter) pushLogsData(ctx context.Context, ld plog.Logs) err res := logs.Resource() resAttr := attributesToMap(res.Attributes()) if v, ok := res.Attributes().Get(conventions.AttributeServiceName); ok { - serviceName = v.StringVal() + serviceName = v.Str() } for j := 0; j < logs.ScopeLogs().Len(); j++ { rs := logs.ScopeLogs().At(j).LogRecords() @@ -115,7 +115,7 @@ func (e *clickhouseExporter) pushLogsData(ctx context.Context, ld plog.Logs) err func attributesToMap(attributes pcommon.Map) map[string]string { m := make(map[string]string, attributes.Len()) attributes.Range(func(k string, v pcommon.Value) bool { - m[k] = v.StringVal() + m[k] = v.Str() return true }) return m diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index e91d7708b142..af34c6557e00 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickh go 1.18 require ( - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -13,8 +13,8 @@ require go.uber.org/multierr v1.8.0 require ( github.com/ClickHouse/clickhouse-go/v2 v2.3.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index b76e0c90be51..b669f78a73f0 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -296,12 +296,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index c18e9bb7b7ba..f16939db100a 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 ) require ( github.com/coralogix/opentelemetry-cx-protobuf-api/coralogixpb v0.0.0-20211201100428-d2a5d0ecf53e github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc google.golang.org/grpc v1.49.0 @@ -43,7 +43,7 @@ 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/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index 33fe8193052c..c847922adf42 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -299,12 +299,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index b998a0a2e0de..b7d9610b73b2 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -21,9 +21,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.60.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index c4800f4c2038..e3e3469f7a69 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -625,12 +625,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= diff --git a/exporter/datadogexporter/internal/metadata/metadata.go b/exporter/datadogexporter/internal/metadata/metadata.go index 17a74a4705e0..4879c79c441e 100644 --- a/exporter/datadogexporter/internal/metadata/metadata.go +++ b/exporter/datadogexporter/internal/metadata/metadata.go @@ -121,16 +121,16 @@ func metadataFromAttributesWithRegistry(registry *featuregate.Registry, attrs pc // AWS EC2 resource metadata cloudProvider, ok := attrs.Get(conventions.AttributeCloudProvider) switch { - case ok && cloudProvider.StringVal() == conventions.AttributeCloudProviderAWS: + case ok && cloudProvider.Str() == conventions.AttributeCloudProviderAWS: ec2HostInfo := ec2Attributes.HostInfoFromAttributes(attrs) hm.Meta.InstanceID = ec2HostInfo.InstanceID hm.Meta.EC2Hostname = ec2HostInfo.EC2Hostname hm.Tags.OTel = append(hm.Tags.OTel, ec2HostInfo.EC2Tags...) - case ok && cloudProvider.StringVal() == conventions.AttributeCloudProviderGCP: + case ok && cloudProvider.Str() == conventions.AttributeCloudProviderGCP: gcpHostInfo := gcp.HostInfoFromAttributes(attrs, usePreviewHostnameLogic) hm.Tags.GCP = gcpHostInfo.GCPTags hm.Meta.HostAliases = append(hm.Meta.HostAliases, gcpHostInfo.HostAliases...) - case ok && cloudProvider.StringVal() == conventions.AttributeCloudProviderAzure: + case ok && cloudProvider.Str() == conventions.AttributeCloudProviderAzure: azureHostInfo := azure.HostInfoFromAttributes(attrs, usePreviewHostnameLogic) hm.Meta.HostAliases = append(hm.Meta.HostAliases, azureHostInfo.HostAliases...) } diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 2346202cf184..d2bd0e7c8546 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index a7c3503499d3..517ea66bb64a 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -274,10 +274,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index f2c62ef6bacd..27c3fd28de0c 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/elastic/go-structform v0.0.10 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 6ba034279e95..a1afcaa8d9e1 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -279,10 +279,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/elasticsearchexporter/internal/objmodel/objmodel.go b/exporter/elasticsearchexporter/internal/objmodel/objmodel.go index d435d36afbc4..f79cb2405c9c 100644 --- a/exporter/elasticsearchexporter/internal/objmodel/objmodel.go +++ b/exporter/elasticsearchexporter/internal/objmodel/objmodel.go @@ -166,7 +166,7 @@ func (doc *Document) AddAttribute(key string, attribute pcommon.Value) { case pcommon.ValueTypeEmpty: // do not add 'null' case pcommon.ValueTypeMap: - doc.AddAttributes(key, attribute.MapVal()) + doc.AddAttributes(key, attribute.Map()) default: doc.Add(key, ValueFromAttribute(attribute)) } @@ -371,18 +371,18 @@ func TimestampValue(ts time.Time) Value { func ValueFromAttribute(attr pcommon.Value) Value { switch attr.Type() { case pcommon.ValueTypeInt: - return IntValue(attr.IntVal()) + return IntValue(attr.Int()) case pcommon.ValueTypeDouble: - return DoubleValue(attr.DoubleVal()) - case pcommon.ValueTypeString: - return StringValue(attr.StringVal()) + return DoubleValue(attr.Double()) + case pcommon.ValueTypeStr: + return StringValue(attr.Str()) case pcommon.ValueTypeBool: - return BoolValue(attr.BoolVal()) + return BoolValue(attr.Bool()) case pcommon.ValueTypeSlice: - sub := arrFromAttributes(attr.SliceVal()) + sub := arrFromAttributes(attr.Slice()) return ArrValue(sub...) case pcommon.ValueTypeMap: - sub := DocumentFromAttributes(attr.MapVal()) + sub := DocumentFromAttributes(attr.Map()) return Value{kind: KindObject, doc: sub} default: return nilValue @@ -491,7 +491,7 @@ func appendAttributeValue(fields []field, path string, key string, attr pcommon. } if attr.Type() == pcommon.ValueTypeMap { - return appendAttributeFields(fields, flattenKey(path, key), attr.MapVal()) + return appendAttributeFields(fields, flattenKey(path, key), attr.Map()) } return append(fields, field{ diff --git a/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go b/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go index c62caa874ff3..5f644d780389 100644 --- a/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go +++ b/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go @@ -78,7 +78,7 @@ func TestObjectModel_CreateMap(t *testing.T) { "add attribute flattens a map value": { build: func() (doc Document) { mapVal := pcommon.NewValueMap() - m := mapVal.MapVal() + m := mapVal.Map() m.PutInt("i", 42) m.PutString("str", "test") doc.AddAttribute("prefix", mapVal) @@ -250,7 +250,7 @@ func TestValue_FromAttribute(t *testing.T) { "non-empty array": { in: func() pcommon.Value { v := pcommon.NewValueSlice() - tgt := v.SliceVal().AppendEmpty() + tgt := v.Slice().AppendEmpty() pcommon.NewValueInt(1).CopyTo(tgt) return v }(), @@ -263,7 +263,7 @@ func TestValue_FromAttribute(t *testing.T) { "non-empty map": { in: func() pcommon.Value { v := pcommon.NewValueMap() - v.MapVal().PutInt("a", 1) + v.Map().PutInt("a", 1) return v }(), want: Value{kind: KindObject, doc: Document{[]field{{"a", IntValue(1)}}}}, diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 160fc61dcde4..3bfd6cbfead5 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 google.golang.org/api v0.97.0 ) @@ -37,7 +37,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 2227e6d0bfae..9fa6809f23b8 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -422,10 +422,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 40f14af85360..05379a4b9233 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 2d6b146f6e79..a5d630639174 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -265,10 +265,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 2fdb0c3cc73e..7a9d84291d91 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/api v0.97.0 google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de google.golang.org/grpc v1.49.0 diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 252c5caf22ae..17d8c939b38a 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -439,12 +439,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 h1:qZ3KzA4qPzLBDtQyPk4ydjlg8zvXbNysnFHaVMKJbVo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 5b5b12cb649a..9c1b8ade1ef0 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,8 +6,8 @@ require ( cloud.google.com/go/pubsub v1.25.1 github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/api v0.97.0 google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 76bf17a438ec..6bd272a8b694 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -416,10 +416,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 73c6fc73bebb..21312135411a 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.32.8 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.32.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -36,8 +36,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/sdk v1.10.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 4b2f7c1872b8..05f7c8ded2e8 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -426,12 +426,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 h1:qZ3KzA4qPzLBDtQyPk4ydjlg8zvXbNysnFHaVMKJbVo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index 59ad4fe76b69..5497c92d7d3a 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 ) diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index 85c6d5a0e35d..db4d26bfca7e 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -412,12 +412,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= diff --git a/exporter/humioexporter/traces_exporter.go b/exporter/humioexporter/traces_exporter.go index 43602afd4464..8f250469f2e6 100644 --- a/exporter/humioexporter/traces_exporter.go +++ b/exporter/humioexporter/traces_exporter.go @@ -174,7 +174,7 @@ func (e *humioTracesExporter) spanToHumioEvent(span ptrace.Span, inst pcommon.In if sName, ok := res.Attributes().Get(conventions.AttributeServiceName); ok { // No need to store the service name in two places delete(attr, conventions.AttributeServiceName) - serviceName = sName.StringVal() + serviceName = sName.Str() } return &HumioStructuredEvent{ @@ -223,18 +223,18 @@ func toHumioAttributes(attrMaps ...pcommon.Map) map[string]interface{} { func toHumioAttributeValue(rawVal pcommon.Value) interface{} { switch rawVal.Type() { - case pcommon.ValueTypeString: - return rawVal.StringVal() + case pcommon.ValueTypeStr: + return rawVal.Str() case pcommon.ValueTypeInt: - return rawVal.IntVal() + return rawVal.Int() case pcommon.ValueTypeDouble: - return rawVal.DoubleVal() + return rawVal.Double() case pcommon.ValueTypeBool: - return rawVal.BoolVal() + return rawVal.Bool() case pcommon.ValueTypeMap: - return toHumioAttributes(rawVal.MapVal()) + return toHumioAttributes(rawVal.Map()) case pcommon.ValueTypeSlice: - arrVal := rawVal.SliceVal() + arrVal := rawVal.Slice() arr := make([]interface{}, 0, arrVal.Len()) for i := 0; i < arrVal.Len(); i++ { arr = append(arr, toHumioAttributeValue(arrVal.At(i))) diff --git a/exporter/humioexporter/traces_exporter_test.go b/exporter/humioexporter/traces_exporter_test.go index f91c85be4184..ed958489fb69 100644 --- a/exporter/humioexporter/traces_exporter_test.go +++ b/exporter/humioexporter/traces_exporter_test.go @@ -403,9 +403,9 @@ func TestToHumioAttributes(t *testing.T) { attr: func() pcommon.Map { attrMap := pcommon.NewMap() arr := attrMap.PutEmptySlice("array") - arr.AppendEmpty().SetStringVal("a") - arr.AppendEmpty().SetStringVal("b") - arr.AppendEmpty().SetIntVal(4) + arr.AppendEmpty().SetStr("a") + arr.AppendEmpty().SetStr("b") + arr.AppendEmpty().SetInt(4) return attrMap }, expected: map[string]interface{}{ diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 2d1027097a30..085bd62c1bde 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.28-0.20220915142310-adbee7fb8146 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 9bb5ab8e3cd7..38cd5269753d 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -302,10 +302,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/instanaexporter/exporter.go b/exporter/instanaexporter/exporter.go index 7a9583895a1f..61cfe777e0b6 100644 --- a/exporter/instanaexporter/exporter.go +++ b/exporter/instanaexporter/exporter.go @@ -62,7 +62,7 @@ func (e *instanaExporter) pushConvertedTraces(ctx context.Context, td ptrace.Tra hostIDAttr, ok := resource.Attributes().Get(backend.AttributeInstanaHostID) if ok { - hostID = hostIDAttr.StringVal() + hostID = hostIDAttr.Str() } ilSpans := resSpan.ScopeSpans() diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 9ed1b6b3a247..2a6ce15624b0 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index d213967f05c1..bf746102fdb0 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -276,12 +276,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/instanaexporter/internal/otlptext/databuffer.go b/exporter/instanaexporter/internal/otlptext/databuffer.go index 91c04ab1394f..bb92ba358a01 100644 --- a/exporter/instanaexporter/internal/otlptext/databuffer.go +++ b/exporter/instanaexporter/internal/otlptext/databuffer.go @@ -283,18 +283,18 @@ func (b *dataBuffer) logLinks(description string, sl ptrace.SpanLinkSlice) { func attributeValueToString(v pcommon.Value) string { switch v.Type() { - case pcommon.ValueTypeString: - return v.StringVal() + case pcommon.ValueTypeStr: + return v.Str() case pcommon.ValueTypeBool: - return strconv.FormatBool(v.BoolVal()) + return strconv.FormatBool(v.Bool()) case pcommon.ValueTypeDouble: - return strconv.FormatFloat(v.DoubleVal(), 'f', -1, 64) + return strconv.FormatFloat(v.Double(), 'f', -1, 64) case pcommon.ValueTypeInt: - return strconv.FormatInt(v.IntVal(), 10) + return strconv.FormatInt(v.Int(), 10) case pcommon.ValueTypeSlice: - return sliceToString(v.SliceVal()) + return sliceToString(v.Slice()) case pcommon.ValueTypeMap: - return mapToString(v.MapVal()) + return mapToString(v.Map()) default: return fmt.Sprintf("", v.Type()) } diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index eef00d0f33f0..f48d5e04c87e 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.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 ) @@ -37,7 +37,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // 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/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index c05c8b796c1e..ed8005e57362 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -297,12 +297,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index f2d3f08e9576..c25117e887fe 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/jaegertracing/jaeger v1.38.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -36,7 +36,7 @@ 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/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 6d610154f5be..6b77eec0bc4f 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -285,12 +285,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 3dea3aed48ec..a1c31d85fbd5 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -11,9 +11,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 github.com/stretchr/testify v1.8.0 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index 0ace7d8a6e06..1220708036e1 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -413,12 +413,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/kafkaexporter/raw_marshaler.go b/exporter/kafkaexporter/raw_marshaler.go index 40dfd5959b25..c49fdda17521 100644 --- a/exporter/kafkaexporter/raw_marshaler.go +++ b/exporter/kafkaexporter/raw_marshaler.go @@ -61,22 +61,22 @@ func (r rawMarshaler) Marshal(logs plog.Logs, topic string) ([]*sarama.ProducerM func (r rawMarshaler) logBodyAsBytes(value pcommon.Value) ([]byte, error) { switch value.Type() { - case pcommon.ValueTypeString: - return r.interfaceAsBytes(value.StringVal()) + case pcommon.ValueTypeStr: + return r.interfaceAsBytes(value.Str()) case pcommon.ValueTypeBytes: - return value.BytesVal().AsRaw(), nil + return value.Bytes().AsRaw(), nil case pcommon.ValueTypeBool: - return r.interfaceAsBytes(value.BoolVal()) + return r.interfaceAsBytes(value.Bool()) case pcommon.ValueTypeDouble: - return r.interfaceAsBytes(value.DoubleVal()) + return r.interfaceAsBytes(value.Double()) case pcommon.ValueTypeInt: - return r.interfaceAsBytes(value.IntVal()) + return r.interfaceAsBytes(value.Int()) case pcommon.ValueTypeEmpty: return []byte{}, nil case pcommon.ValueTypeSlice: - return r.interfaceAsBytes(value.SliceVal().AsRaw()) + return r.interfaceAsBytes(value.Slice().AsRaw()) case pcommon.ValueTypeMap: - return r.interfaceAsBytes(value.MapVal().AsRaw()) + return r.interfaceAsBytes(value.Map().AsRaw()) default: return nil, errUnsupported } diff --git a/exporter/kafkaexporter/raw_marshaller_test.go b/exporter/kafkaexporter/raw_marshaller_test.go index 279b50ec768c..c9880d27b609 100644 --- a/exporter/kafkaexporter/raw_marshaller_test.go +++ b/exporter/kafkaexporter/raw_marshaller_test.go @@ -39,7 +39,7 @@ func Test_RawMarshaler(t *testing.T) { name: "string", logRecord: func() plog.LogRecord { lr := plog.NewLogRecord() - lr.Body().SetStringVal("foo") + lr.Body().SetStr("foo") return lr }, errorExpected: false, @@ -49,7 +49,7 @@ func Test_RawMarshaler(t *testing.T) { name: "[]byte", logRecord: func() plog.LogRecord { lr := plog.NewLogRecord() - lr.Body().SetEmptyBytesVal().FromRaw([]byte("foo")) + lr.Body().SetEmptyBytes().FromRaw([]byte("foo")) return lr }, errorExpected: false, @@ -59,7 +59,7 @@ func Test_RawMarshaler(t *testing.T) { name: "double", logRecord: func() plog.LogRecord { lr := plog.NewLogRecord() - lr.Body().SetDoubleVal(float64(1.64)) + lr.Body().SetDouble(float64(1.64)) return lr }, errorExpected: false, @@ -69,7 +69,7 @@ func Test_RawMarshaler(t *testing.T) { name: "int", logRecord: func() plog.LogRecord { lr := plog.NewLogRecord() - lr.Body().SetIntVal(int64(456)) + lr.Body().SetInt(int64(456)) return lr }, errorExpected: false, @@ -89,7 +89,7 @@ func Test_RawMarshaler(t *testing.T) { name: "bool", logRecord: func() plog.LogRecord { lr := plog.NewLogRecord() - lr.Body().SetBoolVal(false) + lr.Body().SetBool(false) return lr }, errorExpected: false, @@ -99,10 +99,10 @@ func Test_RawMarshaler(t *testing.T) { name: "slice", logRecord: func() plog.LogRecord { lr := plog.NewLogRecord() - slice := lr.Body().SetEmptySliceVal() - slice.AppendEmpty().SetStringVal("foo") - slice.AppendEmpty().SetStringVal("bar") - slice.AppendEmpty().SetBoolVal(false) + slice := lr.Body().SetEmptySlice() + slice.AppendEmpty().SetStr("foo") + slice.AppendEmpty().SetStr("bar") + slice.AppendEmpty().SetBool(false) return lr }, errorExpected: false, @@ -112,7 +112,7 @@ func Test_RawMarshaler(t *testing.T) { name: "map", logRecord: func() plog.LogRecord { lr := plog.NewLogRecord() - m := lr.Body().SetEmptyMapVal() + m := lr.Body().SetEmptyMap() m.PutString("foo", "foo") m.PutString("bar", "bar") m.PutBool("foobar", false) diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 1c1e4a30c7a8..f3cd727447f1 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.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 8ed274b332b9..746a073d9dc2 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -286,10 +286,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/loadbalancingexporter/trace_exporter.go b/exporter/loadbalancingexporter/trace_exporter.go index 72a5fe090197..f4e355dbf4de 100644 --- a/exporter/loadbalancingexporter/trace_exporter.go +++ b/exporter/loadbalancingexporter/trace_exporter.go @@ -159,7 +159,7 @@ func routingIdentifiersFromTraces(td ptrace.Traces, key routingKey) (map[string] if !ok { return nil, errors.New("unable to get service name") } - ids[svc.StringVal()] = true + ids[svc.Str()] = true } return ids, nil } diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 95f605623dfd..bd151f8e0cef 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -68,7 +68,7 @@ func fillLogOne(log plog.LogRecord) { attrs.PutDouble("instance_num", 1) // nested body map - attMap := log.Body().SetEmptyMapVal() + attMap := log.Body().SetEmptyMap() attMap.PutDouble("23", 45) attMap.PutString("foo", "bar") attMap.PutString("message", "hello there") @@ -88,7 +88,7 @@ func fillLogTwo(log plog.LogRecord) { attrs.PutDouble("number", 64) attrs.PutBool("bool", true) attrs.PutString("env", "dev") - log.Body().SetStringVal("something happened") + log.Body().SetStr("something happened") } func fillLogNoTimestamp(log plog.LogRecord) { log.SetDroppedAttributesCount(1) @@ -100,7 +100,7 @@ func fillLogNoTimestamp(log plog.LogRecord) { attrs.PutDouble("number", 64) attrs.PutBool("bool", true) attrs.PutString("env", "dev") - log.Body().SetStringVal("something happened") + log.Body().SetStr("something happened") } func generateLogsOneEmptyTimestamp() plog.Logs { diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 3e8c2ec8a906..124c50119b58 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc google.golang.org/protobuf v1.28.1 diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index a0eab2a507b9..d2b742cf2414 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -293,12 +293,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/logzioexporter/jsonlog.go b/exporter/logzioexporter/jsonlog.go index 599937e1315e..58bc989c7dd2 100644 --- a/exporter/logzioexporter/jsonlog.go +++ b/exporter/logzioexporter/jsonlog.go @@ -24,22 +24,22 @@ import ( func convertAttributeValue(value pcommon.Value, logger hclog.Logger) interface{} { switch value.Type() { case pcommon.ValueTypeInt: - return value.IntVal() + return value.Int() case pcommon.ValueTypeBool: - return value.BoolVal() + return value.Bool() case pcommon.ValueTypeDouble: - return value.DoubleVal() - case pcommon.ValueTypeString: - return value.StringVal() + return value.Double() + case pcommon.ValueTypeStr: + return value.Str() case pcommon.ValueTypeMap: values := map[string]interface{}{} - value.MapVal().Range(func(k string, v pcommon.Value) bool { + value.Map().Range(func(k string, v pcommon.Value) bool { values[k] = convertAttributeValue(v, logger) return true }) return values case pcommon.ValueTypeSlice: - arrayVal := value.SliceVal() + arrayVal := value.Slice() values := make([]interface{}, arrayVal.Len()) for i := 0; i < arrayVal.Len(); i++ { values[i] = convertAttributeValue(arrayVal.At(i), logger) @@ -81,8 +81,8 @@ func convertLogRecordToJSON(log plog.LogRecord, resource pcommon.Resource, logge }) switch log.Body().Type() { - case pcommon.ValueTypeString: - jsonLog["message"] = log.Body().StringVal() + case pcommon.ValueTypeStr: + jsonLog["message"] = log.Body().Str() case pcommon.ValueTypeMap: bodyFieldsMap := convertAttributeValue(log.Body(), logger).(map[string]interface{}) for key, value := range bodyFieldsMap { diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 2a12499b914f..bc2046f9482c 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.0.0-00010101000000-000000000000 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 986ccf0ed6ca..ee5e149a443c 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -1176,12 +1176,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= diff --git a/exporter/lokiexporter/internal/tenant/attribute.go b/exporter/lokiexporter/internal/tenant/attribute.go index 9350046d19d5..dcd22631ed32 100644 --- a/exporter/lokiexporter/internal/tenant/attribute.go +++ b/exporter/lokiexporter/internal/tenant/attribute.go @@ -30,7 +30,7 @@ func (ts *AttributeTenantSource) GetTenant(_ context.Context, logs plog.Logs) (s for i := 0; i < logs.ResourceLogs().Len(); i++ { rl := logs.ResourceLogs().At(i) if v, found := rl.Resource().Attributes().Get(ts.Value); found { - return v.StringVal(), nil + return v.Str(), nil } } return "", nil diff --git a/exporter/lokiexporter/legacy_exporter.go b/exporter/lokiexporter/legacy_exporter.go index dc5516f402ac..496ac51b079a 100644 --- a/exporter/lokiexporter/legacy_exporter.go +++ b/exporter/lokiexporter/legacy_exporter.go @@ -291,11 +291,11 @@ func (l *lokiExporter) convertAttributesToLabels(attributes pcommon.Map, allowed for attr, attrLabelName := range allowedLabels { av, ok := attributes.Get(attr) if ok { - if av.Type() != pcommon.ValueTypeString { + if av.Type() != pcommon.ValueTypeStr { l.settings.Logger.Debug("Failed to convert attribute value to Loki label value, value is not a string", zap.String("attribute", attr)) continue } - ls[attrLabelName] = model.LabelValue(av.StringVal()) + ls[attrLabelName] = model.LabelValue(av.Str()) } } @@ -373,7 +373,7 @@ func (l *lokiExporter) convertLogBodyToEntry(lr plog.LogRecord, res pcommon.Reso return true }) - b.WriteString(lr.Body().StringVal()) + b.WriteString(lr.Body().Str()) return &logproto.Entry{ Timestamp: timestampFromLogRecord(lr), diff --git a/exporter/lokiexporter/legacy_exporter_test.go b/exporter/lokiexporter/legacy_exporter_test.go index 4cb035417389..d24cc97f6f4f 100644 --- a/exporter/lokiexporter/legacy_exporter_test.go +++ b/exporter/lokiexporter/legacy_exporter_test.go @@ -64,7 +64,7 @@ func createTestLogData(numberOfLogs int, attributes map[string]interface{}) plog for i := 0; i < numberOfLogs; i++ { ts := pcommon.Timestamp(int64(i) * time.Millisecond.Nanoseconds()) logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().FromRaw(attributes) logRecord.SetTimestamp(ts) } @@ -373,7 +373,7 @@ func TestExporter_logDataToLoki(t *testing.T) { logs := plog.NewLogs() ts := pcommon.Timestamp(int64(1) * time.Millisecond.Nanoseconds()) lr := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() - lr.Body().SetStringVal("log message") + lr.Body().SetStr("log message") lr.Attributes().PutString("not.in.config", "not allowed") lr.SetTimestamp(ts) @@ -387,7 +387,7 @@ func TestExporter_logDataToLoki(t *testing.T) { logs := plog.NewLogs() ts := pcommon.Timestamp(int64(1) * time.Millisecond.Nanoseconds()) lr := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() - lr.Body().SetStringVal("log message") + lr.Body().SetStr("log message") lr.Attributes().PutString(conventions.AttributeContainerName, "mycontainer") lr.Attributes().PutString("severity", "info") lr.Attributes().PutString("random.attribute", "random attribute") @@ -405,14 +405,14 @@ func TestExporter_logDataToLoki(t *testing.T) { ts := pcommon.Timestamp(int64(1) * time.Millisecond.Nanoseconds()) sl := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty() lr1 := sl.LogRecords().AppendEmpty() - lr1.Body().SetStringVal("log message 1") + lr1.Body().SetStr("log message 1") lr1.Attributes().PutString(conventions.AttributeContainerName, "mycontainer") lr1.Attributes().PutString(conventions.AttributeK8SClusterName, "mycluster") lr1.Attributes().PutString("severity", "info") lr1.SetTimestamp(ts) lr2 := sl.LogRecords().AppendEmpty() - lr2.Body().SetStringVal("log message 2") + lr2.Body().SetStr("log message 2") lr2.Attributes().PutString(conventions.AttributeContainerName, "mycontainer") lr2.Attributes().PutString(conventions.AttributeK8SClusterName, "mycluster") lr2.Attributes().PutString("severity", "info") @@ -431,14 +431,14 @@ func TestExporter_logDataToLoki(t *testing.T) { sl := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty() lr1 := sl.LogRecords().AppendEmpty() - lr1.Body().SetStringVal("log message 1") + lr1.Body().SetStr("log message 1") lr1.Attributes().PutString(conventions.AttributeContainerName, "mycontainer1") lr1.Attributes().PutString(conventions.AttributeK8SClusterName, "mycluster1") lr1.Attributes().PutString("severity", "debug") lr1.SetTimestamp(ts) lr2 := sl.LogRecords().AppendEmpty() - lr2.Body().SetStringVal("log message 2") + lr2.Body().SetStr("log message 2") lr2.Attributes().PutString(conventions.AttributeContainerName, "mycontainer2") lr2.Attributes().PutString(conventions.AttributeK8SClusterName, "mycluster2") lr2.Attributes().PutString("severity", "error") @@ -459,7 +459,7 @@ func TestExporter_logDataToLoki(t *testing.T) { lr.Resource().Attributes().PutString("not.in.config", "not allowed") lri := lr.ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() - lri.Body().SetStringVal("log message") + lri.Body().SetStr("log message") lri.Attributes().PutString("not.in.config", "not allowed") lri.SetTimestamp(ts) @@ -476,7 +476,7 @@ func TestExporter_logDataToLoki(t *testing.T) { lr.Resource().Attributes().PutString("resource.name", "myresource") lri := lr.ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() - lri.Body().SetStringVal("log message") + lri.Body().SetStr("log message") lri.Attributes().PutString(conventions.AttributeContainerName, "mycontainer") lri.Attributes().PutString("severity", "info") lri.Attributes().PutString("random.attribute", "random") @@ -571,7 +571,7 @@ func TestExporter_convertLogBodyToEntry(t *testing.T) { res.Attributes().PutString("pod.name", "something123") lr := plog.NewLogRecord() - lr.Body().SetStringVal("Payment succeeded") + lr.Body().SetStr("Payment succeeded") lr.SetTraceID([16]byte{1, 2, 3, 4}) lr.SetSpanID([8]byte{5, 6, 7, 8}) lr.SetSeverityText("DEBUG") @@ -689,7 +689,7 @@ func TestExporter_stopAlwaysReturnsNil(t *testing.T) { func TestExporter_convertLogtoJSONEntry(t *testing.T) { ts := pcommon.Timestamp(int64(1) * time.Millisecond.Nanoseconds()) lr := plog.NewLogRecord() - lr.Body().SetStringVal("log message") + lr.Body().SetStr("log message") lr.SetTimestamp(ts) res := pcommon.NewResource() res.Attributes().PutString("host.name", "something") diff --git a/exporter/mezmoexporter/exporter.go b/exporter/mezmoexporter/exporter.go index 9614cc0cf32f..2056c45612c7 100644 --- a/exporter/mezmoexporter/exporter.go +++ b/exporter/mezmoexporter/exporter.go @@ -114,12 +114,12 @@ func (m *mezmoExporter) logDataToMezmo(ld plog.Logs) error { } log.Attributes().Range(func(k string, v pcommon.Value) bool { - attrs[k] = truncateString(v.StringVal(), maxMetaDataSize) + attrs[k] = truncateString(v.Str(), maxMetaDataSize) return true }) s, _ := log.Attributes().Get("appname") - app := s.StringVal() + app := s.Str() tstamp := log.Timestamp().AsTime().UTC().UnixMilli() if tstamp == 0 { @@ -133,7 +133,7 @@ func (m *mezmoExporter) logDataToMezmo(ld plog.Logs) error { line := MezmoLogLine{ Timestamp: tstamp, - Line: truncateString(log.Body().StringVal(), maxMessageSize), + Line: truncateString(log.Body().Str(), maxMessageSize), App: truncateString(app, maxAppnameLen), Level: logLevel, Meta: attrs, diff --git a/exporter/mezmoexporter/exporter_test.go b/exporter/mezmoexporter/exporter_test.go index d68b4c111a29..84f18325eef1 100644 --- a/exporter/mezmoexporter/exporter_test.go +++ b/exporter/mezmoexporter/exporter_test.go @@ -51,7 +51,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs { for i := 0; i < numberOfLogs; i++ { ts := pcommon.Timestamp(int64(i) * time.Millisecond.Nanoseconds()) logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("10byteslog") + logRecord.Body().SetStr("10byteslog") logRecord.Attributes().PutString(conventions.AttributeServiceName, "myapp") logRecord.Attributes().PutString("my-label", "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") @@ -71,7 +71,7 @@ func createMinimalAttributesLogData(numberOfLogs int) plog.Logs { for i := 0; i < numberOfLogs; i++ { logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("minimal attribute log") + logRecord.Body().SetStr("minimal attribute log") } return logs @@ -91,7 +91,7 @@ func createMaxLogData() plog.Logs { for i := 0; i < lineCnt; i++ { ts := pcommon.Timestamp(int64(i) * time.Millisecond.Nanoseconds()) logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal(randString(maxMessageSize)) + logRecord.Body().SetStr(randString(maxMessageSize)) logRecord.SetTimestamp(ts) } @@ -109,7 +109,7 @@ func createSizedPayloadLogData(payloadSize int) plog.Logs { ts := pcommon.Timestamp(0) logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal(maxMsg) + logRecord.Body().SetStr(maxMsg) logRecord.SetTimestamp(ts) return logs diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index 727dd958ee2e..91ac22661a91 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index d213967f05c1..bf746102fdb0 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -276,12 +276,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index bcf5bf837997..5557271de739 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/grpc v1.49.0 ) @@ -38,7 +38,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 2f1ba82789d0..10277f048e0b 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -304,12 +304,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index c3313454f204..8567214ca5ca 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.18 require ( - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index 637b697ac825..df04c2edd154 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -262,10 +262,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index f32ebb6f845e..4715740cfad4 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -12,9 +12,9 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index d13927d8ab7a..466c22b57ba3 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -665,12 +665,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index f8579536f043..3336c5c6601c 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -13,8 +13,8 @@ require ( github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.0 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -44,7 +44,7 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index cbc428848417..89970fc457f5 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -369,12 +369,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index a7e4b4b5e3dc..3eacf6356fb0 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index de189c895caf..c2a4ce61be87 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -488,12 +488,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/sapmexporter/exporter.go b/exporter/sapmexporter/exporter.go index c36c206fcc06..b65ab1581c89 100644 --- a/exporter/sapmexporter/exporter.go +++ b/exporter/sapmexporter/exporter.go @@ -148,7 +148,7 @@ func (se *sapmExporter) retrieveAccessToken(md ptrace.ResourceSpans) string { attrs := md.Resource().Attributes() if accessToken, ok := attrs.Get(splunk.SFxAccessTokenLabel); ok { - return accessToken.StringVal() + return accessToken.Str() } return "" } diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 03d0e3e5fcb5..dd9691e6f182 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.60.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -36,7 +36,7 @@ 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/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index b9ef32f16846..bbc597541d19 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -279,12 +279,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index e1397a2fc187..8e4193a33751 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/getsentry/sentry-go v0.13.0 github.com/google/go-cmp v0.5.9 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 7cd1f19ed576..f3a8abfe46b0 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -278,12 +278,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/sentryexporter/sentry_exporter.go b/exporter/sentryexporter/sentry_exporter.go index 74fd35c2844c..51cc89ae0290 100644 --- a/exporter/sentryexporter/sentry_exporter.go +++ b/exporter/sentryexporter/sentry_exporter.go @@ -178,9 +178,9 @@ func convertEventsToSentryExceptions(eventList *[]*sentry.Event, events ptrace.S event.Attributes().Range(func(k string, v pcommon.Value) bool { switch k { case conventions.AttributeExceptionMessage: - exceptionMessage = v.StringVal() + exceptionMessage = v.Str() case conventions.AttributeExceptionType: - exceptionType = v.StringVal() + exceptionType = v.Str() } return true }) @@ -323,7 +323,7 @@ func generateSpanDescriptors(name string, attrs pcommon.Map, spanKind ptrace.Spa } // Ex. description="GET /api/users/{user_id}". - fmt.Fprintf(&dBuilder, "%s %s", httpMethod.StringVal(), name) + fmt.Fprintf(&dBuilder, "%s %s", httpMethod.Str(), name) return opBuilder.String(), dBuilder.String() } @@ -334,7 +334,7 @@ func generateSpanDescriptors(name string, attrs pcommon.Map, spanKind ptrace.Spa // Use DB statement (Ex "SELECT * FROM table") if possible as description. if statement, okInst := attrs.Get(conventions.AttributeDBStatement); okInst { - dBuilder.WriteString(statement.StringVal()) + dBuilder.WriteString(statement.Str()) } else { dBuilder.WriteString(name) } @@ -358,7 +358,7 @@ func generateSpanDescriptors(name string, attrs pcommon.Map, spanKind ptrace.Spa // If faas.trigger exists then this is a function as a service span. if trigger, ok := attrs.Get("faas.trigger"); ok { - opBuilder.WriteString(trigger.StringVal()) + opBuilder.WriteString(trigger.Str()) return opBuilder.String(), name } @@ -376,14 +376,14 @@ func generateTagsFromAttributes(attrs pcommon.Map) map[string]string { attrs.Range(func(key string, attr pcommon.Value) bool { switch attr.Type() { - case pcommon.ValueTypeString: - tags[key] = attr.StringVal() + case pcommon.ValueTypeStr: + tags[key] = attr.Str() case pcommon.ValueTypeBool: - tags[key] = strconv.FormatBool(attr.BoolVal()) + tags[key] = strconv.FormatBool(attr.Bool()) case pcommon.ValueTypeDouble: - tags[key] = strconv.FormatFloat(attr.DoubleVal(), 'g', -1, 64) + tags[key] = strconv.FormatFloat(attr.Double(), 'g', -1, 64) case pcommon.ValueTypeInt: - tags[key] = strconv.FormatInt(attr.IntVal(), 10) + tags[key] = strconv.FormatInt(attr.Int(), 10) } return true }) diff --git a/exporter/signalfxexporter/dpclient.go b/exporter/signalfxexporter/dpclient.go index bd20d1c7ecb1..887de9531b0c 100644 --- a/exporter/signalfxexporter/dpclient.go +++ b/exporter/signalfxexporter/dpclient.go @@ -188,7 +188,7 @@ func (s *sfxDPClient) retrieveAccessToken(md pmetric.ResourceMetrics) string { attrs := md.Resource().Attributes() if accessToken, ok := attrs.Get(splunk.SFxAccessTokenLabel); ok { - return accessToken.StringVal() + return accessToken.Str() } return "" } diff --git a/exporter/signalfxexporter/eventclient.go b/exporter/signalfxexporter/eventclient.go index 0ad17e74dbb1..3ec7f91d799f 100644 --- a/exporter/signalfxexporter/eventclient.go +++ b/exporter/signalfxexporter/eventclient.go @@ -117,8 +117,8 @@ func (s *sfxEventClient) encodeBody(events []*sfxpb.Event) (bodyReader io.Reader func (s *sfxEventClient) retrieveAccessToken(rl plog.ResourceLogs) string { attrs := rl.Resource().Attributes() - if accessToken, ok := attrs.Get(splunk.SFxAccessTokenLabel); ok && accessToken.Type() == pcommon.ValueTypeString { - return accessToken.StringVal() + if accessToken, ok := attrs.Get(splunk.SFxAccessTokenLabel); ok && accessToken.Type() == pcommon.ValueTypeStr { + return accessToken.Str() } return "" } diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index a62f151e8c61..8b33c852b61a 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -539,7 +539,7 @@ func TestConsumeEventData(t *testing.T) { attrs.PutEmptyMap("map") propsAttrs, _ := attrs.Get("com.splunk.signalfx.event_properties") - propsAttrs.MapVal().PutEmptyMap("map") + propsAttrs.Map().PutEmptyMap("map") return out }(), diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 8d16a0378326..631784ae547f 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,9 +15,9 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220920175102-539ae8d8ba8e github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 0e3d031484cc..ebfd74eb65c4 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1232,8 +1232,8 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/WRO2GgRl4I1g= go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1241,15 +1241,15 @@ go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMq go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.60.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.60.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= diff --git a/exporter/signalfxexporter/internal/correlation/spanshims.go b/exporter/signalfxexporter/internal/correlation/spanshims.go index a12ffda7615a..43d6b3b2398c 100644 --- a/exporter/signalfxexporter/internal/correlation/spanshims.go +++ b/exporter/signalfxexporter/internal/correlation/spanshims.go @@ -34,13 +34,13 @@ func (s spanWrap) Environment() (string, bool) { // Try to find deployment.environment before falling back to environment (SignalFx value). env, ok := attr.Get(conventions.AttributeDeploymentEnvironment) - if ok && env.StringVal() != "" { - return env.StringVal(), true + if ok && env.Str() != "" { + return env.Str(), true } env, ok = attr.Get("environment") - if ok && env.StringVal() != "" { - return env.StringVal(), true + if ok && env.Str() != "" { + return env.Str(), true } return "", false @@ -50,8 +50,8 @@ func (s spanWrap) ServiceName() (string, bool) { attr := s.Resource().Attributes() serviceName, ok := attr.Get(conventions.AttributeServiceName) - if ok && serviceName.StringVal() != "" { - return serviceName.StringVal(), true + if ok && serviceName.Str() != "" { + return serviceName.Str(), true } return "", false @@ -61,7 +61,7 @@ func (s spanWrap) Tag(tag string) (string, bool) { attr := s.Resource().Attributes() val, ok := attr.Get(tag) if ok { - return val.StringVal(), true + return val.Str(), true } return "", false } diff --git a/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go b/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go index d701d26ed527..9390cc59de1b 100644 --- a/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go +++ b/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2.go @@ -57,12 +57,12 @@ func convertLogRecord(lr plog.LogRecord, resourceAttrs pcommon.Map, logger *zap. var event sfxpb.Event if categoryVal.Type() == pcommon.ValueTypeInt { - asCat := sfxpb.EventCategory(categoryVal.IntVal()) + asCat := sfxpb.EventCategory(categoryVal.Int()) event.Category = &asCat } if mapVal, ok := attrs.Get(splunk.SFxEventPropertiesKey); ok && mapVal.Type() == pcommon.ValueTypeMap { - mapVal.MapVal().Range(func(k string, v pcommon.Value) bool { + mapVal.Map().Range(func(k string, v pcommon.Value) bool { val, err := attributeValToPropertyVal(v) if err != nil { logger.Debug("Failed to convert log record property value to SignalFx property value", zap.Error(err), zap.String("key", k)) @@ -96,20 +96,20 @@ func convertLogRecord(lr plog.LogRecord, resourceAttrs pcommon.Map, logger *zap. case splunk.SFxEventPropertiesKey: return true case splunk.SFxEventType: - if v.Type() == pcommon.ValueTypeString { - event.EventType = v.StringVal() + if v.Type() == pcommon.ValueTypeStr { + event.EventType = v.Str() } return true } - if v.Type() != pcommon.ValueTypeString { + if v.Type() != pcommon.ValueTypeStr { logger.Debug("Failed to convert log record or resource attribute value to SignalFx property value, key is not a string", zap.String("key", k)) return true } event.Dimensions = append(event.Dimensions, &sfxpb.Dimension{ Key: k, - Value: v.StringVal(), + Value: v.Str(), }) return true } @@ -134,16 +134,16 @@ func attributeValToPropertyVal(v pcommon.Value) (*sfxpb.PropertyValue, error) { var val sfxpb.PropertyValue switch v.Type() { case pcommon.ValueTypeInt: - asInt := v.IntVal() + asInt := v.Int() val.IntValue = &asInt case pcommon.ValueTypeBool: - asBool := v.BoolVal() + asBool := v.Bool() val.BoolValue = &asBool case pcommon.ValueTypeDouble: - asDouble := v.DoubleVal() + asDouble := v.Double() val.DoubleValue = &asDouble - case pcommon.ValueTypeString: - asString := v.StringVal() + case pcommon.ValueTypeStr: + asString := v.Str() val.StrValue = &asString default: return nil, fmt.Errorf("attribute value type %q not supported in SignalFx events", v.Type().String()) diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 3d76bba3d4ca..fa0ddd80f767 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 google.golang.org/grpc v1.49.0 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index c1395611db51..d457aad4728b 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -290,12 +290,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/skywalkingexporter/logrecord_to_logdata_test.go b/exporter/skywalkingexporter/logrecord_to_logdata_test.go index d927c40da7cd..6f3e6cd72860 100644 --- a/exporter/skywalkingexporter/logrecord_to_logdata_test.go +++ b/exporter/skywalkingexporter/logrecord_to_logdata_test.go @@ -31,7 +31,7 @@ func fillComplexAttributeValueMap(m pcommon.Map) { m.PutDouble("value", 1.3) m.PutInt("code", 200) m.PutEmpty("null") - m.PutEmptySlice("array").AppendEmpty().SetStringVal("array") + m.PutEmptySlice("array").AppendEmpty().SetStr("array") m.PutEmptyMap("map").PutString("data", "hello world") m.PutString("status", "ok") } @@ -60,21 +60,21 @@ func createLogData(numberOfLogs int) plog.Logs { switch i { case 0: case 1: - logRecord.Body().SetBoolVal(true) + logRecord.Body().SetBool(true) case 2: - logRecord.Body().SetIntVal(2.0) + logRecord.Body().SetInt(2.0) case 3: - logRecord.Body().SetDoubleVal(3.0) + logRecord.Body().SetDouble(3.0) case 4: - logRecord.Body().SetStringVal("4") + logRecord.Body().SetStr("4") case 5: fillComplexAttributeValueMap(logRecord.Attributes().PutEmptyMap("map-value")) - logRecord.Body().SetStringVal("log contents") + logRecord.Body().SetStr("log contents") case 6: - logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStringVal("array") - logRecord.Body().SetStringVal("log contents") + logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStr("array") + logRecord.Body().SetStr("log contents") default: - logRecord.Body().SetStringVal("log contents") + logRecord.Body().SetStr("log contents") } logRecord.Attributes().PutString("custom", "custom") } diff --git a/exporter/skywalkingexporter/skywalking_benchmark_test.go b/exporter/skywalkingexporter/skywalking_benchmark_test.go index dc41e4f48325..02abdf1eca37 100644 --- a/exporter/skywalkingexporter/skywalking_benchmark_test.go +++ b/exporter/skywalkingexporter/skywalking_benchmark_test.go @@ -92,7 +92,7 @@ func test(nGoroutine int, nStream int, t *testing.T) { exporter, server, m := doInit(nStream, t) consumerNum.Store(-int32(nStream)) l := testdata.GenerateLogsOneLogRecordNoResource() - l.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetIntVal(0) + l.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetInt(0) for i := 0; i < nStream; i++ { err := exporter.pushLogs(context.Background(), l) diff --git a/exporter/skywalkingexporter/skywalking_test.go b/exporter/skywalkingexporter/skywalking_test.go index e48132573a35..2308eedf7986 100644 --- a/exporter/skywalkingexporter/skywalking_test.go +++ b/exporter/skywalkingexporter/skywalking_test.go @@ -82,7 +82,7 @@ func TestSwExporter(t *testing.T) { go func() { defer w1.Done() l := testdata.GenerateLogsOneLogRecordNoResource() - l.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetIntVal(0) + l.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetInt(0) e := got.ConsumeLogs(context.Background(), l) assert.NoError(t, e) }() @@ -103,7 +103,7 @@ func TestSwExporter(t *testing.T) { go func() { defer w2.Done() l := testdata.GenerateLogsOneLogRecordNoResource() - l.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetIntVal(0) + l.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetInt(0) e := got.ConsumeLogs(context.Background(), l) if e != nil { return diff --git a/exporter/splunkhecexporter/client.go b/exporter/splunkhecexporter/client.go index b7c601eeba18..4b846f004f3e 100644 --- a/exporter/splunkhecexporter/client.go +++ b/exporter/splunkhecexporter/client.go @@ -89,7 +89,7 @@ func (c *client) pushMetricsData( if md.ResourceMetrics().Len() != 0 { accessToken, found := md.ResourceMetrics().At(0).Resource().Attributes().Get(splunk.HecTokenLabel) if found { - localHeaders["Authorization"] = splunk.HECTokenHeader + " " + accessToken.StringVal() + localHeaders["Authorization"] = splunk.HECTokenHeader + " " + accessToken.Str() } } @@ -135,7 +135,7 @@ func (c *client) pushTraceData( if td.ResourceSpans().Len() != 0 { accessToken, found := td.ResourceSpans().At(0).Resource().Attributes().Get(splunk.HecTokenLabel) if found { - localHeaders["Authorization"] = splunk.HECTokenHeader + " " + accessToken.StringVal() + localHeaders["Authorization"] = splunk.HECTokenHeader + " " + accessToken.Str() } } @@ -190,7 +190,7 @@ func (c *client) pushLogData(ctx context.Context, ld plog.Logs) error { for k, v := range headers { localHeaders[k] = v } - localHeaders["Authorization"] = splunk.HECTokenHeader + " " + accessToken.StringVal() + localHeaders["Authorization"] = splunk.HECTokenHeader + " " + accessToken.Str() } } diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index 90fdb193bc98..6ea58e83b686 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -154,7 +154,7 @@ func createLogDataWithCustomLibraries(numResources int, libraries []string, numR for k := 0; k < numRecords[j]; k++ { ts := pcommon.Timestamp(int64(k) * time.Millisecond.Nanoseconds()) logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(splunk.DefaultNameLabel, fmt.Sprintf("%d_%d_%d", i, j, k)) logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") @@ -947,7 +947,7 @@ func Test_pushLogData_InvalidLog(t *testing.T) { logs := plog.NewLogs() log := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() // Invalid log value - log.Body().SetDoubleVal(math.Inf(1)) + log.Body().SetDouble(math.Inf(1)) err := c.pushLogData(context.Background(), logs) diff --git a/exporter/splunkhecexporter/exporter_test.go b/exporter/splunkhecexporter/exporter_test.go index d67305bbc5ce..5d97b8e9b6da 100644 --- a/exporter/splunkhecexporter/exporter_test.go +++ b/exporter/splunkhecexporter/exporter_test.go @@ -225,7 +225,7 @@ func generateLargeLogsBatch() plog.Logs { ts := pcommon.Timestamp(123) for i := 0; i < 65000; i++ { logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(splunk.DefaultIndexLabel, "myindex") @@ -240,7 +240,7 @@ func generateLargeLogsBatch() plog.Logs { func TestConsumeLogsData(t *testing.T) { smallBatch := plog.NewLogs() logRecord := smallBatch.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") logRecord.Attributes().PutString("custom", "custom") logRecord.SetTimestamp(123) diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index e917b34cec3a..eb8f92e01811 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 3898df11204e..0c9cd356ea42 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -269,12 +269,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/splunkhecexporter/logdata_to_splunk.go b/exporter/splunkhecexporter/logdata_to_splunk.go index e90469ac1e72..3f8c1a59190c 100644 --- a/exporter/splunkhecexporter/logdata_to_splunk.go +++ b/exporter/splunkhecexporter/logdata_to_splunk.go @@ -60,13 +60,13 @@ func mapLogRecordToSplunkEvent(res pcommon.Resource, lr plog.LogRecord, config * res.Attributes().Range(func(k string, v pcommon.Value) bool { switch k { case hostKey: - host = v.StringVal() + host = v.Str() case sourceKey: - source = v.StringVal() + source = v.Str() case sourceTypeKey: - sourcetype = v.StringVal() + sourcetype = v.Str() case indexKey: - index = v.StringVal() + index = v.Str() case splunk.HecTokenLabel: // ignore default: @@ -77,13 +77,13 @@ func mapLogRecordToSplunkEvent(res pcommon.Resource, lr plog.LogRecord, config * lr.Attributes().Range(func(k string, v pcommon.Value) bool { switch k { case hostKey: - host = v.StringVal() + host = v.Str() case sourceKey: - source = v.StringVal() + source = v.Str() case sourceTypeKey: - sourcetype = v.StringVal() + sourcetype = v.Str() case indexKey: - index = v.StringVal() + index = v.Str() case splunk.HecTokenLabel: // ignore default: @@ -107,22 +107,22 @@ func mapLogRecordToSplunkEvent(res pcommon.Resource, lr plog.LogRecord, config * func convertAttributeValue(value pcommon.Value, logger *zap.Logger) interface{} { switch value.Type() { case pcommon.ValueTypeInt: - return value.IntVal() + return value.Int() case pcommon.ValueTypeBool: - return value.BoolVal() + return value.Bool() case pcommon.ValueTypeDouble: - return value.DoubleVal() - case pcommon.ValueTypeString: - return value.StringVal() + return value.Double() + case pcommon.ValueTypeStr: + return value.Str() case pcommon.ValueTypeMap: values := map[string]interface{}{} - value.MapVal().Range(func(k string, v pcommon.Value) bool { + value.Map().Range(func(k string, v pcommon.Value) bool { values[k] = convertAttributeValue(v, logger) return true }) return values case pcommon.ValueTypeSlice: - arrayVal := value.SliceVal() + arrayVal := value.Slice() values := make([]interface{}, arrayVal.Len()) for i := 0; i < arrayVal.Len(); i++ { values[i] = convertAttributeValue(arrayVal.At(i), logger) diff --git a/exporter/splunkhecexporter/logdata_to_splunk_test.go b/exporter/splunkhecexporter/logdata_to_splunk_test.go index ed5eaa524c86..128ac55b45f8 100644 --- a/exporter/splunkhecexporter/logdata_to_splunk_test.go +++ b/exporter/splunkhecexporter/logdata_to_splunk_test.go @@ -41,7 +41,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "valid", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") @@ -65,7 +65,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with_name", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") @@ -89,7 +89,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with_hec_token", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(splunk.HecTokenLabel, "mytoken") logRecord.SetTimestamp(ts) return logRecord @@ -110,7 +110,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "non-string attribute", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") @@ -133,7 +133,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with_config", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString("custom", "custom") logRecord.SetTimestamp(ts) return logRecord @@ -153,7 +153,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with_custom_mapping", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString("custom", "custom") logRecord.Attributes().PutString("mysource", "mysource") logRecord.Attributes().PutString("mysourcetype", "mysourcetype") @@ -230,7 +230,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with double body", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetDoubleVal(42) + logRecord.Body().SetDouble(42) logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") @@ -253,7 +253,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with int body", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetIntVal(42) + logRecord.Body().SetInt(42) logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") @@ -276,7 +276,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with bool body", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetBoolVal(true) + logRecord.Body().SetBool(true) logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") @@ -300,7 +300,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() attVal := pcommon.NewValueMap() - attMap := attVal.MapVal() + attMap := attVal.Map() attMap.PutDouble("23", 45) attMap.PutString("foo", "bar") attVal.CopyTo(logRecord.Body()) @@ -352,8 +352,8 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() attVal := pcommon.NewValueSlice() - attArray := attVal.SliceVal() - attArray.AppendEmpty().SetStringVal("foo") + attArray := attVal.Slice() + attArray.AppendEmpty().SetStr("foo") attVal.CopyTo(logRecord.Body()) logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") @@ -378,7 +378,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "log resource attribute", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.SetTimestamp(ts) return logRecord }, @@ -408,7 +408,7 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with severity", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(splunk.DefaultSourceLabel, "myapp") logRecord.Attributes().PutString(splunk.DefaultSourceTypeLabel, "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") diff --git a/exporter/splunkhecexporter/metricdata_to_splunk.go b/exporter/splunkhecexporter/metricdata_to_splunk.go index 1b34af337cec..f55dd9d92dc2 100644 --- a/exporter/splunkhecexporter/metricdata_to_splunk.go +++ b/exporter/splunkhecexporter/metricdata_to_splunk.go @@ -73,13 +73,13 @@ func mapMetricToSplunkEvent(res pcommon.Resource, m pmetric.Metric, config *Conf res.Attributes().Range(func(k string, v pcommon.Value) bool { switch k { case hostKey: - host = v.StringVal() + host = v.Str() case sourceKey: - source = v.StringVal() + source = v.Str() case sourceTypeKey: - sourceType = v.StringVal() + sourceType = v.Str() case indexKey: - index = v.StringVal() + index = v.Str() case splunk.HecTokenLabel: // ignore default: diff --git a/exporter/splunkhecexporter/tracedata_to_splunk.go b/exporter/splunkhecexporter/tracedata_to_splunk.go index 0ddb2d053f32..63c0d253aacc 100644 --- a/exporter/splunkhecexporter/tracedata_to_splunk.go +++ b/exporter/splunkhecexporter/tracedata_to_splunk.go @@ -72,13 +72,13 @@ func mapSpanToSplunkEvent(resource pcommon.Resource, span ptrace.Span, config *C resource.Attributes().Range(func(k string, v pcommon.Value) bool { switch k { case hostKey: - host = v.StringVal() + host = v.Str() case sourceKey: - source = v.StringVal() + source = v.Str() case sourceTypeKey: - sourceType = v.StringVal() + sourceType = v.Str() case indexKey: - index = v.StringVal() + index = v.Str() case splunk.HecTokenLabel: // ignore default: diff --git a/exporter/splunkhecexporter/tracedata_to_splunk_test.go b/exporter/splunkhecexporter/tracedata_to_splunk_test.go index 7a1effeea46a..8c0c71464fd0 100644 --- a/exporter/splunkhecexporter/tracedata_to_splunk_test.go +++ b/exporter/splunkhecexporter/tracedata_to_splunk_test.go @@ -116,8 +116,8 @@ func initSpan(name string, ts pcommon.Timestamp, span ptrace.Span) { spanLink.Attributes().PutInt("foo", 1) spanLink.Attributes().PutBool("bar", false) foobarContents := spanLink.Attributes().PutEmptySlice("foobar") - foobarContents.AppendEmpty().SetStringVal("a") - foobarContents.AppendEmpty().SetStringVal("b") + foobarContents.AppendEmpty().SetStr("a") + foobarContents.AppendEmpty().SetStr("b") spanEvent := span.Events().AppendEmpty() spanEvent.Attributes().PutString("foo", "bar") diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index df6c98015fab..479d0970af6c 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 32bd89079f11..34bdcd211198 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -284,10 +284,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/sumologicexporter/prometheus_formatter.go b/exporter/sumologicexporter/prometheus_formatter.go index 9fe879753012..6a1e577feb29 100644 --- a/exporter/sumologicexporter/prometheus_formatter.go +++ b/exporter/sumologicexporter/prometheus_formatter.go @@ -56,7 +56,7 @@ func (f *prometheusFormatter) tags2String(attr pcommon.Map, labels pcommon.Map) mergedAttributes := pcommon.NewMap() attr.CopyTo(mergedAttributes) labels.Range(func(k string, v pcommon.Value) bool { - mergedAttributes.PutString(k, v.StringVal()) + mergedAttributes.PutString(k, v.Str()) return true }) length := mergedAttributes.Len() diff --git a/exporter/sumologicexporter/sender_test.go b/exporter/sumologicexporter/sender_test.go index 6a46b3f04da0..60fffdcefff9 100644 --- a/exporter/sumologicexporter/sender_test.go +++ b/exporter/sumologicexporter/sender_test.go @@ -109,7 +109,7 @@ func extractBody(t *testing.T, req *http.Request) string { func exampleLog() []plog.LogRecord { buffer := make([]plog.LogRecord, 1) buffer[0] = plog.NewLogRecord() - buffer[0].Body().SetStringVal("Example log") + buffer[0].Body().SetStr("Example log") return buffer } @@ -117,11 +117,11 @@ func exampleLog() []plog.LogRecord { func exampleTwoLogs() []plog.LogRecord { buffer := make([]plog.LogRecord, 2) buffer[0] = plog.NewLogRecord() - buffer[0].Body().SetStringVal("Example log") + buffer[0].Body().SetStr("Example log") buffer[0].Attributes().PutString("key1", "value1") buffer[0].Attributes().PutString("key2", "value2") buffer[1] = plog.NewLogRecord() - buffer[1].Body().SetStringVal("Another example log") + buffer[1].Body().SetStr("Another example log") buffer[1].Attributes().PutString("key1", "value1") buffer[1].Attributes().PutString("key2", "value2") @@ -131,11 +131,11 @@ func exampleTwoLogs() []plog.LogRecord { func exampleTwoDifferentLogs() []plog.LogRecord { buffer := make([]plog.LogRecord, 2) buffer[0] = plog.NewLogRecord() - buffer[0].Body().SetStringVal("Example log") + buffer[0].Body().SetStr("Example log") buffer[0].Attributes().PutString("key1", "value1") buffer[0].Attributes().PutString("key2", "value2") buffer[1] = plog.NewLogRecord() - buffer[1].Body().SetStringVal("Another example log") + buffer[1].Body().SetStr("Another example log") buffer[1].Attributes().PutString("key3", "value3") buffer[1].Attributes().PutString("key4", "value4") @@ -146,7 +146,7 @@ func exampleMultitypeLogs() []plog.LogRecord { buffer := make([]plog.LogRecord, 2) attVal := pcommon.NewValueMap() - attMap := attVal.MapVal() + attMap := attVal.Map() attMap.PutString("lk1", "lv1") attMap.PutInt("lk2", 13) @@ -159,11 +159,11 @@ func exampleMultitypeLogs() []plog.LogRecord { buffer[1] = plog.NewLogRecord() attVal = pcommon.NewValueSlice() - attArr := attVal.SliceVal() + attArr := attVal.Slice() strVal := pcommon.NewValueEmpty() - strVal.SetStringVal("lv2") + strVal.SetStr("lv2") intVal := pcommon.NewValueEmpty() - intVal.SetIntVal(13) + intVal.SetInt(13) strTgt := attArr.AppendEmpty() strVal.CopyTo(strTgt) diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index df1f554795d7..b4aa73f2a17e 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 github.com/stretchr/testify v1.8.0 github.com/wavefronthq/wavefront-sdk-go v0.10.4 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index 90483486da39..6bf8dce93da0 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -281,12 +281,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index aec4fcd576b3..7fd7b6eb360e 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.0 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.501 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) require ( - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/protobuf v1.28.1 ) diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index 786d22bba8a9..994c9aa63e24 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -279,12 +279,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go b/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go index aa5f341d37cb..06e8289e7400 100644 --- a/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go +++ b/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go @@ -38,7 +38,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs { for i := 0; i < numberOfLogs; i++ { ts := pcommon.Timestamp(int64(i) * time.Millisecond.Nanoseconds()) logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("mylog") + logRecord.Body().SetStr("mylog") logRecord.Attributes().PutString(conventions.AttributeServiceName, "myapp") logRecord.Attributes().PutString("my-label", "myapp-type") logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost") diff --git a/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice_test.go b/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice_test.go index effb97a5b8b3..ea77a28fca76 100644 --- a/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice_test.go +++ b/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice_test.go @@ -45,7 +45,7 @@ func fillComplexAttributeValueMap(m pcommon.Map) { m.PutDouble("value", 1.3) m.PutInt("code", 200) m.PutEmpty("null") - m.PutEmptySlice("array").AppendEmpty().SetStringVal("array") + m.PutEmptySlice("array").AppendEmpty().SetStr("array") m.PutEmptyMap("map").PutString("data", "hello world") m.PutString("status", "ok") } @@ -68,21 +68,21 @@ func createLogData(numberOfLogs int) plog.Logs { case 0: // do nothing, left body null case 1: - logRecord.Body().SetBoolVal(true) + logRecord.Body().SetBool(true) case 2: - logRecord.Body().SetIntVal(2.0) + logRecord.Body().SetInt(2.0) case 3: - logRecord.Body().SetDoubleVal(3.0) + logRecord.Body().SetDouble(3.0) case 4: - logRecord.Body().SetStringVal("4") + logRecord.Body().SetStr("4") case 5: fillComplexAttributeValueMap(logRecord.Attributes().PutEmptyMap("map-value")) - logRecord.Body().SetStringVal("log contents") + logRecord.Body().SetStr("log contents") case 6: - logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStringVal("array") - logRecord.Body().SetStringVal("log contents") + logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStr("array") + logRecord.Body().SetStr("log contents") default: - logRecord.Body().SetStringVal("log contents") + logRecord.Body().SetStr("log contents") } logRecord.Attributes().PutString(conventions.AttributeServiceName, "myapp") logRecord.Attributes().PutString("my-label", "myapp-type") diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 0ca137a3f894..807d93356de7 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.60.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -41,7 +41,7 @@ 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/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index f5869413fb30..fc962cf88793 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -337,12 +337,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 8fab5e156bbf..7a35289f9ad3 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.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.49.0 ) @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 135f12c389e0..6adbc2fe9365 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -274,10 +274,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 699b0a8b7ad2..6fe36d490b06 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index 890c698e0110..859652414a6c 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -262,10 +262,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 90c46390cd6d..33cc878d24eb 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/grpc v1.49.0 ) @@ -25,7 +25,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index beb86d988e9d..6fb0b272233b 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -267,10 +267,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 4bf5d12454c1..ba00f073fd9b 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 ) @@ -24,7 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index fce62ad2d42e..aacfcfa55a97 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -263,10 +263,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index 5d45fd4f1e70..8d4c48f1a258 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -7,7 +7,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index b75858b2dfc5..cef2a3894b54 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -278,10 +278,10 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/headerssetter/go.mod b/extension/headerssetter/go.mod index df07cfe82f29..b1cc40fe1d7e 100644 --- a/extension/headerssetter/go.mod +++ b/extension/headerssetter/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/grpc v1.49.0 ) @@ -20,7 +20,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/headerssetter/go.sum b/extension/headerssetter/go.sum index db509d3d6e75..828ec8d69b00 100644 --- a/extension/headerssetter/go.sum +++ b/extension/headerssetter/go.sum @@ -255,10 +255,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index 8e0b30127782..9843b4acd81d 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/grpc v1.49.0 ) @@ -20,7 +20,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index db509d3d6e75..828ec8d69b00 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -255,10 +255,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 1d2b6fdbc590..12bba5f17fed 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.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 5195d593fb1c..cc0689e85ca1 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -277,10 +277,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index dbdd57eeefa0..e91e7bde2ead 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 494cf6b56095..a21e218b282f 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -277,10 +277,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 501ecf79264e..30077b427e27 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 ) @@ -45,7 +45,7 @@ require ( github.com/subosito/gotenv v1.3.0 // 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/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 96360f5d11f9..75da6652770f 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -409,10 +409,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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 3db1edec787e..2d2cf2a955a0 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 google.golang.org/grpc v1.49.0 @@ -32,7 +32,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index db2967d7254b..062a472a8bb2 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -272,10 +272,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 7aa9f3d4c172..ddd629d85dba 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -40,7 +40,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 8be191efc15e..32465b2f80da 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -290,10 +290,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 8b45a372ea7f..ce366966199a 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.44.106 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 @@ -28,7 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index 394a899a3fae..62a5a2e2ccd3 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -269,10 +269,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 6647d27693fd..95fe564fda41 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -29,7 +29,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index 61693e470b59..2ca9b987e011 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -270,10 +270,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 91fc37388d3d..354956b0d7f4 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.60.0 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -33,7 +33,7 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index f50d6a8b83b1..9023e31946ed 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -280,10 +280,10 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index beba4d8f4f0b..515d783999bc 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 k8s.io/api v0.25.2 k8s.io/apimachinery v0.25.2 @@ -45,7 +45,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 01f61c7601d6..d8b602fc243c 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -430,10 +430,10 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 6b1665648048..c45744a0e23f 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index ce7dfa2344fd..baf525a0acff 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -343,10 +343,10 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 6bb07c1a1038..d6c59587e8b9 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) @@ -26,7 +26,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 6d274d94c5d6..e960dd7be20a 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -264,10 +264,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 85c78f190ab8..ace93f49fc86 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.12.20 github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 ) @@ -33,7 +33,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 3da80c49545f..4238f590dc11 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -280,10 +280,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index 19b8fb0830f0..a8b8775ecb40 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -37,7 +37,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index 4716bfd1892b..7f628ef2cbc4 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -345,10 +345,10 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/go.mod b/go.mod index 8fd2c432e11d..e06d2afce0b6 100644 --- a/go.mod +++ b/go.mod @@ -152,7 +152,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.60.0 github.com/prometheus/prometheus v1.8.2-0.20220303173753-edfe657b5405 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab ) @@ -563,8 +563,8 @@ require ( go.mongodb.org/atlas v0.16.0 // indirect go.mongodb.org/mongo-driver v1.10.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect diff --git a/go.sum b/go.sum index 283b75512cc5..bf4b85929348 100644 --- a/go.sum +++ b/go.sum @@ -2034,18 +2034,18 @@ 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.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.60.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.60.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index fc0161d1be92..1b333c08c838 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 8940ccc566d7..3901937d0363 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -52,8 +52,8 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/aws/containerinsight/utils_test.go b/internal/aws/containerinsight/utils_test.go index e1854ddcb613..1326720bed06 100644 --- a/internal/aws/containerinsight/utils_test.go +++ b/internal/aws/containerinsight/utils_test.go @@ -161,7 +161,7 @@ func checkMetricsAreExpected(t *testing.T, md pmetric.Metrics, fields map[string timeUnixNano, _ = strconv.ParseUint(val, 10, 64) val = strconv.FormatUint(timeUnixNano/uint64(time.Millisecond), 10) } - assert.Equal(t, val, attr.StringVal()) + assert.Equal(t, val, attr.Str()) } // check the metrics are expected diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 670c58689c8e..3464c84ea14d 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.106 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -26,7 +26,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.4.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 90dcf68d8a66..c782d6a1c7e2 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -268,10 +268,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 3217ec39003b..d496a959c51b 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 494cf6b56095..a21e218b282f 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -277,10 +277,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 368f5c02642c..d2b378ad9eb3 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.44.106 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index d00cd02a8273..b72232389880 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -29,8 +29,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/common/go.mod b/internal/common/go.mod index a0dd9bc91704..e659cdc9ee69 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index cbcf82014684..63fffdc59687 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -20,8 +20,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/coreinternal/attraction/attraction.go b/internal/coreinternal/attraction/attraction.go index 1691d65807e1..c09c3c3534cc 100644 --- a/internal/coreinternal/attraction/attraction.go +++ b/internal/coreinternal/attraction/attraction.go @@ -420,13 +420,13 @@ func extractAttributes(action attributeAction, attrs pcommon.Map) { value, found := attrs.Get(action.Key) // Extracting values only functions on strings. - if !found || value.Type() != pcommon.ValueTypeString { + if !found || value.Type() != pcommon.ValueTypeStr { return } // Note: The number of matches will always be equal to number of // subexpressions. - matches := action.Regex.FindStringSubmatch(value.StringVal()) + matches := action.Regex.FindStringSubmatch(value.Str()) if matches == nil { return } diff --git a/internal/coreinternal/attraction/hasher.go b/internal/coreinternal/attraction/hasher.go index 5b7ec88549f1..d7917687d621 100644 --- a/internal/coreinternal/attraction/hasher.go +++ b/internal/coreinternal/attraction/hasher.go @@ -41,20 +41,20 @@ var ( func sha1Hasher(attr pcommon.Value) { var val []byte switch attr.Type() { - case pcommon.ValueTypeString: - val = []byte(attr.StringVal()) + case pcommon.ValueTypeStr: + val = []byte(attr.Str()) case pcommon.ValueTypeBool: - if attr.BoolVal() { + if attr.Bool() { val = byteTrue[:] } else { val = byteFalse[:] } case pcommon.ValueTypeInt: val = make([]byte, int64ByteSize) - binary.LittleEndian.PutUint64(val, uint64(attr.IntVal())) + binary.LittleEndian.PutUint64(val, uint64(attr.Int())) case pcommon.ValueTypeDouble: val = make([]byte, float64ByteSize) - binary.LittleEndian.PutUint64(val, math.Float64bits(attr.DoubleVal())) + binary.LittleEndian.PutUint64(val, math.Float64bits(attr.Double())) } var hashed string @@ -68,5 +68,5 @@ func sha1Hasher(attr pcommon.Value) { hashed = string(hashedBytes) } - attr.SetStringVal(hashed) + attr.SetStr(hashed) } diff --git a/internal/coreinternal/attraction/type_converter.go b/internal/coreinternal/attraction/type_converter.go index cee247a3e9a5..2dfb17565e0a 100644 --- a/internal/coreinternal/attraction/type_converter.go +++ b/internal/coreinternal/attraction/type_converter.go @@ -31,26 +31,26 @@ func convertValue(logger *zap.Logger, key string, to string, v pcommon.Value) { switch to { case stringConversionTarget: switch v.Type() { - case pcommon.ValueTypeString: + case pcommon.ValueTypeStr: default: - v.SetStringVal(v.AsString()) + v.SetStr(v.AsString()) } case intConversionTarget: switch v.Type() { case pcommon.ValueTypeInt: case pcommon.ValueTypeDouble: - v.SetIntVal(int64(v.DoubleVal())) + v.SetInt(int64(v.Double())) case pcommon.ValueTypeBool: - if v.BoolVal() { - v.SetIntVal(1) + if v.Bool() { + v.SetInt(1) } else { - v.SetIntVal(0) + v.SetInt(0) } - case pcommon.ValueTypeString: - s := v.StringVal() + case pcommon.ValueTypeStr: + s := v.Str() n, err := strconv.ParseInt(s, 10, 64) if err == nil { - v.SetIntVal(n) + v.SetInt(n) } else { logger.Debug("String could not be converted to int", zap.String("key", key), zap.String("value", s), zap.Error(err)) } @@ -60,19 +60,19 @@ func convertValue(logger *zap.Logger, key string, to string, v pcommon.Value) { case doubleConversionTarget: switch v.Type() { case pcommon.ValueTypeInt: - v.SetDoubleVal(float64(v.IntVal())) + v.SetDouble(float64(v.Int())) case pcommon.ValueTypeDouble: case pcommon.ValueTypeBool: - if v.BoolVal() { - v.SetDoubleVal(1) + if v.Bool() { + v.SetDouble(1) } else { - v.SetDoubleVal(0) + v.SetDouble(0) } - case pcommon.ValueTypeString: - s := v.StringVal() + case pcommon.ValueTypeStr: + s := v.Str() n, err := strconv.ParseFloat(s, 64) if err == nil { - v.SetDoubleVal(n) + v.SetDouble(n) } else { logger.Debug("String could not be converted to double", zap.String("key", key), zap.String("value", s), zap.Error(err)) } diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 45cc083cf259..8cae7e418d53 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -8,9 +8,9 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 354506d3494c..f8f0bb669b02 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -276,12 +276,12 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/coreinternal/goldendataset/metrics_gen_test.go b/internal/coreinternal/goldendataset/metrics_gen_test.go index 0bf0b53b05a4..ce6fb9756c9c 100644 --- a/internal/coreinternal/goldendataset/metrics_gen_test.go +++ b/internal/coreinternal/goldendataset/metrics_gen_test.go @@ -32,7 +32,7 @@ func TestGenDefault(t *testing.T) { rattrs.Len() require.Equal(t, 1, rattrs.Len()) val, _ := rattrs.Get("resource-attr-name-0") - require.Equal(t, "resource-attr-val-0", val.StringVal()) + require.Equal(t, "resource-attr-val-0", val.Str()) ilms := rm.ScopeMetrics() require.Equal(t, 1, ilms.Len()) ms := ilms.At(0).Metrics() @@ -49,7 +49,7 @@ func TestGenDefault(t *testing.T) { require.Equal(t, 1, pt.Attributes().Len()) ptAttributes, _ := pt.Attributes().Get("pt-label-key-0") - require.Equal(t, "pt-label-val-0", ptAttributes.StringVal()) + require.Equal(t, "pt-label-val-0", ptAttributes.Str()) require.EqualValues(t, 940000000000000000, pt.StartTimestamp()) require.EqualValues(t, 940000000000000042, pt.Timestamp()) diff --git a/internal/coreinternal/goldendataset/resource_generator.go b/internal/coreinternal/goldendataset/resource_generator.go index e4153237d837..fa6fa3813b05 100644 --- a/internal/coreinternal/goldendataset/resource_generator.go +++ b/internal/coreinternal/goldendataset/resource_generator.go @@ -118,8 +118,8 @@ func appendFassAttributes(attrMap pcommon.Map) { func appendExecAttributes(attrMap pcommon.Map) { attrMap.PutString(conventions.AttributeProcessExecutableName, "otelcol") parts := attrMap.PutEmptySlice(conventions.AttributeProcessCommandLine) - parts.AppendEmpty().SetStringVal("otelcol") - parts.AppendEmpty().SetStringVal("--config=/etc/otel-collector-config.yaml") + parts.AppendEmpty().SetStr("otelcol") + parts.AppendEmpty().SetStr("--config=/etc/otel-collector-config.yaml") attrMap.PutString(conventions.AttributeProcessExecutablePath, "/usr/local/bin/otelcol") attrMap.PutInt(conventions.AttributeProcessPID, 2020) attrMap.PutString(conventions.AttributeProcessOwner, "otel") diff --git a/internal/coreinternal/goldendataset/span_generator.go b/internal/coreinternal/goldendataset/span_generator.go index 2d46889c6d19..38ef26080e21 100644 --- a/internal/coreinternal/goldendataset/span_generator.go +++ b/internal/coreinternal/goldendataset/span_generator.go @@ -364,9 +364,9 @@ func appendMaxCountAttributes(includeStatus bool, attrMap pcommon.Map) { attrMap.PutInt("ai-sampler.maxhops", 6) attrMap.PutString("application.create.location", "https://api.opentelemetry.io/blog/posts/806673B9-4F4D-4284-9635-3A3E3E3805BE") stages := attrMap.PutEmptySlice("application.stages") - stages.AppendEmpty().SetStringVal("Launch") - stages.AppendEmpty().SetStringVal("Injestion") - stages.AppendEmpty().SetStringVal("Validation") + stages.AppendEmpty().SetStr("Launch") + stages.AppendEmpty().SetStr("Injestion") + stages.AppendEmpty().SetStr("Validation") subMap := attrMap.PutEmptyMap("application.abflags") subMap.PutBool("UIx", false) subMap.PutBool("UI4", true) diff --git a/internal/coreinternal/metricstestutil/metric_diff.go b/internal/coreinternal/metricstestutil/metric_diff.go index 9c4ca52fdad7..0d4b3ff6c01f 100644 --- a/internal/coreinternal/metricstestutil/metric_diff.go +++ b/internal/coreinternal/metricstestutil/metric_diff.go @@ -334,7 +334,7 @@ func diffValues( func attrMapToString(m pcommon.Map) string { out := "" m.Range(func(k string, v pcommon.Value) bool { - out += "[" + k + "=" + v.StringVal() + "]" + out += "[" + k + "=" + v.Str() + "]" return true }) return out diff --git a/internal/coreinternal/processor/filterexpr/matcher.go b/internal/coreinternal/processor/filterexpr/matcher.go index 9070ce057747..5c10e3cc45a3 100644 --- a/internal/coreinternal/processor/filterexpr/matcher.go +++ b/internal/coreinternal/processor/filterexpr/matcher.go @@ -39,7 +39,7 @@ func (e *env) HasLabel(key string) bool { func (e *env) Label(key string) string { v, _ := e.attributes.Get(key) - return v.StringVal() + return v.Str() } func NewMatcher(expression string) (*Matcher, error) { diff --git a/internal/coreinternal/processor/filterlog/filterlog.go b/internal/coreinternal/processor/filterlog/filterlog.go index 0e673c7dd83b..c179132428ec 100644 --- a/internal/coreinternal/processor/filterlog/filterlog.go +++ b/internal/coreinternal/processor/filterlog/filterlog.go @@ -100,7 +100,7 @@ func NewMatcher(mp *filterconfig.MatchProperties) (Matcher, error) { // supported to have more than one of these specified, and all specified must // evaluate to true for a match to occur. func (mp *propertiesMatcher) MatchLogRecord(lr plog.LogRecord, resource pcommon.Resource, library pcommon.InstrumentationScope) bool { - if lr.Body().Type() == pcommon.ValueTypeString && mp.bodyFilters != nil && !mp.bodyFilters.Matches(lr.Body().StringVal()) { + if lr.Body().Type() == pcommon.ValueTypeStr && mp.bodyFilters != nil && !mp.bodyFilters.Matches(lr.Body().Str()) { return false } if mp.severityTextFilters != nil && !mp.severityTextFilters.Matches(lr.SeverityText()) { diff --git a/internal/coreinternal/processor/filterlog/filterlog_test.go b/internal/coreinternal/processor/filterlog/filterlog_test.go index 4062e1ad4f37..580686ff765d 100644 --- a/internal/coreinternal/processor/filterlog/filterlog_test.go +++ b/internal/coreinternal/processor/filterlog/filterlog_test.go @@ -197,7 +197,7 @@ func TestLogRecord_Matching_True(t *testing.T) { lr := plog.NewLogRecord() lr.Attributes().PutString("abc", "def") - lr.Body().SetStringVal("AUTHENTICATION FAILED") + lr.Body().SetStr("AUTHENTICATION FAILED") lr.SetSeverityText("debug") lr.SetSeverityNumber(plog.SeverityNumberDebug) diff --git a/internal/coreinternal/processor/filtermatcher/attributematcher.go b/internal/coreinternal/processor/filtermatcher/attributematcher.go index c4f8f6f18d04..8bd06097d731 100644 --- a/internal/coreinternal/processor/filtermatcher/attributematcher.go +++ b/internal/coreinternal/processor/filtermatcher/attributematcher.go @@ -59,14 +59,14 @@ func NewAttributesMatcher(config filterset.Config, attributes []filterconfig.Att switch config.MatchType { case filterset.Regexp: - if val.Type() != pcommon.ValueTypeString { + if val.Type() != pcommon.ValueTypeStr { return nil, fmt.Errorf( "%s=%s for %q only supports STRING, but found %s", filterset.MatchTypeFieldName, filterset.Regexp, attribute.Key, val.Type(), ) } - filter, err := filterset.CreateFilterSet([]string{val.StringVal()}, &config) + filter, err := filterset.CreateFilterSet([]string{val.Str()}, &config) if err != nil { return nil, err } @@ -120,14 +120,14 @@ func (ma AttributesMatcher) Match(attrs pcommon.Map) bool { func attributeStringValue(attr pcommon.Value) (string, error) { switch attr.Type() { - case pcommon.ValueTypeString: - return attr.StringVal(), nil + case pcommon.ValueTypeStr: + return attr.Str(), nil case pcommon.ValueTypeBool: - return strconv.FormatBool(attr.BoolVal()), nil + return strconv.FormatBool(attr.Bool()), nil case pcommon.ValueTypeDouble: - return strconv.FormatFloat(attr.DoubleVal(), 'f', -1, 64), nil + return strconv.FormatFloat(attr.Double(), 'f', -1, 64), nil case pcommon.ValueTypeInt: - return strconv.FormatInt(attr.IntVal(), 10), nil + return strconv.FormatInt(attr.Int(), 10), nil default: return "", errUnexpectedAttributeType } diff --git a/internal/coreinternal/testdata/log.go b/internal/coreinternal/testdata/log.go index 882b99f18f89..f60db5fa6cfe 100644 --- a/internal/coreinternal/testdata/log.go +++ b/internal/coreinternal/testdata/log.go @@ -78,7 +78,7 @@ func fillLogOne(log plog.LogRecord) { attrs.PutString("app", "server") attrs.PutInt("instance_num", 1) - log.Body().SetStringVal("This is a log message") + log.Body().SetStr("This is a log message") } func fillLogTwo(log plog.LogRecord) { @@ -91,7 +91,7 @@ func fillLogTwo(log plog.LogRecord) { attrs.PutString("customer", "acme") attrs.PutString("env", "dev") - log.Body().SetStringVal("something happened") + log.Body().SetStr("something happened") } func fillLogThree(log plog.LogRecord) { @@ -100,7 +100,7 @@ func fillLogThree(log plog.LogRecord) { log.SetSeverityNumber(plog.SeverityNumberWarn) log.SetSeverityText("Warning") - log.Body().SetStringVal("something else happened") + log.Body().SetStr("something else happened") } func GenerateLogsManyLogRecordsSameResource(count int) plog.Logs { diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 9e6ccd663187..6104f8439ccf 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 1b3a192f98da..41164887acdb 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -250,8 +250,8 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/scrapertest/go.mod b/internal/scrapertest/go.mod index d4b46c57f6ca..b40f1c6aaf73 100644 --- a/internal/scrapertest/go.mod +++ b/internal/scrapertest/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/internal/scrapertest/go.sum b/internal/scrapertest/go.sum index 8a71cc15d16d..52d9fd099d8a 100644 --- a/internal/scrapertest/go.sum +++ b/internal/scrapertest/go.sum @@ -59,8 +59,8 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/scrapertest/mask.go b/internal/scrapertest/mask.go index 2131fa40feba..240c3f3dfc3a 100644 --- a/internal/scrapertest/mask.go +++ b/internal/scrapertest/mask.go @@ -126,8 +126,8 @@ func maskDataPointSliceAttributeValues(dataPoints pmetric.NumberDataPointSlice, attribute, ok := attributes.Get(attributeName) if ok { switch attribute.Type() { - case pcommon.ValueTypeString: - attribute.SetStringVal("") + case pcommon.ValueTypeStr: + attribute.SetStr("") default: panic(fmt.Sprintf("data type not supported: %s", attribute.Type())) } diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index a6a2dc65e3f5..a8a3c27d94cc 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -22,7 +22,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index fce62ad2d42e..aacfcfa55a97 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -263,10 +263,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 2962a2721055..f9ed20e5da7f 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 11e815d775eb..6bc08f055df4 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -273,12 +273,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/internal/splunk/hostid.go b/internal/splunk/hostid.go index 3499d66964c0..e0640ab2fc7b 100644 --- a/internal/splunk/hostid.go +++ b/internal/splunk/hostid.go @@ -57,22 +57,22 @@ func ResourceToHostID(res pcommon.Resource) (HostID, bool) { } if attr, ok := attrs.Get(conventions.AttributeCloudAccountID); ok { - cloudAccount = attr.StringVal() + cloudAccount = attr.Str() } if attr, ok := attrs.Get(conventions.AttributeHostID); ok { - hostID = attr.StringVal() + hostID = attr.Str() } if attr, ok := attrs.Get(conventions.AttributeCloudProvider); ok { - provider = attr.StringVal() + provider = attr.Str() } switch provider { case conventions.AttributeCloudProviderAWS: var region string if attr, ok := attrs.Get(conventions.AttributeCloudRegion); ok { - region = attr.StringVal() + region = attr.Str() } if hostID == "" || region == "" || cloudAccount == "" { break @@ -106,7 +106,7 @@ func ResourceToHostID(res pcommon.Resource) (HostID, bool) { if attr, ok := attrs.Get(conventions.AttributeHostName); ok { return HostID{ Key: HostIDKeyHost, - ID: attr.StringVal(), + ID: attr.Str(), }, true } @@ -116,7 +116,7 @@ func ResourceToHostID(res pcommon.Resource) (HostID, bool) { func azureID(attrs pcommon.Map, cloudAccount string) string { var resourceGroupName string if attr, ok := attrs.Get("azure.resourcegroup.name"); ok { - resourceGroupName = attr.StringVal() + resourceGroupName = attr.Str() } if resourceGroupName == "" { return "" @@ -124,7 +124,7 @@ func azureID(attrs pcommon.Map, cloudAccount string) string { var hostname string if attr, ok := attrs.Get("azure.vm.name"); ok { - hostname = attr.StringVal() + hostname = attr.Str() } if hostname == "" { return "" @@ -132,7 +132,7 @@ func azureID(attrs pcommon.Map, cloudAccount string) string { var vmScaleSetName string if attr, ok := attrs.Get("azure.vm.scaleset.name"); ok { - vmScaleSetName = attr.StringVal() + vmScaleSetName = attr.Str() } if vmScaleSetName == "" { return strings.ToLower(fmt.Sprintf( diff --git a/pkg/batchperresourceattr/batchperresourceattr.go b/pkg/batchperresourceattr/batchperresourceattr.go index 74343793fa43..387a19148d44 100644 --- a/pkg/batchperresourceattr/batchperresourceattr.go +++ b/pkg/batchperresourceattr/batchperresourceattr.go @@ -54,7 +54,7 @@ func (bt *batchTraces) ConsumeTraces(ctx context.Context, td ptrace.Traces) erro rs := rss.At(i) var attrVal string if attributeValue, ok := rs.Resource().Attributes().Get(bt.attrKey); ok { - attrVal = attributeValue.StringVal() + attrVal = attributeValue.Str() } tracesForAttr, ok := tracesByAttr[attrVal] @@ -104,7 +104,7 @@ func (bt *batchMetrics) ConsumeMetrics(ctx context.Context, td pmetric.Metrics) rm := rms.At(i) var attrVal string if attributeValue, ok := rm.Resource().Attributes().Get(bt.attrKey); ok { - attrVal = attributeValue.StringVal() + attrVal = attributeValue.Str() } metricsForAttr, ok := metricsByAttr[attrVal] @@ -154,7 +154,7 @@ func (bt *batchLogs) ConsumeLogs(ctx context.Context, td plog.Logs) error { rl := rls.At(i) var attrVal string if attributeValue, ok := rl.Resource().Attributes().Get(bt.attrKey); ok { - attrVal = attributeValue.StringVal() + attrVal = attributeValue.Str() } logsForAttr, ok := logsByAttr[attrVal] diff --git a/pkg/batchperresourceattr/batchperresourceattr_test.go b/pkg/batchperresourceattr/batchperresourceattr_test.go index 107158981123..59c40fa39615 100644 --- a/pkg/batchperresourceattr/batchperresourceattr_test.go +++ b/pkg/batchperresourceattr/batchperresourceattr_test.go @@ -237,11 +237,11 @@ func sortTraces(tds []ptrace.Traces, attrKey string) { sort.Slice(tds, func(i, j int) bool { valI := "" if av, ok := tds[i].ResourceSpans().At(0).Resource().Attributes().Get(attrKey); ok { - valI = av.StringVal() + valI = av.Str() } valJ := "" if av, ok := tds[j].ResourceSpans().At(0).Resource().Attributes().Get(attrKey); ok { - valJ = av.StringVal() + valJ = av.Str() } return valI < valJ }) @@ -271,11 +271,11 @@ func sortMetrics(tds []pmetric.Metrics, attrKey string) { sort.Slice(tds, func(i, j int) bool { valI := "" if av, ok := tds[i].ResourceMetrics().At(0).Resource().Attributes().Get(attrKey); ok { - valI = av.StringVal() + valI = av.Str() } valJ := "" if av, ok := tds[j].ResourceMetrics().At(0).Resource().Attributes().Get(attrKey); ok { - valJ = av.StringVal() + valJ = av.Str() } return valI < valJ }) @@ -305,11 +305,11 @@ func sortLogs(tds []plog.Logs, attrKey string) { sort.Slice(tds, func(i, j int) bool { valI := "" if av, ok := tds[i].ResourceLogs().At(0).Resource().Attributes().Get(attrKey); ok { - valI = av.StringVal() + valI = av.Str() } valJ := "" if av, ok := tds[j].ResourceLogs().At(0).Resource().Attributes().Get(attrKey); ok { - valJ = av.StringVal() + valJ = av.Str() } return valI < valJ }) diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 4adc9abeb6a5..1f3e2710f6e4 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 2b983cb614dc..7d1b77029a28 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -82,10 +82,10 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= 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.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/pkg/batchpersignal/batchpersignal_test.go b/pkg/batchpersignal/batchpersignal_test.go index 697c38ded217..e45e54b38107 100644 --- a/pkg/batchpersignal/batchpersignal_test.go +++ b/pkg/batchpersignal/batchpersignal_test.go @@ -154,13 +154,13 @@ func TestSplitDifferentLogsIntoDifferentBatches(t *testing.T) { library.SetName("first-library") sl.LogRecords().EnsureCapacity(3) firstLog := sl.LogRecords().AppendEmpty() - firstLog.Body().SetStringVal("first-batch-first-log") + firstLog.Body().SetStr("first-batch-first-log") firstLog.SetTraceID([16]byte{1, 2, 3, 4}) secondLog := sl.LogRecords().AppendEmpty() - secondLog.Body().SetStringVal("first-batch-second-log") + secondLog.Body().SetStr("first-batch-second-log") secondLog.SetTraceID([16]byte{2, 3, 4, 5}) thirdLog := sl.LogRecords().AppendEmpty() - thirdLog.Body().SetStringVal("first-batch-third-log") + thirdLog.Body().SetStr("first-batch-third-log") // do not set traceID for third log // test @@ -174,21 +174,21 @@ func TestSplitDifferentLogsIntoDifferentBatches(t *testing.T) { firstOutILL := out[0].ResourceLogs().At(0).ScopeLogs().At(0) assert.Equal(t, sl.SchemaUrl(), firstOutILL.SchemaUrl()) assert.Equal(t, library.Name(), firstOutILL.Scope().Name()) - assert.Equal(t, firstLog.Body().StringVal(), firstOutILL.LogRecords().At(0).Body().StringVal()) + assert.Equal(t, firstLog.Body().Str(), firstOutILL.LogRecords().At(0).Body().Str()) // second batch assert.Equal(t, rl.SchemaUrl(), out[1].ResourceLogs().At(0).SchemaUrl()) secondOutILL := out[1].ResourceLogs().At(0).ScopeLogs().At(0) assert.Equal(t, sl.SchemaUrl(), secondOutILL.SchemaUrl()) assert.Equal(t, library.Name(), secondOutILL.Scope().Name()) - assert.Equal(t, secondLog.Body().StringVal(), secondOutILL.LogRecords().At(0).Body().StringVal()) + assert.Equal(t, secondLog.Body().Str(), secondOutILL.LogRecords().At(0).Body().Str()) // third batch assert.Equal(t, rl.SchemaUrl(), out[2].ResourceLogs().At(0).SchemaUrl()) thirdOutILL := out[2].ResourceLogs().At(0).ScopeLogs().At(0) assert.Equal(t, sl.SchemaUrl(), thirdOutILL.SchemaUrl()) assert.Equal(t, library.Name(), thirdOutILL.Scope().Name()) - assert.Equal(t, thirdLog.Body().StringVal(), thirdOutILL.LogRecords().At(0).Body().StringVal()) + assert.Equal(t, thirdLog.Body().Str(), thirdOutILL.LogRecords().At(0).Body().Str()) } func TestSplitLogsWithNilTraceID(t *testing.T) { @@ -228,10 +228,10 @@ func TestSplitLogsSameTraceIntoDifferentBatches(t *testing.T) { firstLibrary.SetName("first-library") firstILS.LogRecords().EnsureCapacity(2) firstLog := firstILS.LogRecords().AppendEmpty() - firstLog.Body().SetStringVal("first-batch-first-log") + firstLog.Body().SetStr("first-batch-first-log") firstLog.SetTraceID([16]byte{1, 2, 3, 4}) secondLog := firstILS.LogRecords().AppendEmpty() - secondLog.Body().SetStringVal("first-batch-second-log") + secondLog.Body().SetStr("first-batch-second-log") secondLog.SetTraceID([16]byte{1, 2, 3, 4}) // the second ILL has one log @@ -240,7 +240,7 @@ func TestSplitLogsSameTraceIntoDifferentBatches(t *testing.T) { secondLibrary := secondILS.Scope() secondLibrary.SetName("second-library") thirdLog := secondILS.LogRecords().AppendEmpty() - thirdLog.Body().SetStringVal("second-batch-first-log") + thirdLog.Body().SetStr("second-batch-first-log") thirdLog.SetTraceID([16]byte{1, 2, 3, 4}) // test @@ -254,13 +254,13 @@ func TestSplitLogsSameTraceIntoDifferentBatches(t *testing.T) { assert.Equal(t, firstILS.SchemaUrl(), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).SchemaUrl()) assert.Equal(t, pcommon.TraceID([16]byte{1, 2, 3, 4}), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).TraceID()) assert.Equal(t, firstLibrary.Name(), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).Scope().Name()) - assert.Equal(t, firstLog.Body().StringVal(), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().StringVal()) - assert.Equal(t, secondLog.Body().StringVal(), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(1).Body().StringVal()) + assert.Equal(t, firstLog.Body().Str(), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Str()) + assert.Equal(t, secondLog.Body().Str(), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(1).Body().Str()) // second batch assert.Equal(t, rl.SchemaUrl(), batches[1].ResourceLogs().At(0).SchemaUrl()) assert.Equal(t, secondILS.SchemaUrl(), batches[1].ResourceLogs().At(0).ScopeLogs().At(0).SchemaUrl()) assert.Equal(t, pcommon.TraceID([16]byte{1, 2, 3, 4}), batches[1].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).TraceID()) assert.Equal(t, secondLibrary.Name(), batches[1].ResourceLogs().At(0).ScopeLogs().At(0).Scope().Name()) - assert.Equal(t, thirdLog.Body().StringVal(), batches[1].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().StringVal()) + assert.Equal(t, thirdLog.Body().Str(), batches[1].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Str()) } diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index d210a12e304d..4c56b8d81d6c 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 4a19d872ee1e..f763c951afc8 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -48,8 +48,8 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= 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/ottl/contexts/internal/ottlcommon/resource_test.go b/pkg/ottl/contexts/internal/ottlcommon/resource_test.go index e45ce309109b..ea6e0a829fcf 100644 --- a/pkg/ottl/contexts/internal/ottlcommon/resource_test.go +++ b/pkg/ottl/contexts/internal/ottlcommon/resource_test.go @@ -139,11 +139,11 @@ func TestResourcePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refResource.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(resource pcommon.Resource) { - resource.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStringVal("new") + resource.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStr("new") }, }, { @@ -156,11 +156,11 @@ func TestResourcePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refResource.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(resource pcommon.Resource) { - resource.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBoolVal(false) + resource.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBool(false) }, }, { @@ -173,11 +173,11 @@ func TestResourcePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refResource.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(resource pcommon.Resource) { - resource.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetIntVal(20) + resource.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetInt(20) }, }, { @@ -190,11 +190,11 @@ func TestResourcePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refResource.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(resource pcommon.Resource) { - resource.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDoubleVal(2.0) + resource.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDouble(2.0) }, }, { @@ -207,11 +207,11 @@ func TestResourcePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refResource.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(resource pcommon.Resource) { - resource.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + resource.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, { @@ -257,24 +257,24 @@ func createResource() pcommon.Resource { resource.Attributes().PutEmptyBytes("bytes").FromRaw([]byte{1, 3, 2}) arrStr := resource.Attributes().PutEmptySlice("arr_str") - arrStr.AppendEmpty().SetStringVal("one") - arrStr.AppendEmpty().SetStringVal("two") + arrStr.AppendEmpty().SetStr("one") + arrStr.AppendEmpty().SetStr("two") arrBool := resource.Attributes().PutEmptySlice("arr_bool") - arrBool.AppendEmpty().SetBoolVal(true) - arrBool.AppendEmpty().SetBoolVal(false) + arrBool.AppendEmpty().SetBool(true) + arrBool.AppendEmpty().SetBool(false) arrInt := resource.Attributes().PutEmptySlice("arr_int") - arrInt.AppendEmpty().SetIntVal(2) - arrInt.AppendEmpty().SetIntVal(3) + arrInt.AppendEmpty().SetInt(2) + arrInt.AppendEmpty().SetInt(3) arrFloat := resource.Attributes().PutEmptySlice("arr_float") - arrFloat.AppendEmpty().SetDoubleVal(1.0) - arrFloat.AppendEmpty().SetDoubleVal(2.0) + arrFloat.AppendEmpty().SetDouble(1.0) + arrFloat.AppendEmpty().SetDouble(2.0) arrBytes := resource.Attributes().PutEmptySlice("arr_bytes") - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{1, 2, 3}) - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{2, 3, 4}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{1, 2, 3}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{2, 3, 4}) resource.SetDroppedAttributesCount(10) diff --git a/pkg/ottl/contexts/internal/ottlcommon/scope_test.go b/pkg/ottl/contexts/internal/ottlcommon/scope_test.go index 75eeba72ae97..6f6c2a23a192 100644 --- a/pkg/ottl/contexts/internal/ottlcommon/scope_test.go +++ b/pkg/ottl/contexts/internal/ottlcommon/scope_test.go @@ -164,12 +164,12 @@ func TestScopePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refIS.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(is pcommon.InstrumentationScope) { newArr := is.Attributes().PutEmptySlice("arr_str") - newArr.AppendEmpty().SetStringVal("new") + newArr.AppendEmpty().SetStr("new") }, }, { @@ -182,12 +182,12 @@ func TestScopePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refIS.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(is pcommon.InstrumentationScope) { newArr := is.Attributes().PutEmptySlice("arr_bool") - newArr.AppendEmpty().SetBoolVal(false) + newArr.AppendEmpty().SetBool(false) }, }, { @@ -200,12 +200,12 @@ func TestScopePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refIS.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(is pcommon.InstrumentationScope) { newArr := is.Attributes().PutEmptySlice("arr_int") - newArr.AppendEmpty().SetIntVal(20) + newArr.AppendEmpty().SetInt(20) }, }, { @@ -218,12 +218,12 @@ func TestScopePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refIS.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(is pcommon.InstrumentationScope) { newArr := is.Attributes().PutEmptySlice("arr_float") - newArr.AppendEmpty().SetDoubleVal(2.0) + newArr.AppendEmpty().SetDouble(2.0) }, }, { @@ -236,12 +236,12 @@ func TestScopePathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refIS.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(is pcommon.InstrumentationScope) { newArr := is.Attributes().PutEmptySlice("arr_bytes") - newArr.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + newArr.AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, } @@ -277,24 +277,24 @@ func createInstrumentationScope() pcommon.InstrumentationScope { is.Attributes().PutEmptyBytes("bytes").FromRaw([]byte{1, 3, 2}) arrStr := is.Attributes().PutEmptySlice("arr_str") - arrStr.AppendEmpty().SetStringVal("one") - arrStr.AppendEmpty().SetStringVal("two") + arrStr.AppendEmpty().SetStr("one") + arrStr.AppendEmpty().SetStr("two") arrBool := is.Attributes().PutEmptySlice("arr_bool") - arrBool.AppendEmpty().SetBoolVal(true) - arrBool.AppendEmpty().SetBoolVal(false) + arrBool.AppendEmpty().SetBool(true) + arrBool.AppendEmpty().SetBool(false) arrInt := is.Attributes().PutEmptySlice("arr_int") - arrInt.AppendEmpty().SetIntVal(2) - arrInt.AppendEmpty().SetIntVal(3) + arrInt.AppendEmpty().SetInt(2) + arrInt.AppendEmpty().SetInt(3) arrFloat := is.Attributes().PutEmptySlice("arr_float") - arrFloat.AppendEmpty().SetDoubleVal(1.0) - arrFloat.AppendEmpty().SetDoubleVal(2.0) + arrFloat.AppendEmpty().SetDouble(1.0) + arrFloat.AppendEmpty().SetDouble(2.0) arrBytes := is.Attributes().PutEmptySlice("arr_bytes") - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{1, 2, 3}) - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{2, 3, 4}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{1, 2, 3}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{2, 3, 4}) return is } diff --git a/pkg/ottl/contexts/internal/ottlcommon/value.go b/pkg/ottl/contexts/internal/ottlcommon/value.go index bd04e6a0182a..50544bad567d 100644 --- a/pkg/ottl/contexts/internal/ottlcommon/value.go +++ b/pkg/ottl/contexts/internal/ottlcommon/value.go @@ -20,20 +20,20 @@ import ( func GetValue(val pcommon.Value) interface{} { switch val.Type() { - case pcommon.ValueTypeString: - return val.StringVal() + case pcommon.ValueTypeStr: + return val.Str() case pcommon.ValueTypeBool: - return val.BoolVal() + return val.Bool() case pcommon.ValueTypeInt: - return val.IntVal() + return val.Int() case pcommon.ValueTypeDouble: - return val.DoubleVal() + return val.Double() case pcommon.ValueTypeMap: - return val.MapVal() + return val.Map() case pcommon.ValueTypeSlice: - return val.SliceVal() + return val.Slice() case pcommon.ValueTypeBytes: - return val.BytesVal().AsRaw() + return val.Bytes().AsRaw() } return nil } @@ -41,49 +41,49 @@ func GetValue(val pcommon.Value) interface{} { func SetValue(value pcommon.Value, val interface{}) { switch v := val.(type) { case string: - value.SetStringVal(v) + value.SetStr(v) case bool: - value.SetBoolVal(v) + value.SetBool(v) case int64: - value.SetIntVal(v) + value.SetInt(v) case float64: - value.SetDoubleVal(v) + value.SetDouble(v) case []byte: - value.SetEmptyBytesVal().FromRaw(v) + value.SetEmptyBytes().FromRaw(v) case []string: - value.SliceVal().RemoveIf(func(_ pcommon.Value) bool { + value.Slice().RemoveIf(func(_ pcommon.Value) bool { return true }) for _, str := range v { - value.SliceVal().AppendEmpty().SetStringVal(str) + value.Slice().AppendEmpty().SetStr(str) } case []bool: - value.SliceVal().RemoveIf(func(_ pcommon.Value) bool { + value.Slice().RemoveIf(func(_ pcommon.Value) bool { return true }) for _, b := range v { - value.SliceVal().AppendEmpty().SetBoolVal(b) + value.Slice().AppendEmpty().SetBool(b) } case []int64: - value.SliceVal().RemoveIf(func(_ pcommon.Value) bool { + value.Slice().RemoveIf(func(_ pcommon.Value) bool { return true }) for _, i := range v { - value.SliceVal().AppendEmpty().SetIntVal(i) + value.Slice().AppendEmpty().SetInt(i) } case []float64: - value.SliceVal().RemoveIf(func(_ pcommon.Value) bool { + value.Slice().RemoveIf(func(_ pcommon.Value) bool { return true }) for _, f := range v { - value.SliceVal().AppendEmpty().SetDoubleVal(f) + value.Slice().AppendEmpty().SetDouble(f) } case [][]byte: - value.SliceVal().RemoveIf(func(_ pcommon.Value) bool { + value.Slice().RemoveIf(func(_ pcommon.Value) bool { return true }) for _, b := range v { - value.SliceVal().AppendEmpty().SetEmptyBytesVal().FromRaw(b) + value.Slice().AppendEmpty().SetEmptyBytes().FromRaw(b) } default: // TODO(anuraaga): Support set of map type. diff --git a/pkg/ottl/contexts/ottldatapoints/datapoints_test.go b/pkg/ottl/contexts/ottldatapoints/datapoints_test.go index 404786581f80..6a9bc5ab3be5 100644 --- a/pkg/ottl/contexts/ottldatapoints/datapoints_test.go +++ b/pkg/ottl/contexts/ottldatapoints/datapoints_test.go @@ -212,11 +212,11 @@ func Test_newPathGetSetter_NumberDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refNumberDataPoint.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(datapoint pmetric.NumberDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStringVal("new") + datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStr("new") }, }, { @@ -229,11 +229,11 @@ func Test_newPathGetSetter_NumberDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refNumberDataPoint.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(datapoint pmetric.NumberDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBoolVal(false) + datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBool(false) }, }, { @@ -246,11 +246,11 @@ func Test_newPathGetSetter_NumberDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refNumberDataPoint.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(datapoint pmetric.NumberDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetIntVal(20) + datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetInt(20) }, }, { @@ -263,11 +263,11 @@ func Test_newPathGetSetter_NumberDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refNumberDataPoint.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(datapoint pmetric.NumberDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDoubleVal(2.0) + datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDouble(2.0) }, }, { @@ -280,11 +280,11 @@ func Test_newPathGetSetter_NumberDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refNumberDataPoint.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(datapoint pmetric.NumberDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, } @@ -538,11 +538,11 @@ func Test_newPathGetSetter_HistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refHistogramDataPoint.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(datapoint pmetric.HistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStringVal("new") + datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStr("new") }, }, { @@ -555,11 +555,11 @@ func Test_newPathGetSetter_HistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refHistogramDataPoint.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(datapoint pmetric.HistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBoolVal(false) + datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBool(false) }, }, { @@ -572,11 +572,11 @@ func Test_newPathGetSetter_HistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refHistogramDataPoint.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(datapoint pmetric.HistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetIntVal(20) + datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetInt(20) }, }, { @@ -589,11 +589,11 @@ func Test_newPathGetSetter_HistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refHistogramDataPoint.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(datapoint pmetric.HistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDoubleVal(2.0) + datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDouble(2.0) }, }, { @@ -606,11 +606,11 @@ func Test_newPathGetSetter_HistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refHistogramDataPoint.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(datapoint pmetric.HistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, } @@ -960,11 +960,11 @@ func Test_newPathGetSetter_ExpoHistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(datapoint pmetric.ExponentialHistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStringVal("new") + datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStr("new") }, }, { @@ -977,11 +977,11 @@ func Test_newPathGetSetter_ExpoHistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(datapoint pmetric.ExponentialHistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBoolVal(false) + datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBool(false) }, }, { @@ -994,11 +994,11 @@ func Test_newPathGetSetter_ExpoHistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(datapoint pmetric.ExponentialHistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetIntVal(20) + datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetInt(20) }, }, { @@ -1011,11 +1011,11 @@ func Test_newPathGetSetter_ExpoHistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(datapoint pmetric.ExponentialHistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDoubleVal(2.0) + datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDouble(2.0) }, }, { @@ -1028,11 +1028,11 @@ func Test_newPathGetSetter_ExpoHistogramDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(datapoint pmetric.ExponentialHistogramDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, } @@ -1267,11 +1267,11 @@ func Test_newPathGetSetter_SummaryDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(datapoint pmetric.SummaryDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStringVal("new") + datapoint.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStr("new") }, }, { @@ -1284,11 +1284,11 @@ func Test_newPathGetSetter_SummaryDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(datapoint pmetric.SummaryDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBoolVal(false) + datapoint.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBool(false) }, }, { @@ -1301,11 +1301,11 @@ func Test_newPathGetSetter_SummaryDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(datapoint pmetric.SummaryDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetIntVal(20) + datapoint.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetInt(20) }, }, { @@ -1318,11 +1318,11 @@ func Test_newPathGetSetter_SummaryDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(datapoint pmetric.SummaryDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDoubleVal(2.0) + datapoint.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDouble(2.0) }, }, { @@ -1335,11 +1335,11 @@ func Test_newPathGetSetter_SummaryDataPoint(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refExpoHistogramDataPoint.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(datapoint pmetric.SummaryDataPoint) { - datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + datapoint.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, } @@ -1386,24 +1386,24 @@ func createAttributeTelemetry(attributes pcommon.Map) { attributes.PutEmptyBytes("bytes").FromRaw([]byte{1, 3, 2}) arrStr := attributes.PutEmptySlice("arr_str") - arrStr.AppendEmpty().SetStringVal("one") - arrStr.AppendEmpty().SetStringVal("two") + arrStr.AppendEmpty().SetStr("one") + arrStr.AppendEmpty().SetStr("two") arrBool := attributes.PutEmptySlice("arr_bool") - arrBool.AppendEmpty().SetBoolVal(true) - arrBool.AppendEmpty().SetBoolVal(false) + arrBool.AppendEmpty().SetBool(true) + arrBool.AppendEmpty().SetBool(false) arrInt := attributes.PutEmptySlice("arr_int") - arrInt.AppendEmpty().SetIntVal(2) - arrInt.AppendEmpty().SetIntVal(3) + arrInt.AppendEmpty().SetInt(2) + arrInt.AppendEmpty().SetInt(3) arrFloat := attributes.PutEmptySlice("arr_float") - arrFloat.AppendEmpty().SetDoubleVal(1.0) - arrFloat.AppendEmpty().SetDoubleVal(2.0) + arrFloat.AppendEmpty().SetDouble(1.0) + arrFloat.AppendEmpty().SetDouble(2.0) arrBytes := attributes.PutEmptySlice("arr_bytes") - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{1, 2, 3}) - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{2, 3, 4}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{1, 2, 3}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{2, 3, 4}) } func Test_newPathGetSetter_Metric(t *testing.T) { diff --git a/pkg/ottl/contexts/ottllogs/logs_test.go b/pkg/ottl/contexts/ottllogs/logs_test.go index 17b6846a4f74..4fea3d4c7870 100644 --- a/pkg/ottl/contexts/ottllogs/logs_test.go +++ b/pkg/ottl/contexts/ottllogs/logs_test.go @@ -109,7 +109,7 @@ func Test_newPathGetSetter(t *testing.T) { orig: "body", newVal: "head", modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.Body().SetStringVal("head") + log.Body().SetStr("head") }, }, { @@ -277,11 +277,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refLog.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStringVal("new") + log.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStr("new") }, }, { @@ -294,11 +294,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refLog.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBoolVal(false) + log.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBool(false) }, }, { @@ -311,11 +311,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refLog.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetIntVal(20) + log.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetInt(20) }, }, { @@ -328,11 +328,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refLog.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDoubleVal(2.0) + log.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDouble(2.0) }, }, { @@ -345,11 +345,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refLog.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + log.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, { @@ -420,7 +420,7 @@ func createTelemetry() (plog.LogRecord, pcommon.InstrumentationScope, pcommon.Re log.SetObservedTimestamp(pcommon.NewTimestampFromTime(time.UnixMilli(500))) log.SetSeverityNumber(plog.SeverityNumberFatal) log.SetSeverityText("blue screen of death") - log.Body().SetStringVal("body") + log.Body().SetStr("body") log.Attributes().PutString("str", "val") log.Attributes().PutBool("bool", true) log.Attributes().PutInt("int", 10) @@ -428,24 +428,24 @@ func createTelemetry() (plog.LogRecord, pcommon.InstrumentationScope, pcommon.Re log.Attributes().PutEmptyBytes("bytes").FromRaw([]byte{1, 3, 2}) arrStr := log.Attributes().PutEmptySlice("arr_str") - arrStr.AppendEmpty().SetStringVal("one") - arrStr.AppendEmpty().SetStringVal("two") + arrStr.AppendEmpty().SetStr("one") + arrStr.AppendEmpty().SetStr("two") arrBool := log.Attributes().PutEmptySlice("arr_bool") - arrBool.AppendEmpty().SetBoolVal(true) - arrBool.AppendEmpty().SetBoolVal(false) + arrBool.AppendEmpty().SetBool(true) + arrBool.AppendEmpty().SetBool(false) arrInt := log.Attributes().PutEmptySlice("arr_int") - arrInt.AppendEmpty().SetIntVal(2) - arrInt.AppendEmpty().SetIntVal(3) + arrInt.AppendEmpty().SetInt(2) + arrInt.AppendEmpty().SetInt(3) arrFloat := log.Attributes().PutEmptySlice("arr_float") - arrFloat.AppendEmpty().SetDoubleVal(1.0) - arrFloat.AppendEmpty().SetDoubleVal(2.0) + arrFloat.AppendEmpty().SetDouble(1.0) + arrFloat.AppendEmpty().SetDouble(2.0) arrBytes := log.Attributes().PutEmptySlice("arr_bytes") - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{1, 2, 3}) - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{2, 3, 4}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{1, 2, 3}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{2, 3, 4}) log.SetDroppedAttributesCount(10) diff --git a/pkg/ottl/contexts/ottltraces/traces_test.go b/pkg/ottl/contexts/ottltraces/traces_test.go index 5c2e90a7c06f..0f8d80eb79e3 100644 --- a/pkg/ottl/contexts/ottltraces/traces_test.go +++ b/pkg/ottl/contexts/ottltraces/traces_test.go @@ -300,11 +300,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refSpan.Attributes().Get("arr_str") - return val.SliceVal() + return val.Slice() }(), newVal: []string{"new"}, modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStringVal("new") + span.Attributes().PutEmptySlice("arr_str").AppendEmpty().SetStr("new") }, }, { @@ -317,11 +317,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refSpan.Attributes().Get("arr_bool") - return val.SliceVal() + return val.Slice() }(), newVal: []bool{false}, modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBoolVal(false) + span.Attributes().PutEmptySlice("arr_bool").AppendEmpty().SetBool(false) }, }, { @@ -334,11 +334,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refSpan.Attributes().Get("arr_int") - return val.SliceVal() + return val.Slice() }(), newVal: []int64{20}, modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetIntVal(20) + span.Attributes().PutEmptySlice("arr_int").AppendEmpty().SetInt(20) }, }, { @@ -351,11 +351,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refSpan.Attributes().Get("arr_float") - return val.SliceVal() + return val.Slice() }(), newVal: []float64{2.0}, modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDoubleVal(2.0) + span.Attributes().PutEmptySlice("arr_float").AppendEmpty().SetDouble(2.0) }, }, { @@ -368,11 +368,11 @@ func Test_newPathGetSetter(t *testing.T) { }, orig: func() pcommon.Slice { val, _ := refSpan.Attributes().Get("arr_bytes") - return val.SliceVal() + return val.Slice() }(), newVal: [][]byte{{9, 6, 4}}, modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{9, 6, 4}) + span.Attributes().PutEmptySlice("arr_bytes").AppendEmpty().SetEmptyBytes().FromRaw([]byte{9, 6, 4}) }, }, { @@ -557,24 +557,24 @@ func createTelemetry() (ptrace.Span, pcommon.InstrumentationScope, pcommon.Resou span.Attributes().PutEmptyBytes("bytes").FromRaw([]byte{1, 3, 2}) arrStr := span.Attributes().PutEmptySlice("arr_str") - arrStr.AppendEmpty().SetStringVal("one") - arrStr.AppendEmpty().SetStringVal("two") + arrStr.AppendEmpty().SetStr("one") + arrStr.AppendEmpty().SetStr("two") arrBool := span.Attributes().PutEmptySlice("arr_bool") - arrBool.AppendEmpty().SetBoolVal(true) - arrBool.AppendEmpty().SetBoolVal(false) + arrBool.AppendEmpty().SetBool(true) + arrBool.AppendEmpty().SetBool(false) arrInt := span.Attributes().PutEmptySlice("arr_int") - arrInt.AppendEmpty().SetIntVal(2) - arrInt.AppendEmpty().SetIntVal(3) + arrInt.AppendEmpty().SetInt(2) + arrInt.AppendEmpty().SetInt(3) arrFloat := span.Attributes().PutEmptySlice("arr_float") - arrFloat.AppendEmpty().SetDoubleVal(1.0) - arrFloat.AppendEmpty().SetDoubleVal(2.0) + arrFloat.AppendEmpty().SetDouble(1.0) + arrFloat.AppendEmpty().SetDouble(2.0) arrBytes := span.Attributes().PutEmptySlice("arr_bytes") - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{1, 2, 3}) - arrBytes.AppendEmpty().SetEmptyBytesVal().FromRaw([]byte{2, 3, 4}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{1, 2, 3}) + arrBytes.AppendEmpty().SetEmptyBytes().FromRaw([]byte{2, 3, 4}) span.SetDroppedAttributesCount(10) diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 58bb0b7702b2..5a238808c126 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -6,8 +6,8 @@ require ( github.com/alecthomas/participle/v2 v2.0.0-beta.5 github.com/gobwas/glob v0.2.3 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.opentelemetry.io/otel/trace v1.10.0 go.uber.org/multierr v1.8.0 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index e98060857e2f..d559426ab154 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -268,10 +268,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/pkg/ottl/ottlfuncs/func_replace_all_matches.go b/pkg/ottl/ottlfuncs/func_replace_all_matches.go index 3349ce71375d..cae8eff46ce5 100644 --- a/pkg/ottl/ottlfuncs/func_replace_all_matches.go +++ b/pkg/ottl/ottlfuncs/func_replace_all_matches.go @@ -37,8 +37,8 @@ func ReplaceAllMatches(target ottl.GetSetter, pattern string, replacement string updated := pcommon.NewMap() attrs.CopyTo(updated) updated.Range(func(key string, value pcommon.Value) bool { - if glob.Match(value.StringVal()) { - value.SetStringVal(replacement) + if glob.Match(value.Str()) { + value.SetStr(replacement) } return true }) diff --git a/pkg/ottl/ottlfuncs/func_replace_all_patterns.go b/pkg/ottl/ottlfuncs/func_replace_all_patterns.go index 4a89f84e1bf4..9e9394ac3ae2 100644 --- a/pkg/ottl/ottlfuncs/func_replace_all_patterns.go +++ b/pkg/ottl/ottlfuncs/func_replace_all_patterns.go @@ -37,9 +37,9 @@ func ReplaceAllPatterns(target ottl.GetSetter, regexPattern string, replacement updated := pcommon.NewMap() attrs.CopyTo(updated) updated.Range(func(key string, value pcommon.Value) bool { - stringVal := value.StringVal() + stringVal := value.Str() if compiledPattern.MatchString(stringVal) { - value.SetStringVal(compiledPattern.ReplaceAllLiteralString(stringVal, replacement)) + value.SetStr(compiledPattern.ReplaceAllLiteralString(stringVal, replacement)) } return true }) diff --git a/pkg/ottl/ottlfuncs/func_replace_match_test.go b/pkg/ottl/ottlfuncs/func_replace_match_test.go index 7dee0fb5a7b5..0460ff3ed880 100644 --- a/pkg/ottl/ottlfuncs/func_replace_match_test.go +++ b/pkg/ottl/ottlfuncs/func_replace_match_test.go @@ -29,10 +29,10 @@ func Test_replaceMatch(t *testing.T) { target := &ottl.StandardGetSetter{ Getter: func(ctx ottl.TransformContext) interface{} { - return ctx.GetItem().(pcommon.Value).StringVal() + return ctx.GetItem().(pcommon.Value).Str() }, Setter: func(ctx ottl.TransformContext, val interface{}) { - ctx.GetItem().(pcommon.Value).SetStringVal(val.(string)) + ctx.GetItem().(pcommon.Value).SetStr(val.(string)) }, } @@ -49,7 +49,7 @@ func Test_replaceMatch(t *testing.T) { pattern: "hello*", replacement: "hello {universe}", want: func(expectedValue pcommon.Value) { - expectedValue.SetStringVal("hello {universe}") + expectedValue.SetStr("hello {universe}") }, }, { @@ -58,13 +58,13 @@ func Test_replaceMatch(t *testing.T) { pattern: "goodbye*", replacement: "goodbye {universe}", want: func(expectedValue pcommon.Value) { - expectedValue.SetStringVal("hello world") + expectedValue.SetStr("hello world") }, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scenarioValue := pcommon.NewValueString(input.StringVal()) + scenarioValue := pcommon.NewValueString(input.Str()) ctx := ottltest.TestTransformContext{ Item: scenarioValue, diff --git a/pkg/ottl/ottlfuncs/func_replace_pattern_test.go b/pkg/ottl/ottlfuncs/func_replace_pattern_test.go index 8d1e63ef5706..45ec2fd52a03 100644 --- a/pkg/ottl/ottlfuncs/func_replace_pattern_test.go +++ b/pkg/ottl/ottlfuncs/func_replace_pattern_test.go @@ -29,10 +29,10 @@ func Test_replacePattern(t *testing.T) { target := &ottl.StandardGetSetter{ Getter: func(ctx ottl.TransformContext) interface{} { - return ctx.GetItem().(pcommon.Value).StringVal() + return ctx.GetItem().(pcommon.Value).Str() }, Setter: func(ctx ottl.TransformContext, val interface{}) { - ctx.GetItem().(pcommon.Value).SetStringVal(val.(string)) + ctx.GetItem().(pcommon.Value).SetStr(val.(string)) }, } @@ -49,7 +49,7 @@ func Test_replacePattern(t *testing.T) { pattern: `passwd\=[^\s]*(\s?)`, replacement: "passwd=*** ", want: func(expectedValue pcommon.Value) { - expectedValue.SetStringVal("application passwd=*** otherarg=notsensitive key1 key2") + expectedValue.SetStr("application passwd=*** otherarg=notsensitive key1 key2") }, }, { @@ -58,7 +58,7 @@ func Test_replacePattern(t *testing.T) { pattern: `nomatch\=[^\s]*(\s?)`, replacement: "shouldnotbeinoutput", want: func(expectedValue pcommon.Value) { - expectedValue.SetStringVal("application passwd=sensitivedtata otherarg=notsensitive key1 key2") + expectedValue.SetStr("application passwd=sensitivedtata otherarg=notsensitive key1 key2") }, }, { @@ -67,13 +67,13 @@ func Test_replacePattern(t *testing.T) { pattern: `key[^\s]*(\s?)`, replacement: "**** ", want: func(expectedValue pcommon.Value) { - expectedValue.SetStringVal("application passwd=sensitivedtata otherarg=notsensitive **** **** ") + expectedValue.SetStr("application passwd=sensitivedtata otherarg=notsensitive **** **** ") }, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scenarioValue := pcommon.NewValueString(input.StringVal()) + scenarioValue := pcommon.NewValueString(input.Str()) ctx := ottltest.TestTransformContext{ Item: scenarioValue, diff --git a/pkg/ottl/ottlfuncs/func_set_test.go b/pkg/ottl/ottlfuncs/func_set_test.go index 1fd51147c87d..4881d71857d7 100644 --- a/pkg/ottl/ottlfuncs/func_set_test.go +++ b/pkg/ottl/ottlfuncs/func_set_test.go @@ -29,7 +29,7 @@ func Test_set(t *testing.T) { target := &ottl.StandardGetSetter{ Setter: func(ctx ottl.TransformContext, val interface{}) { - ctx.GetItem().(pcommon.Value).SetStringVal(val.(string)) + ctx.GetItem().(pcommon.Value).SetStr(val.(string)) }, } @@ -48,7 +48,7 @@ func Test_set(t *testing.T) { }, }, want: func(expectedValue pcommon.Value) { - expectedValue.SetStringVal("new name") + expectedValue.SetStr("new name") }, }, { @@ -60,13 +60,13 @@ func Test_set(t *testing.T) { }, }, want: func(expectedValue pcommon.Value) { - expectedValue.SetStringVal("original name") + expectedValue.SetStr("original name") }, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scenarioValue := pcommon.NewValueString(input.StringVal()) + scenarioValue := pcommon.NewValueString(input.Str()) ctx := ottltest.TestTransformContext{ Item: scenarioValue, diff --git a/pkg/ottl/ottlfuncs/func_truncate_all.go b/pkg/ottl/ottlfuncs/func_truncate_all.go index e71fd1e029a8..ae5f722ca7fa 100644 --- a/pkg/ottl/ottlfuncs/func_truncate_all.go +++ b/pkg/ottl/ottlfuncs/func_truncate_all.go @@ -40,9 +40,9 @@ func TruncateAll(target ottl.GetSetter, limit int64) (ottl.ExprFunc, error) { updated := pcommon.NewMap() attrs.CopyTo(updated) updated.Range(func(key string, value pcommon.Value) bool { - stringVal := value.StringVal() + stringVal := value.Str() if int64(len(stringVal)) > limit { - value.SetStringVal(stringVal[:limit]) + value.SetStr(stringVal[:limit]) } return true }) diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 5da223d446b9..76c77baa87a5 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index e5ce96e64cd8..dd0c53ff4abd 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -254,10 +254,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/pkg/stanza/adapter/converter.go b/pkg/stanza/adapter/converter.go index d9af7c413bbe..41fe178bf8e4 100644 --- a/pkg/stanza/adapter/converter.go +++ b/pkg/stanza/adapter/converter.go @@ -368,43 +368,43 @@ func convertInto(ent *entry.Entry, dest plog.LogRecord) { func upsertToAttributeVal(value interface{}, dest pcommon.Value) { switch t := value.(type) { case bool: - dest.SetBoolVal(t) + dest.SetBool(t) case string: - dest.SetStringVal(t) + dest.SetStr(t) case []string: - upsertStringsToSlice(t, dest.SetEmptySliceVal()) + upsertStringsToSlice(t, dest.SetEmptySlice()) case []byte: - dest.SetEmptyBytesVal().FromRaw(t) + dest.SetEmptyBytes().FromRaw(t) case int64: - dest.SetIntVal(t) + dest.SetInt(t) case int32: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case int16: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case int8: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case int: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case uint64: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case uint32: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case uint16: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case uint8: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case uint: - dest.SetIntVal(int64(t)) + dest.SetInt(int64(t)) case float64: - dest.SetDoubleVal(t) + dest.SetDouble(t) case float32: - dest.SetDoubleVal(float64(t)) + dest.SetDouble(float64(t)) case map[string]interface{}: - upsertToMap(t, dest.SetEmptyMapVal()) + upsertToMap(t, dest.SetEmptyMap()) case []interface{}: - upsertToSlice(t, dest.SetEmptySliceVal()) + upsertToSlice(t, dest.SetEmptySlice()) default: - dest.SetStringVal(fmt.Sprintf("%v", t)) + dest.SetStr(fmt.Sprintf("%v", t)) } } @@ -425,7 +425,7 @@ func upsertToSlice(obsArr []interface{}, dest pcommon.Slice) { func upsertStringsToSlice(obsArr []string, dest pcommon.Slice) { dest.EnsureCapacity(len(obsArr)) for _, v := range obsArr { - dest.AppendEmpty().SetStringVal(v) + dest.AppendEmpty().SetStr(v) } } diff --git a/pkg/stanza/adapter/converter_test.go b/pkg/stanza/adapter/converter_test.go index afcb8dafc097..4de1cd590977 100644 --- a/pkg/stanza/adapter/converter_test.go +++ b/pkg/stanza/adapter/converter_test.go @@ -223,7 +223,7 @@ func TestConvert(t *testing.T) { m.PutDouble("double", 12.34) m.PutString("string", "hello") m.PutEmptyBytes("bytes").FromRaw([]byte("asdf")) - assert.EqualValues(t, m.Sort(), lr.Body().MapVal().Sort()) + assert.EqualValues(t, m.Sort(), lr.Body().Map().Sort()) } } @@ -548,68 +548,68 @@ func TestConvertMetadata(t *testing.T) { attVal, ok := atts.Get("bool") require.True(t, ok) - require.True(t, attVal.BoolVal()) + require.True(t, attVal.Bool()) attVal, ok = atts.Get("int") require.True(t, ok) - require.Equal(t, int64(123), attVal.IntVal()) + require.Equal(t, int64(123), attVal.Int()) attVal, ok = atts.Get("double") require.True(t, ok) - require.Equal(t, 12.34, attVal.DoubleVal()) + require.Equal(t, 12.34, attVal.Double()) attVal, ok = atts.Get("string") require.True(t, ok) - require.Equal(t, "hello", attVal.StringVal()) + require.Equal(t, "hello", attVal.Str()) attVal, ok = atts.Get("object") require.True(t, ok) - mapVal := attVal.MapVal() + mapVal := attVal.Map() require.Equal(t, 4, mapVal.Len()) attVal, ok = mapVal.Get("bool") require.True(t, ok) - require.True(t, attVal.BoolVal()) + require.True(t, attVal.Bool()) attVal, ok = mapVal.Get("int") require.True(t, ok) - require.Equal(t, int64(123), attVal.IntVal()) + require.Equal(t, int64(123), attVal.Int()) attVal, ok = mapVal.Get("double") require.True(t, ok) - require.Equal(t, 12.34, attVal.DoubleVal()) + require.Equal(t, 12.34, attVal.Double()) attVal, ok = mapVal.Get("string") require.True(t, ok) - require.Equal(t, "hello", attVal.StringVal()) + require.Equal(t, "hello", attVal.Str()) bod := result.Body() require.Equal(t, pcommon.ValueTypeBool, bod.Type()) - require.True(t, bod.BoolVal()) + require.True(t, bod.Bool()) } func TestConvertSimpleBody(t *testing.T) { - require.True(t, anyToBody(true).BoolVal()) - require.False(t, anyToBody(false).BoolVal()) - - require.Equal(t, "string", anyToBody("string").StringVal()) - require.Equal(t, []byte("bytes"), anyToBody([]byte("bytes")).BytesVal().AsRaw()) - - require.Equal(t, int64(1), anyToBody(1).IntVal()) - require.Equal(t, int64(1), anyToBody(int8(1)).IntVal()) - require.Equal(t, int64(1), anyToBody(int16(1)).IntVal()) - require.Equal(t, int64(1), anyToBody(int32(1)).IntVal()) - require.Equal(t, int64(1), anyToBody(int64(1)).IntVal()) - - require.Equal(t, int64(1), anyToBody(uint(1)).IntVal()) - require.Equal(t, int64(1), anyToBody(uint8(1)).IntVal()) - require.Equal(t, int64(1), anyToBody(uint16(1)).IntVal()) - require.Equal(t, int64(1), anyToBody(uint32(1)).IntVal()) - require.Equal(t, int64(1), anyToBody(uint64(1)).IntVal()) - - require.Equal(t, float64(1), anyToBody(float32(1)).DoubleVal()) - require.Equal(t, float64(1), anyToBody(float64(1)).DoubleVal()) + require.True(t, anyToBody(true).Bool()) + require.False(t, anyToBody(false).Bool()) + + require.Equal(t, "string", anyToBody("string").Str()) + require.Equal(t, []byte("bytes"), anyToBody([]byte("bytes")).Bytes().AsRaw()) + + require.Equal(t, int64(1), anyToBody(1).Int()) + require.Equal(t, int64(1), anyToBody(int8(1)).Int()) + require.Equal(t, int64(1), anyToBody(int16(1)).Int()) + require.Equal(t, int64(1), anyToBody(int32(1)).Int()) + require.Equal(t, int64(1), anyToBody(int64(1)).Int()) + + require.Equal(t, int64(1), anyToBody(uint(1)).Int()) + require.Equal(t, int64(1), anyToBody(uint8(1)).Int()) + require.Equal(t, int64(1), anyToBody(uint16(1)).Int()) + require.Equal(t, int64(1), anyToBody(uint32(1)).Int()) + require.Equal(t, int64(1), anyToBody(uint64(1)).Int()) + + require.Equal(t, float64(1), anyToBody(float32(1)).Double()) + require.Equal(t, float64(1), anyToBody(float64(1)).Double()) } func TestConvertMapBody(t *testing.T) { @@ -632,28 +632,28 @@ func TestConvertMapBody(t *testing.T) { "float64": float64(1), } - result := anyToBody(structuredBody).MapVal() + result := anyToBody(structuredBody).Map() v, _ := result.Get("true") - require.True(t, v.BoolVal()) + require.True(t, v.Bool()) v, _ = result.Get("false") - require.False(t, v.BoolVal()) + require.False(t, v.Bool()) for _, k := range []string{"string"} { v, _ = result.Get(k) - require.Equal(t, k, v.StringVal()) + require.Equal(t, k, v.Str()) } for _, k := range []string{"bytes"} { v, _ = result.Get(k) - require.Equal(t, []byte(k), v.BytesVal().AsRaw()) + require.Equal(t, []byte(k), v.Bytes().AsRaw()) } for _, k := range []string{"int", "int8", "int16", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64"} { v, _ = result.Get(k) - require.Equal(t, int64(1), v.IntVal()) + require.Equal(t, int64(1), v.Int()) } for _, k := range []string{"float32", "float64"} { v, _ = result.Get(k) - require.Equal(t, float64(1), v.DoubleVal()) + require.Equal(t, float64(1), v.Double()) } } @@ -679,41 +679,41 @@ func TestConvertArrayBody(t *testing.T) { map[string]interface{}{"one": 1, "yes": true}, } - result := anyToBody(structuredBody).SliceVal() + result := anyToBody(structuredBody).Slice() - require.True(t, result.At(0).BoolVal()) - require.False(t, result.At(1).BoolVal()) - require.Equal(t, "string", result.At(2).StringVal()) - require.Equal(t, []byte("bytes"), result.At(3).BytesVal().AsRaw()) + require.True(t, result.At(0).Bool()) + require.False(t, result.At(1).Bool()) + require.Equal(t, "string", result.At(2).Str()) + require.Equal(t, []byte("bytes"), result.At(3).Bytes().AsRaw()) - require.Equal(t, int64(1), result.At(4).IntVal()) // int - require.Equal(t, int64(1), result.At(5).IntVal()) // int8 - require.Equal(t, int64(1), result.At(6).IntVal()) // int16 - require.Equal(t, int64(1), result.At(7).IntVal()) // int32 - require.Equal(t, int64(1), result.At(8).IntVal()) // int64 - require.Equal(t, int64(1), result.At(9).IntVal()) // uint - require.Equal(t, int64(1), result.At(10).IntVal()) // uint8 - require.Equal(t, int64(1), result.At(11).IntVal()) // uint16 - require.Equal(t, int64(1), result.At(12).IntVal()) // uint32 - require.Equal(t, int64(1), result.At(13).IntVal()) // uint64 + require.Equal(t, int64(1), result.At(4).Int()) // int + require.Equal(t, int64(1), result.At(5).Int()) // int8 + require.Equal(t, int64(1), result.At(6).Int()) // int16 + require.Equal(t, int64(1), result.At(7).Int()) // int32 + require.Equal(t, int64(1), result.At(8).Int()) // int64 + require.Equal(t, int64(1), result.At(9).Int()) // uint + require.Equal(t, int64(1), result.At(10).Int()) // uint8 + require.Equal(t, int64(1), result.At(11).Int()) // uint16 + require.Equal(t, int64(1), result.At(12).Int()) // uint32 + require.Equal(t, int64(1), result.At(13).Int()) // uint64 - require.Equal(t, float64(1), result.At(14).DoubleVal()) // float32 - require.Equal(t, float64(1), result.At(15).DoubleVal()) // float64 + require.Equal(t, float64(1), result.At(14).Double()) // float32 + require.Equal(t, float64(1), result.At(15).Double()) // float64 - nestedArr := result.At(16).SliceVal() - require.Equal(t, "string", nestedArr.At(0).StringVal()) - require.Equal(t, int64(1), nestedArr.At(1).IntVal()) + nestedArr := result.At(16).Slice() + require.Equal(t, "string", nestedArr.At(0).Str()) + require.Equal(t, int64(1), nestedArr.At(1).Int()) - nestedMap := result.At(17).MapVal() + nestedMap := result.At(17).Map() v, _ := nestedMap.Get("one") - require.Equal(t, int64(1), v.IntVal()) + require.Equal(t, int64(1), v.Int()) v, _ = nestedMap.Get("yes") - require.True(t, v.BoolVal()) + require.True(t, v.Bool()) } func TestConvertUnknownBody(t *testing.T) { unknownType := map[string]int{"0": 0, "1": 1} - require.Equal(t, fmt.Sprintf("%v", unknownType), anyToBody(unknownType).StringVal()) + require.Equal(t, fmt.Sprintf("%v", unknownType), anyToBody(unknownType).Str()) } func TestConvertNestedMapBody(t *testing.T) { @@ -725,22 +725,22 @@ func TestConvertNestedMapBody(t *testing.T) { "unknown": unknownType, } - result := anyToBody(structuredBody).MapVal() + result := anyToBody(structuredBody).Map() arrayAttVal, _ := result.Get("array") - a := arrayAttVal.SliceVal() - require.Equal(t, int64(0), a.At(0).IntVal()) - require.Equal(t, int64(1), a.At(1).IntVal()) + a := arrayAttVal.Slice() + require.Equal(t, int64(0), a.At(0).Int()) + require.Equal(t, int64(1), a.At(1).Int()) mapAttVal, _ := result.Get("map") - m := mapAttVal.MapVal() + m := mapAttVal.Map() v, _ := m.Get("0") - require.Equal(t, int64(0), v.IntVal()) + require.Equal(t, int64(0), v.Int()) v, _ = m.Get("1") - require.Equal(t, "one", v.StringVal()) + require.Equal(t, "one", v.Str()) unknownAttVal, _ := result.Get("unknown") - require.Equal(t, fmt.Sprintf("%v", unknownType), unknownAttVal.StringVal()) + require.Equal(t, fmt.Sprintf("%v", unknownType), unknownAttVal.Str()) } func anyToBody(body interface{}) pcommon.Value { diff --git a/pkg/stanza/adapter/frompdataconverter.go b/pkg/stanza/adapter/frompdataconverter.go index 232be52648b3..771bf8e6356a 100644 --- a/pkg/stanza/adapter/frompdataconverter.go +++ b/pkg/stanza/adapter/frompdataconverter.go @@ -235,22 +235,22 @@ func valueToInterface(value pcommon.Value) interface{} { switch value.Type() { case pcommon.ValueTypeEmpty: return nil - case pcommon.ValueTypeString: - return value.StringVal() + case pcommon.ValueTypeStr: + return value.Str() case pcommon.ValueTypeBool: - return value.BoolVal() + return value.Bool() case pcommon.ValueTypeDouble: - return value.DoubleVal() + return value.Double() case pcommon.ValueTypeInt: - return value.IntVal() + return value.Int() case pcommon.ValueTypeBytes: - return value.BytesVal().AsRaw() + return value.Bytes().AsRaw() case pcommon.ValueTypeMap: - return value.MapVal().AsRaw() + return value.Map().AsRaw() case pcommon.ValueTypeSlice: - arr := make([]interface{}, 0, value.SliceVal().Len()) - for i := 0; i < value.SliceVal().Len(); i++ { - arr = append(arr, valueToInterface(value.SliceVal().At(i))) + arr := make([]interface{}, 0, value.Slice().Len()) + for i := 0; i < value.Slice().Len(); i++ { + arr = append(arr, valueToInterface(value.Slice().At(i))) } return arr default: diff --git a/pkg/stanza/adapter/frompdataconverter_test.go b/pkg/stanza/adapter/frompdataconverter_test.go index 6e7f23557be2..6a7150c6c7d8 100644 --- a/pkg/stanza/adapter/frompdataconverter_test.go +++ b/pkg/stanza/adapter/frompdataconverter_test.go @@ -49,8 +49,8 @@ func BenchmarkConvertFromPdataComplex(b *testing.B) { func fillBaseMap(m pcommon.Map) { arr := m.PutEmptySlice("slice") - arr.AppendEmpty().SetStringVal("666") - arr.AppendEmpty().SetStringVal("777") + arr.AppendEmpty().SetStr("666") + arr.AppendEmpty().SetStr("777") m.PutBool("bool", true) m.PutInt("int", 123) m.PutDouble("double", 12.34) @@ -89,8 +89,8 @@ func complexPdataForNDifferentHosts(count int, n int) plog.Logs { lr.Attributes().Remove("double") lr.Attributes().Remove("host") - fillBaseMap(lr.Body().SetEmptyMapVal()) - level1 := lr.Body().MapVal().PutEmptyMap("object") + fillBaseMap(lr.Body().SetEmptyMap()) + level1 := lr.Body().Map().PutEmptyMap("object") fillBaseMap(level1) level2 := level1.PutEmptyMap("object") fillBaseMap(level2) @@ -116,15 +116,15 @@ func TestRoundTrip(t *testing.T) { func sortComplexData(pLogs plog.Logs) { pLogs.ResourceLogs().At(0).Resource().Attributes().Sort() attrObject, _ := pLogs.ResourceLogs().At(0).Resource().Attributes().Get("object") - attrObject.MapVal().Sort() - pLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().MapVal().Sort() - level1, _ := pLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().MapVal().Get("object") - level1.MapVal().Sort() - level2, _ := level1.MapVal().Get("object") - level2.MapVal().Sort() + attrObject.Map().Sort() + pLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().Sort() + level1, _ := pLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().Get("object") + level1.Map().Sort() + level2, _ := level1.Map().Get("object") + level2.Map().Sort() pLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Attributes().Sort() attrObject, _ = pLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Attributes().Get("object") - attrObject.MapVal().Sort() + attrObject.Map().Sort() } func TestConvertFrom(t *testing.T) { diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index 7eeb9560f1b3..5fdaefcf2fbb 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -11,7 +11,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 @@ -23,7 +23,7 @@ require ( require ( github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.60.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index b75e472a66c5..bddf01697304 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -296,10 +296,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index d036349fc6e5..003dc841f64c 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.38.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 066bbbb83602..a220b9937b86 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -46,10 +46,10 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/jaeger/jaegerproto_to_traces.go b/pkg/translator/jaeger/jaegerproto_to_traces.go index efe73f1fe383..971a79cae7ab 100644 --- a/pkg/translator/jaeger/jaegerproto_to_traces.go +++ b/pkg/translator/jaeger/jaegerproto_to_traces.go @@ -188,7 +188,7 @@ func translateJaegerVersionAttr(attrs pcommon.Map) { jaegerVersion, jaegerVersionFound := attrs.Get("jaeger.version") _, exporterVersionFound := attrs.Get(occonventions.AttributeExporterVersion) if jaegerVersionFound && !exporterVersionFound { - attrs.PutString(occonventions.AttributeExporterVersion, "Jaeger-"+jaegerVersion.StringVal()) + attrs.PutString(occonventions.AttributeExporterVersion, "Jaeger-"+jaegerVersion.Str()) attrs.Remove("jaeger.version") } } @@ -234,7 +234,7 @@ func jSpanToInternal(span *model.Span, spansByLibrary map[scope]ptrace.SpanSlice jTagsToInternalAttributes(span.Tags, attrs) setInternalSpanStatus(attrs, dest.Status()) if spanKindAttr, ok := attrs.Get(tracetranslator.TagSpanKind); ok { - dest.SetKind(jSpanKindToInternal(spanKindAttr.StringVal())) + dest.SetKind(jSpanKindToInternal(spanKindAttr.Str())) attrs.Remove(tracetranslator.TagSpanKind) } @@ -274,7 +274,7 @@ func setInternalSpanStatus(attrs pcommon.Map, dest ptrace.SpanStatus) { statusExists := false if errorVal, ok := attrs.Get(tracetranslator.TagError); ok { - if errorVal.BoolVal() { + if errorVal.Bool() { statusCode = ptrace.StatusCodeError attrs.Remove(tracetranslator.TagError) statusExists = true @@ -282,7 +282,7 @@ func setInternalSpanStatus(attrs pcommon.Map, dest ptrace.SpanStatus) { if desc, ok := extractStatusDescFromAttr(attrs); ok { statusMessage = desc } else if descAttr, ok := attrs.Get(tracetranslator.TagHTTPStatusMsg); ok { - statusMessage = descAttr.StringVal() + statusMessage = descAttr.Str() } } } @@ -293,7 +293,7 @@ func setInternalSpanStatus(attrs pcommon.Map, dest ptrace.SpanStatus) { // status. Only parse the otel.status_code tag if the error tag is // not set to true. statusExists = true - switch strings.ToUpper(codeAttr.StringVal()) { + switch strings.ToUpper(codeAttr.Str()) { case statusOk: statusCode = ptrace.StatusCodeOk case statusError: @@ -319,7 +319,7 @@ func setInternalSpanStatus(attrs pcommon.Map, dest ptrace.SpanStatus) { } if msgAttr, ok := attrs.Get(tracetranslator.TagHTTPStatusMsg); ok { - statusMessage = msgAttr.StringVal() + statusMessage = msgAttr.Str() } } } @@ -336,7 +336,7 @@ func setInternalSpanStatus(attrs pcommon.Map, dest ptrace.SpanStatus) { // the process. func extractStatusDescFromAttr(attrs pcommon.Map) (string, bool) { if msgAttr, ok := attrs.Get(conventions.OtelStatusDescription); ok { - msg := msgAttr.StringVal() + msg := msgAttr.Str() attrs.Remove(conventions.OtelStatusDescription) return msg, true } @@ -350,10 +350,10 @@ func codeFromAttr(attrVal pcommon.Value) (int64, error) { var val int64 switch attrVal.Type() { case pcommon.ValueTypeInt: - val = attrVal.IntVal() - case pcommon.ValueTypeString: + val = attrVal.Int() + case pcommon.ValueTypeStr: var err error - val, err = strconv.ParseInt(attrVal.StringVal(), 10, 0) + val, err = strconv.ParseInt(attrVal.Str(), 10, 0) if err != nil { return 0, err } @@ -413,7 +413,7 @@ func jLogsToSpanEvents(logs []model.Log, dest ptrace.SpanEventSlice) { attrs.EnsureCapacity(len(log.Fields)) jTagsToInternalAttributes(log.Fields, attrs) if name, ok := attrs.Get(eventNameAttr); ok { - event.SetName(name.StringVal()) + event.SetName(name.Str()) attrs.Remove(eventNameAttr) } } @@ -441,7 +441,7 @@ func getTraceStateFromAttrs(attrs pcommon.Map) string { traceState := "" // TODO Bring this inline with solution for jaegertracing/jaeger-client-java #702 once available if attr, ok := attrs.Get(tracetranslator.TagW3CTraceState); ok { - traceState = attr.StringVal() + traceState = attr.Str() attrs.Remove(tracetranslator.TagW3CTraceState) } return traceState diff --git a/pkg/translator/jaeger/jaegerthrift_to_traces.go b/pkg/translator/jaeger/jaegerthrift_to_traces.go index 43bca3df956f..60bd52c39755 100644 --- a/pkg/translator/jaeger/jaegerthrift_to_traces.go +++ b/pkg/translator/jaeger/jaegerthrift_to_traces.go @@ -109,7 +109,7 @@ func jThriftSpanToInternal(span *jaeger.Span, dest ptrace.Span) { jThriftTagsToInternalAttributes(span.Tags, attrs) setInternalSpanStatus(attrs, dest.Status()) if spanKindAttr, ok := attrs.Get(tracetranslator.TagSpanKind); ok { - dest.SetKind(jSpanKindToInternal(spanKindAttr.StringVal())) + dest.SetKind(jSpanKindToInternal(spanKindAttr.Str())) attrs.Remove(tracetranslator.TagSpanKind) } @@ -162,7 +162,7 @@ func jThriftLogsToSpanEvents(logs []*jaeger.Log, dest ptrace.SpanEventSlice) { attrs.EnsureCapacity(len(log.Fields)) jThriftTagsToInternalAttributes(log.Fields, attrs) if name, ok := attrs.Get(eventNameAttr); ok { - event.SetName(name.StringVal()) + event.SetName(name.Str()) attrs.Remove(eventNameAttr) } } diff --git a/pkg/translator/jaeger/traces_to_jaegerproto.go b/pkg/translator/jaeger/traces_to_jaegerproto.go index ab41f95031dc..4b97482a5a10 100644 --- a/pkg/translator/jaeger/traces_to_jaegerproto.go +++ b/pkg/translator/jaeger/traces_to_jaegerproto.go @@ -91,7 +91,7 @@ func resourceToJaegerProtoProcess(resource pcommon.Resource) *model.Process { } attrsCount := attrs.Len() if serviceName, ok := attrs.Get(conventions.AttributeServiceName); ok { - process.ServiceName = serviceName.StringVal() + process.ServiceName = serviceName.Str() attrsCount-- } if attrsCount == 0 { @@ -133,20 +133,20 @@ func appendTagsFromAttributes(dest []model.KeyValue, attrs pcommon.Map) []model. func attributeToJaegerProtoTag(key string, attr pcommon.Value) model.KeyValue { tag := model.KeyValue{Key: key} switch attr.Type() { - case pcommon.ValueTypeString: + case pcommon.ValueTypeStr: // Jaeger-to-Internal maps binary tags to string attributes and encodes them as // base64 strings. Blindingly attempting to decode base64 seems too much. tag.VType = model.ValueType_STRING - tag.VStr = attr.StringVal() + tag.VStr = attr.Str() case pcommon.ValueTypeInt: tag.VType = model.ValueType_INT64 - tag.VInt64 = attr.IntVal() + tag.VInt64 = attr.Int() case pcommon.ValueTypeBool: tag.VType = model.ValueType_BOOL - tag.VBool = attr.BoolVal() + tag.VBool = attr.Bool() case pcommon.ValueTypeDouble: tag.VType = model.ValueType_FLOAT64 - tag.VFloat64 = attr.DoubleVal() + tag.VFloat64 = attr.Double() case pcommon.ValueTypeMap, pcommon.ValueTypeSlice: tag.VType = model.ValueType_STRING tag.VStr = attr.AsString() diff --git a/pkg/translator/loki/convert.go b/pkg/translator/loki/convert.go index acd16b211948..8cc9e7ab8e25 100644 --- a/pkg/translator/loki/convert.go +++ b/pkg/translator/loki/convert.go @@ -70,10 +70,10 @@ func parseAttributeNames(attrsToSelect pcommon.Value) []string { var out []string switch attrsToSelect.Type() { - case pcommon.ValueTypeString: + case pcommon.ValueTypeStr: out = strings.Split(attrsToSelect.AsString(), ",") case pcommon.ValueTypeSlice: - as := attrsToSelect.SliceVal().AsRaw() + as := attrsToSelect.Slice().AsRaw() for _, a := range as { out = append(out, fmt.Sprintf("%v", a)) } diff --git a/pkg/translator/loki/convert_test.go b/pkg/translator/loki/convert_test.go index 1989261fdf82..0d2e18dde4a3 100644 --- a/pkg/translator/loki/convert_test.go +++ b/pkg/translator/loki/convert_test.go @@ -100,10 +100,10 @@ func TestConvertAttributesAndMerge(t *testing.T) { func TestConvertAttributesToLabels(t *testing.T) { attrsToSelectSlice := pcommon.NewValueSlice() - attrsToSelectSlice.SliceVal().AppendEmpty() - attrsToSelectSlice.SliceVal().At(0).SetStringVal("host.name") - attrsToSelectSlice.SliceVal().AppendEmpty() - attrsToSelectSlice.SliceVal().At(1).SetStringVal("pod.name") + attrsToSelectSlice.Slice().AppendEmpty() + attrsToSelectSlice.Slice().At(0).SetStr("host.name") + attrsToSelectSlice.Slice().AppendEmpty() + attrsToSelectSlice.Slice().At(1).SetStr("pod.name") testCases := []struct { desc string diff --git a/pkg/translator/loki/encode.go b/pkg/translator/loki/encode.go index 9a0dc0157544..4c430a4d2631 100644 --- a/pkg/translator/loki/encode.go +++ b/pkg/translator/loki/encode.go @@ -69,26 +69,26 @@ func serializeBody(body pcommon.Value) ([]byte, error) { case pcommon.ValueTypeEmpty: // no body - case pcommon.ValueTypeString: - str, err = json.Marshal(body.StringVal()) + case pcommon.ValueTypeStr: + str, err = json.Marshal(body.Str()) case pcommon.ValueTypeInt: - str, err = json.Marshal(body.IntVal()) + str, err = json.Marshal(body.Int()) case pcommon.ValueTypeDouble: - str, err = json.Marshal(body.DoubleVal()) + str, err = json.Marshal(body.Double()) case pcommon.ValueTypeBool: - str, err = json.Marshal(body.BoolVal()) + str, err = json.Marshal(body.Bool()) case pcommon.ValueTypeMap: - str, err = json.Marshal(body.MapVal().AsRaw()) + str, err = json.Marshal(body.Map().AsRaw()) case pcommon.ValueTypeSlice: - str, err = json.Marshal(body.SliceVal().AsRaw()) + str, err = json.Marshal(body.Slice().AsRaw()) case pcommon.ValueTypeBytes: - str, err = json.Marshal(body.BytesVal().AsRaw()) + str, err = json.Marshal(body.Bytes().AsRaw()) default: err = fmt.Errorf("unsuported body type to serialize") diff --git a/pkg/translator/loki/encode_test.go b/pkg/translator/loki/encode_test.go index 97ed87ca3ead..30d1072710c5 100644 --- a/pkg/translator/loki/encode_test.go +++ b/pkg/translator/loki/encode_test.go @@ -25,7 +25,7 @@ import ( func exampleLog() (plog.LogRecord, pcommon.Resource) { buffer := plog.NewLogRecord() - buffer.Body().SetStringVal("Example log") + buffer.Body().SetStr("Example log") buffer.SetSeverityText("error") buffer.Attributes().PutString("attr1", "1") buffer.Attributes().PutString("attr2", "2") @@ -51,8 +51,8 @@ func TestConvertWithMapBody(t *testing.T) { log, resource := exampleLog() mapVal := pcommon.NewValueMap() - mapVal.MapVal().PutString("key1", "value") - mapVal.MapVal().PutString("key2", "value") + mapVal.Map().PutString("key1", "value") + mapVal.Map().PutString("key2", "value") mapVal.CopyTo(log.Body()) out, err := Encode(log, resource) @@ -63,24 +63,24 @@ func TestConvertWithMapBody(t *testing.T) { func TestSerializeBody(t *testing.T) { arrayval := pcommon.NewValueSlice() - arrayval.SliceVal().AppendEmpty().SetStringVal("a") - arrayval.SliceVal().AppendEmpty().SetStringVal("b") + arrayval.Slice().AppendEmpty().SetStr("a") + arrayval.Slice().AppendEmpty().SetStr("b") simplemap := pcommon.NewValueMap() - simplemap.MapVal().PutString("key", "val") + simplemap.Map().PutString("key", "val") complexmap := pcommon.NewValueMap() - complexmap.MapVal().PutString("keystr", "val") - complexmap.MapVal().PutInt("keyint", 1) - complexmap.MapVal().PutDouble("keyint", 1) - complexmap.MapVal().PutBool("keybool", true) - complexmap.MapVal().PutEmpty("keynull") - arrayval.CopyTo(complexmap.MapVal().PutEmpty("keyarr")) - simplemap.CopyTo(complexmap.MapVal().PutEmpty("keymap")) - complexmap.MapVal().PutEmpty("keyempty") + complexmap.Map().PutString("keystr", "val") + complexmap.Map().PutInt("keyint", 1) + complexmap.Map().PutDouble("keyint", 1) + complexmap.Map().PutBool("keybool", true) + complexmap.Map().PutEmpty("keynull") + arrayval.CopyTo(complexmap.Map().PutEmpty("keyarr")) + simplemap.CopyTo(complexmap.Map().PutEmpty("keymap")) + complexmap.Map().PutEmpty("keyempty") bytes := pcommon.NewValueBytes() - bytes.BytesVal().FromRaw([]byte(`abc`)) + bytes.Bytes().FromRaw([]byte(`abc`)) testcases := []struct { input pcommon.Value diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index 365381be5da1..e3509c6438bc 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -6,7 +6,7 @@ require ( github.com/grafana/loki v1.6.2-0.20220718071907-6bd05c9a4399 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index 0863ee44a146..a1b3cdaf5af2 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -434,8 +434,8 @@ 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index 7fbd49709f13..4f635b2e4c10 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 5586c44d22d1..8a9a148f638f 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -72,10 +72,10 @@ 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= 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/translator/opencensus/oc_to_traces_test.go b/pkg/translator/opencensus/oc_to_traces_test.go index 7cbce8426b67..a2c91990c0fd 100644 --- a/pkg/translator/opencensus/oc_to_traces_test.go +++ b/pkg/translator/opencensus/oc_to_traces_test.go @@ -394,14 +394,14 @@ func TestOcSameProcessAsParentSpanToInternal(t *testing.T) { v, ok := span.Attributes().Get(occonventions.AttributeSameProcessAsParentSpan) assert.True(t, ok) assert.EqualValues(t, pcommon.ValueTypeBool, v.Type()) - assert.False(t, v.BoolVal()) + assert.False(t, v.Bool()) ocSameProcessAsParentSpanToInternal(wrapperspb.Bool(true), span) assert.Equal(t, 1, span.Attributes().Len()) v, ok = span.Attributes().Get(occonventions.AttributeSameProcessAsParentSpan) assert.True(t, ok) assert.EqualValues(t, pcommon.ValueTypeBool, v.Type()) - assert.True(t, v.BoolVal()) + assert.True(t, v.Bool()) } func BenchmarkSpansWithAttributesOCToInternal(b *testing.B) { diff --git a/pkg/translator/opencensus/resource_to_oc_test.go b/pkg/translator/opencensus/resource_to_oc_test.go index 9344a87db811..9fd42b695b24 100644 --- a/pkg/translator/opencensus/resource_to_oc_test.go +++ b/pkg/translator/opencensus/resource_to_oc_test.go @@ -217,9 +217,9 @@ func TestResourceToOCAndBack(t *testing.T) { case pcommon.ValueTypeInt: // conventions.AttributeProcessID is special because we preserve the type for this. if k == conventions.AttributeProcessPID { - assert.Equal(t, v.IntVal(), a.IntVal()) + assert.Equal(t, v.Int(), a.Int()) } else { - assert.Equal(t, strconv.FormatInt(v.IntVal(), 10), a.StringVal()) + assert.Equal(t, strconv.FormatInt(v.Int(), 10), a.Str()) } case pcommon.ValueTypeMap, pcommon.ValueTypeSlice: assert.Equal(t, a, a) diff --git a/pkg/translator/opencensus/traces_to_oc.go b/pkg/translator/opencensus/traces_to_oc.go index 7fd112d86785..41afd2ee9666 100644 --- a/pkg/translator/opencensus/traces_to_oc.go +++ b/pkg/translator/opencensus/traces_to_oc.go @@ -124,21 +124,21 @@ func attributeValueToOC(attr pcommon.Value) *octrace.AttributeValue { a := &octrace.AttributeValue{} switch attr.Type() { - case pcommon.ValueTypeString: + case pcommon.ValueTypeStr: a.Value = &octrace.AttributeValue_StringValue{ - StringValue: stringToTruncatableString(attr.StringVal()), + StringValue: stringToTruncatableString(attr.Str()), } case pcommon.ValueTypeBool: a.Value = &octrace.AttributeValue_BoolValue{ - BoolValue: attr.BoolVal(), + BoolValue: attr.Bool(), } case pcommon.ValueTypeDouble: a.Value = &octrace.AttributeValue_DoubleValue{ - DoubleValue: attr.DoubleVal(), + DoubleValue: attr.Double(), } case pcommon.ValueTypeInt: a.Value = &octrace.AttributeValue_IntValue{ - IntValue: attr.IntVal(), + IntValue: attr.Int(), } case pcommon.ValueTypeMap: a.Value = &octrace.AttributeValue_StringValue{ @@ -194,7 +194,7 @@ func attributesMapToOCSameProcessAsParentSpan(attr pcommon.Map) *wrapperspb.Bool if !ok || val.Type() != pcommon.ValueTypeBool { return nil } - return wrapperspb.Bool(val.BoolVal()) + return wrapperspb.Bool(val.Bool()) } // OTLP follows the W3C format, e.g. "vendorname1=opaqueValue1,vendorname2=opaqueValue2" @@ -292,15 +292,15 @@ func eventToOC(event ptrace.SpanEvent) *octrace.Span_TimeEvent { } if ocMessageEventAttrFound { ocMessageEventType := ocMessageEventAttrValues["message.type"] - ocMessageEventTypeVal := octrace.Span_TimeEvent_MessageEvent_Type_value[ocMessageEventType.StringVal()] + ocMessageEventTypeVal := octrace.Span_TimeEvent_MessageEvent_Type_value[ocMessageEventType.Str()] return &octrace.Span_TimeEvent{ Time: timestampAsTimestampPb(event.Timestamp()), Value: &octrace.Span_TimeEvent_MessageEvent_{ MessageEvent: &octrace.Span_TimeEvent_MessageEvent{ Type: octrace.Span_TimeEvent_MessageEvent_Type(ocMessageEventTypeVal), - Id: uint64(ocMessageEventAttrValues[conventions.AttributeMessagingMessageID].IntVal()), - UncompressedSize: uint64(ocMessageEventAttrValues[conventions.AttributeMessagingMessagePayloadSizeBytes].IntVal()), - CompressedSize: uint64(ocMessageEventAttrValues[conventions.AttributeMessagingMessagePayloadCompressedSizeBytes].IntVal()), + Id: uint64(ocMessageEventAttrValues[conventions.AttributeMessagingMessageID].Int()), + UncompressedSize: uint64(ocMessageEventAttrValues[conventions.AttributeMessagingMessagePayloadSizeBytes].Int()), + CompressedSize: uint64(ocMessageEventAttrValues[conventions.AttributeMessagingMessagePayloadCompressedSizeBytes].Int()), }, }, } diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 80255c5d7729..98b119c98d5c 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index a9718b467b8d..29ad24206555 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -79,10 +79,10 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= 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/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index dddc06142716..d3b383e3cc98 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -8,9 +8,9 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index 01feb6156a84..a2f1c7a5a010 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -209,12 +209,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index ec9165d0e26a..fce22b56689c 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.60.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index d608dbac1300..e9fa8e3bccd0 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -57,8 +57,8 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 30926856f6a0..71a32e471514 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 04f80e325acf..435a0a2912a0 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -151,10 +151,10 @@ 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/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= 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.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/pkg/translator/zipkin/internal/zipkin/attributes.go b/pkg/translator/zipkin/internal/zipkin/attributes.go index 123b745039a1..2b20c9d04ce4 100644 --- a/pkg/translator/zipkin/internal/zipkin/attributes.go +++ b/pkg/translator/zipkin/internal/zipkin/attributes.go @@ -56,5 +56,5 @@ func DetermineValueType(value string) pcommon.ValueType { return desc.attrType } } - return pcommon.ValueTypeString + return pcommon.ValueTypeStr } diff --git a/pkg/translator/zipkin/zipkinv2/to_translator_test.go b/pkg/translator/zipkin/zipkinv2/to_translator_test.go index 38676baaa55e..cefcb9fb25ec 100644 --- a/pkg/translator/zipkin/zipkinv2/to_translator_test.go +++ b/pkg/translator/zipkin/zipkinv2/to_translator_test.go @@ -178,5 +178,5 @@ func TestV2SpanWithoutTimestampGetsTag(t *testing.T) { wasAbsent, mapContainedKey := gs.Attributes().Get(zipkin.StartTimeAbsent) assert.True(t, mapContainedKey) - assert.True(t, wasAbsent.BoolVal()) + assert.True(t, wasAbsent.Bool()) } diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index a91f60c28d9d..61807e48a151 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 963925700aec..31046f21f4d7 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -275,12 +275,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index dc15e774bb3e..b82913c17ce3 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 04bf068a4742..324950d5b318 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -261,10 +261,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index ae8d415aed10..e62d773508c3 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index e5fe98f6fa87..0cb088cc95a9 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -269,10 +269,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/filterprocessor/expr_test.go b/processor/filterprocessor/expr_test.go index ca7aab4cc7c6..9127134eb198 100644 --- a/processor/filterprocessor/expr_test.go +++ b/processor/filterprocessor/expr_test.go @@ -69,7 +69,7 @@ func TestExprProcessor(t *testing.T) { func testFilter(t *testing.T, mdType pmetric.MetricType, mvType pmetric.NumberDataPointValueType) { format := "MetricName == '%s' && Label('%s') == '%s'" - q := fmt.Sprintf(format, filteredMetric, filteredAttrKey, filteredAttrVal.StringVal()) + q := fmt.Sprintf(format, filteredMetric, filteredAttrKey, filteredAttrVal.Str()) mds := testDataSlice(2, mdType, mvType) totMetricCount := 0 diff --git a/processor/filterprocessor/filter_processor_logs_test.go b/processor/filterprocessor/filter_processor_logs_test.go index bc2df5839bf5..16576a777bcf 100644 --- a/processor/filterprocessor/filter_processor_logs_test.go +++ b/processor/filterprocessor/filter_processor_logs_test.go @@ -638,7 +638,7 @@ func testResourceLogs(lwrs []logWithResource) plog.Logs { l.Attributes().FromRaw(lwrs[i].recordAttributes) l.Attributes().PutString("name", name) // Set body & severity fields - l.Body().SetStringVal(lwr.body) + l.Body().SetStr(lwr.body) l.SetSeverityText(lwr.severityText) l.SetSeverityNumber(lwr.severityNumber) } diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index e0b7671cecdb..7e500a3bc75a 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 963925700aec..31046f21f4d7 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -275,12 +275,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 99dbfb6e9652..d78ff8fd0daf 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index e9f63da73cc9..221c42d30fed 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -271,10 +271,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 64c77c8f6a24..caa02f03387d 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.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index e9f63da73cc9..221c42d30fed 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -271,10 +271,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 5fccbf4c010f..d8111aaffe4e 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 k8s.io/api v0.25.2 k8s.io/apimachinery v0.25.2 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index b571b0585481..e0f51288aa80 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -436,12 +436,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/k8sattributesprocessor/pod_association.go b/processor/k8sattributesprocessor/pod_association.go index a0123ad0cc2b..8bc74bf3170e 100644 --- a/processor/k8sattributesprocessor/pod_association.go +++ b/processor/k8sattributesprocessor/pod_association.go @@ -141,8 +141,8 @@ func connectionIP(ctx context.Context) string { func stringAttributeFromMap(attrs pcommon.Map, key string) string { if val, ok := attrs.Get(key); ok { - if val.Type() == pcommon.ValueTypeString { - return val.StringVal() + if val.Type() == pcommon.ValueTypeStr { + return val.Str() } } return "" diff --git a/processor/k8sattributesprocessor/processor.go b/processor/k8sattributesprocessor/processor.go index aa00037b4824..6fa3065dfadd 100644 --- a/processor/k8sattributesprocessor/processor.go +++ b/processor/k8sattributesprocessor/processor.go @@ -194,9 +194,9 @@ func (kp *kubernetesprocessor) getAttributesForPodsNamespace(namespace string) m func intFromAttribute(val pcommon.Value) (int, error) { switch val.Type() { case pcommon.ValueTypeInt: - return int(val.IntVal()), nil - case pcommon.ValueTypeString: - i, err := strconv.Atoi(val.StringVal()) + return int(val.Int()), nil + case pcommon.ValueTypeStr: + i, err := strconv.Atoi(val.Str()) if err != nil { return 0, err } diff --git a/processor/k8sattributesprocessor/processor_test.go b/processor/k8sattributesprocessor/processor_test.go index d582d6867deb..478154b8886f 100644 --- a/processor/k8sattributesprocessor/processor_test.go +++ b/processor/k8sattributesprocessor/processor_test.go @@ -1150,8 +1150,8 @@ func TestStartStop(t *testing.T) { func assertResourceHasStringAttribute(t *testing.T, r pcommon.Resource, k, v string) { got, ok := r.Attributes().Get(k) require.True(t, ok, fmt.Sprintf("resource does not contain attribute %s", k)) - assert.EqualValues(t, pcommon.ValueTypeString, got.Type(), "attribute %s is not of type string", k) - assert.EqualValues(t, v, got.StringVal(), "attribute %s is not equal to %s", k, v) + assert.EqualValues(t, pcommon.ValueTypeStr, got.Type(), "attribute %s is not of type string", k) + assert.EqualValues(t, v, got.Str(), "attribute %s is not equal to %s", k, v) } func Test_intFromAttribute(t *testing.T) { diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index 882826ff3f04..af1c3b9bf841 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index 226ee0f65cb7..e58089a1c616 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -283,10 +283,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 8009ab3ea7c5..c4337dc11519 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index e5fe98f6fa87..0cb088cc95a9 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -269,10 +269,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 8f27891bdf17..af0634d25e6d 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 0f21129bab10..6ee9b08cc4bc 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -264,12 +264,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/metricstransformprocessor/metrics_transform_processor_otlp.go b/processor/metricstransformprocessor/metrics_transform_processor_otlp.go index 8bc74f2cbe81..84ea70920cd3 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_otlp.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_otlp.go @@ -224,7 +224,7 @@ func matchAttrs(attrMatchers map[string]StringMatcher, attrs pcommon.Map) bool { for k, v := range attrMatchers { attrVal, ok := attrs.Get(k) // attribute values doesn't match, drop datapoint - if ok && !v.MatchString(attrVal.StringVal()) { + if ok && !v.MatchString(attrVal.Str()) { return false } diff --git a/processor/metricstransformprocessor/operation_aggregate_label_values.go b/processor/metricstransformprocessor/operation_aggregate_label_values.go index 8cc5b31634e7..77e4b81d6607 100644 --- a/processor/metricstransformprocessor/operation_aggregate_label_values.go +++ b/processor/metricstransformprocessor/operation_aggregate_label_values.go @@ -27,8 +27,8 @@ func aggregateLabelValuesOp(metric pmetric.Metric, mtpOp internalOperation) { return true } - if _, ok := mtpOp.aggregatedValuesSet[val.StringVal()]; ok { - val.SetStringVal(mtpOp.configOperation.NewValue) + if _, ok := mtpOp.aggregatedValuesSet[val.Str()]; ok { + val.SetStr(mtpOp.configOperation.NewValue) } return true }) diff --git a/processor/metricstransformprocessor/operation_delete_label_value.go b/processor/metricstransformprocessor/operation_delete_label_value.go index 4c7368450cc3..0b18080e990a 100644 --- a/processor/metricstransformprocessor/operation_delete_label_value.go +++ b/processor/metricstransformprocessor/operation_delete_label_value.go @@ -48,7 +48,7 @@ func deleteLabelValueOp(metric pmetric.Metric, mtpOp internalOperation) { func hasAttr(attrs pcommon.Map, k, v string) bool { if val, ok := attrs.Get(k); ok { - return val.StringVal() == v + return val.Str() == v } return false } diff --git a/processor/metricstransformprocessor/operation_update_label.go b/processor/metricstransformprocessor/operation_update_label.go index c0070b051a40..191761596357 100644 --- a/processor/metricstransformprocessor/operation_update_label.go +++ b/processor/metricstransformprocessor/operation_update_label.go @@ -39,7 +39,7 @@ func updateLabelOp(metric pmetric.Metric, mtpOp internalOperation, f internalFil attrKey = op.NewLabel } - if newValue, ok := mtpOp.valueActionsMapping[attrVal.StringVal()]; ok { + if newValue, ok := mtpOp.valueActionsMapping[attrVal.Str()]; ok { attrs.PutString(attrKey, newValue) } return true diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 559545f5e3cf..3e454276536d 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index c1fe0848a032..d79760b6291b 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -260,12 +260,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler.go b/processor/probabilisticsamplerprocessor/probabilisticsampler.go index a282d2f34f5f..aae2f705dd62 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler.go @@ -128,21 +128,21 @@ func parseSpanSamplingPriority(span ptrace.Span) samplingPriority { // between different formats. switch samplingPriorityAttrib.Type() { case pcommon.ValueTypeInt: - value := samplingPriorityAttrib.IntVal() + value := samplingPriorityAttrib.Int() if value == 0 { decision = doNotSampleSpan } else if value > 0 { decision = mustSampleSpan } case pcommon.ValueTypeDouble: - value := samplingPriorityAttrib.DoubleVal() + value := samplingPriorityAttrib.Double() if value == 0.0 { decision = doNotSampleSpan } else if value > 0.0 { decision = mustSampleSpan } - case pcommon.ValueTypeString: - attribVal := samplingPriorityAttrib.StringVal() + case pcommon.ValueTypeStr: + attribVal := samplingPriorityAttrib.Str() if value, err := strconv.ParseFloat(attribVal, 64); err == nil { if value == 0.0 { decision = doNotSampleSpan diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go index 64b2b27e852c..a54742ce00bd 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go @@ -493,7 +493,7 @@ func assertSampledData(t *testing.T, sampled []ptrace.Traces, serviceName string ilss := rspan.ScopeSpans() for j := 0; j < ilss.Len(); j++ { ils := ilss.At(j) - if svcNameAttr, _ := rspan.Resource().Attributes().Get("service.name"); svcNameAttr.StringVal() != serviceName { + if svcNameAttr, _ := rspan.Resource().Attributes().Get("service.name"); svcNameAttr.Str() != serviceName { continue } for k := 0; k < ils.Spans().Len(); k++ { diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index b98fc62ac062..0e89a228d1df 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index 14f151321218..0c46a859bf5f 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -270,10 +270,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/redactionprocessor/processor.go b/processor/redactionprocessor/processor.go index d539c737e330..8066d2c0b0eb 100644 --- a/processor/redactionprocessor/processor.go +++ b/processor/redactionprocessor/processor.go @@ -118,14 +118,14 @@ func (s *redaction) processAttrs(_ context.Context, attributes pcommon.Map) { } // Mask any blocked values for the other attributes - strVal := value.StringVal() + strVal := value.Str() for _, compiledRE := range s.blockRegexList { match := compiledRE.MatchString(strVal) if match { toBlock = append(toBlock, k) maskedValue := compiledRE.ReplaceAllString(strVal, "****") - value.SetStringVal(maskedValue) + value.SetStr(maskedValue) } } return true @@ -160,15 +160,15 @@ func (s *redaction) addMetaAttrs(redactedAttrs []string, attributes pcommon.Map, // Record summary as span attributes if s.config.Summary == debug { - if existingVal, found := attributes.Get(valuesAttr); found && existingVal.StringVal() != "" { - redactedAttrs = append(redactedAttrs, strings.Split(existingVal.StringVal(), attrValuesSeparator)...) + if existingVal, found := attributes.Get(valuesAttr); found && existingVal.Str() != "" { + redactedAttrs = append(redactedAttrs, strings.Split(existingVal.Str(), attrValuesSeparator)...) } sort.Strings(redactedAttrs) attributes.PutString(valuesAttr, strings.Join(redactedAttrs, attrValuesSeparator)) } if s.config.Summary == info || s.config.Summary == debug { if existingVal, found := attributes.Get(countAttr); found { - redactedCount += existingVal.IntVal() + redactedCount += existingVal.Int() } attributes.PutInt(countAttr, redactedCount) } diff --git a/processor/redactionprocessor/processor_test.go b/processor/redactionprocessor/processor_test.go index 33165c3de42a..a7fd350361e7 100644 --- a/processor/redactionprocessor/processor_test.go +++ b/processor/redactionprocessor/processor_test.go @@ -110,7 +110,7 @@ func TestAllowAllKeys(t *testing.T) { assert.True(t, v.Equal(val)) } value, _ := attr.Get("name") - assert.Equal(t, "placeholder", value.StringVal()) + assert.Equal(t, "placeholder", value.Str()) } // TestAllowAllKeysMaskValues validates that the processor still redacts @@ -142,7 +142,7 @@ func TestAllowAllKeysMaskValues(t *testing.T) { assert.True(t, v.Equal(val)) } value, _ := attr.Get("credit_card") - assert.Equal(t, "placeholder ****", value.StringVal()) + assert.Equal(t, "placeholder ****", value.Str()) } // TODO: Test redaction with metric tags in a metrics PR @@ -181,20 +181,20 @@ func TestRedactSummaryDebug(t *testing.T) { maskedKeys, ok := attr.Get(redactedKeys) assert.True(t, ok) sort.Strings(deleted) - assert.Equal(t, strings.Join(deleted, ","), maskedKeys.StringVal()) + assert.Equal(t, strings.Join(deleted, ","), maskedKeys.Str()) maskedKeyCount, ok := attr.Get(redactedKeyCount) assert.True(t, ok) - assert.Equal(t, int64(len(deleted)), maskedKeyCount.IntVal()) + assert.Equal(t, int64(len(deleted)), maskedKeyCount.Int()) blockedKeys := []string{"name"} maskedValues, ok := attr.Get(maskedValues) assert.True(t, ok) - assert.Equal(t, strings.Join(blockedKeys, ","), maskedValues.StringVal()) + assert.Equal(t, strings.Join(blockedKeys, ","), maskedValues.Str()) maskedValueCount, ok := attr.Get(maskedValueCount) assert.True(t, ok) - assert.Equal(t, int64(1), maskedValueCount.IntVal()) + assert.Equal(t, int64(1), maskedValueCount.Int()) value, _ := attr.Get("name") - assert.Equal(t, "placeholder ****", value.StringVal()) + assert.Equal(t, "placeholder ****", value.Str()) } // TestRedactSummaryInfo validates that the processor writes a verbose summary @@ -230,15 +230,15 @@ func TestRedactSummaryInfo(t *testing.T) { assert.False(t, ok) maskedKeyCount, ok := attr.Get(redactedKeyCount) assert.True(t, ok) - assert.Equal(t, int64(len(deleted)), maskedKeyCount.IntVal()) + assert.Equal(t, int64(len(deleted)), maskedKeyCount.Int()) _, ok = attr.Get(maskedValues) assert.False(t, ok) maskedValueCount, ok := attr.Get(maskedValueCount) assert.True(t, ok) - assert.Equal(t, int64(1), maskedValueCount.IntVal()) + assert.Equal(t, int64(1), maskedValueCount.Int()) value, _ := attr.Get("name") - assert.Equal(t, "placeholder ****", value.StringVal()) + assert.Equal(t, "placeholder ****", value.Str()) } // TestRedactSummarySilent validates that the processor does not create the @@ -274,7 +274,7 @@ func TestRedactSummarySilent(t *testing.T) { _, ok = attr.Get(maskedValueCount) assert.False(t, ok) value, _ := attr.Get("name") - assert.Equal(t, "placeholder ****", value.StringVal()) + assert.Equal(t, "placeholder ****", value.Str()) } // TestRedactSummaryDefault validates that the processor does not create the @@ -331,24 +331,24 @@ func TestMultipleBlockValues(t *testing.T) { } maskedKeys, ok := attr.Get(redactedKeys) assert.True(t, ok) - assert.Equal(t, strings.Join(deleted, ","), maskedKeys.StringVal()) + assert.Equal(t, strings.Join(deleted, ","), maskedKeys.Str()) maskedKeyCount, ok := attr.Get(redactedKeyCount) assert.True(t, ok) - assert.Equal(t, int64(len(deleted)), maskedKeyCount.IntVal()) + assert.Equal(t, int64(len(deleted)), maskedKeyCount.Int()) blockedKeys := []string{"name", "mystery"} maskedValues, ok := attr.Get(maskedValues) assert.True(t, ok) sort.Strings(blockedKeys) - assert.Equal(t, strings.Join(blockedKeys, ","), maskedValues.StringVal()) + assert.Equal(t, strings.Join(blockedKeys, ","), maskedValues.Str()) maskedValues.Equal(pcommon.NewValueString(strings.Join(blockedKeys, ","))) maskedValueCount, ok := attr.Get(maskedValueCount) assert.True(t, ok) - assert.Equal(t, int64(len(blockedKeys)), maskedValueCount.IntVal()) + assert.Equal(t, int64(len(blockedKeys)), maskedValueCount.Int()) nameValue, _ := attr.Get("name") mysteryValue, _ := attr.Get("mystery") - assert.Equal(t, "placeholder ****", nameValue.StringVal()) - assert.Equal(t, "mystery ****", mysteryValue.StringVal()) + assert.Equal(t, "placeholder ****", nameValue.Str()) + assert.Equal(t, "mystery ****", mysteryValue.Str()) } // TestProcessAttrsAppliedTwice validates a use case when data is coming through redaction processor more than once. @@ -378,16 +378,16 @@ func TestProcessAttrsAppliedTwice(t *testing.T) { assert.Equal(t, 7, attrs.Len()) val, found := attrs.Get(redactedKeys) assert.True(t, found) - assert.Equal(t, "dropped_attr1,dropped_attr2,redundant", val.StringVal()) + assert.Equal(t, "dropped_attr1,dropped_attr2,redundant", val.Str()) val, found = attrs.Get(redactedKeyCount) assert.True(t, found) - assert.Equal(t, int64(3), val.IntVal()) + assert.Equal(t, int64(3), val.Int()) val, found = attrs.Get(maskedValues) assert.True(t, found) - assert.Equal(t, "credit_card,mystery", val.StringVal()) + assert.Equal(t, "credit_card,mystery", val.Str()) val, found = attrs.Get(maskedValueCount) assert.True(t, found) - assert.Equal(t, int64(2), val.IntVal()) + assert.Equal(t, int64(2), val.Int()) } // runTest transforms the test input data and passes it through the processor diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 8af968a37421..4ca10eebc169 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -12,9 +12,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.2 diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 5e03ea7b1d50..ece52feb4441 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -396,12 +396,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/processor/resourcedetectionprocessor/internal/aws/ecs/ecs.go b/processor/resourcedetectionprocessor/internal/aws/ecs/ecs.go index dcdb33dcda49..3908efd9520c 100644 --- a/processor/resourcedetectionprocessor/internal/aws/ecs/ecs.go +++ b/processor/resourcedetectionprocessor/internal/aws/ecs/ecs.go @@ -159,10 +159,10 @@ func addValidLogData(containers []ecsutil.ContainerMetadata, self *ecsutil.Conta logStreamArns = dest.PutEmptySlice(conventions.AttributeAWSLogStreamARNs) initialized = true } - logGroupNames.AppendEmpty().SetStringVal(logData.LogGroup) - logGroupArns.AppendEmpty().SetStringVal(constructLogGroupArn(logData.Region, account, logData.LogGroup)) - logStreamNames.AppendEmpty().SetStringVal(logData.Stream) - logStreamArns.AppendEmpty().SetStringVal(constructLogStreamArn(logData.Region, account, logData.LogGroup, logData.Stream)) + logGroupNames.AppendEmpty().SetStr(logData.LogGroup) + logGroupArns.AppendEmpty().SetStr(constructLogGroupArn(logData.Region, account, logData.LogGroup)) + logStreamNames.AppendEmpty().SetStr(logData.Stream) + logStreamArns.AppendEmpty().SetStr(constructLogStreamArn(logData.Region, account, logData.LogGroup, logData.Stream)) } } } diff --git a/processor/resourcedetectionprocessor/internal/aws/ecs/ecs_test.go b/processor/resourcedetectionprocessor/internal/aws/ecs/ecs_test.go index e6758cf9601b..fd644cc4eb54 100644 --- a/processor/resourcedetectionprocessor/internal/aws/ecs/ecs_test.go +++ b/processor/resourcedetectionprocessor/internal/aws/ecs/ecs_test.go @@ -111,10 +111,10 @@ func Test_ecsDetectV4(t *testing.T) { attr.PutString("cloud.availability_zone", "us-west-2a") attr.PutString("cloud.account.id", "123456789123") attr.PutString("aws.ecs.launchtype", "ec2") - attr.PutEmptySlice("aws.log.group.names").AppendEmpty().SetStringVal("group") - attr.PutEmptySlice("aws.log.group.arns").AppendEmpty().SetStringVal("arn:aws:logs:us-east-1:123456789123:log-group:group") - attr.PutEmptySlice("aws.log.stream.names").AppendEmpty().SetStringVal("stream") - attr.PutEmptySlice("aws.log.stream.arns").AppendEmpty().SetStringVal("arn:aws:logs:us-east-1:123456789123:log-group:group:log-stream:stream") + attr.PutEmptySlice("aws.log.group.names").AppendEmpty().SetStr("group") + attr.PutEmptySlice("aws.log.group.arns").AppendEmpty().SetStr("arn:aws:logs:us-east-1:123456789123:log-group:group") + attr.PutEmptySlice("aws.log.stream.names").AppendEmpty().SetStr("stream") + attr.PutEmptySlice("aws.log.stream.arns").AppendEmpty().SetStr("arn:aws:logs:us-east-1:123456789123:log-group:group:log-stream:stream") d := Detector{provider: &mockMetaDataProvider{isV4: true}} got, _, err := d.Detect(context.TODO()) diff --git a/processor/resourcedetectionprocessor/internal/resourcedetection.go b/processor/resourcedetectionprocessor/internal/resourcedetection.go index 53709d5407e9..a09e3167d8c8 100644 --- a/processor/resourcedetectionprocessor/internal/resourcedetection.go +++ b/processor/resourcedetectionprocessor/internal/resourcedetection.go @@ -168,17 +168,17 @@ func AttributesToMap(am pcommon.Map) map[string]interface{} { func UnwrapAttribute(v pcommon.Value) interface{} { switch v.Type() { case pcommon.ValueTypeBool: - return v.BoolVal() + return v.Bool() case pcommon.ValueTypeInt: - return v.IntVal() + return v.Int() case pcommon.ValueTypeDouble: - return v.DoubleVal() - case pcommon.ValueTypeString: - return v.StringVal() + return v.Double() + case pcommon.ValueTypeStr: + return v.Str() case pcommon.ValueTypeSlice: - return getSerializableArray(v.SliceVal()) + return getSerializableArray(v.Slice()) case pcommon.ValueTypeMap: - return AttributesToMap(v.MapVal()) + return AttributesToMap(v.Map()) default: return nil } diff --git a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go index c64191e0584d..7bfeffdcbc14 100644 --- a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go +++ b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go @@ -349,8 +349,8 @@ func TestAttributesToMap(t *testing.T) { arrayAttr := attr.PutEmptySlice("array") arrayAttr.EnsureCapacity(2) - arrayAttr.AppendEmpty().SetStringVal("inner") - arrayAttr.AppendEmpty().SetIntVal(42) + arrayAttr.AppendEmpty().SetStr("inner") + arrayAttr.AppendEmpty().SetInt(42) assert.Equal(t, m, AttributesToMap(attr)) } diff --git a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go index dffe4473b13e..a07c9b9d336f 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go @@ -285,7 +285,7 @@ func oCensusResource(res pcommon.Resource) *resourcepb.Resource { mp := make(map[string]string, res.Attributes().Len()) res.Attributes().Range(func(k string, v pcommon.Value) bool { - mp[k] = v.StringVal() + mp[k] = v.Str() return true }) diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 70bfe0ea7606..6c461f4c8ed0 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index a80afafce6cc..a6f4667aa513 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -259,10 +259,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 105208464f75..328d92a30832 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 272fbcd464b2..e0dcf90fac6f 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -294,10 +294,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/processor/routingprocessor/logs_test.go b/processor/routingprocessor/logs_test.go index 4584f519073c..59f5e06085ff 100644 --- a/processor/routingprocessor/logs_test.go +++ b/processor/routingprocessor/logs_test.go @@ -213,7 +213,7 @@ func TestLogs_RoutingWorks_ResourceAttribute_DropsRoutingAttribute(t *testing.T) assert.False(t, ok, "routing attribute should have been dropped") v, ok := attrs.Get("attr") assert.True(t, ok, "non routing attributes shouldn't be dropped") - assert.Equal(t, "acme", v.StringVal()) + assert.Equal(t, "acme", v.Str()) } func TestLogs_AreCorrectlySplitPerResourceAttributeRouting(t *testing.T) { diff --git a/processor/routingprocessor/metrics_test.go b/processor/routingprocessor/metrics_test.go index 75a26236de72..d8342427488d 100644 --- a/processor/routingprocessor/metrics_test.go +++ b/processor/routingprocessor/metrics_test.go @@ -276,7 +276,7 @@ func TestMetrics_RoutingWorks_ResourceAttribute_DropsRoutingAttribute(t *testing assert.False(t, ok, "routing attribute should have been dropped") v, ok := attrs.Get("attr") assert.True(t, ok, "non routing attributes shouldn't be dropped") - assert.Equal(t, "acme", v.StringVal()) + assert.Equal(t, "acme", v.Str()) } type mockMetricsExporter struct { @@ -465,6 +465,6 @@ func TestMetricsAreCorrectlySplitPerResourceAttributeRoutingWithOTTL(t *testing. rmetric := defaultExp.AllMetrics()[0].ResourceMetrics().At(0) attr, ok := rmetric.Resource().Attributes().Get("value") assert.True(t, ok, "routing attribute must exists") - assert.Equal(t, attr.DoubleVal(), float64(-1.0)) + assert.Equal(t, attr.Double(), float64(-1.0)) }) } diff --git a/processor/routingprocessor/traces_test.go b/processor/routingprocessor/traces_test.go index 47ace4d6770b..2a5360af2644 100644 --- a/processor/routingprocessor/traces_test.go +++ b/processor/routingprocessor/traces_test.go @@ -331,7 +331,7 @@ func TestTraces_RoutingWorks_ResourceAttribute_DropsRoutingAttribute(t *testing. assert.False(t, ok, "routing attribute should have been dropped") v, ok := attrs.Get("attr") assert.True(t, ok, "non-routing attributes shouldn't have been dropped") - assert.Equal(t, "acme", v.StringVal()) + assert.Equal(t, "acme", v.Str()) } func TestTracesAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { @@ -457,7 +457,7 @@ func TestTracesAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { rspan := defaultExp.AllTraces()[0].ResourceSpans().At(0) attr, ok := rspan.Resource().Attributes().Get("value") assert.True(t, ok, "routing attribute must exists") - assert.Equal(t, attr.IntVal(), int64(-1)) + assert.Equal(t, attr.Int(), int64(-1)) }) } diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 846c66d5e932..d2397b4705b3 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 576f888f2afa..52ca93824f4f 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -282,10 +282,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index af8bd3cde13e..052164878340 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum index f84c485ff2d4..50bd98becc01 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -289,12 +289,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 6580e4db0381..7ae937ec939a 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index 83ea679676cc..926be5b97c5c 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -452,12 +452,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index f8dcfb380431..41b619debe95 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -356,7 +356,7 @@ func (p *processorImp) aggregateMetrics(traces ptrace.Traces) { if !ok { continue } - serviceName := attr.StringVal() + serviceName := attr.Str() p.aggregateMetricsForServiceSpans(rspans, serviceName) } } diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index d6c6e3469b93..dfe78987f38c 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -531,13 +531,13 @@ func verifyMetricLabels(dp metricDataPoint, t testing.TB, seenMetricIDs map[metr dp.Attributes().Range(func(k string, v pcommon.Value) bool { switch k { case serviceNameKey: - mID.service = v.StringVal() + mID.service = v.Str() case operationKey: - mID.operation = v.StringVal() + mID.operation = v.Str() case spanKindKey: - mID.kind = v.StringVal() + mID.kind = v.Str() case statusCodeKey: - mID.statusCode = v.StringVal() + mID.statusCode = v.Str() case notInSpanAttrName1: assert.Fail(t, notInSpanAttrName1+" should not be in this metric") default: diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index d46055826264..9763e5369b39 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 8a693cf139d8..1b4dc4c38050 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -260,12 +260,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/spanprocessor/span.go b/processor/spanprocessor/span.go index 6b9da8a9c354..c48137daebfe 100644 --- a/processor/spanprocessor/span.go +++ b/processor/spanprocessor/span.go @@ -143,14 +143,14 @@ func (sp *spanProcessor) processFromAttributes(span ptrace.Span) { } switch attr.Type() { - case pcommon.ValueTypeString: - sb.WriteString(attr.StringVal()) + case pcommon.ValueTypeStr: + sb.WriteString(attr.Str()) case pcommon.ValueTypeBool: - sb.WriteString(strconv.FormatBool(attr.BoolVal())) + sb.WriteString(strconv.FormatBool(attr.Bool())) case pcommon.ValueTypeDouble: - sb.WriteString(strconv.FormatFloat(attr.DoubleVal(), 'f', -1, 64)) + sb.WriteString(strconv.FormatFloat(attr.Double(), 'f', -1, 64)) case pcommon.ValueTypeInt: - sb.WriteString(strconv.FormatInt(attr.IntVal(), 10)) + sb.WriteString(strconv.FormatInt(attr.Int(), 10)) default: sb.WriteString("") } diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 6d8cd67ae582..9d22620a1aae 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.opentelemetry.io/otel/trace v1.10.0 go.uber.org/atomic v1.10.0 go.uber.org/goleak v1.2.0 diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 698c4a770527..3e4add4bac4f 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -262,10 +262,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter.go b/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter.go index 0b2b0230f76d..9bfa9ad5dad6 100644 --- a/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter.go +++ b/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter.go @@ -47,7 +47,7 @@ func (naf *numericAttributeFilter) Evaluate(_ pcommon.TraceID, trace *TraceData) return hasSpanWithCondition(batches, func(span ptrace.Span) bool { if v, ok := span.Attributes().Get(naf.key); ok { - value := v.IntVal() + value := v.Int() if value >= naf.minValue && value <= naf.maxValue { return true } diff --git a/processor/tailsamplingprocessor/internal/sampling/string_tag_filter.go b/processor/tailsamplingprocessor/internal/sampling/string_tag_filter.go index 7b3e85cf85ac..d555950221c6 100644 --- a/processor/tailsamplingprocessor/internal/sampling/string_tag_filter.go +++ b/processor/tailsamplingprocessor/internal/sampling/string_tag_filter.go @@ -112,7 +112,7 @@ func (saf *stringAttributeFilter) Evaluate(_ pcommon.TraceID, trace *TraceData) batches, func(resource pcommon.Resource) bool { if v, ok := resource.Attributes().Get(saf.key); ok { - if ok := saf.matcher(v.StringVal()); ok { + if ok := saf.matcher(v.Str()); ok { return false } } @@ -120,9 +120,9 @@ func (saf *stringAttributeFilter) Evaluate(_ pcommon.TraceID, trace *TraceData) }, func(span ptrace.Span) bool { if v, ok := span.Attributes().Get(saf.key); ok { - truncableStr := v.StringVal() + truncableStr := v.Str() if len(truncableStr) > 0 { - if ok := saf.matcher(v.StringVal()); ok { + if ok := saf.matcher(v.Str()); ok { return false } } @@ -136,7 +136,7 @@ func (saf *stringAttributeFilter) Evaluate(_ pcommon.TraceID, trace *TraceData) batches, func(resource pcommon.Resource) bool { if v, ok := resource.Attributes().Get(saf.key); ok { - if ok := saf.matcher(v.StringVal()); ok { + if ok := saf.matcher(v.Str()); ok { return true } } @@ -144,9 +144,9 @@ func (saf *stringAttributeFilter) Evaluate(_ pcommon.TraceID, trace *TraceData) }, func(span ptrace.Span) bool { if v, ok := span.Attributes().Get(saf.key); ok { - truncableStr := v.StringVal() + truncableStr := v.Str() if len(truncableStr) > 0 { - if ok := saf.matcher(v.StringVal()); ok { + if ok := saf.matcher(v.Str()); ok { return true } } diff --git a/processor/transformprocessor/factory_test.go b/processor/transformprocessor/factory_test.go index 95408e874d45..fd455825dd4d 100644 --- a/processor/transformprocessor/factory_test.go +++ b/processor/transformprocessor/factory_test.go @@ -94,7 +94,7 @@ func TestFactoryCreateTracesProcessor(t *testing.T) { val, ok := span.Attributes().Get("test") assert.True(t, ok) - assert.Equal(t, "pass", val.StringVal()) + assert.Equal(t, "pass", val.Str()) } func TestFactoryCreateMetricsProcessor_InvalidActions(t *testing.T) { @@ -129,7 +129,7 @@ func TestFactoryCreateMetricsProcessor(t *testing.T) { val, ok := metric.Sum().DataPoints().At(0).Attributes().Get("test") assert.True(t, ok) - assert.Equal(t, "pass", val.StringVal()) + assert.Equal(t, "pass", val.Str()) } func TestFactoryCreateLogsProcessor(t *testing.T) { @@ -144,7 +144,7 @@ func TestFactoryCreateLogsProcessor(t *testing.T) { ld := plog.NewLogs() log := ld.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() - log.Body().SetStringVal("operationA") + log.Body().SetStr("operationA") _, ok := log.Attributes().Get("test") assert.False(t, ok) @@ -154,7 +154,7 @@ func TestFactoryCreateLogsProcessor(t *testing.T) { val, ok := log.Attributes().Get("test") assert.True(t, ok) - assert.Equal(t, "pass", val.StringVal()) + assert.Equal(t, "pass", val.Str()) } func TestFactoryCreateLogsProcessor_InvalidActions(t *testing.T) { diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 6605a47670e4..829b94d49ac9 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index bd31bada64ca..cedd963fb436 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -274,10 +274,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/processor/transformprocessor/internal/logs/processor_test.go b/processor/transformprocessor/internal/logs/processor_test.go index 9a565a22e825..a4f060ab72fe 100644 --- a/processor/transformprocessor/internal/logs/processor_test.go +++ b/processor/transformprocessor/internal/logs/processor_test.go @@ -157,21 +157,21 @@ func TestProcess(t *testing.T) { statement: `set(attributes["test"], Split(attributes["flags"], "|"))`, want: func(td plog.Logs) { v1 := td.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Attributes().PutEmptySlice("test") - v1.AppendEmpty().SetStringVal("A") - v1.AppendEmpty().SetStringVal("B") - v1.AppendEmpty().SetStringVal("C") + v1.AppendEmpty().SetStr("A") + v1.AppendEmpty().SetStr("B") + v1.AppendEmpty().SetStr("C") v2 := td.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(1).Attributes().PutEmptySlice("test") - v2.AppendEmpty().SetStringVal("C") - v2.AppendEmpty().SetStringVal("D") + v2.AppendEmpty().SetStr("C") + v2.AppendEmpty().SetStr("D") }, }, { statement: `set(attributes["test"], Split(attributes["flags"], "|")) where body == "operationA"`, want: func(td plog.Logs) { newValue := td.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Attributes().PutEmptySlice("test") - newValue.AppendEmpty().SetStringVal("A") - newValue.AppendEmpty().SetStringVal("B") - newValue.AppendEmpty().SetStringVal("C") + newValue.AppendEmpty().SetStr("A") + newValue.AppendEmpty().SetStr("B") + newValue.AppendEmpty().SetStr("C") }, }, { @@ -208,7 +208,7 @@ func constructLogs() plog.Logs { } func fillLogOne(log plog.LogRecord) { - log.Body().SetStringVal("operationA") + log.Body().SetStr("operationA") log.SetTimestamp(TestLogTimestamp) log.SetObservedTimestamp(TestObservedTimestamp) log.SetDroppedAttributesCount(1) @@ -224,7 +224,7 @@ func fillLogOne(log plog.LogRecord) { } func fillLogTwo(log plog.LogRecord) { - log.Body().SetStringVal("operationB") + log.Body().SetStr("operationB") log.SetTimestamp(TestLogTimestamp) log.SetObservedTimestamp(TestObservedTimestamp) log.Attributes().PutString("http.method", "get") diff --git a/processor/transformprocessor/internal/metrics/processor_test.go b/processor/transformprocessor/internal/metrics/processor_test.go index 695e6a054d30..a1458271229f 100644 --- a/processor/transformprocessor/internal/metrics/processor_test.go +++ b/processor/transformprocessor/internal/metrics/processor_test.go @@ -277,32 +277,32 @@ func TestProcess(t *testing.T) { statements: []string{`set(attributes["test"], Split(attributes["flags"], "|"))`}, want: func(td pmetric.Metrics) { v00 := td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(0).Attributes().PutEmptySlice("test") - v00.AppendEmpty().SetStringVal("A") - v00.AppendEmpty().SetStringVal("B") - v00.AppendEmpty().SetStringVal("C") + v00.AppendEmpty().SetStr("A") + v00.AppendEmpty().SetStr("B") + v00.AppendEmpty().SetStr("C") v01 := td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(1).Attributes().PutEmptySlice("test") - v01.AppendEmpty().SetStringVal("A") - v01.AppendEmpty().SetStringVal("B") - v01.AppendEmpty().SetStringVal("C") + v01.AppendEmpty().SetStr("A") + v01.AppendEmpty().SetStr("B") + v01.AppendEmpty().SetStr("C") v10 := td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(1).Histogram().DataPoints().At(0).Attributes().PutEmptySlice("test") - v10.AppendEmpty().SetStringVal("C") - v10.AppendEmpty().SetStringVal("D") + v10.AppendEmpty().SetStr("C") + v10.AppendEmpty().SetStr("D") v11 := td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(1).Histogram().DataPoints().At(1).Attributes().PutEmptySlice("test") - v11.AppendEmpty().SetStringVal("C") - v11.AppendEmpty().SetStringVal("D") + v11.AppendEmpty().SetStr("C") + v11.AppendEmpty().SetStr("D") }, }, { statements: []string{`set(attributes["test"], Split(attributes["flags"], "|")) where metric.name == "operationA"`}, want: func(td pmetric.Metrics) { v00 := td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(0).Attributes().PutEmptySlice("test") - v00.AppendEmpty().SetStringVal("A") - v00.AppendEmpty().SetStringVal("B") - v00.AppendEmpty().SetStringVal("C") + v00.AppendEmpty().SetStr("A") + v00.AppendEmpty().SetStr("B") + v00.AppendEmpty().SetStr("C") v01 := td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(1).Attributes().PutEmptySlice("test") - v01.AppendEmpty().SetStringVal("A") - v01.AppendEmpty().SetStringVal("B") - v01.AppendEmpty().SetStringVal("C") + v01.AppendEmpty().SetStr("A") + v01.AppendEmpty().SetStr("B") + v01.AppendEmpty().SetStr("C") }, }, { diff --git a/processor/transformprocessor/internal/traces/processor_test.go b/processor/transformprocessor/internal/traces/processor_test.go index 0a448068bf59..39d77ac06484 100644 --- a/processor/transformprocessor/internal/traces/processor_test.go +++ b/processor/transformprocessor/internal/traces/processor_test.go @@ -197,21 +197,21 @@ func TestProcess(t *testing.T) { statement: `set(attributes["test"], Split(attributes["flags"], "|"))`, want: func(td ptrace.Traces) { v1 := td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes().PutEmptySlice("test") - v1.AppendEmpty().SetStringVal("A") - v1.AppendEmpty().SetStringVal("B") - v1.AppendEmpty().SetStringVal("C") + v1.AppendEmpty().SetStr("A") + v1.AppendEmpty().SetStr("B") + v1.AppendEmpty().SetStr("C") v2 := td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(1).Attributes().PutEmptySlice("test") - v2.AppendEmpty().SetStringVal("C") - v2.AppendEmpty().SetStringVal("D") + v2.AppendEmpty().SetStr("C") + v2.AppendEmpty().SetStr("D") }, }, { statement: `set(attributes["test"], Split(attributes["flags"], "|")) where name == "operationA"`, want: func(td ptrace.Traces) { v1 := td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes().PutEmptySlice("test") - v1.AppendEmpty().SetStringVal("A") - v1.AppendEmpty().SetStringVal("B") - v1.AppendEmpty().SetStringVal("C") + v1.AppendEmpty().SetStr("A") + v1.AppendEmpty().SetStr("B") + v1.AppendEmpty().SetStr("C") }, }, { diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 10f1c4a4854d..6a8005ff493f 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 354e3c222e80..3d55f9ec751c 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -266,10 +266,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 212642a26f14..b98d6c09d802 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index 2a8fab761781..5f770580eb0c 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -319,10 +319,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 512a3a3884ab..df91eafba62a 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -69,7 +69,7 @@ require ( require ( github.com/rogpeppe/go-internal v1.6.2 // indirect github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 3f067f83874c..f5a84c8efd1d 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -992,10 +992,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index a4ad2e6a327a..f5a1abe1b1b5 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.60.0 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 k8s.io/api v0.25.2 k8s.io/apimachinery v0.25.2 diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 441257aa8b86..77272b6fcd21 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -566,10 +566,10 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver_test.go b/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver_test.go index fdaeca2d2ae6..e1983c6a80f3 100644 --- a/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver_test.go +++ b/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver_test.go @@ -119,7 +119,7 @@ func getStringAttrVal(m pmetric.Metrics, key string) string { rm := m.ResourceMetrics().At(0) attributes := rm.Resource().Attributes() if attributeValue, ok := attributes.Get(key); ok { - return attributeValue.StringVal() + return attributeValue.Str() } return "" } diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 5e0f0910b555..3f12c082b758 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 562244f58a78..881d926f37f3 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -269,12 +269,12 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go b/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go index d9ec0bc43233..0fc0b1e01d6a 100644 --- a/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go +++ b/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource_test.go @@ -76,7 +76,7 @@ func TestContainerResourceForStoppedContainer(t *testing.T) { attrMap := r.Attributes() getExitCodeAd, found := attrMap.Get(attributeContainerExitCode) require.EqualValues(t, true, found) - require.EqualValues(t, 2, getExitCodeAd.IntVal()) + require.EqualValues(t, 2, getExitCodeAd.Int()) require.EqualValues(t, 11, attrMap.Len()) expected := map[string]string{ conventions.AttributeContainerName: "container-1", @@ -174,7 +174,7 @@ func verifyAttributeMap(t *testing.T, expected map[string]string, found pcommon. attributeVal, found := found.Get(key) require.EqualValues(t, true, found) - require.EqualValues(t, val, attributeVal.StringVal()) + require.EqualValues(t, val, attributeVal.Str()) } } diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 5657e0dee096..6bb9e5e8d8b3 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index ea41d96c0409..c25c5488f66b 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -275,12 +275,12 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 102b5d5e0236..3c9f2dbb81f6 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -47,7 +47,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.opentelemetry.io/otel/sdk v1.10.0 // indirect ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 6d6fe4c5649e..240c007c9d5d 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -268,12 +268,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index f19f30bf09d0..b50151397359 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.60.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -17,7 +17,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index c8440caf7636..a1d190bd8910 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -250,10 +250,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index d1aea6ccd5cb..612e13ea0780 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -2,7 +2,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuree go 1.18 -require go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 +require go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 require ( github.com/gogo/protobuf v1.3.2 // indirect @@ -14,7 +14,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index 60a2fd590316..9eaa3fadcd4c 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -250,10 +250,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 557cee25be46..28416c3e2d9f 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index a16abc73effc..3fc2ed694cc0 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -279,10 +279,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 205c3f5326f1..8d57a95a2129 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.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -30,8 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/sdk v1.10.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 00f7b69bc9cd..5d512ee9d3be 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -265,12 +265,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index d2d650668954..8951a5f02d50 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 github.com/stretchr/testify v1.8.0 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index 3b70dc8aa146..fb100b87064f 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -275,10 +275,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/cloudfoundryreceiver/converter_test.go b/receiver/cloudfoundryreceiver/converter_test.go index 4b19bce4da55..58b43a38740c 100644 --- a/receiver/cloudfoundryreceiver/converter_test.go +++ b/receiver/cloudfoundryreceiver/converter_test.go @@ -159,6 +159,6 @@ func assertAttributes(t *testing.T, attributes pcommon.Map, expected map[string] for key, expectedValue := range expected { value, present := attributes.Get(key) assert.True(t, present, "Attribute %s presence", key) - assert.Equal(t, expectedValue, value.StringVal(), "Attribute %s value", key) + assert.Equal(t, expectedValue, value.Str(), "Attribute %s value", key) } } diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index c5ec50135fe3..a98758825279 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.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 4239b4e9666a..76cbe049da68 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -307,10 +307,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 33868c7f40b8..f83f2d5bb3f7 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.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -28,8 +28,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index aaad10d67aa3..d6e5256daf4e 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -261,12 +261,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index cf3a75c092f3..086194fa6f6e 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.18 require ( - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) @@ -11,7 +11,7 @@ require github.com/stretchr/testify v1.8.0 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 57c83e65774a..9a777a9b42df 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -282,10 +282,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 5d1f3828d9a4..8339c25bf109 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 543cb051ca5f..fd77fe8f0619 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -296,12 +296,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/dockerstatsreceiver/integration_test.go b/receiver/dockerstatsreceiver/integration_test.go index 4c264e3d2cd7..087021d2c60c 100644 --- a/receiver/dockerstatsreceiver/integration_test.go +++ b/receiver/dockerstatsreceiver/integration_test.go @@ -156,7 +156,7 @@ func TestExcludedImageProducesNoMetricsIntegration(t *testing.T) { resourceMetric := resourceMetrics.At(i) resource := resourceMetric.Resource() if nameAttr, ok := resource.Attributes().Get(conventions.AttributeContainerImageName); ok { - if strings.Contains(nameAttr.StringVal(), "redis") { + if strings.Contains(nameAttr.Str(), "redis") { return true } } diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index c6da77cdba6a..50ac17541942 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index e9f63da73cc9..221c42d30fed 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -271,10 +271,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 1ea1cc7c92c5..5a0381040bb1 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -73,7 +73,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect ) diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 048c395b2980..408582519e11 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -995,10 +995,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index b2a74843288e..e3cdf1c2e81d 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 27e9e85d2293..d0f0866e649d 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -277,10 +277,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 0138626ac1ff..f533542ef10b 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index ac1e2c608d85..9ad1e74c8754 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -289,10 +289,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/filelogreceiver/storage_test.go b/receiver/filelogreceiver/storage_test.go index d41fcfb66081..9d1bc0b1f54f 100644 --- a/receiver/filelogreceiver/storage_test.go +++ b/receiver/filelogreceiver/storage_test.go @@ -199,12 +199,7 @@ func expectLogs(sink *consumertest.LogsSink, expected []string) func() bool { } for _, logs := range sink.AllLogs() { - body := logs.ResourceLogs(). - At(0).ScopeLogs(). - At(0).LogRecords(). - At(0).Body(). - StringVal() - + body := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Str() found[body] = true } diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index d6f198690a58..603d4624a3fa 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 21b35a6de521..74a5fcb3c9ac 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -993,10 +993,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/fluentforwardreceiver/conversion.go b/receiver/fluentforwardreceiver/conversion.go index 1db6cf786431..1a9233ba195c 100644 --- a/receiver/fluentforwardreceiver/conversion.go +++ b/receiver/fluentforwardreceiver/conversion.go @@ -85,7 +85,7 @@ func (em EventMode) String() string { // parseInterfaceToMap takes map of interface objects and returns // AttributeValueMap func parseInterfaceToMap(msi map[string]interface{}, dest pcommon.Value) { - am := dest.SetEmptyMapVal() + am := dest.SetEmptyMap() am.EnsureCapacity(len(msi)) for k, value := range msi { parseToAttributeValue(value, am.PutEmpty(k)) @@ -95,7 +95,7 @@ func parseInterfaceToMap(msi map[string]interface{}, dest pcommon.Value) { // parseInterfaceToArray takes array of interface objects and returns // AttributeValueArray func parseInterfaceToArray(ai []interface{}, dest pcommon.Value) { - av := dest.SetEmptySliceVal() + av := dest.SetEmptySlice() av.EnsureCapacity(len(ai)) for _, value := range ai { parseToAttributeValue(value, av.AppendEmpty()) @@ -107,27 +107,27 @@ func parseToAttributeValue(val interface{}, dest pcommon.Value) { // See https://github.com/tinylib/msgp/wiki/Type-Mapping-Rules switch r := val.(type) { case bool: - dest.SetBoolVal(r) + dest.SetBool(r) case string: - dest.SetStringVal(r) + dest.SetStr(r) case uint64: - dest.SetIntVal(int64(r)) + dest.SetInt(int64(r)) case int64: - dest.SetIntVal(r) + dest.SetInt(r) // Sometimes strings come in as bytes array case []byte: - dest.SetStringVal(string(r)) + dest.SetStr(string(r)) case map[string]interface{}: parseInterfaceToMap(r, dest) case []interface{}: parseInterfaceToArray(r, dest) case float32: - dest.SetDoubleVal(float64(r)) + dest.SetDouble(float64(r)) case float64: - dest.SetDoubleVal(r) + dest.SetDouble(r) case nil: default: - dest.SetStringVal(fmt.Sprintf("%v", val)) + dest.SetStr(fmt.Sprintf("%v", val)) } } diff --git a/receiver/fluentforwardreceiver/conversion_test.go b/receiver/fluentforwardreceiver/conversion_test.go index 894445e1b09c..06974289c59d 100644 --- a/receiver/fluentforwardreceiver/conversion_test.go +++ b/receiver/fluentforwardreceiver/conversion_test.go @@ -253,18 +253,18 @@ func TestBodyConversion(t *testing.T) { le.Attributes().Sort() body := pcommon.NewValueMap() - body.MapVal().PutString("a", "value") + body.Map().PutString("a", "value") - bv := body.MapVal().PutEmptySlice("b") - bv.AppendEmpty().SetStringVal("first") - bv.AppendEmpty().SetStringVal("second") + bv := body.Map().PutEmptySlice("b") + bv.AppendEmpty().SetStr("first") + bv.AppendEmpty().SetStr("second") - cv := body.MapVal().PutEmptyMap("c") + cv := body.Map().PutEmptyMap("c") cv.PutInt("d", 24) // Sort the map, sometimes may get in a different order. require.Equal(t, pcommon.ValueTypeMap, le.Body().Type()) - le.Body().MapVal().Sort() + le.Body().Map().Sort() assert.EqualValues(t, Logs( Log{ Timestamp: 5000000000000, diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 714d94ec88d4..03455a38c453 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.8.0 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index cb44dbb4d1eb..4e4bd26d848a 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -273,10 +273,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 4077a001ab59..98fb000e87fc 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( cloud.google.com/go/pubsub v1.25.1 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/api v0.97.0 diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index 44e2e5def589..51ef11c064b9 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -416,10 +416,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/googlecloudpubsubreceiver/receiver.go b/receiver/googlecloudpubsubreceiver/receiver.go index 879688d29408..f0ba20f0a7f6 100644 --- a/receiver/googlecloudpubsubreceiver/receiver.go +++ b/receiver/googlecloudpubsubreceiver/receiver.go @@ -142,7 +142,7 @@ func (receiver *pubsubReceiver) handleLogStrings(ctx context.Context, message *p ills := rls.ScopeLogs().AppendEmpty() lr := ills.LogRecords().AppendEmpty() - lr.Body().SetStringVal(data) + lr.Body().SetStr(data) lr.SetTimestamp(pcommon.NewTimestampFromTime(timestamp.AsTime())) return receiver.logsConsumer.ConsumeLogs(ctx, out) } diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 0ddc1ed02e0c..3464d8cdde44 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( cloud.google.com/go/spanner v1.39.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 google.golang.org/api v0.97.0 gopkg.in/yaml.v3 v3.0.1 @@ -20,7 +20,7 @@ require ( require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index a99e51c0e152..fa8f44cab123 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -436,10 +436,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go b/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go index 312f09afc5bd..0731d162d232 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/labelvalue_test.go @@ -118,7 +118,7 @@ func TestStringLabelValue(t *testing.T) { attributeValue, exists := attributes.Get(labelName) assert.True(t, exists) - assert.Equal(t, stringValue, attributeValue.StringVal()) + assert.Equal(t, stringValue, attributeValue.Str()) } func TestInt64LabelValue(t *testing.T) { @@ -138,7 +138,7 @@ func TestInt64LabelValue(t *testing.T) { attributeValue, exists := attributes.Get(labelName) assert.True(t, exists) - assert.Equal(t, int64Value, attributeValue.IntVal()) + assert.Equal(t, int64Value, attributeValue.Int()) } func TestBoolLabelValue(t *testing.T) { @@ -158,7 +158,7 @@ func TestBoolLabelValue(t *testing.T) { attributeValue, exists := attributes.Get(labelName) assert.True(t, exists) - assert.Equal(t, boolValue, attributeValue.BoolVal()) + assert.Equal(t, boolValue, attributeValue.Bool()) } func TestStringSliceLabelValue(t *testing.T) { @@ -178,7 +178,7 @@ func TestStringSliceLabelValue(t *testing.T) { attributeValue, exists := attributes.Get(labelName) assert.True(t, exists) - assert.Equal(t, stringValue, attributeValue.StringVal()) + assert.Equal(t, stringValue, attributeValue.Str()) } func TestByteSliceLabelValue(t *testing.T) { @@ -198,7 +198,7 @@ func TestByteSliceLabelValue(t *testing.T) { attributeValue, exists := attributes.Get(labelName) assert.True(t, exists) - assert.Equal(t, stringValue, attributeValue.StringVal()) + assert.Equal(t, stringValue, attributeValue.Str()) } func TestLockRequestSliceLabelValue(t *testing.T) { @@ -218,7 +218,7 @@ func TestLockRequestSliceLabelValue(t *testing.T) { attributeValue, exists := attributes.Get(labelName) assert.True(t, exists) - assert.Equal(t, stringValue, attributeValue.StringVal()) + assert.Equal(t, stringValue, attributeValue.Str()) } func TestNewStringLabelValue(t *testing.T) { diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go b/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go index ed634242a39f..e2ad341d29c7 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go @@ -189,11 +189,11 @@ func assertLabelValue(t *testing.T, attributesMap pcommon.Map, labelValue LabelV assert.True(t, exists) switch labelValue.(type) { case stringLabelValue, stringSliceLabelValue, byteSliceLabelValue, lockRequestSliceLabelValue: - assert.Equal(t, labelValue.Value(), value.StringVal()) + assert.Equal(t, labelValue.Value(), value.Str()) case boolLabelValue: - assert.Equal(t, labelValue.Value(), value.BoolVal()) + assert.Equal(t, labelValue.Value(), value.Bool()) case int64LabelValue: - assert.Equal(t, labelValue.Value(), value.IntVal()) + assert.Equal(t, labelValue.Value(), value.Int()) default: assert.Fail(t, "Unknown label value type received") } @@ -203,7 +203,7 @@ func assertStringLabelValue(t *testing.T, attributesMap pcommon.Map, labelName s value, exists := attributesMap.Get(labelName) assert.True(t, exists) - assert.Equal(t, expectedValue, value.StringVal()) + assert.Equal(t, expectedValue, value.Str()) } func assertMetricValue(t *testing.T, metricValue MetricValue, dataPoint pmetric.NumberDataPoint) { diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 77d3d63f0642..d874756d4b00 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index d2da7dc2b646..9c3cb85a4f6b 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -285,12 +285,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go index 1d8052a70c93..9d6019d0c21a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go @@ -346,7 +346,7 @@ func assertDatapointValueAndStringAttributes(t *testing.T, dp pmetric.NumberData for k, v := range attrs { cpuAttribute, exists := dp.Attributes().Get(k) assert.True(t, exists) - assert.Equal(t, v, cpuAttribute.StringVal()) + assert.Equal(t, v, cpuAttribute.Str()) } } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go index 8e1d683fd9f1..56118bc462a6 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go @@ -141,7 +141,7 @@ func validateRealData(t *testing.T, metrics pmetric.MetricSlice) { points := countMetric.Sum().DataPoints() for i := 0; i < points.Len(); i++ { v, ok := points.At(i).Attributes().Get("status") - if ok && v.StringVal() == statusVal { + if ok && v.Str() == statusVal { return } } @@ -210,7 +210,7 @@ func validateFakeData(t *testing.T, metrics pmetric.MetricSlice) { point := points.At(i) val, ok := point.Attributes().Get("status") assert.Truef(t, ok, "Missing status attribute in data point %d", i) - attrs[val.StringVal()] = point.IntValue() + attrs[val.Str()] = point.IntValue() } assert.Equal(t, attrs, map[string]int64{ diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go index 98990119dc3a..2bb9116a9adf 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go @@ -488,7 +488,7 @@ func TestScrapeMetrics_Filtered(t *testing.T) { for i, expectedName := range test.expectedNames { rm := md.ResourceMetrics().At(i) name, _ := rm.Resource().Attributes().Get(conventions.AttributeProcessExecutableName) - assert.Equal(t, expectedName, name.StringVal()) + assert.Equal(t, expectedName, name.Str()) } }) } diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index cfbe27962bec..55989b0acc95 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index 354e3c222e80..3d55f9ec751c 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -266,10 +266,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index c8c503a36b99..fc247c558623 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.28-0.20220915142310-adbee7fb8146 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index c998d24c333c..68ebaee6cc44 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -291,10 +291,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index ef224d59d9cc..94e517b44803 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.49.0 ) diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 70f113c6863b..03459e46c99c 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -443,12 +443,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 19f4049f8f2d..df76b6653061 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 274b08084f1b..2bb5b05f682a 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -1014,10 +1014,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.60.0 h1:xy6HSukzA5CC8SR4DvFyLd28EFEOnQgxtpU1bSCM0qY= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= diff --git a/receiver/jmxreceiver/integration_test.go b/receiver/jmxreceiver/integration_test.go index 2d783537d277..1b30a7c943d3 100644 --- a/receiver/jmxreceiver/integration_test.go +++ b/receiver/jmxreceiver/integration_test.go @@ -198,23 +198,23 @@ func (suite *JMXIntegrationSuite) TestJMXReceiverHappyPath() { attributes := resource.Attributes() lang, ok := attributes.Get("telemetry.sdk.language") require.True(t, ok) - require.Equal(t, "java", lang.StringVal()) + require.Equal(t, "java", lang.Str()) sdkName, ok := attributes.Get("telemetry.sdk.name") require.True(t, ok) - require.Equal(t, "opentelemetry", sdkName.StringVal()) + require.Equal(t, "opentelemetry", sdkName.Str()) version, ok := attributes.Get("telemetry.sdk.version") require.True(t, ok) - require.NotEmpty(t, version.StringVal()) + require.NotEmpty(t, version.Str()) customAttr, ok := attributes.Get("myattr") require.True(t, ok) - require.Equal(t, "myvalue", customAttr.StringVal()) + require.Equal(t, "myvalue", customAttr.Str()) anotherCustomAttr, ok := attributes.Get("myotherattr") require.True(t, ok) - require.Equal(t, "myothervalue", anotherCustomAttr.StringVal()) + require.Equal(t, "myothervalue", anotherCustomAttr.Str()) ilm := rm.ScopeMetrics().At(0) require.Equal(t, "io.opentelemetry.contrib.jmxmetrics", ilm.Scope().Name()) diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index c5b70e6e318a..0841611c162e 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 9f2bd6e4771d..2d6e41b9e3f7 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -292,10 +292,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 06f4a4b5711e..fb4523df9ded 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,9 +12,9 @@ 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.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 503d965fc0c7..de7d1756cda3 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -413,12 +413,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index ffda0a8acfaf..3f5500ef3491 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 k8s.io/api v0.25.2 k8s.io/apimachinery v0.25.2 diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index aa7e4ba9f635..33093b895075 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -436,12 +436,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/k8seventsreceiver/k8s_event_to_logdata.go b/receiver/k8seventsreceiver/k8s_event_to_logdata.go index 9cea11a56642..b203ada4ca13 100644 --- a/receiver/k8seventsreceiver/k8s_event_to_logdata.go +++ b/receiver/k8seventsreceiver/k8s_event_to_logdata.go @@ -63,7 +63,7 @@ func k8sEventToLogData(logger *zap.Logger, ev *corev1.Event) plog.Logs { // The Message field contains description about the event, // which is best suited for the "Body" of the LogRecordSlice. - lr.Body().SetStringVal(ev.Message) + lr.Body().SetStr(ev.Message) // Set the "SeverityNumber" and "SeverityText" if a known type of // severity is found. diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 9143e43e11cd..6290a506fc14 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -65,7 +65,7 @@ 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/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 070fa4c28fda..1d9be4a7d842 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -435,12 +435,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index ba0de62711a0..34a13c0bcb68 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,9 +14,9 @@ require ( github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 5870a21def14..2bc3905aed27 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -446,12 +446,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/kafkareceiver/raw_unmarshaler.go b/receiver/kafkareceiver/raw_unmarshaler.go index 8886e51b9a49..e8f01daa3983 100644 --- a/receiver/kafkareceiver/raw_unmarshaler.go +++ b/receiver/kafkareceiver/raw_unmarshaler.go @@ -26,7 +26,7 @@ func newRawLogsUnmarshaler() LogsUnmarshaler { func (r rawLogsUnmarshaler) Unmarshal(buf []byte) (plog.Logs, error) { l := plog.NewLogs() - l.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty().Body().SetEmptyBytesVal().FromRaw(buf) + l.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty().Body().SetEmptyBytes().FromRaw(buf) return l, nil } diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 5cf128806a70..2de01f09e387 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 k8s.io/api v0.25.2 k8s.io/apimachinery v0.25.2 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 2fe1e4452239..671f925b0fa3 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -431,12 +431,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/kubeletstatsreceiver/scraper_test.go b/receiver/kubeletstatsreceiver/scraper_test.go index 1ec9edb68dcd..4ac17d19b3b4 100644 --- a/receiver/kubeletstatsreceiver/scraper_test.go +++ b/receiver/kubeletstatsreceiver/scraper_test.go @@ -368,7 +368,7 @@ func TestScraperWithPVCDetailedLabels(t *testing.T) { continue } - ev := test.expectedVolumes[claimName.StringVal()] + ev := test.expectedVolumes[claimName.Str()] requireExpectedVolume(t, ev, resource) // Assert metrics from certain volume claims expected to be missed @@ -376,7 +376,7 @@ func TestScraperWithPVCDetailedLabels(t *testing.T) { if test.volumeClaimsToMiss != nil { for c := range test.volumeClaimsToMiss { val, ok := resource.Attributes().Get("k8s.persistentvolumeclaim.name") - require.True(t, !ok || val.StringVal() != c) + require.True(t, !ok || val.Str() != c) } } } @@ -398,7 +398,7 @@ func requireExpectedVolume(t *testing.T, ev expectedVolume, resource pcommon.Res func requireAttribute(t *testing.T, attr pcommon.Map, key string, value string) { val, ok := attr.Get(key) require.True(t, ok) - require.Equal(t, value, val.StringVal()) + require.Equal(t, value, val.Str()) } diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index dc73c5461d8a..fac972cf1543 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index b373b7831b42..5ca7b83ab88e 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -297,10 +297,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/mongodbatlasreceiver/alerts.go b/receiver/mongodbatlasreceiver/alerts.go index 3a441126f453..8ea8c51026b9 100644 --- a/receiver/mongodbatlasreceiver/alerts.go +++ b/receiver/mongodbatlasreceiver/alerts.go @@ -237,7 +237,7 @@ func payloadToLogs(now time.Time, payload []byte) (plog.Logs, error) { logRecord.SetObservedTimestamp(pcommon.NewTimestampFromTime(now)) logRecord.SetTimestamp(timestampFromAlert(alert)) logRecord.SetSeverityNumber(severityFromAlert(alert)) - logRecord.Body().SetStringVal(string(payload)) + logRecord.Body().SetStr(string(payload)) resourceAttrs := resourceLogs.Resource().Attributes() resourceAttrs.PutString("mongodbatlas.group.id", alert.GroupID) diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index 289ca426e0e5..69e5cb20e32a 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -83,7 +83,7 @@ func TestPayloadToLogRecord(t *testing.T) { lr.SetTimestamp(pcommon.NewTimestampFromTime(time.Date(2022, time.June, 3, 22, 30, 31, 0, time.UTC))) lr.SetSeverityNumber(plog.SeverityNumberInfo) - lr.Body().SetStringVal(payload) + lr.Body().SetStr(payload) return logs }, @@ -154,7 +154,7 @@ func TestPayloadToLogRecord(t *testing.T) { lr.SetTimestamp(pcommon.NewTimestampFromTime(time.Date(2022, time.June, 3, 22, 30, 35, 0, time.UTC))) lr.SetSeverityNumber(plog.SeverityNumberInfo) - lr.Body().SetStringVal(payload) + lr.Body().SetStr(payload) return logs }, diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index d33ffec98b50..3b203375e496 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 github.com/mongodb-forks/digest v1.0.4 go.mongodb.org/atlas v0.16.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -45,7 +45,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 388e715226df..5367b2e3a508 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -284,10 +284,10 @@ go.mongodb.org/atlas v0.16.0 h1:IqnDuK3XAZUgJ5lPHc4v4z4B8F6mvsS37O4ck7tOYVc= go.mongodb.org/atlas v0.16.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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/mongodbatlasreceiver/mongodb_event_to_logdata.go b/receiver/mongodbatlasreceiver/mongodb_event_to_logdata.go index 72d5db1f3bed..dc69a0bf7314 100644 --- a/receiver/mongodbatlasreceiver/mongodb_event_to_logdata.go +++ b/receiver/mongodbatlasreceiver/mongodb_event_to_logdata.go @@ -79,7 +79,7 @@ func mongodbAuditEventToLogData(logger *zap.Logger, logs []model.AuditLog, pc Pr lr.SetTimestamp(pcommon.NewTimestampFromTime(t)) lr.SetObservedTimestamp(pcommon.NewTimestampFromTime(time.Now())) // Insert Raw Log message into Body of LogRecord - lr.Body().SetStringVal(log.Raw) + lr.Body().SetStr(log.Raw) // Since Audit Logs don't have a severity/level // Set the "SeverityNumber" and "SeverityText" to INFO lr.SetSeverityNumber(plog.SeverityNumberInfo) @@ -133,13 +133,13 @@ func mongodbAuditEventToLogData(logger *zap.Logger, logs []model.AuditLog, pc Pr usersSlice := attrs.PutEmptySlice("users") usersSlice.EnsureCapacity(len(log.Users)) for _, user := range log.Users { - user.Pdata().CopyTo(usersSlice.AppendEmpty().SetEmptyMapVal()) + user.Pdata().CopyTo(usersSlice.AppendEmpty().SetEmptyMap()) } rolesSlice := attrs.PutEmptySlice("roles") rolesSlice.EnsureCapacity(len(log.Roles)) for _, roles := range log.Roles { - roles.Pdata().CopyTo(rolesSlice.AppendEmpty().SetEmptyMapVal()) + roles.Pdata().CopyTo(rolesSlice.AppendEmpty().SetEmptyMap()) } attrs.PutString("log_name", logName) @@ -176,7 +176,7 @@ func mongodbEventToLogData(logger *zap.Logger, logs []model.LogEntry, pc Project lr.SetTimestamp(pcommon.NewTimestampFromTime(t)) lr.SetObservedTimestamp(pcommon.NewTimestampFromTime(time.Now())) // Insert Raw Log message into Body of LogRecord - lr.Body().SetStringVal(log.Raw) + lr.Body().SetStr(log.Raw) // Set the "SeverityNumber" and "SeverityText" if a known type of // severity is found. if severityNumber, ok := severityMap[log.Severity]; ok { diff --git a/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go b/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go index 7be3b133c885..aede19bfff71 100644 --- a/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go +++ b/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go @@ -61,7 +61,7 @@ func TestMongoeventToLogData4_4(t *testing.T) { assertInt(t, attrs, "connectionId", 9052) assert.Equal(t, pcommon.Timestamp(1663006227215000000), lr.Timestamp()) - assert.Equal(t, "RAW MESSAGE", lr.Body().StringVal()) + assert.Equal(t, "RAW MESSAGE", lr.Body().Str()) assert.Equal(t, "I", lr.SeverityText()) assert.Equal(t, plog.SeverityNumberInfo, lr.SeverityNumber()) } @@ -97,7 +97,7 @@ func TestMongoeventToLogData4_2(t *testing.T) { _, exists := attrs.Get("id") assert.False(t, exists, "expected attribute id to not exist, but it did") - assert.Equal(t, "RAW MESSAGE", lr.Body().StringVal()) + assert.Equal(t, "RAW MESSAGE", lr.Body().Str()) assert.Equal(t, "I", lr.SeverityText()) assert.Equal(t, plog.SeverityNumberInfo, lr.SeverityNumber()) } @@ -154,24 +154,24 @@ func TestMongoEventToAuditLogData5_0(t *testing.T) { roles, ok := attrs.Get("roles") require.True(t, ok, "roles key does not exist") - require.Equal(t, roles.SliceVal().Len(), 1) - assertString(t, roles.SliceVal().At(0).MapVal(), "role", "test_role") - assertString(t, roles.SliceVal().At(0).MapVal(), "db", "test_db") + require.Equal(t, roles.Slice().Len(), 1) + assertString(t, roles.Slice().At(0).Map(), "role", "test_role") + assertString(t, roles.Slice().At(0).Map(), "db", "test_db") users, ok := attrs.Get("users") require.True(t, ok, "users key does not exist") - require.Equal(t, users.SliceVal().Len(), 1) - assertString(t, users.SliceVal().At(0).MapVal(), "user", "mongo_user") - assertString(t, users.SliceVal().At(0).MapVal(), "db", "my_db") + require.Equal(t, users.Slice().Len(), 1) + assertString(t, users.Slice().At(0).Map(), "user", "mongo_user") + assertString(t, users.Slice().At(0).Map(), "db", "my_db") param, ok := attrs.Get("param") require.True(t, ok, "param key does not exist") - assert.Equal(t, mongoevent.Param, param.MapVal().AsRaw()) + assert.Equal(t, mongoevent.Param, param.Map().AsRaw()) assert.Equal(t, pcommon.Timestamp(1663342012563000000), lr.Timestamp()) assert.Equal(t, plog.SeverityNumberInfo, lr.SeverityNumber()) assert.Equal(t, "INFO", lr.SeverityText()) - assert.Equal(t, "RAW MESSAGE", lr.Body().StringVal()) + assert.Equal(t, "RAW MESSAGE", lr.Body().Str()) } func TestMongoEventToAuditLogData4_2(t *testing.T) { @@ -207,24 +207,24 @@ func TestMongoEventToAuditLogData4_2(t *testing.T) { roles, ok := attrs.Get("roles") require.True(t, ok, "roles key does not exist") - require.Equal(t, roles.SliceVal().Len(), 1) - assertString(t, roles.SliceVal().At(0).MapVal(), "role", "test_role") - assertString(t, roles.SliceVal().At(0).MapVal(), "db", "test_db") + require.Equal(t, roles.Slice().Len(), 1) + assertString(t, roles.Slice().At(0).Map(), "role", "test_role") + assertString(t, roles.Slice().At(0).Map(), "db", "test_db") users, ok := attrs.Get("users") require.True(t, ok, "users key does not exist") - require.Equal(t, users.SliceVal().Len(), 1) - assertString(t, users.SliceVal().At(0).MapVal(), "user", "mongo_user") - assertString(t, users.SliceVal().At(0).MapVal(), "db", "my_db") + require.Equal(t, users.Slice().Len(), 1) + assertString(t, users.Slice().At(0).Map(), "user", "mongo_user") + assertString(t, users.Slice().At(0).Map(), "db", "my_db") param, ok := attrs.Get("param") require.True(t, ok, "param key does not exist") - assert.Equal(t, mongoevent.Param, param.MapVal().AsRaw()) + assert.Equal(t, mongoevent.Param, param.Map().AsRaw()) assert.Equal(t, pcommon.Timestamp(1663342012563000000), lr.Timestamp()) assert.Equal(t, plog.SeverityNumberInfo, lr.SeverityNumber()) assert.Equal(t, "INFO", lr.SeverityText()) - assert.Equal(t, "RAW MESSAGE", lr.Body().StringVal()) + assert.Equal(t, "RAW MESSAGE", lr.Body().Str()) } func GetTestEvent4_4() model.LogEntry { @@ -342,11 +342,11 @@ func assertString(t *testing.T, m pcommon.Map, key, expected string) { return } - if v.Type() != pcommon.ValueTypeString { + if v.Type() != pcommon.ValueTypeStr { assert.Fail(t, "Value for key %s was expected be STRING but was %s", key, v.Type().String()) } - assert.Equal(t, expected, v.StringVal()) + assert.Equal(t, expected, v.Str()) } func assertInt(t *testing.T, m pcommon.Map, key string, expected int64) { @@ -362,7 +362,7 @@ func assertInt(t *testing.T, m pcommon.Map, key string, expected int64) { assert.Fail(t, "Value for key %s was expected be INT but was %s", key, v.Type().String()) } - assert.Equal(t, expected, v.IntVal()) + assert.Equal(t, expected, v.Int()) } func assertBool(t *testing.T, m pcommon.Map, key string, expected bool) { @@ -378,5 +378,5 @@ func assertBool(t *testing.T, m pcommon.Map, key string, expected bool) { assert.Fail(t, "Value for key %s was expected be BOOL but was %s", key, v.Type().String()) } - assert.Equal(t, expected, v.BoolVal()) + assert.Equal(t, expected, v.Bool()) } diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index add3b1129016..778472c48887 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/testcontainers/testcontainers-go v0.14.0 go.mongodb.org/mongo-driver v1.10.2 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 5f4ba1f69671..3cce690dac79 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -1006,10 +1006,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index b79a373e27c2..cb3d70566e21 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -6,13 +6,13 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) require ( github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 4d346874dec3..8f6884c4e94c 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -983,10 +983,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 95366f53d9d3..172c2d0a349c 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.60.0 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index b2286a65b78b..363471bc2c07 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -999,10 +999,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index db20805719a1..ab189e63069f 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index 42ccae28ce67..6fa3c9cf2a58 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -280,10 +280,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index d26f19739eb5..252b9a423711 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.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 go.opentelemetry.io/otel v1.10.0 go.opentelemetry.io/otel/sdk v1.10.0 @@ -42,7 +42,7 @@ require ( github.com/mostynb/go-grpc-compression v1.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index bab507f9ed3a..703a8c6d2729 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -292,12 +292,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 3515257e406a..6cdacb359c0c 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index 5913723b4c1e..6c63da2078e6 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -284,10 +284,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 16eb6d943149..2d85f9b79bef 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index d64f1f596fdb..a0d87bd6b187 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -271,12 +271,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/podmanreceiver/metrics_test.go b/receiver/podmanreceiver/metrics_test.go index 15f833c700a2..19b84194db07 100644 --- a/receiver/podmanreceiver/metrics_test.go +++ b/receiver/podmanreceiver/metrics_test.go @@ -46,7 +46,7 @@ func assertStatsEqualToMetrics(t *testing.T, podmanStats *containerStats, md pme for k, v := range resourceAttrs { attr, exists := rsm.Resource().Attributes().Get(k) assert.True(t, exists) - assert.Equal(t, attr.StringVal(), v) + assert.Equal(t, attr.Str(), v) } assert.Equal(t, rsm.ScopeMetrics().Len(), 1) @@ -113,7 +113,7 @@ func assertPoints(t *testing.T, dpts pmetric.NumberDataPointSlice, pts []point) for k, expectedV := range expected.attributes { gotV, exists := got.Attributes().Get(k) assert.True(t, exists) - assert.Equal(t, gotV.StringVal(), expectedV) + assert.Equal(t, gotV.Str(), expectedV) } } } diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 9e4dd5364bff..639125f98342 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -6,14 +6,14 @@ require ( github.com/lib/pq v1.10.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) require ( github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 460f10e79356..c8eca16f38ae 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -986,10 +986,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 18874efc7759..0e4a366275ea 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) @@ -115,7 +115,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index 85d384c91bd9..b18da062aecb 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -660,12 +660,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 9ad0feb69590..25823aa69dcc 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -11,9 +11,9 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 7d4b3933b6d0..07f615504b5b 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -689,12 +689,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= diff --git a/receiver/prometheusreceiver/internal/metrics_adjuster.go b/receiver/prometheusreceiver/internal/metrics_adjuster.go index b3724b81f30a..61fbe89b9e34 100644 --- a/receiver/prometheusreceiver/internal/metrics_adjuster.go +++ b/receiver/prometheusreceiver/internal/metrics_adjuster.go @@ -133,7 +133,7 @@ func (tsm *timeseriesMap) get(metric pmetric.Metric, kv pcommon.Map) (*timeserie func getAttributesSignature(kv pcommon.Map) string { labelValues := make([]string, 0, kv.Len()) kv.Sort().Range(func(_ string, attrValue pcommon.Value) bool { - value := attrValue.StringVal() + value := attrValue.Str() if value != "" { labelValues = append(labelValues, value) } @@ -268,7 +268,7 @@ func (ma *initialPointAdjuster) AdjustMetrics(metrics pmetric.Metrics) error { if !found { return errors.New("adjusting metrics without instance") } - tsm := ma.jobsMap.get(job.StringVal(), instance.StringVal()) + tsm := ma.jobsMap.get(job.Str(), instance.Str()) // The lock on the relevant timeseriesMap is held throughout the adjustment process to ensure that // nothing else can modify the data used for adjustment. diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index c599202b5e9e..bb1dc90b38bd 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,9 +11,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.60.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index b477ad4b11a6..86e045ae4173 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -523,12 +523,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 67aba58b90e9..47f2ad014c55 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index bd6b75e95d4b..375ec55dcdc8 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -993,10 +993,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index ee96b5167356..fecad06a3604 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index b6e7ab1b3d3a..1ca4188eb93b 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -412,12 +412,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= go.opentelemetry.io/contrib/propagators/b3 v1.10.0/go.mod h1:oxvamQ/mTDFQVugml/uFS59+aEUnFLhmd1wsG+n5MOE= go.opentelemetry.io/contrib/zpages v0.36.0 h1:/BSq75P5b39Qv3T1COsbrc3CnzzWvWiD2Rtz4xgeZc4= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index e372fc6217b2..e520c68f9a49 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.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 806da8057fc4..538190b2f12c 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -312,10 +312,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 8b13e62247bd..f0e7e54367cb 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakre go 1.18 require ( - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -13,7 +13,7 @@ require github.com/stretchr/testify v1.8.0 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index bd6b75e95d4b..375ec55dcdc8 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -993,10 +993,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index be26e6ef5c34..e7251b42e90e 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/SAP/go-hdb v0.108.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 054a0a843d06..b7d550763c3a 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -272,10 +272,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index bd7517d82d2b..762fac18f58e 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.60.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 94b24d9ad671..47799119a6c5 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -287,12 +287,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 290f59fe56bb..edf44bf6f6cd 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -378,7 +378,7 @@ func TestAccessTokenPassthrough(t *testing.T) { attrs := rspan.Resource().Attributes() amap, contains := attrs.Get("com.splunk.signalfx.access_token") if tt.accessTokenPassthrough && tt.token != "" { - assert.Equal(t, tt.token, amap.StringVal()) + assert.Equal(t, tt.token, amap.Str()) } else { assert.False(t, contains) } diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index a53aee8afe6e..425387ddef44 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,9 +11,9 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index b9bfa15fc601..26beeb9fe33a 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1233,8 +1233,8 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/WRO2GgRl4I1g= go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1242,15 +1242,15 @@ go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMq go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.60.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.60.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 375516cfb878..e4f3ac325b29 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -681,7 +681,7 @@ func Test_sfxReceiver_DatapointAccessTokenPassthrough(t *testing.T) { resource := mds[0].ResourceMetrics().At(0).Resource() tokenLabel := "" if label, ok := resource.Attributes().Get("com.splunk.signalfx.access_token"); ok { - tokenLabel = label.StringVal() + tokenLabel = label.Str() } if tt.passthrough { @@ -758,7 +758,7 @@ func Test_sfxReceiver_EventAccessTokenPassthrough(t *testing.T) { tokenLabel := "" if accessTokenAttr, ok := got[0].ResourceLogs().At(0).Resource().Attributes().Get("com.splunk.signalfx.access_token"); ok { - tokenLabel = accessTokenAttr.StringVal() + tokenLabel = accessTokenAttr.Str() } if tt.passthrough { diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 28cf73a081b2..5cd0de2fbf87 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 k8s.io/client-go v0.25.2 ) @@ -117,8 +117,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 00df5156eda0..437ec2421cb1 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -664,12 +664,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index c60b02557422..d8d6074a13de 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -6,9 +6,9 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.49.0 google.golang.org/protobuf v1.28.1 diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index c30565e2fbc2..0a2363d56258 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -403,12 +403,12 @@ 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 22324bf8435e..59c117173633 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -20,8 +20,8 @@ require ( github.com/Azure/go-amqp v0.17.5 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 5fd76129c85a..9eb074039c78 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -272,10 +272,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/solacereceiver/unmarshaller_test.go b/receiver/solacereceiver/unmarshaller_test.go index f7dfdb13a52e..25f2d13e50c8 100644 --- a/receiver/solacereceiver/unmarshaller_test.go +++ b/receiver/solacereceiver/unmarshaller_test.go @@ -893,98 +893,98 @@ func TestUnmarshallerInsertUserProperty(t *testing.T) { &model_v1.SpanData_UserPropertyValue_BoolValue{BoolValue: true}, pcommon.ValueTypeBool, func(val pcommon.Value) { - assert.Equal(t, true, val.BoolVal()) + assert.Equal(t, true, val.Bool()) }, }, { &model_v1.SpanData_UserPropertyValue_DoubleValue{DoubleValue: 12.34}, pcommon.ValueTypeDouble, func(val pcommon.Value) { - assert.Equal(t, float64(12.34), val.DoubleVal()) + assert.Equal(t, float64(12.34), val.Double()) }, }, { &model_v1.SpanData_UserPropertyValue_ByteArrayValue{ByteArrayValue: []byte{1, 2, 3, 4}}, pcommon.ValueTypeBytes, func(val pcommon.Value) { - assert.Equal(t, []byte{1, 2, 3, 4}, val.BytesVal().AsRaw()) + assert.Equal(t, []byte{1, 2, 3, 4}, val.Bytes().AsRaw()) }, }, { &model_v1.SpanData_UserPropertyValue_FloatValue{FloatValue: 12.34}, pcommon.ValueTypeDouble, func(val pcommon.Value) { - assert.Equal(t, float64(float32(12.34)), val.DoubleVal()) + assert.Equal(t, float64(float32(12.34)), val.Double()) }, }, { &model_v1.SpanData_UserPropertyValue_Int8Value{Int8Value: 8}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(8), val.IntVal()) + assert.Equal(t, int64(8), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_Int16Value{Int16Value: 16}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(16), val.IntVal()) + assert.Equal(t, int64(16), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_Int32Value{Int32Value: 32}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(32), val.IntVal()) + assert.Equal(t, int64(32), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_Int64Value{Int64Value: 64}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(64), val.IntVal()) + assert.Equal(t, int64(64), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_Uint8Value{Uint8Value: 8}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(8), val.IntVal()) + assert.Equal(t, int64(8), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_Uint16Value{Uint16Value: 16}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(16), val.IntVal()) + assert.Equal(t, int64(16), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_Uint32Value{Uint32Value: 32}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(32), val.IntVal()) + assert.Equal(t, int64(32), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_Uint64Value{Uint64Value: 64}, pcommon.ValueTypeInt, func(val pcommon.Value) { - assert.Equal(t, int64(64), val.IntVal()) + assert.Equal(t, int64(64), val.Int()) }, }, { &model_v1.SpanData_UserPropertyValue_StringValue{StringValue: "hello world"}, - pcommon.ValueTypeString, + pcommon.ValueTypeStr, func(val pcommon.Value) { - assert.Equal(t, "hello world", val.StringVal()) + assert.Equal(t, "hello world", val.Str()) }, }, { &model_v1.SpanData_UserPropertyValue_DestinationValue{DestinationValue: "some_dest"}, - pcommon.ValueTypeString, + pcommon.ValueTypeStr, func(val pcommon.Value) { - assert.Equal(t, "some_dest", val.StringVal()) + assert.Equal(t, "some_dest", val.Str()) }, }, } diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 822b15801573..e5e5599d5ecc 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 3fc235f01c2b..84bb34b2270b 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -276,12 +276,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index bfab86ea42bf..e84032914d27 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -267,7 +267,7 @@ func (r *splunkReceiver) handleRawReq(resp http.ResponseWriter, req *http.Reques for sc.Scan() { logRecord := sl.LogRecords().AppendEmpty() logLine := sc.Text() - logRecord.Body().SetStringVal(logLine) + logRecord.Body().SetStr(logLine) } consumerErr := r.logsConsumer.ConsumeLogs(ctx, ld) diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index f4b58f5febcf..b02377bf8160 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -406,7 +406,7 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { sec := float64(msecInt64) / 1e3 lr.SetTimestamp(pcommon.Timestamp(int64(sec * 1e9))) - lr.Body().SetStringVal("foo") + lr.Body().SetStr("foo") lr.Attributes().PutString("com.splunk.sourcetype", "custom:sourcetype") lr.Attributes().PutString("com.splunk.index", "myindex") want := logs diff --git a/receiver/splunkhecreceiver/splunk_to_logdata.go b/receiver/splunkhecreceiver/splunk_to_logdata.go index f28fe826b609..2ba586a820a5 100644 --- a/receiver/splunkhecreceiver/splunk_to_logdata.go +++ b/receiver/splunkhecreceiver/splunk_to_logdata.go @@ -85,13 +85,13 @@ func convertToValue(logger *zap.Logger, src interface{}, dest pcommon.Value) err switch value := src.(type) { case nil: case string: - dest.SetStringVal(value) + dest.SetStr(value) case int64: - dest.SetIntVal(value) + dest.SetInt(value) case float64: - dest.SetDoubleVal(value) + dest.SetDouble(value) case bool: - dest.SetBoolVal(value) + dest.SetBool(value) case map[string]interface{}: return convertToAttributeMap(logger, value, dest) case []interface{}: @@ -105,7 +105,7 @@ func convertToValue(logger *zap.Logger, src interface{}, dest pcommon.Value) err } func convertToSliceVal(logger *zap.Logger, value []interface{}, dest pcommon.Value) error { - arr := dest.SetEmptySliceVal() + arr := dest.SetEmptySlice() for _, elt := range value { err := convertToValue(logger, elt, arr.AppendEmpty()) if err != nil { @@ -116,7 +116,7 @@ func convertToSliceVal(logger *zap.Logger, value []interface{}, dest pcommon.Val } func convertToAttributeMap(logger *zap.Logger, value map[string]interface{}, dest pcommon.Value) error { - attrMap := dest.SetEmptyMapVal() + attrMap := dest.SetEmptyMap() keys := make([]string, 0, len(value)) for k := range value { keys = append(keys, k) diff --git a/receiver/splunkhecreceiver/splunk_to_logdata_test.go b/receiver/splunkhecreceiver/splunk_to_logdata_test.go index 1578fd67b06e..a43b5a2e206c 100644 --- a/receiver/splunkhecreceiver/splunk_to_logdata_test.go +++ b/receiver/splunkhecreceiver/splunk_to_logdata_test.go @@ -82,7 +82,7 @@ func Test_SplunkHecToLogData(t *testing.T) { hecConfig: defaultTestingHecConfig, output: func() plog.ResourceLogsSlice { logsSlice := createLogsSlice(nanoseconds) - logsSlice.At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetDoubleVal(12.3) + logsSlice.At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetDouble(12.3) return logsSlice }(), wantErr: nil, @@ -104,9 +104,9 @@ func Test_SplunkHecToLogData(t *testing.T) { output: func() plog.ResourceLogsSlice { logsSlice := createLogsSlice(nanoseconds) arrVal := pcommon.NewValueSlice() - arr := arrVal.SliceVal() - arr.AppendEmpty().SetStringVal("foo") - arr.AppendEmpty().SetStringVal("bar") + arr := arrVal.Slice() + arr.AppendEmpty().SetStr("foo") + arr.AppendEmpty().SetStr("bar") arrVal.CopyTo(logsSlice.At(0).ScopeLogs().At(0).LogRecords().At(0).Body()) return logsSlice }(), @@ -129,13 +129,13 @@ func Test_SplunkHecToLogData(t *testing.T) { output: func() plog.ResourceLogsSlice { logsSlice := createLogsSlice(nanoseconds) - attMap := logsSlice.At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetEmptyMapVal() + attMap := logsSlice.At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetEmptyMap() attMap.PutBool("bool", false) foos := attMap.PutEmptySlice("foos") foos.EnsureCapacity(3) - foos.AppendEmpty().SetStringVal("foo") - foos.AppendEmpty().SetStringVal("bar") - foos.AppendEmpty().SetStringVal("foobar") + foos.AppendEmpty().SetStr("foo") + foos.AppendEmpty().SetStr("bar") + foos.AppendEmpty().SetStr("foobar") attMap.PutInt("someInt", 12) return logsSlice @@ -187,7 +187,7 @@ func Test_SplunkHecToLogData(t *testing.T) { lr := lrs.AppendEmpty() sl := lr.ScopeLogs().AppendEmpty() logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("value") + logRecord.Body().SetStr("value") logRecord.SetTimestamp(pcommon.Timestamp(0)) logRecord.Attributes().PutString("foo", "bar") logRecord.Attributes().PutString("myhost", "localhost") @@ -214,7 +214,7 @@ func createLogsSlice(nanoseconds int) plog.ResourceLogsSlice { lr := lrs.AppendEmpty() sl := lr.ScopeLogs().AppendEmpty() logRecord := sl.LogRecords().AppendEmpty() - logRecord.Body().SetStringVal("value") + logRecord.Body().SetStr("value") logRecord.SetTimestamp(pcommon.Timestamp(nanoseconds)) logRecord.Attributes().PutString("foo", "bar") logRecord.Attributes().PutString("host.name", "localhost") @@ -253,7 +253,7 @@ func TestConvertToValueMap(t *testing.T) { value := pcommon.NewValueEmpty() assert.NoError(t, convertToValue(zap.NewNop(), map[string]interface{}{"foo": "bar"}, value)) atts := pcommon.NewValueMap() - attMap := atts.MapVal() + attMap := atts.Map() attMap.PutString("foo", "bar") assert.Equal(t, atts, value) } @@ -262,8 +262,8 @@ func TestConvertToValueArray(t *testing.T) { value := pcommon.NewValueEmpty() assert.NoError(t, convertToValue(zap.NewNop(), []interface{}{"foo"}, value)) arrValue := pcommon.NewValueSlice() - arr := arrValue.SliceVal() - arr.AppendEmpty().SetStringVal("foo") + arr := arrValue.Slice() + arr.AppendEmpty().SetStr("foo") assert.Equal(t, arrValue, value) } diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 8593cbb68eea..89fddd4b24f9 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -12,8 +12,8 @@ require ( github.com/snowflakedb/gosnowflake v1.6.13 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.14.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.opentelemetry.io/otel/trace v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index da31ff76a025..95f8bd914fc5 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -1096,10 +1096,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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= diff --git a/receiver/sqlqueryreceiver/integration_test.go b/receiver/sqlqueryreceiver/integration_test.go index c28d77d1b40d..624c019fad3a 100644 --- a/receiver/sqlqueryreceiver/integration_test.go +++ b/receiver/sqlqueryreceiver/integration_test.go @@ -261,9 +261,9 @@ func testMovieMetrics(t *testing.T, rm pmetric.ResourceMetrics, genreAttrKey str genreStr := genre.AsString() switch genreStr { case "SciFi": - assert.EqualValues(t, 3, pt.IntVal()) + assert.EqualValues(t, 3, pt.IntValue()) case "Action": - assert.EqualValues(t, 2, pt.IntVal()) + assert.EqualValues(t, 2, pt.IntValue()) default: assert.Failf(t, "unexpected genre: %s", genreStr) } diff --git a/receiver/sqlqueryreceiver/scraper_test.go b/receiver/sqlqueryreceiver/scraper_test.go index 66505fdf8919..013ba074ac41 100644 --- a/receiver/sqlqueryreceiver/scraper_test.go +++ b/receiver/sqlqueryreceiver/scraper_test.go @@ -229,14 +229,14 @@ func TestScraper_MultiRow(t *testing.T) { dp := metric.Gauge().DataPoints().At(0) assert.EqualValues(t, 42, dp.IntValue()) val, _ := dp.Attributes().Get("genre") - assert.Equal(t, "action", val.StringVal()) + assert.Equal(t, "action", val.Str()) } { metric := ms.At(1) dp := metric.Gauge().DataPoints().At(0) assert.EqualValues(t, 111, dp.IntValue()) val, _ := dp.Attributes().Get("genre") - assert.Equal(t, "sci-fi", val.StringVal()) + assert.Equal(t, "sci-fi", val.Str()) } } diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 788863244ad6..fdb798a81e53 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index 99365113f13c..37461ea85b7c 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -271,10 +271,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 3fa9b6cb4427..723bd9d919d0 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.60.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.opentelemetry.io/otel v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 4e43de007007..1a51ef898864 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -277,10 +277,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index ca124f614850..38825c8cddc3 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) require ( diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index b7a00b9397f8..1844214aa3f0 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -296,10 +296,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index bcd3b38449ad..5455308fa818 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -28,7 +28,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 23c39c163224..cd3a04215b33 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -293,10 +293,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index e55953adcf1b..b134a41be4f6 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -69,7 +69,7 @@ func testTCP(t *testing.T, cfg *TCPLogConfig) { log := logs.At(i) msg := log.Body() - require.Equal(t, msg.StringVal(), fmt.Sprintf("<86>1 2021-02-28T00:0%d:02.003Z test msg %d", i, i)) + require.Equal(t, msg.Str(), fmt.Sprintf("<86>1 2021-02-28T00:0%d:02.003Z test msg %d", i, i)) } } diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 1c743bc2d382..bfe742d3afbc 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 ) require ( @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 9f2bd6e4771d..2d6e41b9e3f7 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -292,10 +292,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index d01c6c2230b3..6b99dce610be 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -73,7 +73,7 @@ func testUDP(t *testing.T, cfg *UDPLogConfig) { } for i := 0; i < numLogs; i++ { - assert.Contains(t, expectedLogs, logs.At(i).Body().StringVal()) + assert.Contains(t, expectedLogs, logs.At(i).Body().Str()) } } diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 387fc93fb83a..cdb3edc266dc 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/vmware/govmomi v0.29.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index a67475ea9171..c8f47df8160d 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -277,10 +277,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/vcenterreceiver/integration_test.go b/receiver/vcenterreceiver/integration_test.go index 99b849cdfaa2..f81da19bb813 100644 --- a/receiver/vcenterreceiver/integration_test.go +++ b/receiver/vcenterreceiver/integration_test.go @@ -69,7 +69,7 @@ func TestEndtoEnd_ESX(t *testing.T) { // please see #10129 for i := 0; i < metrics.ResourceMetrics().Len(); i++ { if val, ok := metrics.ResourceMetrics().At(i).Resource().Attributes().Get("vcenter.host.name"); ok { - val.SetStringVal("DC0_C0_H0") + val.SetStr("DC0_C0_H0") } } diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index e471a860f3ca..1b11be481d37 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/protobuf v1.28.1 ) @@ -28,8 +28,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 18a2f569ea9a..c6ae37adbb88 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -262,12 +262,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 0f890a2e7bd5..acc9fbc139d7 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 ) @@ -28,7 +28,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.32.1 // indirect go.opentelemetry.io/otel/trace v1.10.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 52729512b89f..1dc886bb5ba0 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -292,10 +292,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/windowseventlogreceiver/receiver_windows_test.go b/receiver/windowseventlogreceiver/receiver_windows_test.go index 798bcc20552a..35f77d8c40d3 100644 --- a/receiver/windowseventlogreceiver/receiver_windows_test.go +++ b/receiver/windowseventlogreceiver/receiver_windows_test.go @@ -119,7 +119,7 @@ func TestReadWindowsEventLogger(t *testing.T) { require.Equal(t, 1, records.Len()) record := records.At(0) - body := record.Body().MapVal().AsRaw() + body := record.Body().Map().AsRaw() strs := []string{"Test log"} test := make([]interface{}, len(strs)) diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index b0763cc08252..6a39389b91c5 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -41,7 +41,7 @@ require ( github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/pelletier/go-toml v1.9.4 // indirect - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 8bfedb0a37ec..0d7155b2ff49 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -268,10 +268,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index 4807907fb531..f3da1e5c258c 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -384,10 +384,10 @@ func TestScrape(t *testing.T) { assert.Equal(t, expectedAttributeLen, dps.At(dpIdx).Attributes().Len()) dps.At(dpIdx).Attributes().Range(func(k string, v pcommon.Value) bool { if k == instanceLabelName { - assert.Equal(t, val.InstanceName, v.StringVal()) + assert.Equal(t, val.InstanceName, v.Str()) return true } - assert.Equal(t, counterCfg.MetricRep.Attributes[k], v.StringVal()) + assert.Equal(t, counterCfg.MetricRep.Attributes[k], v.Str()) return true }) } diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index e8275787c870..be5e845c55bc 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.60.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 google.golang.org/protobuf v1.28.1 ) diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index aad82c413705..a30100c47b11 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -335,12 +335,12 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 h1:ledXJmnPfXGbE/gO4/PWSBsJGonnq6czWLrdHfQxeTU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1/go.mod h1:W6/Lb2w3nD2K/l+4SzaqJUr2Ibj2uHA+PdFZlO5cWus= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= diff --git a/receiver/zipkinreceiver/proto_parse_test.go b/receiver/zipkinreceiver/proto_parse_test.go index 73e64d1a546e..b1c312e5f9a5 100644 --- a/receiver/zipkinreceiver/proto_parse_test.go +++ b/receiver/zipkinreceiver/proto_parse_test.go @@ -158,7 +158,7 @@ func TestConvertSpansToTraceSpans_protobuf(t *testing.T) { reqsRS := reqs.ResourceSpans().At(j) rSvcName, ok := reqsRS.Resource().Attributes().Get(conventions.AttributeServiceName) assert.True(t, ok) - if rSvcName.StringVal() == wSvcName.StringVal() { + if rSvcName.Str() == wSvcName.Str() { compareResourceSpans(t, wantRS, reqsRS) } } diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index 58ad5a22ed0c..3a4ba067e58e 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -120,7 +120,7 @@ func TestConvertSpansToTraceSpans_json(t *testing.T) { req := reqs.ResourceSpans().At(0) sn, _ := req.Resource().Attributes().Get(conventions.AttributeServiceName) - assert.Equal(t, "frontend", sn.StringVal()) + assert.Equal(t, "frontend", sn.Str()) // Expecting 9 non-nil spans require.Equal(t, 9, reqs.SpanCount(), "Incorrect non-nil spans count") @@ -458,5 +458,5 @@ func TestFromBytesWithNoTimestamp(t *testing.T) { wasAbsent, mapContainedKey := gs.Attributes().Get("otel.zipkin.absentField.startTime") assert.True(t, mapContainedKey) - assert.True(t, wasAbsent.BoolVal()) + assert.True(t, wasAbsent.Bool()) } diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 92b9c784bc32..10e89de7c7c2 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.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.60.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index f368bf9f0a2e..1b03cec5fd85 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -292,10 +292,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/testbed/datasenders/fluent.go b/testbed/datasenders/fluent.go index 2c5ffe669522..b01549168683 100644 --- a/testbed/datasenders/fluent.go +++ b/testbed/datasenders/fluent.go @@ -110,20 +110,20 @@ func (f *FluentLogsForwarder) ConsumeLogs(_ context.Context, logs plog.Logs) err func (f *FluentLogsForwarder) convertLogToMap(lr plog.LogRecord) map[string]string { out := map[string]string{} - if lr.Body().Type() == pcommon.ValueTypeString { - out["log"] = lr.Body().StringVal() + if lr.Body().Type() == pcommon.ValueTypeStr { + out["log"] = lr.Body().Str() } lr.Attributes().Range(func(k string, v pcommon.Value) bool { switch v.Type() { - case pcommon.ValueTypeString: - out[k] = v.StringVal() + case pcommon.ValueTypeStr: + out[k] = v.Str() case pcommon.ValueTypeInt: - out[k] = strconv.FormatInt(v.IntVal(), 10) + out[k] = strconv.FormatInt(v.Int(), 10) case pcommon.ValueTypeDouble: - out[k] = strconv.FormatFloat(v.DoubleVal(), 'f', -1, 64) + out[k] = strconv.FormatFloat(v.Double(), 'f', -1, 64) case pcommon.ValueTypeBool: - out[k] = strconv.FormatBool(v.BoolVal()) + out[k] = strconv.FormatBool(v.Bool()) default: panic("missing case") } @@ -137,18 +137,18 @@ func (f *FluentLogsForwarder) convertLogToJSON(lr plog.LogRecord) []byte { rec := map[string]string{ "time": time.Unix(0, int64(lr.Timestamp())).Format("02/01/2006:15:04:05Z"), } - rec["log"] = lr.Body().StringVal() + rec["log"] = lr.Body().Str() lr.Attributes().Range(func(k string, v pcommon.Value) bool { switch v.Type() { - case pcommon.ValueTypeString: - rec[k] = v.StringVal() + case pcommon.ValueTypeStr: + rec[k] = v.Str() case pcommon.ValueTypeInt: - rec[k] = strconv.FormatInt(v.IntVal(), 10) + rec[k] = strconv.FormatInt(v.Int(), 10) case pcommon.ValueTypeDouble: - rec[k] = strconv.FormatFloat(v.DoubleVal(), 'f', -1, 64) + rec[k] = strconv.FormatFloat(v.Double(), 'f', -1, 64) case pcommon.ValueTypeBool: - rec[k] = strconv.FormatBool(v.BoolVal()) + rec[k] = strconv.FormatBool(v.Bool()) default: panic("missing case") } diff --git a/testbed/datasenders/fluentbit.go b/testbed/datasenders/fluentbit.go index 78999f90a52b..c3eaea68905d 100644 --- a/testbed/datasenders/fluentbit.go +++ b/testbed/datasenders/fluentbit.go @@ -110,18 +110,18 @@ func (f *FluentBitFileLogWriter) convertLogToJSON(lr plog.LogRecord) []byte { rec := map[string]string{ "time": time.Unix(0, int64(lr.Timestamp())).Format("02/01/2006:15:04:05Z"), } - rec["log"] = lr.Body().StringVal() + rec["log"] = lr.Body().Str() lr.Attributes().Range(func(k string, v pcommon.Value) bool { switch v.Type() { - case pcommon.ValueTypeString: - rec[k] = v.StringVal() + case pcommon.ValueTypeStr: + rec[k] = v.Str() case pcommon.ValueTypeInt: - rec[k] = strconv.FormatInt(v.IntVal(), 10) + rec[k] = strconv.FormatInt(v.Int(), 10) case pcommon.ValueTypeDouble: - rec[k] = strconv.FormatFloat(v.DoubleVal(), 'f', -1, 64) + rec[k] = strconv.FormatFloat(v.Double(), 'f', -1, 64) case pcommon.ValueTypeBool: - rec[k] = strconv.FormatBool(v.BoolVal()) + rec[k] = strconv.FormatBool(v.Bool()) default: panic("missing case") } diff --git a/testbed/datasenders/k8s.go b/testbed/datasenders/k8s.go index 879d1afc9051..9b20a322ac74 100644 --- a/testbed/datasenders/k8s.go +++ b/testbed/datasenders/k8s.go @@ -115,8 +115,8 @@ func (f *FileLogK8sWriter) convertLogToTextLine(lr plog.LogRecord) []byte { sb.WriteString(lr.SeverityText()) sb.WriteString(" ") - if lr.Body().Type() == pcommon.ValueTypeString { - sb.WriteString(lr.Body().StringVal()) + if lr.Body().Type() == pcommon.ValueTypeStr { + sb.WriteString(lr.Body().Str()) } lr.Attributes().Range(func(k string, v pcommon.Value) bool { @@ -124,14 +124,14 @@ func (f *FileLogK8sWriter) convertLogToTextLine(lr plog.LogRecord) []byte { sb.WriteString(k) sb.WriteString("=") switch v.Type() { - case pcommon.ValueTypeString: - sb.WriteString(v.StringVal()) + case pcommon.ValueTypeStr: + sb.WriteString(v.Str()) case pcommon.ValueTypeInt: - sb.WriteString(strconv.FormatInt(v.IntVal(), 10)) + sb.WriteString(strconv.FormatInt(v.Int(), 10)) case pcommon.ValueTypeDouble: - sb.WriteString(strconv.FormatFloat(v.DoubleVal(), 'f', -1, 64)) + sb.WriteString(strconv.FormatFloat(v.Double(), 'f', -1, 64)) case pcommon.ValueTypeBool: - sb.WriteString(strconv.FormatBool(v.BoolVal())) + sb.WriteString(strconv.FormatBool(v.Bool())) default: panic("missing case") } diff --git a/testbed/datasenders/stanza.go b/testbed/datasenders/stanza.go index 23643265eb5b..9da631ea0d9f 100644 --- a/testbed/datasenders/stanza.go +++ b/testbed/datasenders/stanza.go @@ -89,8 +89,8 @@ func (f *FileLogWriter) convertLogToTextLine(lr plog.LogRecord) []byte { sb.WriteString(lr.SeverityText()) sb.WriteString(" ") - if lr.Body().Type() == pcommon.ValueTypeString { - sb.WriteString(lr.Body().StringVal()) + if lr.Body().Type() == pcommon.ValueTypeStr { + sb.WriteString(lr.Body().Str()) } lr.Attributes().Range(func(k string, v pcommon.Value) bool { @@ -98,14 +98,14 @@ func (f *FileLogWriter) convertLogToTextLine(lr plog.LogRecord) []byte { sb.WriteString(k) sb.WriteString("=") switch v.Type() { - case pcommon.ValueTypeString: - sb.WriteString(v.StringVal()) + case pcommon.ValueTypeStr: + sb.WriteString(v.Str()) case pcommon.ValueTypeInt: - sb.WriteString(strconv.FormatInt(v.IntVal(), 10)) + sb.WriteString(strconv.FormatInt(v.Int(), 10)) case pcommon.ValueTypeDouble: - sb.WriteString(strconv.FormatFloat(v.DoubleVal(), 'f', -1, 64)) + sb.WriteString(strconv.FormatFloat(v.Double(), 'f', -1, 64)) case pcommon.ValueTypeBool: - sb.WriteString(strconv.FormatBool(v.BoolVal())) + sb.WriteString(strconv.FormatBool(v.Bool())) default: panic("missing case") } diff --git a/testbed/datasenders/syslog.go b/testbed/datasenders/syslog.go index eaebfb0f0bca..7599c8b97dc9 100644 --- a/testbed/datasenders/syslog.go +++ b/testbed/datasenders/syslog.go @@ -106,10 +106,10 @@ func (f *SyslogWriter) Send(lr plog.LogRecord) error { sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", "span_id", lr.SpanID().HexString())) sdid.WriteString(fmt.Sprintf("%s=\"%d\" ", "trace_flags", lr.Flags())) lr.Attributes().Range(func(k string, v pcommon.Value) bool { - sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", k, v.StringVal())) + sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", k, v.Str())) return true }) - msg := fmt.Sprintf("<166> %s localhost - - - [%s] %s\n", ts, sdid.String(), lr.Body().StringVal()) + msg := fmt.Sprintf("<166> %s localhost - - - [%s] %s\n", ts, sdid.String(), lr.Body().Str()) f.buf = append(f.buf, msg) return f.SendCheck() diff --git a/testbed/datasenders/tcpudp.go b/testbed/datasenders/tcpudp.go index b93505f3f545..82d30ab00b93 100644 --- a/testbed/datasenders/tcpudp.go +++ b/testbed/datasenders/tcpudp.go @@ -104,10 +104,10 @@ func (f *TCPUDPWriter) Send(lr plog.LogRecord) error { sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", "span_id", lr.SpanID().HexString())) sdid.WriteString(fmt.Sprintf("%s=\"%d\" ", "trace_flags", lr.Flags())) lr.Attributes().Range(func(k string, v pcommon.Value) bool { - sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", k, v.StringVal())) + sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", k, v.Str())) return true }) - msg := fmt.Sprintf("<166> %s localhost - - - [%s] %s\n", ts, sdid.String(), lr.Body().StringVal()) + msg := fmt.Sprintf("<166> %s localhost - - - [%s] %s\n", ts, sdid.String(), lr.Body().Str()) f.buf = append(f.buf, msg) return f.SendCheck() diff --git a/testbed/go.mod b/testbed/go.mod index 2ee7105e3fac..59032f8b6ab8 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -27,9 +27,9 @@ require ( github.com/prometheus/prometheus v0.38.0 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/testbed/go.sum b/testbed/go.sum index e3d084ddd172..a93bb0785a84 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1399,18 +1399,18 @@ 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.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.60.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.60.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 h1:IsWKqDHwzB/iNwTbooSE5x9bq489z4l2G3bw5P0D1vE= -go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 h1:O+zOWHJz2yX7bGH/vgPs5JSrj9mlRQHbOFw3TmT9SJI= +go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 h1:+jrwcA4gF8tIZmdKWgTUysKtYW2VIzywjkfgd/5OPEM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 502290c3cd1a..3963bb102b68 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002 - go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 + go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 + go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 go.uber.org/zap v1.23.0 ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index 6251494b915e..3fb319bdbefe 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -262,10 +262,10 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= 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.60.1-0.20220923151520-96e9af35c002 h1:+KmAweE0XE/8cGo6ZqE7Qb83vnFVZ5agFjo/QBJ0vvQ= -go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 h1:08j0YeDgQ5pD589XGdGBV/IQciJsCiM2tt30SFGGFeg= -go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6 h1:RNsT4D0YrCvYa8RS0MAnM9ovj/eHNRM8rknqhG5Ms50= +go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:DJMX+EnDACRnwynrLOpWShrYbxx7+rFZTNHTiRTvU3w= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 h1:kFAoLRVF06RaqFG4StSU6amWb5/oSvoJ1Ax7iOyh3EA= +go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index 6a07b9250114..c98ef8de7f7f 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -157,7 +157,7 @@ func (dp *perfTestDataProvider) GenerateLogs() (plog.Logs, bool) { record := logRecords.AppendEmpty() record.SetSeverityNumber(plog.SeverityNumberInfo3) record.SetSeverityText("INFO3") - record.Body().SetStringVal("Load Generator Counter #" + strconv.Itoa(i)) + record.Body().SetStr("Load Generator Counter #" + strconv.Itoa(i)) record.SetFlags(plog.DefaultLogRecordFlags.WithIsSampled(true)) record.SetTimestamp(now) diff --git a/testbed/testbed/mock_backend.go b/testbed/testbed/mock_backend.go index f4c37f7daffc..ab77c2e63e86 100644 --- a/testbed/testbed/mock_backend.go +++ b/testbed/testbed/mock_backend.go @@ -186,12 +186,12 @@ func (tc *MockTraceConsumer) ConsumeTraces(_ context.Context, td ptrace.Traces) seqnumAttr, ok := span.Attributes().Get("load_generator.span_seq_num") if ok { - spanSeqnum = seqnumAttr.IntVal() + spanSeqnum = seqnumAttr.Int() } seqnumAttr, ok = span.Attributes().Get("load_generator.trace_seq_num") if ok { - traceSeqnum = seqnumAttr.IntVal() + traceSeqnum = seqnumAttr.Int() } // Ignore the seqnums for now. We will use them later. diff --git a/testbed/testbed/validator.go b/testbed/testbed/validator.go index d0b92d161432..4e93a8d94005 100644 --- a/testbed/testbed/validator.go +++ b/testbed/testbed/validator.go @@ -461,8 +461,8 @@ func (v *CorrectnessTestValidator) compareKeyValueList( spanName string, sentVal pcommon.Value, recdVal pcommon.Value, fmtStr string, attrKey string) { switch recdVal.Type() { case pcommon.ValueTypeMap: - v.diffAttributeMap(spanName, sentVal.MapVal(), recdVal.MapVal(), fmtStr) - case pcommon.ValueTypeString: + v.diffAttributeMap(spanName, sentVal.Map(), recdVal.Map(), fmtStr) + case pcommon.ValueTypeStr: v.compareSimpleValues(spanName, sentVal, recdVal, fmtStr, attrKey) default: af := &TraceAssertionFailure{ diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index f3f89faa3dd0..a521a19214e8 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -459,7 +459,7 @@ func TestTraceAttributesProcessor(t *testing.T) { require.Equal(t, span.Attributes().Len(), 1) attrVal, ok := span.Attributes().Get("new_attr") assert.True(t, ok) - assert.EqualValues(t, "string value", attrVal.StringVal()) + assert.EqualValues(t, "string value", attrVal.Str()) } verifySingleSpan(t, tc, nodeToInclude, spanToInclude, verifySpan)