diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 58bd3f92b615..5624cf137b14 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 golang.org/x/text v0.3.7 ) @@ -538,8 +538,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.59.0 // indirect - go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/contrib/zpages v0.34.0 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index ec77bd40c6cb..fd39771326c6 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -1872,12 +1872,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index bc7afb5c5881..a22d675a59bb 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.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 7fa37b3df97f..40127c90fd49 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/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/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 53c0841d6e7d..61527aaaf3c0 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index fc4eff809d21..4a9fedd3ac15 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -415,12 +415,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go index f447c865f231..8a6b50befae5 100644 --- a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go +++ b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go @@ -171,7 +171,7 @@ func mapLogRecordToLogService(lr plog.LogRecord, contentsBuffer = append(contentsBuffer, sls.LogContent{ Key: proto.String(slsLogFlags), - Value: proto.String(strconv.FormatUint(uint64(lr.FlagsStruct()), 16)), + Value: proto.String(strconv.FormatUint(uint64(lr.Flags()), 16)), }) contentsBuffer = append(contentsBuffer, sls.LogContent{ diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go index 94ec44e4513d..412a3b1507ca 100644 --- a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go @@ -181,12 +181,12 @@ func constructSpanAttributes(attributes map[string]interface{}) pcommon.Map { func newTraceID() pcommon.TraceID { r := [16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x96, 0x9A, 0x89, 0x55, 0x57, 0x1A, 0x3F} - return pcommon.NewTraceID(r) + return pcommon.TraceID(r) } func newSegmentID() pcommon.SpanID { r := [8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x7D, 0x98} - return pcommon.NewSpanID(r) + return pcommon.SpanID(r) } func TestSpanKindToShortString(t *testing.T) { diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go index 504ecb257cb2..7def446392e6 100644 --- a/exporter/awscloudwatchlogsexporter/exporter.go +++ b/exporter/awscloudwatchlogsexporter/exporter.go @@ -190,7 +190,7 @@ func logToCWLog(resourceAttrs map[string]interface{}, log plog.LogRecord) (*clou SeverityNumber: int32(log.SeverityNumber()), SeverityText: log.SeverityText(), DroppedAttributesCount: log.DroppedAttributesCount(), - Flags: uint32(log.FlagsStruct()), + Flags: uint32(log.Flags()), } if traceID := log.TraceID(); !traceID.IsEmpty() { body.TraceID = traceID.HexString() diff --git a/exporter/awscloudwatchlogsexporter/exporter_test.go b/exporter/awscloudwatchlogsexporter/exporter_test.go index cc733621f984..58b7041d4cb6 100644 --- a/exporter/awscloudwatchlogsexporter/exporter_test.go +++ b/exporter/awscloudwatchlogsexporter/exporter_test.go @@ -132,9 +132,9 @@ func testLogRecord() plog.LogRecord { record.Body().SetStringVal("hello world") record.Attributes().UpsertInt("key1", 1) record.Attributes().UpsertString("key2", "attr2") - record.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - record.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) - record.SetFlagsStruct(plog.DefaultLogRecordFlags.WithIsSampled(true)) + record.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + record.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) + record.SetFlags(plog.DefaultLogRecordFlags.WithIsSampled(true)) record.SetTimestamp(1609719139000000) return record } diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 9583a9c67ee7..6774c509c1e7 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index c6c4479533f7..e415c54c2e53 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 9e1ee0f4b071..ef7f40d0c4cf 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 37a243abee35..727b910b8270 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 3b910e4066d4..d53f5b7cb458 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -49,7 +49,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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index ad64c802b0b0..44827431480e 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -364,12 +364,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/awskinesisexporter/internal/batch/encoder_test.go b/exporter/awskinesisexporter/internal/batch/encoder_test.go index 82196ce473b8..8dcc2e96b715 100644 --- a/exporter/awskinesisexporter/internal/batch/encoder_test.go +++ b/exporter/awskinesisexporter/internal/batch/encoder_test.go @@ -29,8 +29,8 @@ func NewTestTraces(spanCount int) ptrace.Traces { span.SetName("foo") span.SetStartTimestamp(pcommon.Timestamp(10)) span.SetEndTimestamp(pcommon.Timestamp(20)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) } return traces diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go index d32667366c84..3c32d7daa3a2 100644 --- a/exporter/awsxrayexporter/awsxray_test.go +++ b/exporter/awsxrayexporter/awsxray_test.go @@ -241,7 +241,7 @@ func newTraceID() pcommon.TraceID { if err != nil { panic(err) } - return pcommon.NewTraceID(r) + return r } func constructW3CTraceID() pcommon.TraceID { @@ -249,7 +249,7 @@ func constructW3CTraceID() pcommon.TraceID { for i := range r { r[i] = byte(rand.Intn(128)) } - return pcommon.NewTraceID(r) + return r } func newSegmentID() pcommon.SpanID { @@ -258,5 +258,5 @@ func newSegmentID() pcommon.SpanID { if err != nil { panic(err) } - return pcommon.NewSpanID(r) + return r } diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 11dfe8534d90..99ac3b6c373e 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index a80152af986d..0b0622f13991 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/awsxrayexporter/internal/translator/segment.go b/exporter/awsxrayexporter/internal/translator/segment.go index 5add4aa2ee48..f5c8402c458b 100644 --- a/exporter/awsxrayexporter/internal/translator/segment.go +++ b/exporter/awsxrayexporter/internal/translator/segment.go @@ -219,7 +219,7 @@ func newSegmentID() pcommon.SpanID { if err != nil { panic(err) } - return pcommon.NewSpanID(r) + return pcommon.SpanID(r) } func determineAwsOrigin(resource pcommon.Resource) string { @@ -290,7 +290,7 @@ func convertToAmazonTraceID(traceID pcommon.TraceID) (string, error) { var ( content = [traceIDLength]byte{} epochNow = time.Now().Unix() - traceIDBytes = traceID.Bytes() + traceIDBytes = traceID epoch = int64(binary.BigEndian.Uint32(traceIDBytes[0:4])) b = [4]byte{} ) diff --git a/exporter/awsxrayexporter/internal/translator/segment_test.go b/exporter/awsxrayexporter/internal/translator/segment_test.go index 55a1185415dc..525a67ce0049 100644 --- a/exporter/awsxrayexporter/internal/translator/segment_test.go +++ b/exporter/awsxrayexporter/internal/translator/segment_test.go @@ -187,7 +187,7 @@ func TestServerSpanWithThrottle(t *testing.T) { func TestServerSpanNoParentId(t *testing.T) { spanName := "/api/locations" - parentSpanID := pcommon.EmptySpanID + parentSpanID := pcommon.NewSpanIDEmpty() resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeOk, "OK", nil) @@ -201,7 +201,7 @@ func TestSpanNoParentId(t *testing.T) { span.SetName("my-topic send") span.SetTraceID(newTraceID()) span.SetSpanID(newSegmentID()) - span.SetParentSpanID(pcommon.EmptySpanID) + span.SetParentSpanID(pcommon.NewSpanIDEmpty()) span.SetKind(ptrace.SpanKindProducer) span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now().Add(10))) @@ -336,12 +336,12 @@ func TestSpanWithInvalidTraceId(t *testing.T) { attributes[conventions.AttributeNetPeerPort] = "9443" attributes[conventions.AttributeHTTPTarget] = spanName resource := constructDefaultResource() - span := constructClientSpan(pcommon.EmptySpanID, spanName, ptrace.StatusCodeUnset, "OK", attributes) + span := constructClientSpan(pcommon.NewSpanIDEmpty(), spanName, ptrace.StatusCodeUnset, "OK", attributes) timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTimestamp()) timeEvents.CopyTo(span.Events()) - traceID := span.TraceID().Bytes() + traceID := span.TraceID() traceID[0] = 0x11 - span.SetTraceID(pcommon.NewTraceID(traceID)) + span.SetTraceID(traceID) _, err := MakeSegmentDocumentString(span, resource, nil, false) @@ -353,10 +353,10 @@ func TestSpanWithExpiredTraceId(t *testing.T) { const maxAge = 60 * 60 * 24 * 30 ExpiredEpoch := time.Now().Unix() - maxAge - 1 - tempTraceID := newTraceID().Bytes() + tempTraceID := newTraceID() binary.BigEndian.PutUint32(tempTraceID[0:4], uint32(ExpiredEpoch)) - _, err := convertToAmazonTraceID(pcommon.NewTraceID(tempTraceID)) + _, err := convertToAmazonTraceID(tempTraceID) assert.NotNil(t, err) } @@ -903,5 +903,5 @@ func newTraceID() pcommon.TraceID { if err != nil { panic(err) } - return pcommon.NewTraceID(r) + return r } diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index d28c719766f0..3fb683008a70 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 8ba6e10c6b1c..f539e1e32e56 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/azuremonitorexporter/trace_to_envelope_test.go b/exporter/azuremonitorexporter/trace_to_envelope_test.go index ebb78114d557..588ef8840291 100644 --- a/exporter/azuremonitorexporter/trace_to_envelope_test.go +++ b/exporter/azuremonitorexporter/trace_to_envelope_test.go @@ -759,9 +759,9 @@ The remainder of these methods are for building up test assets */ func getSpan(spanName string, spanKind ptrace.SpanKind, initialAttributes map[string]interface{}) ptrace.Span { span := ptrace.NewSpan() - span.SetTraceID(pcommon.NewTraceID(defaultTraceID)) - span.SetSpanID(pcommon.NewSpanID(defaultSpanID)) - span.SetParentSpanID(pcommon.NewSpanID(defaultParentSpanID)) + span.SetTraceID(defaultTraceID) + span.SetSpanID(defaultSpanID) + span.SetParentSpanID(defaultParentSpanID) span.SetName(spanName) span.SetKind(spanKind) span.SetStartTimestamp(defaultSpanStartTime) diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 23be49e3ded6..7391042a48e5 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 90ab83b6a4af..05044352f2d7 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/clickhouseexporter/exporter.go b/exporter/clickhouseexporter/exporter.go index 827b9513166b..06d4330436fb 100644 --- a/exporter/clickhouseexporter/exporter.go +++ b/exporter/clickhouseexporter/exporter.go @@ -90,7 +90,7 @@ func (e *clickhouseExporter) pushLogsData(ctx context.Context, ld plog.Logs) err r.Timestamp().AsTime(), r.TraceID().HexString(), r.SpanID().HexString(), - uint32(r.FlagsStruct()), + uint32(r.Flags()), r.SeverityText(), int32(r.SeverityNumber()), serviceName, diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index 64b36cfd3ecc..48f40088c517 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index afbc9ef57351..63b00c5a1a08 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 6ba687214f03..e5579630126d 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 ) require ( github.com/coralogix/opentelemetry-cx-protobuf-api/coralogixpb v0.0.0-20211201100428-d2a5d0ecf53e github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index 209cca6f7dc7..8c74c5947b44 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -301,12 +301,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/datadogexporter/config.go b/exporter/datadogexporter/config.go index 9d495a7fb6d8..858c3ddcf8b4 100644 --- a/exporter/datadogexporter/config.go +++ b/exporter/datadogexporter/config.go @@ -461,7 +461,7 @@ func handleRemovedSettings(configMap *confmap.Conf) (err error) { return } -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) // Unmarshal a configuration map into the configuration struct. func (c *Config) Unmarshal(configMap *confmap.Conf) error { diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 984e8e0d0e9a..6e07e44bbc48 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -17,9 +17,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 4049969a0054..bd5b4d33239d 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -533,12 +533,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/datadogexporter/traces_exporter_test.go b/exporter/datadogexporter/traces_exporter_test.go index 8ebe5b60b3a3..05e72933b715 100644 --- a/exporter/datadogexporter/traces_exporter_test.go +++ b/exporter/datadogexporter/traces_exporter_test.go @@ -327,11 +327,11 @@ func TestPushTraceData(t *testing.T) { } func simpleTraces() ptrace.Traces { - return genTraces(pcommon.NewTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4}), nil) + return genTraces([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4}, nil) } func simpleTracesWithAttributes(attrs map[string]interface{}) ptrace.Traces { - return genTraces(pcommon.NewTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4}), attrs) + return genTraces([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4}, attrs) } func genTraces(traceID pcommon.TraceID, attrs map[string]interface{}) ptrace.Traces { @@ -339,7 +339,7 @@ func genTraces(traceID pcommon.TraceID, attrs map[string]interface{}) ptrace.Tra rspans := traces.ResourceSpans().AppendEmpty() span := rspans.ScopeSpans().AppendEmpty().Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 1, 2, 3, 4})) + span.SetSpanID([8]byte{0, 0, 0, 0, 1, 2, 3, 4}) if attrs == nil { return traces } diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index e3808aa7a1f1..f8b71c9ea405 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 07115d9a7eea..ad0d381ceb6a 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 00ea79e55740..5bed2c7a0503 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 47b11ffb3087..b6266b82299a 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/elasticsearchexporter/model.go b/exporter/elasticsearchexporter/model.go index 18e7fdf85a39..446a395f15f6 100644 --- a/exporter/elasticsearchexporter/model.go +++ b/exporter/elasticsearchexporter/model.go @@ -52,7 +52,7 @@ func (m *encodeModel) encodeLog(resource pcommon.Resource, record plog.LogRecord document.AddTimestamp("@timestamp", record.Timestamp()) // We use @timestamp in order to ensure that we can index if the default data stream logs template is used. document.AddID("TraceId", record.TraceID()) document.AddID("SpanId", record.SpanID()) - document.AddInt("TraceFlags", int64(record.FlagsStruct())) + document.AddInt("TraceFlags", int64(record.Flags())) document.AddString("SeverityText", record.SeverityText()) document.AddInt("SeverityNumber", int64(record.SeverityNumber())) document.AddAttribute("Body", record.Body()) diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 3391386fd478..d0861ea1d389 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 google.golang.org/api v0.95.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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 800f1b7bd97a..f7e6ba44c085 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 0d5b0be46626..cfc02c8bdf64 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 62f11335c7e2..8b72a6d168c2 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 75b0702165ad..20c905bb816b 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 google.golang.org/api v0.95.0 google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf google.golang.org/grpc v1.49.0 diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 6c7bef65d76f..28fc5cecbcef 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -436,12 +436,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 75f252a24d0d..1a46ded219ac 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 google.golang.org/api v0.95.0 google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index c238919f5e5b..badea096811c 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -415,10 +415,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 2ae09cd6afe2..0d71ea72b902 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.7 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.32.7 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect - go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/sdk v1.9.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 496eaa7b8dec..4a0f09b8f3e1 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -425,12 +425,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index a0cb87fed769..2128d1e1efd6 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 ) diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index 5f72c5aae990..b44632f4d905 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= diff --git a/exporter/humioexporter/traces_exporter_test.go b/exporter/humioexporter/traces_exporter_test.go index f8379f8a4ee1..a45f631e190e 100644 --- a/exporter/humioexporter/traces_exporter_test.go +++ b/exporter/humioexporter/traces_exporter_test.go @@ -197,16 +197,16 @@ func TestTracesToHumioEvents_OrganizedByTags(t *testing.T) { res1 := traces.ResourceSpans().AppendEmpty() res1.Resource().Attributes().UpsertString(conventions.AttributeServiceName, "service-A") ils1 := res1.ScopeSpans().AppendEmpty() - ils1.Spans().AppendEmpty().SetTraceID(pcommon.NewTraceID(createTraceID("10000000000000000000000000000000"))) - ils1.Spans().AppendEmpty().SetTraceID(pcommon.NewTraceID(createTraceID("10000000000000000000000000000000"))) + ils1.Spans().AppendEmpty().SetTraceID(createTraceID("10000000000000000000000000000000")) + ils1.Spans().AppendEmpty().SetTraceID(createTraceID("10000000000000000000000000000000")) res2 := traces.ResourceSpans().AppendEmpty() res2.Resource().Attributes().UpsertString(conventions.AttributeServiceName, "service-B") - res2.ScopeSpans().AppendEmpty().Spans().AppendEmpty().SetTraceID(pcommon.NewTraceID(createTraceID("10000000000000000000000000000000"))) + res2.ScopeSpans().AppendEmpty().Spans().AppendEmpty().SetTraceID(createTraceID("10000000000000000000000000000000")) res3 := traces.ResourceSpans().AppendEmpty() res3.Resource().Attributes().UpsertString(conventions.AttributeServiceName, "service-C") - res3.ScopeSpans().AppendEmpty().Spans().AppendEmpty().SetTraceID(pcommon.NewTraceID(createTraceID("20000000000000000000000000000000"))) + res3.ScopeSpans().AppendEmpty().Spans().AppendEmpty().SetTraceID(createTraceID("20000000000000000000000000000000")) // Organize by trace id cg := func(cfg *Config, settings component.TelemetrySettings, host component.Host) (exporterClient, error) { @@ -240,8 +240,8 @@ func TestTracesToHumioEvents_OrganizedByTags(t *testing.T) { func TestSpanToHumioEvent(t *testing.T) { // Arrange span := ptrace.NewSpan() - span.SetTraceID(pcommon.NewTraceID(createTraceID("10"))) - span.SetSpanID(pcommon.NewSpanID(createSpanID("20"))) + span.SetTraceID(createTraceID("10")) + span.SetSpanID(createSpanID("20")) span.SetName("span") span.SetKind(ptrace.SpanKindServer) span.SetStartTimestamp(pcommon.NewTimestampFromTime( @@ -335,13 +335,13 @@ func TestToHumioLinks(t *testing.T) { // Arrange slice := ptrace.NewSpanLinkSlice() link1 := slice.AppendEmpty() - link1.SetTraceID(pcommon.NewTraceID(createTraceID("11"))) - link1.SetSpanID(pcommon.NewSpanID(createSpanID("22"))) + link1.SetTraceID(createTraceID("11")) + link1.SetSpanID(createSpanID("22")) link1.SetTraceState("state1") link2 := slice.AppendEmpty() - link2.SetTraceID(pcommon.NewTraceID(createTraceID("33"))) - link2.SetSpanID(pcommon.NewSpanID(createSpanID("44"))) + link2.SetTraceID(createTraceID("33")) + link2.SetSpanID(createSpanID("44")) expected := []*HumioLink{ { diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index b91cb1c375ae..fc9317a6034a 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.27 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 081a72571c9b..385568fcbcfc 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/instanaexporter/exporter_test.go b/exporter/instanaexporter/exporter_test.go index aa09991a6b5c..3e6da203b5a6 100644 --- a/exporter/instanaexporter/exporter_test.go +++ b/exporter/instanaexporter/exporter_test.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" ) @@ -55,7 +54,7 @@ func newTestTraces() ptrace.Traces { rspans := traces.ResourceSpans().AppendEmpty() rspans.Resource().Attributes().UpsertString("instana.agent", "agent1") span := rspans.ScopeSpans().AppendEmpty().Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4})) - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 1, 2, 3, 4})) + span.SetTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4}) + span.SetSpanID([8]byte{0, 0, 0, 0, 1, 2, 3, 4}) return traces } diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index eaba66888a4d..a0c2ee6ab879 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index f330eb9c881a..f0148a262d38 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/instanaexporter/internal/converter/model/util.go b/exporter/instanaexporter/internal/converter/model/util.go index dd2cb0329d6d..0a048b9b3c00 100644 --- a/exporter/instanaexporter/internal/converter/model/util.go +++ b/exporter/instanaexporter/internal/converter/model/util.go @@ -22,13 +22,11 @@ import ( ) func convertTraceID(traceID pcommon.TraceID) string { - bytes := traceID.Bytes() - return hex.EncodeToString(bytes[:]) + return hex.EncodeToString(traceID[:]) } func convertSpanID(spanID pcommon.SpanID) string { - bytes := spanID.Bytes() - return hex.EncodeToString(bytes[:]) + return hex.EncodeToString(spanID[:]) } func otelKindToInstanaKind(otelKind ptrace.SpanKind) (string, bool) { diff --git a/exporter/instanaexporter/internal/converter/model/util_test.go b/exporter/instanaexporter/internal/converter/model/util_test.go index 4c10c2eaa720..d4d816588cf7 100644 --- a/exporter/instanaexporter/internal/converter/model/util_test.go +++ b/exporter/instanaexporter/internal/converter/model/util_test.go @@ -24,5 +24,5 @@ import ( func TestCanConvertSpanID(t *testing.T) { bytes := [8]byte{1, 2, 3, 4, 10, 11, 12, 13} - assert.Equal(t, "010203040a0b0c0d", convertSpanID(pcommon.NewSpanID(bytes))) + assert.Equal(t, "010203040a0b0c0d", convertSpanID(pcommon.SpanID(bytes))) } diff --git a/exporter/instanaexporter/internal/converter/span_converter_test.go b/exporter/instanaexporter/internal/converter/span_converter_test.go index 7e2de4eb7059..903166b92151 100644 --- a/exporter/instanaexporter/internal/converter/span_converter_test.go +++ b/exporter/instanaexporter/internal/converter/span_converter_test.go @@ -72,17 +72,17 @@ func setupSpan(span *ptrace.Span, opts SpanOptions) { } if !bytes.Equal(parentID[:], empty8[:]) { - span.SetParentSpanID(pcommon.NewSpanID(parentID)) + span.SetParentSpanID(parentID) } span.SetStartTimestamp(pcommon.Timestamp(startTime * 1e6)) span.SetEndTimestamp(pcommon.Timestamp(endTime * 1e6)) - span.SetSpanID(pcommon.NewSpanID(spanID)) + span.SetSpanID(spanID) span.SetKind(ptrace.SpanKindClient) span.SetName("my_operation") span.SetTraceState(ptrace.TraceStateEmpty) - span.SetTraceID(pcommon.NewTraceID(traceID)) + span.SetTraceID(traceID) // adding attributes (tags in the instana side) span.Attributes().UpsertBool("some_key", true) @@ -203,17 +203,17 @@ func TestSpanCorrelation(t *testing.T) { sp2 := spanSlice.AppendEmpty() setupSpan(&sp2, SpanOptions{ - ParentID: sp1.SpanID().Bytes(), + ParentID: sp1.SpanID(), }) sp3 := spanSlice.AppendEmpty() setupSpan(&sp3, SpanOptions{ - ParentID: sp2.SpanID().Bytes(), + ParentID: sp2.SpanID(), }) sp4 := spanSlice.AppendEmpty() setupSpan(&sp4, SpanOptions{ - ParentID: sp1.SpanID().Bytes(), + ParentID: sp1.SpanID(), }) attrs := generateAttrs() diff --git a/exporter/jaegerexporter/exporter_test.go b/exporter/jaegerexporter/exporter_test.go index 1409c3bbbe69..f020a3d13024 100644 --- a/exporter/jaegerexporter/exporter_test.go +++ b/exporter/jaegerexporter/exporter_test.go @@ -228,8 +228,8 @@ func TestMutualTLS(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, exporter.Shutdown(context.Background())) }) - traceID := pcommon.NewTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}) - spanID := pcommon.NewSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7}) + traceID := pcommon.TraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}) + spanID := pcommon.SpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7}) td := ptrace.NewTraces() span := td.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty() @@ -240,8 +240,7 @@ func TestMutualTLS(t *testing.T) { require.NoError(t, err) requestes := spanHandler.getRequests() assert.Equal(t, 1, len(requestes)) - tidBytes := traceID.Bytes() - jTraceID, err := model.TraceIDFromBytes(tidBytes[:]) + jTraceID, err := model.TraceIDFromBytes(traceID[:]) require.NoError(t, err) require.Len(t, requestes, 1) require.Len(t, requestes[0].GetBatch().Spans, 1) diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index f75507d3c5f9..858032562da2 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index 3bb45ed6d09a..81fb1d6630b3 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index ed1d486130b0..4cad7b2a0803 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/jaegertracing/jaeger v1.37.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 9b134e4a669c..b3f59f02d959 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 8a05e1307d7d..7d8c090c4fa9 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.59.0 github.com/stretchr/testify v1.8.0 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 6dc7bbea9ea4..1b65cb35fff6 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -419,12 +419,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/kafkaexporter/jaeger_marshaler_test.go b/exporter/kafkaexporter/jaeger_marshaler_test.go index 5e3c5e78bf66..11ca9d8aade5 100644 --- a/exporter/kafkaexporter/jaeger_marshaler_test.go +++ b/exporter/kafkaexporter/jaeger_marshaler_test.go @@ -34,8 +34,8 @@ func TestJaegerMarshaler(t *testing.T) { span.SetName("foo") span.SetStartTimestamp(pcommon.Timestamp(10)) span.SetEndTimestamp(pcommon.Timestamp(20)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) batches, err := jaeger.ProtoFromTraces(td) require.NoError(t, err) diff --git a/exporter/kafkaexporter/marshaler_test.go b/exporter/kafkaexporter/marshaler_test.go index 2c094819ca2d..0a192a699d2b 100644 --- a/exporter/kafkaexporter/marshaler_test.go +++ b/exporter/kafkaexporter/marshaler_test.go @@ -97,8 +97,8 @@ func TestOTLPTracesJsonMarshaling(t *testing.T) { span.SetName(t.Name()) span.SetStartTimestamp(pcommon.NewTimestampFromTime(now)) span.SetEndTimestamp(pcommon.NewTimestampFromTime(now.Add(time.Second))) - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7})) - span.SetParentSpanID(pcommon.NewSpanID([8]byte{8, 9, 10, 11, 12, 13, 14})) + span.SetSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7}) + span.SetParentSpanID([8]byte{8, 9, 10, 11, 12, 13, 14}) marshaler, ok := tracesMarshalers()["otlp_json"] require.True(t, ok, "Must have otlp json marshaller") diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index e5729e008448..725ef33906c6 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 970fa5870760..cd1413fd26c2 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -359,10 +359,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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/loadbalancingexporter/log_exporter.go b/exporter/loadbalancingexporter/log_exporter.go index bc825297de10..89ddc1650f08 100644 --- a/exporter/loadbalancingexporter/log_exporter.go +++ b/exporter/loadbalancingexporter/log_exporter.go @@ -87,15 +87,14 @@ func (e *logExporterImp) ConsumeLogs(ctx context.Context, ld plog.Logs) error { func (e *logExporterImp) consumeLog(ctx context.Context, ld plog.Logs) error { traceID := traceIDFromLogs(ld) balancingKey := traceID - if traceID == pcommon.EmptyTraceID { + if traceID == pcommon.NewTraceIDEmpty() { // every log may not contain a traceID // generate a random traceID as balancingKey // so the log can be routed to a random backend balancingKey = random() } - tid := balancingKey.Bytes() - endpoint := e.loadBalancer.Endpoint(tid[:]) + endpoint := e.loadBalancer.Endpoint(balancingKey[:]) exp, err := e.loadBalancer.Exporter(endpoint) if err != nil { return err @@ -126,17 +125,17 @@ func (e *logExporterImp) consumeLog(ctx context.Context, ld plog.Logs) error { func traceIDFromLogs(ld plog.Logs) pcommon.TraceID { rl := ld.ResourceLogs() if rl.Len() == 0 { - return pcommon.EmptyTraceID + return pcommon.NewTraceIDEmpty() } sl := rl.At(0).ScopeLogs() if sl.Len() == 0 { - return pcommon.EmptyTraceID + return pcommon.NewTraceIDEmpty() } logs := sl.At(0).LogRecords() if logs.Len() == 0 { - return pcommon.EmptyTraceID + return pcommon.NewTraceIDEmpty() } return logs.At(0).TraceID() @@ -147,5 +146,5 @@ func random() pcommon.TraceID { v2 := uint8(rand.Intn(256)) v3 := uint8(rand.Intn(256)) v4 := uint8(rand.Intn(256)) - return pcommon.NewTraceID([16]byte{v1, v2, v3, v4}) + return [16]byte{v1, v2, v3, v4} } diff --git a/exporter/loadbalancingexporter/log_exporter_test.go b/exporter/loadbalancingexporter/log_exporter_test.go index bcb0efdca102..28dc12ecdacc 100644 --- a/exporter/loadbalancingexporter/log_exporter_test.go +++ b/exporter/loadbalancingexporter/log_exporter_test.go @@ -220,7 +220,7 @@ func TestLogBatchWithTwoTraces(t *testing.T) { }() first := simpleLogs() - second := simpleLogWithID(pcommon.NewTraceID([16]byte{2, 3, 4, 5})) + second := simpleLogWithID(pcommon.TraceID([16]byte{2, 3, 4, 5})) batch := plog.NewLogs() firstTgt := batch.ResourceLogs().AppendEmpty() first.ResourceLogs().At(0).CopyTo(firstTgt) @@ -263,7 +263,7 @@ func TestNoLogsInBatch(t *testing.T) { } { t.Run(tt.desc, func(t *testing.T) { res := traceIDFromLogs(tt.batch) - assert.Equal(t, pcommon.EmptyTraceID, res) + assert.Equal(t, pcommon.NewTraceIDEmpty(), res) }) } } @@ -447,7 +447,7 @@ func randomLogs() plog.Logs { } func simpleLogs() plog.Logs { - return simpleLogWithID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + return simpleLogWithID(pcommon.TraceID([16]byte{1, 2, 3, 4})) } func simpleLogWithID(id pcommon.TraceID) plog.Logs { diff --git a/exporter/loadbalancingexporter/trace_exporter.go b/exporter/loadbalancingexporter/trace_exporter.go index 96fd126378e2..ec91c267689e 100644 --- a/exporter/loadbalancingexporter/trace_exporter.go +++ b/exporter/loadbalancingexporter/trace_exporter.go @@ -160,7 +160,7 @@ func routingIdentifiersFromTraces(td ptrace.Traces, key routingKey) (map[string] } return ids, nil } - tid := spans.At(0).TraceID().Bytes() + tid := spans.At(0).TraceID() ids[string(tid[:])] = true return ids, nil } diff --git a/exporter/loadbalancingexporter/trace_exporter_test.go b/exporter/loadbalancingexporter/trace_exporter_test.go index 30bce97c5deb..4552ebf4c28d 100644 --- a/exporter/loadbalancingexporter/trace_exporter_test.go +++ b/exporter/loadbalancingexporter/trace_exporter_test.go @@ -199,7 +199,7 @@ func TestConsumeTracesServiceBased(t *testing.T) { } func TestServiceBasedRoutingForSameTraceId(t *testing.T) { - b := pcommon.NewTraceID([16]byte{1, 2, 3, 4}).Bytes() + b := pcommon.TraceID([16]byte{1, 2, 3, 4}) for _, tt := range []struct { desc string batch ptrace.Traces @@ -346,7 +346,7 @@ func TestBatchWithTwoTraces(t *testing.T) { lb.addMissingExporters(context.Background(), []string{"endpoint-1"}) first := simpleTraces() - second := simpleTraceWithID(pcommon.NewTraceID([16]byte{2, 3, 4, 5})) + second := simpleTraceWithID(pcommon.TraceID([16]byte{2, 3, 4, 5})) batch := ptrace.NewTraces() first.ResourceSpans().MoveAndAppendTo(batch.ResourceSpans()) second.ResourceSpans().MoveAndAppendTo(batch.ResourceSpans()) @@ -549,19 +549,19 @@ func randomTraces() ptrace.Traces { v2 := uint8(rand.Intn(256)) v3 := uint8(rand.Intn(256)) v4 := uint8(rand.Intn(256)) - return simpleTraceWithID(pcommon.NewTraceID([16]byte{v1, v2, v3, v4})) + return simpleTraceWithID(pcommon.TraceID([16]byte{v1, v2, v3, v4})) } func simpleTraces() ptrace.Traces { - return simpleTraceWithID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + return simpleTraceWithID(pcommon.TraceID([16]byte{1, 2, 3, 4})) } func simpleTracesWithServiceName() ptrace.Traces { - return simpleTraceWithServiceName(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + return simpleTraceWithServiceName(pcommon.TraceID([16]byte{1, 2, 3, 4})) } func twoServicesWithSameTraceID() ptrace.Traces { - return servicesWithSameTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + return servicesWithSameTraceID(pcommon.TraceID([16]byte{1, 2, 3, 4})) } func simpleTraceWithID(id pcommon.TraceID) ptrace.Traces { diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 893934a71907..bdea73fe8af1 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -69,8 +69,8 @@ func fillLogOne(log plog.LogRecord) { log.SetDroppedAttributesCount(1) log.SetSeverityNumber(plog.SeverityNumberInfo) log.SetSeverityText("Info") - log.SetSpanID(pcommon.NewSpanID([8]byte{0x01, 0x02, 0x04, 0x08})) - log.SetTraceID(pcommon.NewTraceID([16]byte{0x08, 0x04, 0x02, 0x01})) + log.SetSpanID([8]byte{0x01, 0x02, 0x04, 0x08}) + log.SetTraceID([16]byte{0x08, 0x04, 0x02, 0x01}) attrs := log.Attributes() attrs.UpsertString("app", "server") @@ -189,8 +189,8 @@ func newTestTracesWithAttributes() ptrace.Traces { for i := 0; i < 10; i++ { s := td.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty() s.SetName(fmt.Sprintf("%s-%d", testOperation, i)) - s.SetTraceID(pcommon.NewTraceID([16]byte{byte(i), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1})) - s.SetSpanID(pcommon.NewSpanID([8]byte{byte(i), 0, 0, 0, 0, 0, 0, 2})) + s.SetTraceID(pcommon.TraceID([16]byte{byte(i), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1})) + s.SetSpanID(pcommon.SpanID([8]byte{byte(i), 0, 0, 0, 0, 0, 0, 2})) for j := 0; j < 5; j++ { s.Attributes().UpsertString(fmt.Sprintf("k%d", j), fmt.Sprintf("v%d", j)) } @@ -203,8 +203,8 @@ func newTestTraces() ptrace.Traces { td := ptrace.NewTraces() s := td.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty() s.SetName(testOperation) - s.SetTraceID(pcommon.NewTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1})) - s.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 2})) + s.SetTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}) + s.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 2}) s.SetKind(ptrace.SpanKindServer) return td } diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index c8db48b2eb40..280ec8bc8b97 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -7,9 +7,9 @@ require ( github.com/jaegertracing/jaeger v1.37.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd google.golang.org/protobuf v1.28.1 diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 47346dc6f11e..93f0e3c309ea 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -300,12 +300,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index a3a939e03cf5..5982f7da67dc 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -9,9 +9,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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 7043dbab1347..349318e57bff 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -364,12 +364,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/lokiexporter/legacy_encode_json_test.go b/exporter/lokiexporter/legacy_encode_json_test.go index 9c0649043fcd..f06d819b09b4 100644 --- a/exporter/lokiexporter/legacy_encode_json_test.go +++ b/exporter/lokiexporter/legacy_encode_json_test.go @@ -29,8 +29,8 @@ func exampleLog() (plog.LogRecord, pcommon.Resource) { buffer.SetSeverityText("error") buffer.Attributes().UpsertString("attr1", "1") buffer.Attributes().UpsertString("attr2", "2") - buffer.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) - buffer.SetSpanID(pcommon.NewSpanID([8]byte{5, 6, 7, 8})) + buffer.SetTraceID([16]byte{1, 2, 3, 4}) + buffer.SetSpanID([8]byte{5, 6, 7, 8}) resource := pcommon.NewResource() resource.Attributes().UpsertString("host.name", "something") diff --git a/exporter/lokiexporter/legacy_exporter_test.go b/exporter/lokiexporter/legacy_exporter_test.go index 8af3be99d631..b0867edd9023 100644 --- a/exporter/lokiexporter/legacy_exporter_test.go +++ b/exporter/lokiexporter/legacy_exporter_test.go @@ -576,8 +576,8 @@ func TestExporter_convertLogBodyToEntry(t *testing.T) { lr := plog.NewLogRecord() lr.Body().SetStringVal("Payment succeeded") - lr.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) - lr.SetSpanID(pcommon.NewSpanID([8]byte{5, 6, 7, 8})) + lr.SetTraceID([16]byte{1, 2, 3, 4}) + lr.SetSpanID([8]byte{5, 6, 7, 8}) lr.SetSeverityText("DEBUG") lr.SetSeverityNumber(plog.SeverityNumberDebug) lr.Attributes().UpsertString("payment_method", "credit_card") @@ -719,7 +719,7 @@ func TestConvertRecordAttributesToLabels(t *testing.T) { desc: "traceID", lr: func() plog.LogRecord { lr := plog.NewLogRecord() - lr.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + lr.SetTraceID([16]byte{1, 2, 3, 4}) return lr }(), expected: func() model.LabelSet { @@ -732,7 +732,7 @@ func TestConvertRecordAttributesToLabels(t *testing.T) { desc: "spanID", lr: func() plog.LogRecord { lr := plog.NewLogRecord() - lr.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4})) + lr.SetSpanID([8]byte{1, 2, 3, 4}) return lr }(), expected: func() model.LabelSet { diff --git a/exporter/lokiexporter/next_exporter_test.go b/exporter/lokiexporter/next_exporter_test.go index ae192ad9392b..70f819fb6949 100644 --- a/exporter/lokiexporter/next_exporter_test.go +++ b/exporter/lokiexporter/next_exporter_test.go @@ -104,7 +104,7 @@ func TestPushLogData(t *testing.T) { ld.ResourceLogs().AppendEmpty() ld.ResourceLogs().At(0).ScopeLogs().AppendEmpty() ld.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().AppendEmpty() - ld.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + ld.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).SetTraceID([16]byte{1, 2, 3, 4}) // copy the attributes from the test case to the log entry if tC.attrs.Len() > 0 { diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index 07270cd4f15b..85d618af83e3 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index f330eb9c881a..f0148a262d38 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 1f65dae83633..16054523a857 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index f2de90826717..fb30e67e5d6c 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -301,12 +301,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index a83b7089eb7e..d46942acc239 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index c5c5731bf216..247883c52400 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/prometheusexporter/accumulator.go b/exporter/prometheusexporter/accumulator.go index 36e2d28cfa61..dc9bd61330c5 100644 --- a/exporter/prometheusexporter/accumulator.go +++ b/exporter/prometheusexporter/accumulator.go @@ -114,7 +114,7 @@ func (a *lastValueAccumulator) accumulateSummary(metric pmetric.Metric, il pcomm ip := dps.At(i) signature := timeseriesSignature(il.Name(), metric, ip.Attributes(), resourceAttrs) - if ip.FlagsImmutable().NoRecordedValue() { + if ip.Flags().NoRecordedValue() { a.registeredMetrics.Delete(signature) return 0 } @@ -143,7 +143,7 @@ func (a *lastValueAccumulator) accumulateGauge(metric pmetric.Metric, il pcommon ip := dps.At(i) signature := timeseriesSignature(il.Name(), metric, ip.Attributes(), resourceAttrs) - if ip.FlagsImmutable().NoRecordedValue() { + if ip.Flags().NoRecordedValue() { a.registeredMetrics.Delete(signature) return 0 } @@ -189,7 +189,7 @@ func (a *lastValueAccumulator) accumulateSum(metric pmetric.Metric, il pcommon.I ip := dps.At(i) signature := timeseriesSignature(il.Name(), metric, ip.Attributes(), resourceAttrs) - if ip.FlagsImmutable().NoRecordedValue() { + if ip.Flags().NoRecordedValue() { a.registeredMetrics.Delete(signature) return 0 } @@ -245,7 +245,7 @@ func (a *lastValueAccumulator) accumulateDoubleHistogram(metric pmetric.Metric, ip := dps.At(i) signature := timeseriesSignature(il.Name(), metric, ip.Attributes(), resourceAttrs) - if ip.FlagsImmutable().NoRecordedValue() { + if ip.Flags().NoRecordedValue() { a.registeredMetrics.Delete(signature) return 0 } diff --git a/exporter/prometheusexporter/accumulator_test.go b/exporter/prometheusexporter/accumulator_test.go index 6bf34b5719ac..a3f84158b98f 100644 --- a/exporter/prometheusexporter/accumulator_test.go +++ b/exporter/prometheusexporter/accumulator_test.go @@ -226,7 +226,7 @@ func TestAccumulateMetrics(t *testing.T) { dp.Attributes().UpsertString("label_1", "1") dp.Attributes().UpsertString("label_2", "2") dp.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) }, }, { @@ -243,7 +243,7 @@ func TestAccumulateMetrics(t *testing.T) { dp.Attributes().UpsertString("label_1", "1") dp.Attributes().UpsertString("label_2", "2") dp.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) }, }, { @@ -262,7 +262,7 @@ func TestAccumulateMetrics(t *testing.T) { dp.Attributes().UpsertString("label_1", "1") dp.Attributes().UpsertString("label_2", "2") dp.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) }, }, { @@ -279,7 +279,7 @@ func TestAccumulateMetrics(t *testing.T) { dp.Attributes().UpsertString("label_1", "1") dp.Attributes().UpsertString("label_2", "2") dp.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) fillQuantileValue := func(pN, value float64, dest pmetric.ValueAtQuantile) { dest.SetQuantile(pN) dest.SetValue(value) diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 1c247dc39866..d5a666f69c7f 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 8adce8592b50..d4fe3cd510d9 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 4642348404a0..7182419de3b9 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index 89bc4eebd47f..5c76e089fc72 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/prometheusremotewriteexporter/testutil_test.go b/exporter/prometheusremotewriteexporter/testutil_test.go index d3cb621a5bb3..98248edf6975 100644 --- a/exporter/prometheusremotewriteexporter/testutil_test.go +++ b/exporter/prometheusremotewriteexporter/testutil_test.go @@ -210,7 +210,7 @@ func getIntGaugeMetric(name string, attributes pcommon.Map, value int64, ts uint metric.SetDataType(pmetric.MetricDataTypeGauge) dp := metric.Gauge().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetIntVal(value) attributes.CopyTo(dp.Attributes()) @@ -226,7 +226,7 @@ func getDoubleGaugeMetric(name string, attributes pcommon.Map, value float64, ts metric.SetDataType(pmetric.MetricDataTypeGauge) dp := metric.Gauge().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetDoubleVal(value) attributes.CopyTo(dp.Attributes()) @@ -250,7 +250,7 @@ func getIntSumMetric(name string, attributes pcommon.Map, value int64, ts uint64 metric.Sum().SetAggregationTemporality(pmetric.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetIntVal(value) attributes.CopyTo(dp.Attributes()) @@ -275,7 +275,7 @@ func getSumMetric(name string, attributes pcommon.Map, value float64, ts uint64) metric.Sum().SetAggregationTemporality(pmetric.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetDoubleVal(value) attributes.CopyTo(dp.Attributes()) @@ -319,7 +319,7 @@ func getHistogramMetric(name string, attributes pcommon.Map, ts uint64, sum *flo metric.Histogram().SetAggregationTemporality(pmetric.MetricAggregationTemporalityCumulative) dp := metric.Histogram().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetCount(count) @@ -347,7 +347,7 @@ func getSummaryMetric(name string, attributes pcommon.Map, ts uint64, sum float6 metric.SetDataType(pmetric.MetricDataTypeSummary) dp := metric.Summary().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetCount(count) dp.SetSum(sum) diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index 7a2212162aee..050e699e24a4 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 828c8562b3d0..bd3d1678475c 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -493,12 +493,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/pulsarexporter/jaeger_marshaler_test.go b/exporter/pulsarexporter/jaeger_marshaler_test.go index a6855dcafa3d..71fc0585f93e 100644 --- a/exporter/pulsarexporter/jaeger_marshaler_test.go +++ b/exporter/pulsarexporter/jaeger_marshaler_test.go @@ -33,8 +33,8 @@ func buildTraces() ptrace.Traces { span.SetName("foo") span.SetStartTimestamp(pcommon.Timestamp(10)) span.SetEndTimestamp(pcommon.Timestamp(20)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) return td } diff --git a/exporter/pulsarexporter/marshaler_test.go b/exporter/pulsarexporter/marshaler_test.go index c16c40dbb871..af608642a97c 100644 --- a/exporter/pulsarexporter/marshaler_test.go +++ b/exporter/pulsarexporter/marshaler_test.go @@ -97,8 +97,8 @@ func TestOTLPTracesJsonMarshaling(t *testing.T) { span.SetName(t.Name()) span.SetStartTimestamp(pcommon.NewTimestampFromTime(now)) span.SetEndTimestamp(pcommon.NewTimestampFromTime(now.Add(time.Second))) - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7})) - span.SetParentSpanID(pcommon.NewSpanID([8]byte{8, 9, 10, 11, 12, 13, 14})) + span.SetSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7}) + span.SetParentSpanID([8]byte{8, 9, 10, 11, 12, 13, 14}) marshaler, ok := tracesMarshalers()["otlp_json"] require.True(t, ok, "Must have otlp json marshaller") diff --git a/exporter/sapmexporter/exporter_test.go b/exporter/sapmexporter/exporter_test.go index 3afa3654af73..0e63ad88730d 100644 --- a/exporter/sapmexporter/exporter_test.go +++ b/exporter/sapmexporter/exporter_test.go @@ -28,7 +28,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" @@ -86,8 +85,8 @@ func buildTestTraces(setTokenLabel bool) (traces ptrace.Traces) { span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty() name := fmt.Sprintf("Span%d", i) span.SetName(name) - span.SetTraceID(pcommon.NewTraceID([16]byte{1})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1})) + span.SetTraceID([16]byte{1}) + span.SetSpanID([8]byte{1}) } return traces @@ -149,8 +148,8 @@ func buildTestTrace() ptrace.Traces { var spanIDBytes [8]byte rand.Read(traceIDBytes[:]) rand.Read(spanIDBytes[:]) - span.SetTraceID(pcommon.NewTraceID(traceIDBytes)) - span.SetSpanID(pcommon.NewSpanID(spanIDBytes)) + span.SetTraceID(traceIDBytes) + span.SetSpanID(spanIDBytes) } return trace } diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 1c5cd31088d3..3d0a96cab777 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.59.0 github.com/signalfx/sapm-proto v0.11.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index a94682df4cf4..a215ad5c4ff1 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -286,12 +286,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 635514db59e4..d46ecd1afc7b 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.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 4a3e2ea9ee9b..5fb232040f10 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/sentryexporter/sentry_exporter.go b/exporter/sentryexporter/sentry_exporter.go index 41ffd72fdae6..848687e681da 100644 --- a/exporter/sentryexporter/sentry_exporter.go +++ b/exporter/sentryexporter/sentry_exporter.go @@ -249,8 +249,8 @@ func convertToSentrySpan(span ptrace.Span, library pcommon.InstrumentationScope, tags["library_version"] = library.Version() sentrySpan = &sentry.Span{ - TraceID: span.TraceID().Bytes(), - SpanID: span.SpanID().Bytes(), + TraceID: sentry.TraceID(span.TraceID()), + SpanID: sentry.SpanID(span.SpanID()), Description: description, Op: op, Tags: tags, @@ -260,7 +260,7 @@ func convertToSentrySpan(span ptrace.Span, library pcommon.InstrumentationScope, } if parentSpanID := span.ParentSpanID(); !parentSpanID.IsEmpty() { - sentrySpan.ParentSpanID = parentSpanID.Bytes() + sentrySpan.ParentSpanID = sentry.SpanID(parentSpanID) } return sentrySpan diff --git a/exporter/sentryexporter/sentry_exporter_test.go b/exporter/sentryexporter/sentry_exporter_test.go index b2c4ed84e423..0e3b1167ba86 100644 --- a/exporter/sentryexporter/sentry_exporter_test.go +++ b/exporter/sentryexporter/sentry_exporter_test.go @@ -286,7 +286,7 @@ func TestSpanEventToSentryEvent(t *testing.T) { func TestSpanToSentrySpan(t *testing.T) { t.Run("with root span and invalid parent span_id", func(t *testing.T) { testSpan := ptrace.NewSpan() - testSpan.SetParentSpanID(pcommon.EmptySpanID) + testSpan.SetParentSpanID(pcommon.NewSpanIDEmpty()) sentrySpan := convertToSentrySpan(testSpan, pcommon.NewInstrumentationScope(), map[string]string{}) assert.NotNil(t, sentrySpan) @@ -296,9 +296,9 @@ func TestSpanToSentrySpan(t *testing.T) { t.Run("with full span", func(t *testing.T) { testSpan := ptrace.NewSpan() - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1}) - spanID := pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) - parentSpanID := pcommon.NewSpanID([8]byte{8, 7, 6, 5, 4, 3, 2, 1}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1}) + spanID := pcommon.SpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) + parentSpanID := pcommon.SpanID([8]byte{8, 7, 6, 5, 4, 3, 2, 1}) name := "span_name" var startTime pcommon.Timestamp = 123 var endTime pcommon.Timestamp = 1234567890 diff --git a/exporter/signalfxexporter/config.go b/exporter/signalfxexporter/config.go index e4f59be8d069..fb7de3c4d865 100644 --- a/exporter/signalfxexporter/config.go +++ b/exporter/signalfxexporter/config.go @@ -34,7 +34,7 @@ const ( translationRulesConfigKey = "translation_rules" ) -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) // Config defines configuration for SignalFx exporter. type Config struct { diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 731788f1a66a..d2f02dfb4a6a 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -14,8 +14,8 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -73,7 +73,7 @@ require ( require ( github.com/jaegertracing/jaeger v1.37.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 ) diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 600ba122fbeb..b934583d1a31 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -367,12 +367,12 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 85995a16cfa2..166027a05874 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 a4fb57921873..0a9b7fcf52cc 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/skywalkingexporter/logrecord_to_logdata.go b/exporter/skywalkingexporter/logrecord_to_logdata.go index 76ea4e7dece0..94e261b928a2 100644 --- a/exporter/skywalkingexporter/logrecord_to_logdata.go +++ b/exporter/skywalkingexporter/logrecord_to_logdata.go @@ -134,7 +134,7 @@ func mapLogRecordToLogData(lr plog.LogRecord, logData *logpb.LogData) { }}, } - if flag := strconv.FormatUint(uint64(lr.FlagsStruct()), 16); flag != "" { + if flag := strconv.FormatUint(uint64(lr.Flags()), 16); flag != "" { logData.Tags.Data = append(logData.Tags.Data, &common.KeyStringValuePair{ Key: flags, Value: flag, diff --git a/exporter/skywalkingexporter/logrecord_to_logdata_test.go b/exporter/skywalkingexporter/logrecord_to_logdata_test.go index e4af561acec5..a0a46ad5ce8f 100644 --- a/exporter/skywalkingexporter/logrecord_to_logdata_test.go +++ b/exporter/skywalkingexporter/logrecord_to_logdata_test.go @@ -51,9 +51,9 @@ func createLogData(numberOfLogs int) plog.Logs { for i := 0; i < numberOfLogs; i++ { ts := pcommon.Timestamp(int64(i) * time.Millisecond.Nanoseconds()) logRecord := sl.LogRecords().AppendEmpty() - logRecord.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1})) - logRecord.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) - logRecord.SetFlagsStruct(plog.DefaultLogRecordFlags.WithIsSampled(true)) + logRecord.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1}) + logRecord.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) + logRecord.SetFlags(plog.DefaultLogRecordFlags.WithIsSampled(true)) logRecord.SetSeverityText("INFO") logRecord.SetSeverityNumber(plog.SeverityNumberInfo) logRecord.SetTimestamp(ts) diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index cc762b383fba..fb8da42236b2 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -117,11 +117,11 @@ func createTraceData(numberOfTraces int) ptrace.Traces { span.SetName("root") span.SetStartTimestamp(pcommon.Timestamp((i + 1) * 1e9)) span.SetEndTimestamp(pcommon.Timestamp((i + 2) * 1e9)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) span.SetTraceState("foo") if i%2 == 0 { - span.SetParentSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetParentSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) span.Status().SetCode(ptrace.StatusCodeOk) span.Status().SetMessage("ok") } diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 2163277a6b67..15647e20846b 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 4e5cefd15224..7afbbf619dad 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/splunkhecexporter/logdata_to_splunk_test.go b/exporter/splunkhecexporter/logdata_to_splunk_test.go index aa0d1c2fc0db..935d3fd59868 100644 --- a/exporter/splunkhecexporter/logdata_to_splunk_test.go +++ b/exporter/splunkhecexporter/logdata_to_splunk_test.go @@ -208,8 +208,8 @@ func Test_mapLogRecordToSplunkEvent(t *testing.T) { name: "with span and trace id", logRecordFn: func() plog.LogRecord { logRecord := plog.NewLogRecord() - logRecord.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 50})) - logRecord.SetTraceID(pcommon.NewTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100})) + logRecord.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 50}) + logRecord.SetTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100}) return logRecord }, logResourceFn: pcommon.NewResource, diff --git a/exporter/splunkhecexporter/tracedata_to_splunk_test.go b/exporter/splunkhecexporter/tracedata_to_splunk_test.go index fe053027d0a7..280deeecdeac 100644 --- a/exporter/splunkhecexporter/tracedata_to_splunk_test.go +++ b/exporter/splunkhecexporter/tracedata_to_splunk_test.go @@ -110,11 +110,11 @@ func initSpan(name string, ts *pcommon.Timestamp, span ptrace.Span) { bytes, _ := hex.DecodeString("12345678") var traceID [16]byte copy(traceID[:], bytes) - spanLink.SetTraceID(pcommon.NewTraceID(traceID)) + spanLink.SetTraceID(traceID) bytes, _ = hex.DecodeString("1234") var spanID [8]byte copy(spanID[:], bytes) - spanLink.SetSpanID(pcommon.NewSpanID(spanID)) + spanLink.SetSpanID(spanID) spanLink.Attributes().UpsertInt("foo", 1) spanLink.Attributes().UpsertBool("bar", false) foobarContents := spanLink.Attributes().UpsertEmptySlice("foobar") diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 625cc9b29dad..a4f369f1c1af 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 60333cc08459..d7931f33c7ca 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/tanzuobservabilityexporter/exporter_test.go b/exporter/tanzuobservabilityexporter/exporter_test.go index e7875e09ea09..7afa39e806cd 100644 --- a/exporter/tanzuobservabilityexporter/exporter_test.go +++ b/exporter/tanzuobservabilityexporter/exporter_test.go @@ -33,9 +33,9 @@ import ( func TestSpansRequireTraceAndSpanIDs(t *testing.T) { spanWithNoTraceID := ptrace.NewSpan() - spanWithNoTraceID.SetSpanID(pcommon.NewSpanID([8]byte{9, 9, 9, 9, 9, 9, 9, 9})) + spanWithNoTraceID.SetSpanID([8]byte{9, 9, 9, 9, 9, 9, 9, 9}) spanWithNoSpanID := ptrace.NewSpan() - spanWithNoSpanID.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + spanWithNoSpanID.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) traces := constructTraces([]ptrace.Span{spanWithNoTraceID, spanWithNoSpanID}) _, err := consumeTraces(traces) @@ -49,8 +49,8 @@ func TestExportTraceDataMinimum(t *testing.T) { // getAllUsers source=localhost traceId=7b3bf470-9456-11e8-9eb6-529269fb1459 spanId=0313bafe-9457-11e8-9eb6-529269fb1459 parent=2f64e538-9457-11e8-9eb6-529269fb1459 application=Wavefront service=auth cluster=us-west-2 shard=secondary http.method=GET 1552949776000 343 minSpan := createSpan( "root", - pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}), - pcommon.NewSpanID([8]byte{9, 9, 9, 9, 9, 9, 9, 9}), + [16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + [8]byte{9, 9, 9, 9, 9, 9, 9, 9}, pcommon.SpanID{}, ) traces := constructTraces([]ptrace.Span{minSpan}) @@ -69,19 +69,19 @@ func TestExportTraceDataMinimum(t *testing.T) { } func TestExportTraceDataFullTrace(t *testing.T) { - traceID := pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) + traceID := pcommon.TraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) rootSpan := createSpan( "root", traceID, - pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}), + [8]byte{0, 0, 0, 0, 0, 0, 0, 1}, pcommon.SpanID{}, ) clientSpan := createSpan( "client", traceID, - pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 2}), + [8]byte{0, 0, 0, 0, 0, 0, 0, 2}, rootSpan.SpanID(), ) @@ -100,7 +100,7 @@ func TestExportTraceDataFullTrace(t *testing.T) { serverSpan := createSpan( "server", traceID, - pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 3}), + pcommon.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 3}), clientSpan.SpanID(), ) serverSpan.SetKind(ptrace.SpanKindServer) @@ -192,8 +192,8 @@ func validateTraces(t *testing.T, expected []*span, traces ptrace.Traces) { func TestExportTraceDataWithInstrumentationDetails(t *testing.T) { minSpan := createSpan( "root", - pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}), - pcommon.NewSpanID([8]byte{9, 9, 9, 9, 9, 9, 9, 9}), + pcommon.TraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}), + pcommon.SpanID([8]byte{9, 9, 9, 9, 9, 9, 9, 9}), pcommon.SpanID{}, ) traces := constructTraces([]ptrace.Span{minSpan}) @@ -220,8 +220,8 @@ func TestExportTraceDataWithInstrumentationDetails(t *testing.T) { func TestExportTraceDataRespectsContext(t *testing.T) { traces := constructTraces([]ptrace.Span{createSpan( "root", - pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}), - pcommon.NewSpanID([8]byte{9, 9, 9, 9, 9, 9, 9, 9}), + pcommon.TraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}), + pcommon.SpanID([8]byte{9, 9, 9, 9, 9, 9, 9, 9}), pcommon.SpanID{}, )}) diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 44e335800aed..9a1fbb566597 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.59.0 github.com/stretchr/testify v1.8.0 github.com/wavefronthq/wavefront-sdk-go v0.10.4 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 149123a4fe18..c2f7788666fc 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/exporter/tanzuobservabilityexporter/transformer.go b/exporter/tanzuobservabilityexporter/transformer.go index 072b35892331..c410a96dc3ef 100644 --- a/exporter/tanzuobservabilityexporter/transformer.go +++ b/exporter/tanzuobservabilityexporter/transformer.go @@ -263,7 +263,7 @@ func traceIDtoUUID(id pcommon.TraceID) (uuid.UUID, error) { } func spanIDtoUUID(id pcommon.SpanID) (uuid.UUID, error) { - formatted, err := uuid.FromBytes(padTo16Bytes(id.Bytes())) + formatted, err := uuid.FromBytes(padTo16Bytes(id)) if err != nil || id.IsEmpty() { return uuid.Nil, errInvalidSpanID } @@ -275,7 +275,7 @@ func parentSpanIDtoUUID(id pcommon.SpanID) uuid.UUID { return uuid.Nil } // FromBytes only returns an error if the length is not 16 bytes, so the error case is unreachable - formatted, _ := uuid.FromBytes(padTo16Bytes(id.Bytes())) + formatted, _ := uuid.FromBytes(padTo16Bytes(id)) return formatted } diff --git a/exporter/tanzuobservabilityexporter/transformer_test.go b/exporter/tanzuobservabilityexporter/transformer_test.go index 2de74e8a3ce3..9913504dcf88 100644 --- a/exporter/tanzuobservabilityexporter/transformer_test.go +++ b/exporter/tanzuobservabilityexporter/transformer_test.go @@ -30,8 +30,8 @@ func TestSpanStartTimeIsConvertedToMilliseconds(t *testing.T) { att := pcommon.NewMap() transform := transformerFromAttributes(att) span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetStartTimestamp(pcommon.Timestamp(inNanos)) actual, err := transform.Span(span) @@ -46,8 +46,8 @@ func TestSpanDurationIsCalculatedFromStartAndEndTimes(t *testing.T) { att := pcommon.NewMap() transform := transformerFromAttributes(att) span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetStartTimestamp(pcommon.Timestamp(startNanos)) span.SetEndTimestamp(pcommon.Timestamp(endNanos)) @@ -62,8 +62,8 @@ func TestSpanDurationIsZeroIfEndTimeIsUnset(t *testing.T) { att := pcommon.NewMap() transform := transformerFromAttributes(att) span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetStartTimestamp(pcommon.Timestamp(startNanos)) actual, err := transform.Span(span) @@ -146,8 +146,8 @@ func TestSpanEventsAreTranslatedToSpanLogs(t *testing.T) { transform := transformerFromAttributes(pcommon.NewMap()) now := time.Now() span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) event := span.Events().AppendEmpty() event.SetName("eventName") event.SetTimestamp(pcommon.NewTimestampFromTime(now)) @@ -229,8 +229,8 @@ func TestSpanForSourceTag(t *testing.T) { resAttrs := pcommon.NewMap() transform := transformerFromAttributes(resAttrs) span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetStartTimestamp(pcommon.Timestamp(inNanos)) actual, err := transform.Span(span) @@ -243,8 +243,8 @@ func TestSpanForSourceTag(t *testing.T) { resAttrs.UpsertString(conventions.AttributeHostName, "test_host.name") transform = transformerFromAttributes(resAttrs) span = ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetStartTimestamp(pcommon.Timestamp(inNanos)) actual, err = transform.Span(span) @@ -262,8 +262,8 @@ func TestSpanForSourceTag(t *testing.T) { resAttrs.UpsertString(conventions.AttributeHostName, "test_host.name") transform = transformerFromAttributes(resAttrs) span = ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetStartTimestamp(pcommon.Timestamp(inNanos)) actual, err = transform.Span(span) @@ -299,8 +299,8 @@ func TestSpanForDroppedCount(t *testing.T) { resAttrs := pcommon.NewMap() transform := transformerFromAttributes(resAttrs) span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetStartTimestamp(pcommon.Timestamp(inNanos)) actual, err := transform.Span(span) @@ -368,16 +368,16 @@ func TestAttributesToTagsReplaceSource(t *testing.T) { func spanWithKind(kind ptrace.SpanKind) ptrace.Span { span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetKind(kind) return span } func spanWithTraceState(state ptrace.TraceState) ptrace.Span { span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) span.SetTraceState(state) return span } @@ -390,8 +390,8 @@ func transformerFromAttributes(attrs pcommon.Map) *traceTransformer { func spanWithStatus(statusCode ptrace.StatusCode, message string) ptrace.Span { span := ptrace.NewSpan() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) + span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}) + span.SetTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) status := ptrace.NewSpanStatus() status.SetCode(statusCode) if message != "" { diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index 9a0292202349..1674069e04b7 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.492 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) require ( - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 google.golang.org/protobuf v1.28.1 ) diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index bd85ff5de4d3..dd953b61a246 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice.go b/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice.go index 318a9dad0589..217d788bf987 100644 --- a/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice.go +++ b/exporter/tencentcloudlogserviceexporter/logsdata_to_logservice.go @@ -169,7 +169,7 @@ func mapLogRecordToLogService(lr plog.LogRecord, }, { Key: proto.String(clsLogFlags), - Value: proto.String(strconv.FormatUint(uint64(lr.FlagsStruct()), 16)), + Value: proto.String(strconv.FormatUint(uint64(lr.Flags()), 16)), }, { Key: proto.String(traceIDField), diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 142ff245f780..a15368c3cb0d 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.59.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 64f55f708965..4181059e96bf 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -342,12 +342,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index c719366576a2..0cc42ea04734 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 196ff9488e46..f88f694bc393 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index bacf7a91402c..406f271a89e5 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index cf587461e044..91e038d64e00 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 9f1211004db1..e3b1fd4dab1e 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index 4a02ab66913a..3ff73e9e8864 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 33be5d76c352..3e967ed7e9ea 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index 341aa72a70b9..372379e56280 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index 8f8a0006b3e8..3d72b4051af5 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 14f1d9042ef3..11dfa5810e9b 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/headerssetter/go.mod b/extension/headerssetter/go.mod index d2b734d3225f..13ad276e4c6a 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/headerssetter/go.sum b/extension/headerssetter/go.sum index 4d79f5d542d1..36add494892d 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 61bb39de22b4..4abff8664702 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 4c9afe371835..9f912fcdaf81 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 5bb13776d537..542ab56c7250 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 128f9064ac45..38215c1187e2 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 613c806523a8..9e0326ed27ff 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.37.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 63d88659b6ea..1a4e2e6b0ea8 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 75b25f0afb66..b47130b7c62d 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index eabce209eb4b..4cdf0c97f5c5 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -347,10 +347,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 428b9ab2cd0d..e2dce837899f 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 411963a1222c..e6d9ba5d59e7 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index bd0bb1fafcf0..a43122022584 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.93 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index c2d7cbb581f8..3e34853ab3f5 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 8925d2293695..57de7d20e1a7 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index b666c5d3fdc1..47abecb0b6c7 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index fa559a1bd820..9b118491ced9 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.59.0 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index f9a1052389c5..d4c22868796a 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 1d002b266b17..a8df95826934 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 @@ -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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index db8c2ddaf04c..61e6dfa6e1d1 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 699ac2383a3b..b9530143adad 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index 926e170b1a35..2330655d1c36 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index b8c399c51672..eb9000121424 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 38543e92f67b..23627b06295f 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 226f1f76d32d..686dc088ce61 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.18 github.com/aws/aws-sdk-go-v2/service/sts v1.16.17 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index bdfd51f06b64..d2f1c6fa729b 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index e208040da9ec..adc7340069ec 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index b5ca650cb650..ca843a91d9a9 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/go.mod b/go.mod index d9626516bcef..890b8cd496e4 100644 --- a/go.mod +++ b/go.mod @@ -152,7 +152,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.59.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab ) @@ -538,8 +538,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.59.0 // indirect - go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.9.0 // indirect diff --git a/go.sum b/go.sum index 9b92542500db..4dd14210414f 100644 --- a/go.sum +++ b/go.sum @@ -1934,12 +1934,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= 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/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index 08815a823d09..09466aa403ed 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.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 45ff38402586..873cb5aa0ae4 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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/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/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index fb803a3777f9..eb5baed4ee70 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.93 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 075b81c613eb..288fa8a1af91 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index d700d31998b7..4abdf1d678ba 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 128f9064ac45..38215c1187e2 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index d5855a632e87..4308b324ef13 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.93 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index fc2d89e5d622..1a88ee8f9237 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= 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 0d508591e16a..21bab8a0e96f 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 6d0492f9452b..d3b81ea61efd 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= 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/go.mod b/internal/coreinternal/go.mod index 36bba34f30ca..fb48f340a17a 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 807216f3500c..43bd6282e44f 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -282,12 +282,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/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/internal/coreinternal/goldendataset/span_generator.go b/internal/coreinternal/goldendataset/span_generator.go index 625cc91a29bc..78dc96f77538 100644 --- a/internal/coreinternal/goldendataset/span_generator.go +++ b/internal/coreinternal/goldendataset/span_generator.go @@ -69,7 +69,7 @@ func appendSpans(count int, pictFile string, random io.Reader, spanList ptrace.S switch spanInputs.Parent { case SpanParentRoot: traceID = generateTraceID(random) - parentID = pcommon.NewSpanID([8]byte{}) + parentID = pcommon.SpanID([8]byte{}) case SpanParentChild: // use existing if available if traceID.IsEmpty() { @@ -464,7 +464,7 @@ func generateTraceID(random io.Reader) pcommon.TraceID { if err != nil { panic(err) } - return pcommon.NewTraceID(r) + return pcommon.TraceID(r) } func generateSpanID(random io.Reader) pcommon.SpanID { @@ -473,5 +473,5 @@ func generateSpanID(random io.Reader) pcommon.SpanID { if err != nil { panic(err) } - return pcommon.NewSpanID(r) + return pcommon.SpanID(r) } diff --git a/internal/coreinternal/goldendataset/span_generator_test.go b/internal/coreinternal/goldendataset/span_generator_test.go index 201283bbed62..f77658f4da16 100644 --- a/internal/coreinternal/goldendataset/span_generator_test.go +++ b/internal/coreinternal/goldendataset/span_generator_test.go @@ -36,7 +36,7 @@ func TestGenerateParentSpan(t *testing.T) { Status: SpanStatusOk, } span := ptrace.NewSpan() - fillSpan(traceID, pcommon.NewSpanID([8]byte{}), "/gotest-parent", spanInputs, random, span) + fillSpan(traceID, pcommon.SpanID([8]byte{}), "/gotest-parent", spanInputs, random, span) assert.Equal(t, traceID, span.TraceID()) assert.True(t, span.ParentSpanID().IsEmpty()) assert.Equal(t, 11, span.Attributes().Len()) diff --git a/internal/coreinternal/idutils/big_endian_converter.go b/internal/coreinternal/idutils/big_endian_converter.go index 4dbbd4463e47..1b2590a93e9a 100644 --- a/internal/coreinternal/idutils/big_endian_converter.go +++ b/internal/coreinternal/idutils/big_endian_converter.go @@ -25,24 +25,22 @@ func UInt64ToTraceID(high, low uint64) pcommon.TraceID { traceID := [16]byte{} binary.BigEndian.PutUint64(traceID[:8], high) binary.BigEndian.PutUint64(traceID[8:], low) - return pcommon.NewTraceID(traceID) + return traceID } // TraceIDToUInt64Pair converts the pcommon.TraceID to a pair of uint64 representation. func TraceIDToUInt64Pair(traceID pcommon.TraceID) (uint64, uint64) { - bytes := traceID.Bytes() - return binary.BigEndian.Uint64(bytes[:8]), binary.BigEndian.Uint64(bytes[8:]) + return binary.BigEndian.Uint64(traceID[:8]), binary.BigEndian.Uint64(traceID[8:]) } // UInt64ToSpanID converts the uint64 representation of a SpanID to pcommon.SpanID. func UInt64ToSpanID(id uint64) pcommon.SpanID { spanID := [8]byte{} binary.BigEndian.PutUint64(spanID[:], id) - return pcommon.NewSpanID(spanID) + return pcommon.SpanID(spanID) } // SpanIDToUInt64 converts the pcommon.SpanID to uint64 representation. func SpanIDToUInt64(spanID pcommon.SpanID) uint64 { - bytes := spanID.Bytes() - return binary.BigEndian.Uint64(bytes[:]) + return binary.BigEndian.Uint64(spanID[:]) } diff --git a/internal/coreinternal/idutils/big_endian_converter_test.go b/internal/coreinternal/idutils/big_endian_converter_test.go index baedaecbb9a2..9bb404fa9d6a 100644 --- a/internal/coreinternal/idutils/big_endian_converter_test.go +++ b/internal/coreinternal/idutils/big_endian_converter_test.go @@ -24,39 +24,39 @@ import ( func TestUInt64ToTraceIDConversion(t *testing.T) { assert.Equal(t, - pcommon.NewTraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), + pcommon.TraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), UInt64ToTraceID(0, 0), "Failed 0 conversion:") assert.Equal(t, - pcommon.NewTraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01}), + pcommon.TraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01}), UInt64ToTraceID(256*256+256+1, 256+1), "Failed simple conversion:") assert.Equal(t, - pcommon.NewTraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05}), + pcommon.TraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05}), UInt64ToTraceID(0, 5), "Failed to convert 0 high:") assert.Equal(t, UInt64ToTraceID(5, 0), - pcommon.NewTraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), + pcommon.TraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), UInt64ToTraceID(5, 0), "Failed to convert 0 low:") assert.Equal(t, - pcommon.NewTraceID([16]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05}), + pcommon.TraceID([16]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05}), UInt64ToTraceID(math.MaxUint64, 5), "Failed to convert MaxUint64:") } func TestUInt64ToSpanIDConversion(t *testing.T) { assert.Equal(t, - pcommon.NewSpanID([8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), + pcommon.SpanID([8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), UInt64ToSpanID(0), "Failed 0 conversion:") assert.Equal(t, - pcommon.NewSpanID([8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01}), + pcommon.SpanID([8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01}), UInt64ToSpanID(256*256+256+1), "Failed simple conversion:") assert.Equal(t, - pcommon.NewSpanID([8]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}), + pcommon.SpanID([8]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}), UInt64ToSpanID(math.MaxUint64), "Failed to convert MaxUint64:") } diff --git a/internal/coreinternal/testdata/log.go b/internal/coreinternal/testdata/log.go index 11a8f73c6840..8d54552a869d 100644 --- a/internal/coreinternal/testdata/log.go +++ b/internal/coreinternal/testdata/log.go @@ -83,8 +83,8 @@ func fillLogOne(log plog.LogRecord) { log.SetDroppedAttributesCount(1) log.SetSeverityNumber(plog.SeverityNumberInfo) log.SetSeverityText("Info") - log.SetSpanID(pcommon.NewSpanID([8]byte{0x01, 0x02, 0x04, 0x08})) - log.SetTraceID(pcommon.NewTraceID([16]byte{0x08, 0x04, 0x02, 0x01})) + log.SetSpanID([8]byte{0x01, 0x02, 0x04, 0x08}) + log.SetTraceID([16]byte{0x08, 0x04, 0x02, 0x01}) attrs := log.Attributes() attrs.UpsertString("app", "server") diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 133dfd0a4517..4177d08120c9 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 44dae6baf66d..9c24359aceac 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= 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 6cc09a315ac5..073e6715124a 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.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/internal/scrapertest/go.sum b/internal/scrapertest/go.sum index 88828a69bb10..7f8f5fb3e013 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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/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/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index d6ccd4c6329d..1e8ed3b978e8 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index 341aa72a70b9..372379e56280 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 63e2888b474f..d033851c36b6 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 906f6339ade2..de7dc2262bca 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/pkg/batchperresourceattr/batchperresourceattr_test.go b/pkg/batchperresourceattr/batchperresourceattr_test.go index 529682aaf879..998d42066734 100644 --- a/pkg/batchperresourceattr/batchperresourceattr_test.go +++ b/pkg/batchperresourceattr/batchperresourceattr_test.go @@ -253,10 +253,10 @@ func fillResourceSpans(rs ptrace.ResourceSpans, key string, val string) { ils := rs.ScopeSpans().AppendEmpty() firstSpan := ils.Spans().AppendEmpty() firstSpan.SetName("first-span") - firstSpan.SetTraceID(pcommon.NewTraceID([16]byte{byte(rand.Int())})) + firstSpan.SetTraceID(pcommon.TraceID([16]byte{byte(rand.Int())})) secondSpan := ils.Spans().AppendEmpty() secondSpan.SetName("second-span") - secondSpan.SetTraceID(pcommon.NewTraceID([16]byte{byte(rand.Int())})) + secondSpan.SetTraceID(pcommon.TraceID([16]byte{byte(rand.Int())})) } func newMetrics(rms ...pmetric.ResourceMetrics) pmetric.Metrics { @@ -320,9 +320,9 @@ func fillResourceLogs(rs plog.ResourceLogs, key string, val string) { rs.Resource().Attributes().UpsertInt("__other_key__", 123) ils := rs.ScopeLogs().AppendEmpty() firstLogRecord := ils.LogRecords().AppendEmpty() - firstLogRecord.SetFlagsStruct(plog.LogRecordFlags(rand.Int31())) + firstLogRecord.SetFlags(plog.LogRecordFlags(rand.Int31())) secondLogRecord := ils.LogRecords().AppendEmpty() - secondLogRecord.SetFlagsStruct(plog.LogRecordFlags(rand.Int31())) + secondLogRecord.SetFlags(plog.LogRecordFlags(rand.Int31())) } func BenchmarkBatchPerResourceTraces(b *testing.B) { diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index f7bf8e9109d7..166f555d957a 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index cb760f0f041c..63db398dfb75 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/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 f3014d620481..f99e7383419f 100644 --- a/pkg/batchpersignal/batchpersignal_test.go +++ b/pkg/batchpersignal/batchpersignal_test.go @@ -34,10 +34,10 @@ func TestSplitDifferentTracesIntoDifferentBatches(t *testing.T) { library.SetName("first-library") firstSpan := ils.Spans().AppendEmpty() firstSpan.SetName("first-batch-first-span") - firstSpan.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + firstSpan.SetTraceID([16]byte{1, 2, 3, 4}) secondSpan := ils.Spans().AppendEmpty() secondSpan.SetName("first-batch-second-span") - secondSpan.SetTraceID(pcommon.NewTraceID([16]byte{2, 3, 4, 5})) + secondSpan.SetTraceID([16]byte{2, 3, 4, 5}) // test out := SplitTraces(inBatch) @@ -62,14 +62,14 @@ func TestSplitTracesWithNilTraceID(t *testing.T) { rs := inBatch.ResourceSpans().AppendEmpty() ils := rs.ScopeSpans().AppendEmpty() firstSpan := ils.Spans().AppendEmpty() - firstSpan.SetTraceID(pcommon.NewTraceID([16]byte{})) + firstSpan.SetTraceID([16]byte{}) // test batches := SplitTraces(inBatch) // verify assert.Len(t, batches, 1) - assert.Equal(t, pcommon.NewTraceID([16]byte{}), batches[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID()) + assert.Equal(t, pcommon.TraceID([16]byte{}), batches[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID()) } func TestSplitSameTraceIntoDifferentBatches(t *testing.T) { @@ -87,10 +87,10 @@ func TestSplitSameTraceIntoDifferentBatches(t *testing.T) { firstILS.Spans().EnsureCapacity(2) firstSpan := firstILS.Spans().AppendEmpty() firstSpan.SetName("first-batch-first-span") - firstSpan.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + firstSpan.SetTraceID([16]byte{1, 2, 3, 4}) secondSpan := firstILS.Spans().AppendEmpty() secondSpan.SetName("first-batch-second-span") - secondSpan.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + secondSpan.SetTraceID([16]byte{1, 2, 3, 4}) // the second ILS has one span secondILS := rs.ScopeSpans().AppendEmpty() @@ -98,7 +98,7 @@ func TestSplitSameTraceIntoDifferentBatches(t *testing.T) { secondLibrary.SetName("second-library") thirdSpan := secondILS.Spans().AppendEmpty() thirdSpan.SetName("second-batch-first-span") - thirdSpan.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + thirdSpan.SetTraceID([16]byte{1, 2, 3, 4}) // test batches := SplitTraces(inBatch) @@ -107,13 +107,13 @@ func TestSplitSameTraceIntoDifferentBatches(t *testing.T) { assert.Len(t, batches, 2) // first batch - assert.Equal(t, pcommon.NewTraceID([16]byte{1, 2, 3, 4}), batches[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID()) + assert.Equal(t, pcommon.TraceID([16]byte{1, 2, 3, 4}), batches[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID()) assert.Equal(t, firstLibrary.Name(), batches[0].ResourceSpans().At(0).ScopeSpans().At(0).Scope().Name()) assert.Equal(t, firstSpan.Name(), batches[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Name()) assert.Equal(t, secondSpan.Name(), batches[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(1).Name()) // second batch - assert.Equal(t, pcommon.NewTraceID([16]byte{1, 2, 3, 4}), batches[1].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID()) + assert.Equal(t, pcommon.TraceID([16]byte{1, 2, 3, 4}), batches[1].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID()) assert.Equal(t, secondLibrary.Name(), batches[1].ResourceSpans().At(0).ScopeSpans().At(0).Scope().Name()) assert.Equal(t, thirdSpan.Name(), batches[1].ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Name()) } @@ -130,10 +130,10 @@ func TestSplitDifferentLogsIntoDifferentBatches(t *testing.T) { sl.LogRecords().EnsureCapacity(3) firstLog := sl.LogRecords().AppendEmpty() firstLog.Body().SetStringVal("first-batch-first-log") - firstLog.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + firstLog.SetTraceID([16]byte{1, 2, 3, 4}) secondLog := sl.LogRecords().AppendEmpty() secondLog.Body().SetStringVal("first-batch-second-log") - secondLog.SetTraceID(pcommon.NewTraceID([16]byte{2, 3, 4, 5})) + secondLog.SetTraceID([16]byte{2, 3, 4, 5}) thirdLog := sl.LogRecords().AppendEmpty() thirdLog.Body().SetStringVal("first-batch-third-log") // do not set traceID for third log @@ -166,14 +166,14 @@ func TestSplitLogsWithNilTraceID(t *testing.T) { rl := inBatch.ResourceLogs().AppendEmpty() sl := rl.ScopeLogs().AppendEmpty() firstLog := sl.LogRecords().AppendEmpty() - firstLog.SetTraceID(pcommon.NewTraceID([16]byte{})) + firstLog.SetTraceID([16]byte{}) // test batches := SplitLogs(inBatch) // verify assert.Len(t, batches, 1) - assert.Equal(t, pcommon.NewTraceID([16]byte{}), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).TraceID()) + assert.Equal(t, pcommon.TraceID([16]byte{}), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).TraceID()) } func TestSplitLogsSameTraceIntoDifferentBatches(t *testing.T) { @@ -191,10 +191,10 @@ func TestSplitLogsSameTraceIntoDifferentBatches(t *testing.T) { firstILS.LogRecords().EnsureCapacity(2) firstLog := firstILS.LogRecords().AppendEmpty() firstLog.Body().SetStringVal("first-batch-first-log") - firstLog.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + firstLog.SetTraceID([16]byte{1, 2, 3, 4}) secondLog := firstILS.LogRecords().AppendEmpty() secondLog.Body().SetStringVal("first-batch-second-log") - secondLog.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + secondLog.SetTraceID([16]byte{1, 2, 3, 4}) // the second ILL has one log secondILS := rl.ScopeLogs().AppendEmpty() @@ -202,7 +202,7 @@ func TestSplitLogsSameTraceIntoDifferentBatches(t *testing.T) { secondLibrary.SetName("second-library") thirdLog := secondILS.LogRecords().AppendEmpty() thirdLog.Body().SetStringVal("second-batch-first-log") - thirdLog.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + thirdLog.SetTraceID([16]byte{1, 2, 3, 4}) // test batches := SplitLogs(inBatch) @@ -211,13 +211,13 @@ func TestSplitLogsSameTraceIntoDifferentBatches(t *testing.T) { assert.Len(t, batches, 2) // first batch - assert.Equal(t, pcommon.NewTraceID([16]byte{1, 2, 3, 4}), batches[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).TraceID()) + 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()) // second batch - assert.Equal(t, pcommon.NewTraceID([16]byte{1, 2, 3, 4}), batches[1].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).TraceID()) + 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()) } diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index e60c4a0ebe31..689b071c793e 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.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 0cb7054e467d..7a045f192d2b 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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/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/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 1d1a8838a1f0..5802c3e63fd7 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 732c704a417c..9d29b8a56fe8 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -260,10 +260,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/pkg/stanza/adapter/converter.go b/pkg/stanza/adapter/converter.go index ec6880bf0bcc..2034984f4671 100644 --- a/pkg/stanza/adapter/converter.go +++ b/pkg/stanza/adapter/converter.go @@ -350,18 +350,18 @@ func convertInto(ent *entry.Entry, dest plog.LogRecord) { if ent.TraceID != nil { var buffer [16]byte copy(buffer[0:16], ent.TraceID) - dest.SetTraceID(pcommon.NewTraceID(buffer)) + dest.SetTraceID(buffer) } if ent.SpanID != nil { var buffer [8]byte copy(buffer[0:8], ent.SpanID) - dest.SetSpanID(pcommon.NewSpanID(buffer)) + dest.SetSpanID(buffer) } if ent.TraceFlags != nil { // The 8 least significant bits are the trace flags as defined in W3C Trace // Context specification. Don't override the 24 reserved bits. flags := uint32(ent.TraceFlags[0]) - dest.SetFlagsStruct(plog.LogRecordFlags(flags)) + dest.SetFlags(plog.LogRecordFlags(flags)) } } diff --git a/pkg/stanza/adapter/converter_test.go b/pkg/stanza/adapter/converter_test.go index 73f9cb748767..4c5a7f5bd0a6 100644 --- a/pkg/stanza/adapter/converter_test.go +++ b/pkg/stanza/adapter/converter_test.go @@ -863,15 +863,15 @@ func TestConvertTrace(t *testing.T) { 0x01, }}) - require.Equal(t, pcommon.NewTraceID( + require.Equal(t, pcommon.TraceID( [16]byte{ 0x48, 0x01, 0x40, 0xf3, 0xd7, 0x70, 0xa5, 0xae, 0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff, }), record.TraceID()) - require.Equal(t, pcommon.NewSpanID( + require.Equal(t, pcommon.SpanID( [8]byte{ 0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff, }), record.SpanID()) - require.Equal(t, uint32(0x01), uint32(record.FlagsStruct())) + require.Equal(t, uint32(0x01), uint32(record.Flags())) } func BenchmarkConverter(b *testing.B) { diff --git a/pkg/stanza/adapter/frompdataconverter.go b/pkg/stanza/adapter/frompdataconverter.go index 3e41e12a7f36..232be52648b3 100644 --- a/pkg/stanza/adapter/frompdataconverter.go +++ b/pkg/stanza/adapter/frompdataconverter.go @@ -208,16 +208,16 @@ func convertFrom(src plog.LogRecord, ent *entry.Entry) { ent.Body = valueToInterface(src.Body()) if !src.TraceID().IsEmpty() { - buffer := src.TraceID().Bytes() + buffer := src.TraceID() ent.TraceID = buffer[:] } if !src.SpanID().IsEmpty() { - buffer := src.SpanID().Bytes() + buffer := src.SpanID() ent.SpanID = buffer[:] } - if src.FlagsStruct() != 0 { + if src.Flags() != 0 { a := make([]byte, 4) - binary.LittleEndian.PutUint32(a, uint32(src.FlagsStruct())) + binary.LittleEndian.PutUint32(a, uint32(src.Flags())) ent.TraceFlags = []byte{a[0]} } } diff --git a/pkg/stanza/adapter/frompdataconverter_test.go b/pkg/stanza/adapter/frompdataconverter_test.go index 70d53febcdc3..231321096d94 100644 --- a/pkg/stanza/adapter/frompdataconverter_test.go +++ b/pkg/stanza/adapter/frompdataconverter_test.go @@ -74,9 +74,9 @@ func complexPdataForNDifferentHosts(count int, n int) plog.Logs { scopeLog.Scope().SetName("myScope") lr := scopeLog.LogRecords().AppendEmpty() - lr.SetSpanID(pcommon.NewSpanID([8]byte{0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff})) - lr.SetTraceID(pcommon.NewTraceID([16]byte{0x48, 0x01, 0x40, 0xf3, 0xd7, 0x70, 0xa5, 0xae, 0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff})) - lr.SetFlagsStruct(plog.DefaultLogRecordFlags.WithIsSampled(true)) + lr.SetSpanID([8]byte{0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff}) + lr.SetTraceID([16]byte{0x48, 0x01, 0x40, 0xf3, 0xd7, 0x70, 0xa5, 0xae, 0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff}) + lr.SetFlags(plog.DefaultLogRecordFlags.WithIsSampled(true)) lr.SetSeverityNumber(plog.SeverityNumberError) lr.SetSeverityText("Error") diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index 10b4969435f3..bae447098639 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 f8f4218dd72b..e0540ce443ea 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/pkg/telemetryquerylanguage/contexts/tqllogs/logs.go b/pkg/telemetryquerylanguage/contexts/tqllogs/logs.go index 1a20483df2a3..455c6b0e474a 100644 --- a/pkg/telemetryquerylanguage/contexts/tqllogs/logs.go +++ b/pkg/telemetryquerylanguage/contexts/tqllogs/logs.go @@ -246,11 +246,11 @@ func accessDroppedAttributesCount() tql.StandardGetSetter { func accessFlags() tql.StandardGetSetter { return tql.StandardGetSetter{ Getter: func(ctx tql.TransformContext) interface{} { - return int64(ctx.GetItem().(plog.LogRecord).FlagsStruct()) + return int64(ctx.GetItem().(plog.LogRecord).Flags()) }, Setter: func(ctx tql.TransformContext, val interface{}) { if i, ok := val.(int64); ok { - ctx.GetItem().(plog.LogRecord).SetFlagsStruct(plog.LogRecordFlags(i)) + ctx.GetItem().(plog.LogRecord).SetFlags(plog.LogRecordFlags(i)) } }, } @@ -322,7 +322,7 @@ func parseSpanID(spanIDStr string) (pcommon.SpanID, error) { } var idArr [8]byte copy(idArr[:8], id) - return pcommon.NewSpanID(idArr), nil + return pcommon.SpanID(idArr), nil } func parseTraceID(traceIDStr string) (pcommon.TraceID, error) { @@ -335,5 +335,5 @@ func parseTraceID(traceIDStr string) (pcommon.TraceID, error) { } var idArr [16]byte copy(idArr[:16], id) - return pcommon.NewTraceID(idArr), nil + return pcommon.TraceID(idArr), nil } diff --git a/pkg/telemetryquerylanguage/contexts/tqllogs/logs_test.go b/pkg/telemetryquerylanguage/contexts/tqllogs/logs_test.go index 6886169f8cb2..9fb6b4bbd9cd 100644 --- a/pkg/telemetryquerylanguage/contexts/tqllogs/logs_test.go +++ b/pkg/telemetryquerylanguage/contexts/tqllogs/logs_test.go @@ -122,7 +122,7 @@ func Test_newPathGetSetter(t *testing.T) { orig: int64(4), newVal: int64(5), modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.SetFlagsStruct(plog.LogRecordFlags(5)) + log.SetFlags(plog.LogRecordFlags(5)) }, }, { @@ -132,10 +132,10 @@ func Test_newPathGetSetter(t *testing.T) { Name: "trace_id", }, }, - orig: pcommon.NewTraceID(traceID), - newVal: pcommon.NewTraceID(traceID2), + orig: pcommon.TraceID(traceID), + newVal: pcommon.TraceID(traceID2), modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.SetTraceID(pcommon.NewTraceID(traceID2)) + log.SetTraceID(traceID2) }, }, { @@ -145,10 +145,10 @@ func Test_newPathGetSetter(t *testing.T) { Name: "span_id", }, }, - orig: pcommon.NewSpanID(spanID), - newVal: pcommon.NewSpanID(spanID2), + orig: pcommon.SpanID(spanID), + newVal: pcommon.SpanID(spanID2), modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.SetSpanID(pcommon.NewSpanID(spanID2)) + log.SetSpanID(spanID2) }, }, { @@ -164,7 +164,7 @@ func Test_newPathGetSetter(t *testing.T) { orig: hex.EncodeToString(traceID[:]), newVal: hex.EncodeToString(traceID2[:]), modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.SetTraceID(pcommon.NewTraceID(traceID2)) + log.SetTraceID(traceID2) }, }, { @@ -180,7 +180,7 @@ func Test_newPathGetSetter(t *testing.T) { orig: hex.EncodeToString(spanID[:]), newVal: hex.EncodeToString(spanID2[:]), modified: func(log plog.LogRecord, il pcommon.InstrumentationScope, resource pcommon.Resource) { - log.SetSpanID(pcommon.NewSpanID(spanID2)) + log.SetSpanID(spanID2) }, }, { @@ -449,10 +449,10 @@ func createTelemetry() (plog.LogRecord, pcommon.InstrumentationScope, pcommon.Re log.SetDroppedAttributesCount(10) - log.SetFlagsStruct(plog.LogRecordFlags(4)) + log.SetFlags(plog.LogRecordFlags(4)) - log.SetTraceID(pcommon.NewTraceID(traceID)) - log.SetSpanID(pcommon.NewSpanID(spanID)) + log.SetTraceID(traceID) + log.SetSpanID(spanID) il := pcommon.NewInstrumentationScope() il.SetName("library") diff --git a/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics.go b/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics.go index 6333eaf3d01c..042958c17fe6 100644 --- a/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics.go +++ b/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics.go @@ -495,13 +495,13 @@ func accessFlags() tql.StandardGetSetter { Getter: func(ctx tql.TransformContext) interface{} { switch ctx.GetItem().(type) { case pmetric.NumberDataPoint: - return int64(ctx.GetItem().(pmetric.NumberDataPoint).FlagsImmutable()) + return int64(ctx.GetItem().(pmetric.NumberDataPoint).Flags()) case pmetric.HistogramDataPoint: - return int64(ctx.GetItem().(pmetric.HistogramDataPoint).FlagsImmutable()) + return int64(ctx.GetItem().(pmetric.HistogramDataPoint).Flags()) case pmetric.ExponentialHistogramDataPoint: - return int64(ctx.GetItem().(pmetric.ExponentialHistogramDataPoint).FlagsImmutable()) + return int64(ctx.GetItem().(pmetric.ExponentialHistogramDataPoint).Flags()) case pmetric.SummaryDataPoint: - return int64(ctx.GetItem().(pmetric.SummaryDataPoint).FlagsImmutable()) + return int64(ctx.GetItem().(pmetric.SummaryDataPoint).Flags()) } return nil }, @@ -509,13 +509,13 @@ func accessFlags() tql.StandardGetSetter { if newFlags, ok := val.(int64); ok { switch ctx.GetItem().(type) { case pmetric.NumberDataPoint: - ctx.GetItem().(pmetric.NumberDataPoint).SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(newFlags)) + ctx.GetItem().(pmetric.NumberDataPoint).SetFlags(pmetric.MetricDataPointFlags(newFlags)) case pmetric.HistogramDataPoint: - ctx.GetItem().(pmetric.HistogramDataPoint).SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(newFlags)) + ctx.GetItem().(pmetric.HistogramDataPoint).SetFlags(pmetric.MetricDataPointFlags(newFlags)) case pmetric.ExponentialHistogramDataPoint: - ctx.GetItem().(pmetric.ExponentialHistogramDataPoint).SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(newFlags)) + ctx.GetItem().(pmetric.ExponentialHistogramDataPoint).SetFlags(pmetric.MetricDataPointFlags(newFlags)) case pmetric.SummaryDataPoint: - ctx.GetItem().(pmetric.SummaryDataPoint).SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(newFlags)) + ctx.GetItem().(pmetric.SummaryDataPoint).SetFlags(pmetric.MetricDataPointFlags(newFlags)) } } }, diff --git a/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics_test.go b/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics_test.go index 198e5f3eef23..00ca31ec50e5 100644 --- a/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics_test.go +++ b/pkg/telemetryquerylanguage/contexts/tqlmetrics/metrics_test.go @@ -102,7 +102,7 @@ func Test_newPathGetSetter_NumberDataPoint(t *testing.T) { orig: int64(0), newVal: int64(1), modified: func(datapoint pmetric.NumberDataPoint) { - datapoint.SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(1)) + datapoint.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) }, }, { @@ -376,7 +376,7 @@ func Test_newPathGetSetter_HistogramDataPoint(t *testing.T) { orig: int64(0), newVal: int64(1), modified: func(datapoint pmetric.HistogramDataPoint) { - datapoint.SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(1)) + datapoint.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) }, }, { @@ -708,7 +708,7 @@ func Test_newPathGetSetter_ExpoHistogramDataPoint(t *testing.T) { orig: int64(0), newVal: int64(1), modified: func(datapoint pmetric.ExponentialHistogramDataPoint) { - datapoint.SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(1)) + datapoint.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) }, }, { @@ -1131,7 +1131,7 @@ func Test_newPathGetSetter_SummaryDataPoint(t *testing.T) { orig: int64(0), newVal: int64(1), modified: func(datapoint pmetric.SummaryDataPoint) { - datapoint.SetFlagsImmutable(pmetric.MetricDataPointFlagsImmutable(1)) + datapoint.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) }, }, { diff --git a/pkg/telemetryquerylanguage/contexts/tqltraces/traces.go b/pkg/telemetryquerylanguage/contexts/tqltraces/traces.go index 48b132ac6ffc..cdb0f7aaac9d 100644 --- a/pkg/telemetryquerylanguage/contexts/tqltraces/traces.go +++ b/pkg/telemetryquerylanguage/contexts/tqltraces/traces.go @@ -450,7 +450,7 @@ func parseSpanID(spanIDStr string) (pcommon.SpanID, error) { } var idArr [8]byte copy(idArr[:8], id) - return pcommon.NewSpanID(idArr), nil + return pcommon.SpanID(idArr), nil } func parseTraceID(traceIDStr string) (pcommon.TraceID, error) { @@ -463,5 +463,5 @@ func parseTraceID(traceIDStr string) (pcommon.TraceID, error) { } var idArr [16]byte copy(idArr[:16], id) - return pcommon.NewTraceID(idArr), nil + return pcommon.TraceID(idArr), nil } diff --git a/pkg/telemetryquerylanguage/contexts/tqltraces/traces_test.go b/pkg/telemetryquerylanguage/contexts/tqltraces/traces_test.go index 8d022810ec33..c5beb621cce0 100644 --- a/pkg/telemetryquerylanguage/contexts/tqltraces/traces_test.go +++ b/pkg/telemetryquerylanguage/contexts/tqltraces/traces_test.go @@ -44,7 +44,7 @@ func Test_newPathGetSetter(t *testing.T) { newEvents.AppendEmpty().SetName("new event") newLinks := ptrace.NewSpanLinkSlice() - newLinks.AppendEmpty().SetSpanID(pcommon.NewSpanID(spanID2)) + newLinks.AppendEmpty().SetSpanID(spanID2) newStatus := ptrace.NewSpanStatus() newStatus.SetMessage("new status") @@ -63,10 +63,10 @@ func Test_newPathGetSetter(t *testing.T) { Name: "trace_id", }, }, - orig: pcommon.NewTraceID(traceID), - newVal: pcommon.NewTraceID(traceID2), + orig: pcommon.TraceID(traceID), + newVal: pcommon.TraceID(traceID2), modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.SetTraceID(pcommon.NewTraceID(traceID2)) + span.SetTraceID(traceID2) }, }, { @@ -76,10 +76,10 @@ func Test_newPathGetSetter(t *testing.T) { Name: "span_id", }, }, - orig: pcommon.NewSpanID(spanID), - newVal: pcommon.NewSpanID(spanID2), + orig: pcommon.SpanID(spanID), + newVal: pcommon.SpanID(spanID2), modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.SetSpanID(pcommon.NewSpanID(spanID2)) + span.SetSpanID(spanID2) }, }, { @@ -95,7 +95,7 @@ func Test_newPathGetSetter(t *testing.T) { orig: hex.EncodeToString(traceID[:]), newVal: hex.EncodeToString(traceID2[:]), modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.SetTraceID(pcommon.NewTraceID(traceID2)) + span.SetTraceID(traceID2) }, }, { @@ -111,7 +111,7 @@ func Test_newPathGetSetter(t *testing.T) { orig: hex.EncodeToString(spanID[:]), newVal: hex.EncodeToString(spanID2[:]), modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.SetSpanID(pcommon.NewSpanID(spanID2)) + span.SetSpanID(spanID2) }, }, { @@ -148,10 +148,10 @@ func Test_newPathGetSetter(t *testing.T) { Name: "parent_span_id", }, }, - orig: pcommon.NewSpanID(spanID2), - newVal: pcommon.NewSpanID(spanID), + orig: pcommon.SpanID(spanID2), + newVal: pcommon.SpanID(spanID), modified: func(span ptrace.Span, il pcommon.InstrumentationScope, resource pcommon.Resource) { - span.SetParentSpanID(pcommon.NewSpanID(spanID)) + span.SetParentSpanID(spanID) }, }, { @@ -542,10 +542,10 @@ func Test_newPathGetSetter(t *testing.T) { func createTelemetry() (ptrace.Span, pcommon.InstrumentationScope, pcommon.Resource) { span := ptrace.NewSpan() - span.SetTraceID(pcommon.NewTraceID(traceID)) - span.SetSpanID(pcommon.NewSpanID(spanID)) + span.SetTraceID(traceID) + span.SetSpanID(spanID) span.SetTraceState("key1=val1,key2=val2") - span.SetParentSpanID(pcommon.NewSpanID(spanID2)) + span.SetParentSpanID(spanID2) span.SetName("bear") span.SetKind(ptrace.SpanKindServer) span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.UnixMilli(100))) @@ -581,7 +581,7 @@ func createTelemetry() (ptrace.Span, pcommon.InstrumentationScope, pcommon.Resou span.Events().AppendEmpty().SetName("event") span.SetDroppedEventsCount(20) - span.Links().AppendEmpty().SetTraceID(pcommon.NewTraceID(traceID)) + span.Links().AppendEmpty().SetTraceID(traceID) span.SetDroppedLinksCount(30) span.Status().SetCode(ptrace.StatusCodeOk) diff --git a/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id.go b/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id.go index 407ca890f391..b2a7eab6faf2 100644 --- a/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id.go +++ b/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id.go @@ -28,7 +28,7 @@ func SpanID(bytes []byte) (tql.ExprFunc, error) { } var idArr [8]byte copy(idArr[:8], bytes) - id := pcommon.NewSpanID(idArr) + id := pcommon.SpanID(idArr) return func(ctx tql.TransformContext) interface{} { return id }, nil diff --git a/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id_test.go b/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id_test.go index 4448a2b00d38..01d5ff0e218f 100644 --- a/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id_test.go +++ b/pkg/telemetryquerylanguage/functions/tqlotel/func_span_id_test.go @@ -32,7 +32,7 @@ func Test_spanID(t *testing.T) { { name: "create span id", bytes: []byte{1, 2, 3, 4, 5, 6, 7, 8}, - want: pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}), + want: pcommon.SpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}), }, } for _, tt := range tests { diff --git a/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id.go b/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id.go index 3619283087f5..905f8309fe53 100644 --- a/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id.go +++ b/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id.go @@ -28,7 +28,7 @@ func TraceID(bytes []byte) (tql.ExprFunc, error) { } var idArr [16]byte copy(idArr[:16], bytes) - id := pcommon.NewTraceID(idArr) + id := pcommon.TraceID(idArr) return func(ctx tql.TransformContext) interface{} { return id }, nil diff --git a/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id_test.go b/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id_test.go index 8cc6155f1eb7..16110a5f3385 100644 --- a/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id_test.go +++ b/pkg/telemetryquerylanguage/functions/tqlotel/func_trace_id_test.go @@ -32,7 +32,7 @@ func Test_traceID(t *testing.T) { { name: "create trace id", bytes: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}, - want: pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), + want: pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), }, } for _, tt := range tests { diff --git a/pkg/telemetryquerylanguage/go.mod b/pkg/telemetryquerylanguage/go.mod index b25516dc7d92..a8cdb21d7f69 100644 --- a/pkg/telemetryquerylanguage/go.mod +++ b/pkg/telemetryquerylanguage/go.mod @@ -6,7 +6,7 @@ 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/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.opentelemetry.io/otel/trace v1.9.0 go.uber.org/multierr v1.8.0 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e diff --git a/pkg/telemetryquerylanguage/go.sum b/pkg/telemetryquerylanguage/go.sum index 59ab857f3a78..86968ef6b5d1 100644 --- a/pkg/telemetryquerylanguage/go.sum +++ b/pkg/telemetryquerylanguage/go.sum @@ -67,8 +67,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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 5d4f25b383b9..e167016a7a22 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.37.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 29d7a01c0257..f6566020229f 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -91,10 +91,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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/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/jaeger/jaegerproto_to_traces_test.go b/pkg/translator/jaeger/jaegerproto_to_traces_test.go index 0229bb682bff..fb57941a5d63 100644 --- a/pkg/translator/jaeger/jaegerproto_to_traces_test.go +++ b/pkg/translator/jaeger/jaegerproto_to_traces_test.go @@ -594,9 +594,9 @@ func generateProtoProcess() *model.Process { func generateTracesOneSpanNoResource() ptrace.Traces { td := testdata.GenerateTracesOneSpanNoResource() span := td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0) - span.SetSpanID(pcommon.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8})) - span.SetTraceID(pcommon.NewTraceID( - [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80})) + span.SetSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) + span.SetTraceID( + [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}) span.SetDroppedAttributesCount(0) span.SetDroppedEventsCount(0) span.SetStartTimestamp(testSpanStartTimestamp) @@ -779,7 +779,7 @@ func generateTracesTwoSpansChildParent() ptrace.Traces { span := spans.AppendEmpty() span.SetName("operationB") - span.SetSpanID(pcommon.NewSpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18})) + span.SetSpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18}) span.SetParentSpanID(spans.At(0).SpanID()) span.SetKind(ptrace.SpanKindServer) span.SetTraceID(spans.At(0).TraceID()) @@ -829,7 +829,7 @@ func generateTracesTwoSpansWithFollower() ptrace.Traces { span := spans.AppendEmpty() span.SetName("operationC") - span.SetSpanID(pcommon.NewSpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18})) + span.SetSpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18}) span.SetTraceID(spans.At(0).TraceID()) span.SetStartTimestamp(spans.At(0).EndTimestamp()) span.SetEndTimestamp(spans.At(0).EndTimestamp() + 1000000) diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index 1c34a5e6384c..439d31e0e4ed 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index a54a05dd5a91..90120624dd2b 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -88,10 +88,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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/pkg/translator/opencensus/oc_to_traces.go b/pkg/translator/opencensus/oc_to_traces.go index ef126fac2e18..67cc11ebe62d 100644 --- a/pkg/translator/opencensus/oc_to_traces.go +++ b/pkg/translator/opencensus/oc_to_traces.go @@ -150,7 +150,7 @@ func ocSpanToInternal(src *octrace.Span, dest ptrace.Span) { func traceIDToInternal(traceID []byte) pcommon.TraceID { tid := [16]byte{} copy(tid[:], traceID) - return pcommon.NewTraceID(tid) + return pcommon.TraceID(tid) } // Transforms the byte slice span ID into a [8]byte internal pcommon.SpanID. @@ -158,7 +158,7 @@ func traceIDToInternal(traceID []byte) pcommon.TraceID { func spanIDToInternal(spanID []byte) pcommon.SpanID { sid := [8]byte{} copy(sid[:], spanID) - return pcommon.NewSpanID(sid) + return pcommon.SpanID(sid) } func ocStatusToInternal(ocStatus *octrace.Status, ocAttrs *octrace.Span_Attributes, dest ptrace.SpanStatus) { diff --git a/pkg/translator/opencensus/traces_to_oc.go b/pkg/translator/opencensus/traces_to_oc.go index 9f1c4ff17d9f..92fc46adcb30 100644 --- a/pkg/translator/opencensus/traces_to_oc.go +++ b/pkg/translator/opencensus/traces_to_oc.go @@ -352,16 +352,14 @@ func traceIDToOC(tid pcommon.TraceID) []byte { if tid.IsEmpty() { return nil } - tidBytes := tid.Bytes() - return tidBytes[:] + return tid[:] } func spanIDToOC(sid pcommon.SpanID) []byte { if sid.IsEmpty() { return nil } - sidBytes := sid.Bytes() - return sidBytes[:] + return sid[:] } func statusToOC(status ptrace.SpanStatus) (*octrace.Status, *octrace.AttributeValue) { diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 55438ebe8294..aea86ecd655e 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index 1f7e8cfe2f5f..ce02b096409e 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/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 ebbd5139a38a..bd272490a3fb 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index 5a5f8945b3bb..17d04b851a7d 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/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/prometheusremotewrite/helper.go b/pkg/translator/prometheusremotewrite/helper.go index aacfce9dbd34..a8d59948b39c 100644 --- a/pkg/translator/prometheusremotewrite/helper.go +++ b/pkg/translator/prometheusremotewrite/helper.go @@ -272,7 +272,7 @@ func addSingleNumberDataPoint(pt pmetric.NumberDataPoint, resource pcommon.Resou case pmetric.NumberDataPointValueTypeDouble: sample.Value = pt.DoubleVal() } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { sample.Value = math.Float64frombits(value.StaleNaN) } addSample(tsMap, sample, labels, metric.DataType().String()) @@ -293,7 +293,7 @@ func addSingleHistogramDataPoint(pt pmetric.HistogramDataPoint, resource pcommon Value: pt.Sum(), Timestamp: time, } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { sum.Value = math.Float64frombits(value.StaleNaN) } @@ -306,7 +306,7 @@ func addSingleHistogramDataPoint(pt pmetric.HistogramDataPoint, resource pcommon Value: float64(pt.Count()), Timestamp: time, } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { count.Value = math.Float64frombits(value.StaleNaN) } @@ -330,7 +330,7 @@ func addSingleHistogramDataPoint(pt pmetric.HistogramDataPoint, resource pcommon Value: float64(cumulativeCount), Timestamp: time, } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { bucket.Value = math.Float64frombits(value.StaleNaN) } boundStr := strconv.FormatFloat(bound, 'f', -1, 64) @@ -343,7 +343,7 @@ func addSingleHistogramDataPoint(pt pmetric.HistogramDataPoint, resource pcommon infBucket := &prompb.Sample{ Timestamp: time, } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { infBucket.Value = math.Float64frombits(value.StaleNaN) } else { if pt.BucketCounts().Len() > 0 { @@ -460,7 +460,7 @@ func addSingleSummaryDataPoint(pt pmetric.SummaryDataPoint, resource pcommon.Res Value: pt.Sum(), Timestamp: time, } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { sum.Value = math.Float64frombits(value.StaleNaN) } sumlabels := createAttributes(resource, pt.Attributes(), settings.ExternalLabels, nameStr, baseName+sumStr) @@ -471,7 +471,7 @@ func addSingleSummaryDataPoint(pt pmetric.SummaryDataPoint, resource pcommon.Res Value: float64(pt.Count()), Timestamp: time, } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { count.Value = math.Float64frombits(value.StaleNaN) } countlabels := createAttributes(resource, pt.Attributes(), settings.ExternalLabels, nameStr, baseName+countStr) @@ -484,7 +484,7 @@ func addSingleSummaryDataPoint(pt pmetric.SummaryDataPoint, resource pcommon.Res Value: qt.Value(), Timestamp: time, } - if pt.FlagsImmutable().NoRecordedValue() { + if pt.Flags().NoRecordedValue() { quantile.Value = math.Float64frombits(value.StaleNaN) } percentileStr := strconv.FormatFloat(qt.Quantile(), 'f', -1, 64) diff --git a/pkg/translator/prometheusremotewrite/testutils_test.go b/pkg/translator/prometheusremotewrite/testutils_test.go index 2d15823d73e5..7025cbc6c9e0 100644 --- a/pkg/translator/prometheusremotewrite/testutils_test.go +++ b/pkg/translator/prometheusremotewrite/testutils_test.go @@ -227,14 +227,14 @@ func getHistogramDataPointWithExemplars(t *testing.T, time time.Time, value floa traceIDBytesSlice, err := hex.DecodeString(traceID) require.NoErrorf(t, err, "error decoding trace id: %v", err) copy(traceIDBytes[:], traceIDBytesSlice) - e.SetTraceID(pcommon.NewTraceID(traceIDBytes)) + e.SetTraceID(traceIDBytes) } if spanID != "" { var spanIDBytes [8]byte spanIDBytesSlice, err := hex.DecodeString(spanID) require.NoErrorf(t, err, "error decoding span id: %v", err) copy(spanIDBytes[:], spanIDBytesSlice) - e.SetSpanID(pcommon.NewSpanID(spanIDBytes)) + e.SetSpanID(spanIDBytes) } return &h @@ -272,7 +272,7 @@ func getIntGaugeMetric(name string, attributes pcommon.Map, value int64, ts uint metric.SetDataType(pmetric.MetricDataTypeGauge) dp := metric.Gauge().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetIntVal(value) attributes.CopyTo(dp.Attributes()) @@ -288,7 +288,7 @@ func getDoubleGaugeMetric(name string, attributes pcommon.Map, value float64, ts metric.SetDataType(pmetric.MetricDataTypeGauge) dp := metric.Gauge().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetDoubleVal(value) attributes.CopyTo(dp.Attributes()) @@ -312,7 +312,7 @@ func getIntSumMetric(name string, attributes pcommon.Map, value int64, ts uint64 metric.Sum().SetAggregationTemporality(pmetric.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetIntVal(value) attributes.CopyTo(dp.Attributes()) @@ -337,7 +337,7 @@ func getSumMetric(name string, attributes pcommon.Map, value float64, ts uint64) metric.Sum().SetAggregationTemporality(pmetric.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetDoubleVal(value) attributes.CopyTo(dp.Attributes()) @@ -370,7 +370,7 @@ func getHistogramMetric(name string, attributes pcommon.Map, ts uint64, sum floa metric.Histogram().SetAggregationTemporality(pmetric.MetricAggregationTemporalityCumulative) dp := metric.Histogram().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetCount(count) dp.SetSum(sum) @@ -395,7 +395,7 @@ func getSummaryMetric(name string, attributes pcommon.Map, ts uint64, sum float6 metric.SetDataType(pmetric.MetricDataTypeSummary) dp := metric.Summary().DataPoints().AppendEmpty() if strings.HasPrefix(name, "staleNaN") { - dp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + dp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } dp.SetCount(count) dp.SetSum(sum) diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index 4d8136d3bb4b..9e2878774a33 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.59.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index c6a4b22891a4..1c743d7e49df 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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/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 8c2067a4ceb7..4d105a0f472e 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.59.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index a5df2c4dc78d..ee3ff0a80817 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -157,10 +157,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.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/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/zipkinv1/json.go b/pkg/translator/zipkin/zipkinv1/json.go index cccda031d967..70fa4e3dba18 100644 --- a/pkg/translator/zipkin/zipkinv1/json.go +++ b/pkg/translator/zipkin/zipkinv1/json.go @@ -436,7 +436,7 @@ func hexTraceIDToOCTraceID(hex string) ([]byte, error) { return nil, errHexTraceIDZero } - tidBytes := idutils.UInt64ToTraceID(high, low).Bytes() + tidBytes := idutils.UInt64ToTraceID(high, low) return tidBytes[:], nil } @@ -455,7 +455,7 @@ func hexIDToOCID(hex string) ([]byte, error) { return nil, errHexIDZero } - idBytes := idutils.UInt64ToSpanID(idValue).Bytes() + idBytes := idutils.UInt64ToSpanID(idValue) return idBytes[:], nil } diff --git a/pkg/translator/zipkin/zipkinv1/thrift.go b/pkg/translator/zipkin/zipkinv1/thrift.go index 46c991da91a1..51ca0cdd71f3 100644 --- a/pkg/translator/zipkin/zipkinv1/thrift.go +++ b/pkg/translator/zipkin/zipkinv1/thrift.go @@ -77,11 +77,11 @@ func zipkinV1ThriftToOCSpan(zSpan *zipkincore.Span) (*tracepb.Span, *annotationP // failures on the receivers in general are silent at this moment, so letting them // proceed for now. We should validate the traceID, spanID and parentID are good with // OC proto requirements. - traceID := idutils.UInt64ToTraceID(uint64(traceIDHigh), uint64(zSpan.TraceID)).Bytes() - spanID := idutils.UInt64ToSpanID(uint64(zSpan.ID)).Bytes() + traceID := idutils.UInt64ToTraceID(uint64(traceIDHigh), uint64(zSpan.TraceID)) + spanID := idutils.UInt64ToSpanID(uint64(zSpan.ID)) var parentID []byte if zSpan.ParentID != nil { - parentIDBytes := idutils.UInt64ToSpanID(uint64(*zSpan.ParentID)).Bytes() + parentIDBytes := idutils.UInt64ToSpanID(uint64(*zSpan.ParentID)) parentID = parentIDBytes[:] } diff --git a/pkg/translator/zipkin/zipkinv2/from_translator_test.go b/pkg/translator/zipkin/zipkinv2/from_translator_test.go index b9bbb8aad628..aeffd8cefc77 100644 --- a/pkg/translator/zipkin/zipkinv2/from_translator_test.go +++ b/pkg/translator/zipkin/zipkinv2/from_translator_test.go @@ -150,9 +150,9 @@ func findSpanByID(rs ptrace.ResourceSpansSlice, spanID pcommon.SpanID) *ptrace.S func generateTraceOneSpanOneTraceID(status ptrace.StatusCode) ptrace.Traces { td := testdata.GenerateTracesOneSpan() span := td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0) - span.SetTraceID(pcommon.NewTraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10})) - span.SetSpanID(pcommon.NewSpanID([8]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08})) + span.SetTraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}) + span.SetSpanID([8]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}) switch status { case ptrace.StatusCodeError: span.Status().SetCode(ptrace.StatusCodeError) diff --git a/pkg/translator/zipkin/zipkinv2/to_translator.go b/pkg/translator/zipkin/zipkinv2/to_translator.go index 0f444d75858e..f1b56eb9ba5d 100644 --- a/pkg/translator/zipkin/zipkinv2/to_translator.go +++ b/pkg/translator/zipkin/zipkinv2/to_translator.go @@ -217,7 +217,7 @@ func zTagsToSpanLinks(tags map[string]string, dest ptrace.SpanLinkSlice) error { if errTrace != nil { return errTrace } - link.SetTraceID(pcommon.NewTraceID(rawTrace)) + link.SetTraceID(rawTrace) // Convert span id. rawSpan := [8]byte{} @@ -225,7 +225,7 @@ func zTagsToSpanLinks(tags map[string]string, dest ptrace.SpanLinkSlice) error { if errSpan != nil { return errSpan } - link.SetSpanID(pcommon.NewSpanID(rawSpan)) + link.SetSpanID(rawSpan) link.SetTraceState(ptrace.TraceState(parts[2])) diff --git a/pkg/translator/zipkin/zipkinv2/to_translator_test.go b/pkg/translator/zipkin/zipkinv2/to_translator_test.go index 224b95127cb7..77d980b9b07f 100644 --- a/pkg/translator/zipkin/zipkinv2/to_translator_test.go +++ b/pkg/translator/zipkin/zipkinv2/to_translator_test.go @@ -20,7 +20,6 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -75,8 +74,8 @@ func generateSpanNoEndpoints() []*zipkinmodel.SpanModel { spans[0] = &zipkinmodel.SpanModel{ SpanContext: zipkinmodel.SpanContext{ TraceID: convertTraceID( - pcommon.NewTraceID([16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80})), - ID: convertSpanID(pcommon.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8})), + [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}), + ID: convertSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}), }, Name: "MinimalData", Kind: zipkinmodel.Client, @@ -110,8 +109,8 @@ func generateTraceSingleSpanNoResourceOrInstrLibrary() ptrace.Traces { td := ptrace.NewTraces() span := td.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty() span.SetTraceID( - pcommon.NewTraceID([16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80})) - span.SetSpanID(pcommon.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8})) + [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}) + span.SetSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) span.SetName("MinimalData") span.SetKind(ptrace.SpanKindClient) span.SetStartTimestamp(1596911098294000000) @@ -131,8 +130,8 @@ func generateTraceSingleSpanErrorStatus() ptrace.Traces { td := ptrace.NewTraces() span := td.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty() span.SetTraceID( - pcommon.NewTraceID([16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80})) - span.SetSpanID(pcommon.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8})) + [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}) + span.SetSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) span.SetName("MinimalData") span.SetKind(ptrace.SpanKindClient) span.SetStartTimestamp(1596911098294000000) @@ -147,8 +146,8 @@ func TestV2SpanWithoutTimestampGetsTag(t *testing.T) { spans[0] = &zipkinmodel.SpanModel{ SpanContext: zipkinmodel.SpanContext{ TraceID: convertTraceID( - pcommon.NewTraceID([16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80})), - ID: convertSpanID(pcommon.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8})), + [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}), + ID: convertSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}), }, Name: "NoTimestamps", Kind: zipkinmodel.Client, diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index b3f2b808d0af..4a4992cfcfd9 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index d85c4ef9a60c..74b1440e0967 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index fb3653925579..3f0938badd6d 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 09bcbc7115c8..1486a32fe4fc 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -267,10 +267,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 180b880e9e34..0eca890fc6b6 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index c51e94cfd789..0f410c928c45 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 82fd636db99c..7ab25c4069ad 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index d85c4ef9a60c..74b1440e0967 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index d4472dcbfeda..8cb620c84b14 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 42dd84d9fe96..a060d8a5e340 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/groupbytraceprocessor/event.go b/processor/groupbytraceprocessor/event.go index 9e22f79797df..e6b516bc4fa7 100644 --- a/processor/groupbytraceprocessor/event.go +++ b/processor/groupbytraceprocessor/event.go @@ -249,8 +249,7 @@ func workerIndexForTraceID(traceID pcommon.TraceID, numWorkers int) uint64 { hashPool.Put(hash) }() - bytes := traceID.Bytes() - _, _ = hash.Write(bytes[:]) + _, _ = hash.Write(traceID[:]) return hash.Sum64() % uint64(numWorkers) } @@ -365,17 +364,17 @@ func doWithTimeout(timeout time.Duration, do func() error) (bool, error) { func getTraceID(td ptrace.Traces) (pcommon.TraceID, error) { rss := td.ResourceSpans() if rss.Len() == 0 { - return pcommon.EmptyTraceID, errNoTraceID + return pcommon.NewTraceIDEmpty(), errNoTraceID } ilss := rss.At(0).ScopeSpans() if ilss.Len() == 0 { - return pcommon.EmptyTraceID, errNoTraceID + return pcommon.NewTraceIDEmpty(), errNoTraceID } spans := ilss.At(0).Spans() if spans.Len() == 0 { - return pcommon.EmptyTraceID, errNoTraceID + return pcommon.NewTraceIDEmpty(), errNoTraceID } return spans.At(0).TraceID(), nil diff --git a/processor/groupbytraceprocessor/event_test.go b/processor/groupbytraceprocessor/event_test.go index d30f458ac58f..d388195df52f 100644 --- a/processor/groupbytraceprocessor/event_test.go +++ b/processor/groupbytraceprocessor/event_test.go @@ -41,7 +41,7 @@ func TestEventCallback(t *testing.T) { { casename: "onTraceReceived", typ: traceReceived, - payload: tracesWithID{id: pcommon.EmptyTraceID, td: ptrace.NewTraces()}, + payload: tracesWithID{id: pcommon.NewTraceIDEmpty(), td: ptrace.NewTraces()}, registerCallback: func(em *eventMachine, wg *sync.WaitGroup) { em.onTraceReceived = func(received tracesWithID, worker *eventMachineWorker) error { wg.Done() @@ -52,11 +52,11 @@ func TestEventCallback(t *testing.T) { { casename: "onTraceExpired", typ: traceExpired, - payload: pcommon.NewTraceID([16]byte{1, 2, 3, 4}), + payload: pcommon.TraceID([16]byte{1, 2, 3, 4}), registerCallback: func(em *eventMachine, wg *sync.WaitGroup) { em.onTraceExpired = func(expired pcommon.TraceID, worker *eventMachineWorker) error { wg.Done() - assert.Equal(t, pcommon.NewTraceID([16]byte{1, 2, 3, 4}), expired) + assert.Equal(t, pcommon.TraceID([16]byte{1, 2, 3, 4}), expired) return nil } }, @@ -75,11 +75,11 @@ func TestEventCallback(t *testing.T) { { casename: "onTraceRemoved", typ: traceRemoved, - payload: pcommon.NewTraceID([16]byte{1, 2, 3, 4}), + payload: pcommon.TraceID([16]byte{1, 2, 3, 4}), registerCallback: func(em *eventMachine, wg *sync.WaitGroup) { em.onTraceRemoved = func(expired pcommon.TraceID) error { wg.Done() - assert.Equal(t, pcommon.NewTraceID([16]byte{1, 2, 3, 4}), expired) + assert.Equal(t, pcommon.TraceID([16]byte{1, 2, 3, 4}), expired) return nil } }, @@ -284,7 +284,7 @@ func TestEventTracePerWorker(t *testing.T) { workerForTrace = w w.fire(event{ typ: traceExpired, - payload: pcommon.NewTraceID([16]byte{1}), + payload: pcommon.TraceID([16]byte{1}), }) return nil } @@ -300,7 +300,7 @@ func TestEventTracePerWorker(t *testing.T) { ils := td.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty() if tt.traceID != [16]byte{} { span := ils.Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID(tt.traceID)) + span.SetTraceID(tt.traceID) } // test @@ -336,14 +336,14 @@ func TestEventConsumeConsistency(t *testing.T) { }, } { t.Run(tt.casename, func(t *testing.T) { - realTraceID := workerIndexForTraceID(pcommon.NewTraceID(tt.traceID), 100) + realTraceID := workerIndexForTraceID(pcommon.TraceID(tt.traceID), 100) var wg sync.WaitGroup for i := 0; i < 50; i++ { wg.Add(1) go func() { defer wg.Done() for j := 0; j < 30; j++ { - assert.Equal(t, realTraceID, workerIndexForTraceID(pcommon.NewTraceID(tt.traceID), 100)) + assert.Equal(t, realTraceID, workerIndexForTraceID(pcommon.TraceID(tt.traceID), 100)) } }() } @@ -377,15 +377,15 @@ func TestEventShutdown(t *testing.T) { // test em.workers[0].fire(event{ typ: traceReceived, - payload: tracesWithID{id: pcommon.EmptyTraceID, td: ptrace.NewTraces()}, + payload: tracesWithID{id: pcommon.NewTraceIDEmpty(), td: ptrace.NewTraces()}, }) em.workers[0].fire(event{ typ: traceRemoved, - payload: pcommon.NewTraceID([16]byte{1, 2, 3, 4}), + payload: pcommon.TraceID([16]byte{1, 2, 3, 4}), }) em.workers[0].fire(event{ typ: traceRemoved, - payload: pcommon.NewTraceID([16]byte{1, 2, 3, 4}), + payload: pcommon.TraceID([16]byte{1, 2, 3, 4}), }) time.Sleep(10 * time.Millisecond) // give it a bit of time to process the items @@ -406,7 +406,7 @@ func TestEventShutdown(t *testing.T) { // new events should *not* be processed em.workers[0].fire(event{ typ: traceExpired, - payload: pcommon.NewTraceID([16]byte{1, 2, 3, 4}), + payload: pcommon.TraceID([16]byte{1, 2, 3, 4}), }) // verify diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index bd1f7e65d73d..6b7c74be93c6 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 42dd84d9fe96..a060d8a5e340 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/groupbytraceprocessor/processor_test.go b/processor/groupbytraceprocessor/processor_test.go index 8127a0c3ed81..7c1ce6fa9016 100644 --- a/processor/groupbytraceprocessor/processor_test.go +++ b/processor/groupbytraceprocessor/processor_test.go @@ -126,7 +126,7 @@ func TestInternalCacheLimit(t *testing.T) { // 6 iterations for _, traceID := range traceIDs { - batch := simpleTracesWithID(pcommon.NewTraceID(traceID)) + batch := simpleTracesWithID(pcommon.TraceID(traceID)) assert.NoError(t, p.ConsumeTraces(ctx, batch)) } @@ -136,7 +136,7 @@ func TestInternalCacheLimit(t *testing.T) { assert.Equal(t, 5, len(receivedTraceIDs)) for i := 5; i > 0; i-- { // last 5 traces - traceID := pcommon.NewTraceID(traceIDs[i]) + traceID := pcommon.TraceID(traceIDs[i]) assert.Contains(t, receivedTraceIDs, traceID) } @@ -173,14 +173,14 @@ func TestProcessBatchDoesntFail(t *testing.T) { st := newMemoryStorage() next := &mockProcessor{} - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) trace := ptrace.NewTraces() rs := trace.ResourceSpans().AppendEmpty() ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4})) + span.SetSpanID([8]byte{1, 2, 3, 4}) p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) assert.NotNil(t, p) @@ -206,7 +206,7 @@ func TestTraceDisappearedFromStorageBeforeReleasing(t *testing.T) { p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) require.NotNil(t, p) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) batch := simpleTracesWithID(traceID) ctx := context.Background() @@ -244,7 +244,7 @@ func TestTraceErrorFromStorageWhileReleasing(t *testing.T) { p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) require.NotNil(t, p) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) batch := simpleTracesWithID(traceID) ctx := context.Background() @@ -282,7 +282,7 @@ func TestTraceErrorFromStorageWhileProcessingTrace(t *testing.T) { p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) require.NotNil(t, p) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) trace := ptrace.NewTraces() rss := trace.ResourceSpans() @@ -290,7 +290,7 @@ func TestTraceErrorFromStorageWhileProcessingTrace(t *testing.T) { ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4})) + span.SetSpanID([8]byte{1, 2, 3, 4}) batch := batchpersignal.SplitTraces(trace) @@ -331,7 +331,7 @@ func TestAddSpansToExistingTrace(t *testing.T) { assert.NoError(t, p.Shutdown(ctx)) }() - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) // test first := simpleTracesWithID(traceID) @@ -364,7 +364,7 @@ func TestTraceErrorFromStorageWhileProcessingSecondTrace(t *testing.T) { p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) require.NotNil(t, p) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) trace := ptrace.NewTraces() rss := trace.ResourceSpans() @@ -372,7 +372,7 @@ func TestTraceErrorFromStorageWhileProcessingSecondTrace(t *testing.T) { ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4})) + span.SetSpanID([8]byte{1, 2, 3, 4}) batch := batchpersignal.SplitTraces(trace) @@ -412,7 +412,7 @@ func TestErrorFromStorageWhileRemovingTrace(t *testing.T) { p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) require.NotNil(t, p) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) // test err := p.onTraceRemoved(traceID) @@ -438,7 +438,7 @@ func TestTraceNotFoundWhileRemovingTrace(t *testing.T) { p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) require.NotNil(t, p) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) // test err := p.onTraceRemoved(traceID) @@ -475,7 +475,7 @@ func TestTracesAreDispatchedInIndividualBatches(t *testing.T) { assert.NoError(t, p.Shutdown(ctx)) }() - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) firstTrace := ptrace.NewTraces() firstRss := firstTrace.ResourceSpans() @@ -484,7 +484,7 @@ func TestTracesAreDispatchedInIndividualBatches(t *testing.T) { span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - secondTraceID := pcommon.NewTraceID([16]byte{2, 3, 4, 5}) + secondTraceID := pcommon.TraceID([16]byte{2, 3, 4, 5}) secondTrace := ptrace.NewTraces() secondRss := secondTrace.ResourceSpans() secondResourceSpans := secondRss.AppendEmpty() @@ -517,7 +517,7 @@ func TestErrorOnProcessResourceSpansContinuesProcessing(t *testing.T) { p := newGroupByTraceProcessor(zap.NewNop(), st, next, config) require.NotNil(t, p) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) trace := ptrace.NewTraces() rss := trace.ResourceSpans() @@ -525,7 +525,7 @@ func TestErrorOnProcessResourceSpansContinuesProcessing(t *testing.T) { ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4})) + span.SetSpanID([8]byte{1, 2, 3, 4}) expectedError := errors.New("some unexpected error") returnedError := false @@ -581,7 +581,7 @@ func BenchmarkConsumeTracesCompleteOnFirstBatch(b *testing.B) { }() for n := 0; n < b.N; n++ { - traceID := pcommon.NewTraceID([16]byte{byte(1 + n), 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{byte(1 + n), 2, 3, 4}) trace := simpleTracesWithID(traceID) assert.NoError(b, p.ConsumeTraces(context.Background(), trace)) } @@ -668,7 +668,7 @@ func (b *blockingConsumer) ConsumeTraces(context.Context, ptrace.Traces) error { } func simpleTraces() ptrace.Traces { - return simpleTracesWithID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + return simpleTracesWithID(pcommon.TraceID([16]byte{1, 2, 3, 4})) } func simpleTracesWithID(traceID pcommon.TraceID) ptrace.Traces { diff --git a/processor/groupbytraceprocessor/ring_buffer.go b/processor/groupbytraceprocessor/ring_buffer.go index e27a42a108b5..b41ebf32ddd8 100644 --- a/processor/groupbytraceprocessor/ring_buffer.go +++ b/processor/groupbytraceprocessor/ring_buffer.go @@ -64,6 +64,6 @@ func (r *ringBuffer) delete(traceID pcommon.TraceID) bool { } delete(r.idToIndex, traceID) - r.ids[index] = pcommon.EmptyTraceID + r.ids[index] = pcommon.NewTraceIDEmpty() return true } diff --git a/processor/groupbytraceprocessor/ring_buffer_test.go b/processor/groupbytraceprocessor/ring_buffer_test.go index 40ac28e01573..8dfcd80c875f 100644 --- a/processor/groupbytraceprocessor/ring_buffer_test.go +++ b/processor/groupbytraceprocessor/ring_buffer_test.go @@ -27,12 +27,12 @@ func TestRingBufferCapacity(t *testing.T) { // test traceIDs := []pcommon.TraceID{ - pcommon.NewTraceID([16]byte{1, 2, 3, 4}), - pcommon.NewTraceID([16]byte{2, 3, 4, 5}), - pcommon.NewTraceID([16]byte{3, 4, 5, 6}), - pcommon.NewTraceID([16]byte{4, 5, 6, 7}), - pcommon.NewTraceID([16]byte{5, 6, 7, 8}), - pcommon.NewTraceID([16]byte{6, 7, 8, 9}), + pcommon.TraceID([16]byte{1, 2, 3, 4}), + pcommon.TraceID([16]byte{2, 3, 4, 5}), + pcommon.TraceID([16]byte{3, 4, 5, 6}), + pcommon.TraceID([16]byte{4, 5, 6, 7}), + pcommon.TraceID([16]byte{5, 6, 7, 8}), + pcommon.TraceID([16]byte{6, 7, 8, 9}), } for _, traceID := range traceIDs { buffer.put(traceID) @@ -51,7 +51,7 @@ func TestRingBufferCapacity(t *testing.T) { func TestDeleteFromBuffer(t *testing.T) { // prepare buffer := newRingBuffer(2) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) buffer.put(traceID) // test @@ -65,7 +65,7 @@ func TestDeleteFromBuffer(t *testing.T) { func TestDeleteNonExistingFromBuffer(t *testing.T) { // prepare buffer := newRingBuffer(2) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) // test deleted := buffer.delete(traceID) diff --git a/processor/groupbytraceprocessor/storage_memory_test.go b/processor/groupbytraceprocessor/storage_memory_test.go index d7b707187dbd..cd40ef9efdb2 100644 --- a/processor/groupbytraceprocessor/storage_memory_test.go +++ b/processor/groupbytraceprocessor/storage_memory_test.go @@ -28,8 +28,8 @@ func TestMemoryCreateAndGetTrace(t *testing.T) { st := newMemoryStorage() traceIDs := []pcommon.TraceID{ - pcommon.NewTraceID([16]byte{1, 2, 3, 4}), - pcommon.NewTraceID([16]byte{2, 3, 4, 5}), + pcommon.TraceID([16]byte{1, 2, 3, 4}), + pcommon.TraceID([16]byte{2, 3, 4, 5}), } baseTrace := ptrace.NewTraces() @@ -62,7 +62,7 @@ func TestMemoryDeleteTrace(t *testing.T) { // prepare st := newMemoryStorage() - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) trace := ptrace.NewTraces() rss := trace.ResourceSpans() @@ -89,7 +89,7 @@ func TestMemoryAppendSpans(t *testing.T) { // prepare st := newMemoryStorage() - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) trace := ptrace.NewTraces() rss := trace.ResourceSpans() @@ -97,7 +97,7 @@ func TestMemoryAppendSpans(t *testing.T) { ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4})) + span.SetSpanID([8]byte{1, 2, 3, 4}) assert.NoError(t, st.createOrAppend(traceID, trace)) @@ -108,7 +108,7 @@ func TestMemoryAppendSpans(t *testing.T) { secondSpan := secondIls.Spans().AppendEmpty() secondSpan.SetName("second-name") secondSpan.SetTraceID(traceID) - secondSpan.SetSpanID(pcommon.NewSpanID([8]byte{5, 6, 7, 8})) + secondSpan.SetSpanID([8]byte{5, 6, 7, 8}) expected := []ptrace.ResourceSpans{ ptrace.NewResourceSpans(), @@ -139,7 +139,7 @@ func TestMemoryAppendSpans(t *testing.T) { func TestMemoryTraceIsBeingCloned(t *testing.T) { // prepare st := newMemoryStorage() - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4}) trace := ptrace.NewTraces() rss := trace.ResourceSpans() @@ -147,7 +147,7 @@ func TestMemoryTraceIsBeingCloned(t *testing.T) { ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4})) + span.SetSpanID([8]byte{1, 2, 3, 4}) span.SetName("should-not-be-changed") // test diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 77e31917c691..e63a9eb5f660 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index a4a8baf79e23..ccc91d110319 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index a8a3449f323c..8916682c9305 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index bb9795304d7a..73fb56032959 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/logstransformprocessor/processor_test.go b/processor/logstransformprocessor/processor_test.go index 35d13e3f42b7..44bf8066643c 100644 --- a/processor/logstransformprocessor/processor_test.go +++ b/processor/logstransformprocessor/processor_test.go @@ -81,8 +81,8 @@ var skip = func(t *testing.T, why string) { func TestLogsTransformProcessor(t *testing.T) { skip(t, "Flaky Test - See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/9761") baseMessage := pcommon.NewValueString("2022-01-01 01:02:03 INFO this is a test message") - spanID := pcommon.NewSpanID([8]byte{0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff}) - traceID := pcommon.NewTraceID([16]byte{0x48, 0x01, 0x40, 0xf3, 0xd7, 0x70, 0xa5, 0xae, 0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff}) + spanID := pcommon.SpanID([8]byte{0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff}) + traceID := pcommon.TraceID([16]byte{0x48, 0x01, 0x40, 0xf3, 0xd7, 0x70, 0xa5, 0xae, 0x32, 0xf0, 0xa2, 0x2b, 0x6a, 0x81, 0x2c, 0xff}) infoSeverityText := "Info" tests := []struct { @@ -200,7 +200,7 @@ func generateLogData(messages []testLogMessage) plog.Logs { log.SetTraceID(content.traceID) if content.flags != uint32(0x00) { - log.SetFlagsStruct(plog.LogRecordFlags(content.flags)) + log.SetFlags(plog.LogRecordFlags(content.flags)) } } diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 2c851e07d34c..c95bc90fb9bb 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index c51e94cfd789..0f410c928c45 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 110cc82f7a81..137cf1be25d6 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 51252d2221a2..2c02632248c9 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/metricstransformprocessor/operation_aggregate_labels.go b/processor/metricstransformprocessor/operation_aggregate_labels.go index e36ed977ad05..77fd1d673445 100644 --- a/processor/metricstransformprocessor/operation_aggregate_labels.go +++ b/processor/metricstransformprocessor/operation_aggregate_labels.go @@ -119,7 +119,7 @@ func groupHistogramDataPoints(dps pmetric.HistogramDataPointSlice, useStartTime keyHashParts = append(keyHashParts, dp.StartTimestamp().String()) } - keyHashParts = append(keyHashParts, dp.HasMin(), dp.HasMax(), uint32(dp.FlagsImmutable())) + keyHashParts = append(keyHashParts, dp.HasMin(), dp.HasMax(), uint32(dp.Flags())) key := dataPointHashKey(dps.At(i).Attributes(), dp.Timestamp(), keyHashParts...) if _, ok := dpsByAttrsAndTs[key]; !ok { dpsByAttrsAndTs[key] = pmetric.NewHistogramDataPointSlice() @@ -133,7 +133,7 @@ func groupExponentialHistogramDataPoints(dps pmetric.ExponentialHistogramDataPoi for i := 0; i < dps.Len(); i++ { dp := dps.At(i) keyHashParts := make([]interface{}, 0, 5) - keyHashParts = append(keyHashParts, dp.Scale(), dp.HasMin(), dp.HasMax(), uint32(dp.FlagsImmutable()), dp.Negative().Offset(), + keyHashParts = append(keyHashParts, dp.Scale(), dp.HasMin(), dp.HasMax(), uint32(dp.Flags()), dp.Negative().Offset(), dp.Positive().Offset()) if useStartTime { keyHashParts = append(keyHashParts, dp.StartTimestamp().String()) diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 7dd786d03808..6cff101a0ae7 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index ae95d76eba08..ebe77f30420b 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -266,12 +266,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler.go b/processor/probabilisticsamplerprocessor/probabilisticsampler.go index 79ac7cbeff58..a282d2f34f5f 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler.go @@ -87,7 +87,7 @@ func (tsp *tracesamplerprocessor) processTraces(_ context.Context, td ptrace.Tra // If one assumes random trace ids hashing may seems avoidable, however, traces can be coming from sources // with various different criteria to generate trace id and perhaps were already sampled without hashing. // Hashing here prevents bias due to such systems. - tidBytes := s.TraceID().Bytes() + tidBytes := s.TraceID() sampled := sp == mustSampleSpan || hash(tidBytes[:], tsp.hashSeed)&bitMaskHashBuckets < tsp.scaledSamplingRate return !sampled diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go index 357949e7fb78..bd097e46c0a6 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go @@ -440,7 +440,7 @@ func Test_hash(t *testing.T) { // collisions, but, of course it is possible that they happen, a different random source // should avoid that. r := rand.New(rand.NewSource(1)) - fullKey := idutils.UInt64ToTraceID(r.Uint64(), r.Uint64()).Bytes() + fullKey := idutils.UInt64ToTraceID(r.Uint64(), r.Uint64()) seen := make(map[uint32]bool) for i := 1; i <= len(fullKey); i++ { key := fullKey[:i] @@ -499,7 +499,7 @@ func assertSampledData(t *testing.T, sampled []ptrace.Traces, serviceName string for k := 0; k < ils.Spans().Len(); k++ { spanCount++ span := ils.Spans().At(k) - key := span.TraceID().Bytes() + key := span.TraceID() if traceIDs[key] { t.Errorf("same traceID used more than once %q", key) return diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index 093fd66a5648..3786c8648553 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index f687ca9818fc..992daa9a021d 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/redactionprocessor/processor_test.go b/processor/redactionprocessor/processor_test.go index da96b509c239..f65061fd0453 100644 --- a/processor/redactionprocessor/processor_test.go +++ b/processor/redactionprocessor/processor_test.go @@ -405,7 +405,7 @@ func runTest( library.SetName("first-library") span := ils.Spans().AppendEmpty() span.SetName("first-batch-first-span") - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + span.SetTraceID([16]byte{1, 2, 3, 4}) length := len(allowed) + len(masked) + len(redacted) for k, v := range allowed { @@ -506,7 +506,7 @@ func runBenchmark( library.SetName("first-library") span := ils.Spans().AppendEmpty() span.SetName("first-batch-first-span") - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + span.SetTraceID([16]byte{1, 2, 3, 4}) for k, v := range allowed { v.CopyTo(span.Attributes().UpsertEmpty(k)) diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 332d7bad96e7..cbbaef6650bd 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.0 diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 83fa106841f3..9cd20b47e907 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -468,12 +468,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 64ed6d90b38b..74a406f77fae 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 438e80847b46..ae9c80ed6fff 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 64e70e515324..bd5108aea80e 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 f955235c54fb..81f98383f761 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -361,10 +361,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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index ee3018a03c29..f00ca2e12cbe 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 54e74ca102e8..ae703a4ea3c8 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/processor/schemaprocessor/transformer_test.go b/processor/schemaprocessor/transformer_test.go index 718c71a163db..fd5d50e68631 100644 --- a/processor/schemaprocessor/transformer_test.go +++ b/processor/schemaprocessor/transformer_test.go @@ -23,7 +23,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -86,7 +85,7 @@ func TestTransformerProcessing(t *testing.T) { s := in.ResourceSpans().At(0).ScopeSpans().At(0).Spans().AppendEmpty() s.SetName("http.request") s.SetKind(ptrace.SpanKindConsumer) - s.SetSpanID(pcommon.NewSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7})) + s.SetSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7}) s.SetTraceState(ptrace.TraceStateEmpty) s.CopyTo(in.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)) diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index 5aa5f8e8596a..31af2d9f1601 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum index c4eddb3bd76f..180455b881fa 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -409,12 +409,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/processor/servicegraphprocessor/processor_test.go b/processor/servicegraphprocessor/processor_test.go index e9509ae72c2b..caed8e8183ac 100644 --- a/processor/servicegraphprocessor/processor_test.go +++ b/processor/servicegraphprocessor/processor_test.go @@ -210,8 +210,8 @@ func sampleTraces() ptrace.Traces { scopeSpans := resourceSpans.ScopeSpans().AppendEmpty() - traceID := pcommon.NewTraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}) - clientSpanID := pcommon.NewSpanID([8]byte{0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) + traceID := pcommon.TraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}) + clientSpanID := pcommon.SpanID([8]byte{0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) clientSpan := scopeSpans.Spans().AppendEmpty() clientSpan.SetName("client span") @@ -224,7 +224,7 @@ func sampleTraces() ptrace.Traces { serverSpan := scopeSpans.Spans().AppendEmpty() serverSpan.SetName("server span") - serverSpan.SetSpanID(pcommon.NewSpanID([8]byte{0x19, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26})) + serverSpan.SetSpanID([8]byte{0x19, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26}) serverSpan.SetTraceID(traceID) serverSpan.SetParentSpanID(clientSpanID) serverSpan.SetKind(ptrace.SpanKindServer) diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 5825fd6070b0..d508821da71f 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 0117ee60beb8..0f961ea3d273 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 80d80c32e679..05ff701e47a4 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -630,7 +630,7 @@ func initSpan(span span, s ptrace.Span) { s.Attributes().UpsertEmpty(nullAttrName) s.Attributes().UpsertEmptyMap(mapAttrName) s.Attributes().UpsertEmptySlice(arrayAttrName) - s.SetTraceID(pcommon.NewTraceID([16]byte{byte(42)})) + s.SetTraceID(pcommon.TraceID([16]byte{byte(42)})) } func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExporter, component.TracesExporter) { diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 948b0abfcfcd..2a6afb5aa672 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 9165b25816fd..4bb3bb12b8b0 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -266,12 +266,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 6960ea777a10..b801b6e9a091 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.opentelemetry.io/otel/trace v1.9.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 c4687df385d2..27fe32f7781c 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/tailsamplingprocessor/internal/idbatcher/id_batcher_test.go b/processor/tailsamplingprocessor/internal/idbatcher/id_batcher_test.go index e87fc28ac05e..3a154bc1e4cf 100644 --- a/processor/tailsamplingprocessor/internal/idbatcher/id_batcher_test.go +++ b/processor/tailsamplingprocessor/internal/idbatcher/id_batcher_test.go @@ -140,11 +140,11 @@ func concurrencyTest(t *testing.T, numBatches, newBatchesInitialCapacity, batchC idSeen := make(map[[16]byte]bool, len(ids)) for _, id := range got { - idSeen[id.Bytes()] = true + idSeen[id] = true } for i := 0; i < len(ids); i++ { - require.True(t, idSeen[ids[i].Bytes()], "want id %v but id was not seen", ids[i]) + require.True(t, idSeen[ids[i]], "want id %v but id was not seen", ids[i]) } } @@ -154,7 +154,7 @@ func generateSequentialIds(numIds uint64) []pcommon.TraceID { traceID := [16]byte{} binary.BigEndian.PutUint64(traceID[:8], 0) binary.BigEndian.PutUint64(traceID[8:], i) - ids[i] = pcommon.NewTraceID(traceID) + ids[i] = pcommon.TraceID(traceID) } return ids } diff --git a/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go b/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go index 18d48e9eb175..254e4b45f08c 100644 --- a/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go @@ -24,7 +24,7 @@ import ( func TestEvaluate_AlwaysSample(t *testing.T) { filter := NewAlwaysSample(zap.NewNop()) - decision, err := filter.Evaluate(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + decision, err := filter.Evaluate(pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), newTraceStringAttrs(pcommon.NewMap(), "example", "value")) assert.Nil(t, err) assert.Equal(t, decision, Sampled) diff --git a/processor/tailsamplingprocessor/internal/sampling/and_test.go b/processor/tailsamplingprocessor/internal/sampling/and_test.go index 65b4b66fbf6c..110f8902d3e7 100644 --- a/processor/tailsamplingprocessor/internal/sampling/and_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/and_test.go @@ -19,7 +19,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" ) @@ -39,8 +38,8 @@ func TestAndEvaluatorNotSampled(t *testing.T) { span := ils.Spans().AppendEmpty() span.Status().SetCode(ptrace.StatusCodeError) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) trace := &TraceData{ ReceivedBatches: []ptrace.Traces{traces}, @@ -67,8 +66,8 @@ func TestAndEvaluatorSampled(t *testing.T) { span := ils.Spans().AppendEmpty() span.Attributes().UpsertString("attribute_name", "attribute_value") span.Status().SetCode(ptrace.StatusCodeError) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) trace := &TraceData{ ReceivedBatches: []ptrace.Traces{traces}, @@ -95,8 +94,8 @@ func TestAndEvaluatorStringInvertSampled(t *testing.T) { span := ils.Spans().AppendEmpty() span.Attributes().UpsertString("attribute_name", "attribute_value") span.Status().SetCode(ptrace.StatusCodeError) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) trace := &TraceData{ ReceivedBatches: []ptrace.Traces{traces}, @@ -123,8 +122,8 @@ func TestAndEvaluatorStringInvertNotSampled(t *testing.T) { span := ils.Spans().AppendEmpty() span.Attributes().UpsertString("attribute_name", "attribute_value") span.Status().SetCode(ptrace.StatusCodeError) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) trace := &TraceData{ ReceivedBatches: []ptrace.Traces{traces}, diff --git a/processor/tailsamplingprocessor/internal/sampling/composite_test.go b/processor/tailsamplingprocessor/internal/sampling/composite_test.go index ca7fa032050f..c22958ed0e69 100644 --- a/processor/tailsamplingprocessor/internal/sampling/composite_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/composite_test.go @@ -33,7 +33,7 @@ func (f FakeTimeProvider) getCurSecond() int64 { return f.second } -var traceID = pcommon.NewTraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x96, 0x9A, 0x89, 0x55, 0x57, 0x1A, 0x3F}) +var traceID = pcommon.TraceID([16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x96, 0x9A, 0x89, 0x55, 0x57, 0x1A, 0x3F}) func createTrace() *TraceData { trace := &TraceData{SpanCount: atomic.NewInt64(1)} @@ -42,7 +42,7 @@ func createTrace() *TraceData { func newTraceID() pcommon.TraceID { r := [16]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x96, 0x9A, 0x89, 0x55, 0x57, 0x1A, 0x3F} - return pcommon.NewTraceID(r) + return pcommon.TraceID(r) } func newTraceWithKV(traceID pcommon.TraceID, key string, val int64) *TraceData { @@ -52,7 +52,7 @@ func newTraceWithKV(traceID pcommon.TraceID, key string, val int64) *TraceData { ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() span.SetTraceID(traceID) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) span.SetStartTimestamp(pcommon.NewTimestampFromTime( time.Date(2020, 1, 1, 12, 0, 0, 0, time.UTC), )) diff --git a/processor/tailsamplingprocessor/internal/sampling/latency_test.go b/processor/tailsamplingprocessor/internal/sampling/latency_test.go index 7a3b882309cc..e4867077cb3f 100644 --- a/processor/tailsamplingprocessor/internal/sampling/latency_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/latency_test.go @@ -27,7 +27,7 @@ import ( func TestEvaluate_Latency(t *testing.T) { filter := NewLatency(zap.NewNop(), 5000) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) now := time.Now() cases := []struct { @@ -94,8 +94,8 @@ func newTraceWithSpans(spans []spanWithTimeAndDuration) *TraceData { for _, s := range spans { span := ils.Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) span.SetStartTimestamp(pcommon.NewTimestampFromTime(s.StartTime)) span.SetEndTimestamp(pcommon.NewTimestampFromTime(s.StartTime.Add(s.Duration))) } diff --git a/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go b/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go index 393263a6cdc1..a59527d600c0 100644 --- a/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/numeric_tag_filter_test.go @@ -68,7 +68,7 @@ func TestNumericTagFilter(t *testing.T) { for _, c := range cases { t.Run(c.Desc, func(t *testing.T) { u, _ := uuid.NewRandom() - decision, err := filter.Evaluate(pcommon.NewTraceID(u), c.Trace) + decision, err := filter.Evaluate(pcommon.TraceID(u), c.Trace) assert.NoError(t, err) assert.Equal(t, decision, c.Decision) }) @@ -82,8 +82,8 @@ func newTraceIntAttrs(nodeAttrs map[string]interface{}, spanAttrKey string, span pcommon.NewMapFromRaw(nodeAttrs).CopyTo(rs.Resource().Attributes()) ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) span.Attributes().UpsertInt(spanAttrKey, spanAttrValue) traceBatches = append(traceBatches, traces) return &TraceData{ diff --git a/processor/tailsamplingprocessor/internal/sampling/probabilistic.go b/processor/tailsamplingprocessor/internal/sampling/probabilistic.go index 0e997653ee9a..951a0e655df6 100644 --- a/processor/tailsamplingprocessor/internal/sampling/probabilistic.go +++ b/processor/tailsamplingprocessor/internal/sampling/probabilistic.go @@ -54,8 +54,7 @@ func NewProbabilisticSampler(logger *zap.Logger, hashSalt string, samplingPercen func (s *probabilisticSampler) Evaluate(traceID pcommon.TraceID, _ *TraceData) (Decision, error) { s.logger.Debug("Evaluating spans in probabilistic filter") - traceIDBytes := traceID.Bytes() - if hashTraceID(s.hashSalt, traceIDBytes[:]) <= s.threshold { + if hashTraceID(s.hashSalt, traceID[:]) <= s.threshold { return Sampled, nil } diff --git a/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go b/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go index e0c1420445f0..c2293fef1222 100644 --- a/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/probabilistic_test.go @@ -107,7 +107,7 @@ func genRandomTraceIDs(num int) (ids []pcommon.TraceID) { traceID := [16]byte{} binary.BigEndian.PutUint64(traceID[:8], r.Uint64()) binary.BigEndian.PutUint64(traceID[8:], r.Uint64()) - ids = append(ids, pcommon.NewTraceID(traceID)) + ids = append(ids, pcommon.TraceID(traceID)) } return ids } diff --git a/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go b/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go index e66362ead85a..18a6f73b6fb2 100644 --- a/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go @@ -25,7 +25,7 @@ import ( func TestRateLimiter(t *testing.T) { trace := newTraceStringAttrs(pcommon.NewMap(), "example", "value") - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) rateLimiter := NewRateLimiting(zap.NewNop(), 3) // Trace span count greater than spans per second diff --git a/processor/tailsamplingprocessor/internal/sampling/span_count_sampler_test.go b/processor/tailsamplingprocessor/internal/sampling/span_count_sampler_test.go index 890152776433..f56cf5875489 100644 --- a/processor/tailsamplingprocessor/internal/sampling/span_count_sampler_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/span_count_sampler_test.go @@ -27,7 +27,7 @@ import ( func TestEvaluate_NumberSpans(t *testing.T) { filter := NewSpanCount(zap.NewNop(), 2) - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) cases := []struct { Desc string @@ -108,8 +108,8 @@ func newTraceWithMultipleSpans(numberSpans []int32) *TraceData { for r := 0; r < int(numberSpans[i]); r++ { span := ils.Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) } traceBatches = append(traceBatches, traces) totalNumberSpans += numberSpans[i] diff --git a/processor/tailsamplingprocessor/internal/sampling/status_code_test.go b/processor/tailsamplingprocessor/internal/sampling/status_code_test.go index 14754bf77d13..7fe1b67ce6f5 100644 --- a/processor/tailsamplingprocessor/internal/sampling/status_code_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/status_code_test.go @@ -32,7 +32,7 @@ func TestNewStatusCodeFilter_errorHandling(t *testing.T) { } func TestStatusCodeSampling(t *testing.T) { - traceID := pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + traceID := pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) cases := []struct { Desc string @@ -75,8 +75,8 @@ func TestStatusCodeSampling(t *testing.T) { for _, statusCode := range c.StatusCodesPresent { span := ils.Spans().AppendEmpty() span.Status().SetCode(statusCode) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) } trace := &TraceData{ diff --git a/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go b/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go index ecf878a41633..6cb0544f4564 100644 --- a/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/string_tag_filter_test.go @@ -213,7 +213,7 @@ func TestStringTagFilter(t *testing.T) { for _, c := range cases { t.Run(c.Desc, func(t *testing.T) { filter := NewStringAttributeFilter(zap.NewNop(), c.filterCfg.Key, c.filterCfg.Values, c.filterCfg.EnabledRegexMatching, c.filterCfg.CacheMaxSize, c.filterCfg.InvertMatch) - decision, err := filter.Evaluate(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), c.Trace) + decision, err := filter.Evaluate(pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), c.Trace) assert.NoError(t, err) assert.Equal(t, decision, c.Decision) }) @@ -225,7 +225,7 @@ func BenchmarkStringTagFilterEvaluatePlainText(b *testing.B) { filter := NewStringAttributeFilter(zap.NewNop(), "example", []string{"value"}, false, 0, false) b.ResetTimer() for i := 0; i < b.N; i++ { - _, err := filter.Evaluate(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), trace) + _, err := filter.Evaluate(pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), trace) assert.NoError(b, err) } } @@ -235,7 +235,7 @@ func BenchmarkStringTagFilterEvaluateRegex(b *testing.B) { filter := NewStringAttributeFilter(zap.NewNop(), "example", []string{"v[0-9]+.HealthCheck$"}, true, 0, false) b.ResetTimer() for i := 0; i < b.N; i++ { - _, err := filter.Evaluate(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), trace) + _, err := filter.Evaluate(pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), trace) assert.NoError(b, err) } } @@ -247,8 +247,8 @@ func newTraceStringAttrs(nodeAttrs pcommon.Map, spanAttrKey string, spanAttrValu nodeAttrs.CopyTo(rs.Resource().Attributes()) ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) span.Attributes().UpsertString(spanAttrKey, spanAttrValue) traceBatches = append(traceBatches, traces) return &TraceData{ diff --git a/processor/tailsamplingprocessor/internal/sampling/trace_state_filter_test.go b/processor/tailsamplingprocessor/internal/sampling/trace_state_filter_test.go index bcb3f4968377..4219cb4224f3 100644 --- a/processor/tailsamplingprocessor/internal/sampling/trace_state_filter_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/trace_state_filter_test.go @@ -90,7 +90,7 @@ func TestTraceStateFilter(t *testing.T) { for _, c := range cases { t.Run(c.Desc, func(t *testing.T) { filter := NewTraceStateFilter(zap.NewNop(), c.filterCfg.Key, c.filterCfg.Values) - decision, err := filter.Evaluate(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), c.Trace) + decision, err := filter.Evaluate(pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), c.Trace) assert.NoError(t, err) assert.Equal(t, decision, c.Decision) }) @@ -103,8 +103,8 @@ func newTraceState(traceState string) *TraceData { rs := traces.ResourceSpans().AppendEmpty() ils := rs.ScopeSpans().AppendEmpty() span := ils.Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) span.SetTraceState(ptrace.TraceState(traceState)) traceBatches = append(traceBatches, traces) return &TraceData{ diff --git a/processor/tailsamplingprocessor/processor_test.go b/processor/tailsamplingprocessor/processor_test.go index 96b7754a95b2..3f29c90458a0 100644 --- a/processor/tailsamplingprocessor/processor_test.go +++ b/processor/tailsamplingprocessor/processor_test.go @@ -559,9 +559,9 @@ func TestMultipleBatchesAreCombinedIntoOne(t *testing.T) { // might have received out of order, sort for comparison sort.Slice(got, func(i, j int) bool { - bytesA := got[i].Bytes() + bytesA := got[i] a := binary.BigEndian.Uint64(bytesA[:]) - bytesB := got[j].Bytes() + bytesB := got[j] b := binary.BigEndian.Uint64(bytesB[:]) return a < b }) @@ -592,7 +592,7 @@ func collectSpanIds(trace *ptrace.Traces) []pcommon.SpanID { func findTrace(a []ptrace.Traces, traceID pcommon.TraceID) *ptrace.Traces { for _, batch := range a { id := batch.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID() - if traceID.Bytes() == id.Bytes() { + if traceID == id { return &batch } } @@ -607,7 +607,7 @@ func generateIdsAndBatches(numIds int) ([]pcommon.TraceID, []ptrace.Traces) { traceID := [16]byte{} binary.BigEndian.PutUint64(traceID[:8], 1) binary.BigEndian.PutUint64(traceID[8:], uint64(i+1)) - traceIds[i] = pcommon.NewTraceID(traceID) + traceIds[i] = pcommon.TraceID(traceID) // Send each span in a separate batch for j := 0; j <= i; j++ { td := simpleTraces() @@ -627,7 +627,7 @@ func generateIdsAndBatches(numIds int) ([]pcommon.TraceID, []ptrace.Traces) { func uInt64ToSpanID(id uint64) pcommon.SpanID { spanID := [8]byte{} binary.BigEndian.PutUint64(spanID[:], id) - return pcommon.NewSpanID(spanID) + return pcommon.SpanID(spanID) } type mockPolicyEvaluator struct { @@ -696,7 +696,7 @@ func (s *syncIDBatcher) Stop() { } func simpleTraces() ptrace.Traces { - return simpleTracesWithID(pcommon.NewTraceID([16]byte{1, 2, 3, 4})) + return simpleTracesWithID(pcommon.TraceID([16]byte{1, 2, 3, 4})) } func simpleTracesWithID(traceID pcommon.TraceID) ptrace.Traces { diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index af009168044d..94cfdc4457fc 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/telemetryquerylanguage v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 77f27dfc0de6..2845cb8acfa2 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/processor/transformprocessor/internal/common/parser.go b/processor/transformprocessor/internal/common/parser.go index 761a102ce2f6..86f38ccc641a 100644 --- a/processor/transformprocessor/internal/common/parser.go +++ b/processor/transformprocessor/internal/common/parser.go @@ -31,7 +31,7 @@ func ParseSpanID(spanIDStr string) (pcommon.SpanID, error) { } var idArr [8]byte copy(idArr[:8], id) - return pcommon.NewSpanID(idArr), nil + return idArr, nil } func ParseTraceID(traceIDStr string) (pcommon.TraceID, error) { @@ -44,5 +44,5 @@ func ParseTraceID(traceIDStr string) (pcommon.TraceID, error) { } var idArr [16]byte copy(idArr[:16], id) - return pcommon.NewTraceID(idArr), nil + return idArr, nil } diff --git a/processor/transformprocessor/internal/logs/processor_test.go b/processor/transformprocessor/internal/logs/processor_test.go index 276307ae1cb6..b4feeaf7b60d 100644 --- a/processor/transformprocessor/internal/logs/processor_test.go +++ b/processor/transformprocessor/internal/logs/processor_test.go @@ -183,10 +183,10 @@ func fillLogOne(log plog.LogRecord) { log.SetTimestamp(TestLogTimestamp) log.SetObservedTimestamp(TestObservedTimestamp) log.SetDroppedAttributesCount(1) - log.SetFlagsStruct(plog.DefaultLogRecordFlags.WithIsSampled(true)) + log.SetFlags(plog.DefaultLogRecordFlags.WithIsSampled(true)) log.SetSeverityNumber(1) - log.SetTraceID(pcommon.NewTraceID(traceID)) - log.SetSpanID(pcommon.NewSpanID(spanID)) + log.SetTraceID(traceID) + log.SetSpanID(spanID) log.Attributes().UpsertString("http.method", "get") log.Attributes().UpsertString("http.path", "/health") log.Attributes().UpsertString("http.url", "http://localhost/health") diff --git a/processor/transformprocessor/internal/traces/processor_test.go b/processor/transformprocessor/internal/traces/processor_test.go index 82cd0d40456b..2a836d858a04 100644 --- a/processor/transformprocessor/internal/traces/processor_test.go +++ b/processor/transformprocessor/internal/traces/processor_test.go @@ -322,9 +322,9 @@ func constructTracesNum(num int) ptrace.Traces { func fillSpanOne(span ptrace.Span) { span.SetName("operationA") - span.SetSpanID(pcommon.NewSpanID(spanID)) - span.SetParentSpanID(pcommon.NewSpanID(spanID2)) - span.SetTraceID(pcommon.NewTraceID(traceID)) + span.SetSpanID(spanID) + span.SetParentSpanID(spanID2) + span.SetTraceID(traceID) span.SetStartTimestamp(TestSpanStartTimestamp) span.SetEndTimestamp(TestSpanEndTimestamp) span.SetDroppedAttributesCount(1) diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index fa25ff0c8e0e..f51ccbafa05d 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 2d71bb3b575c..1d4d19ed68af 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 04cb871eda94..1ee557808f1b 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 215cf19a8add..e4e998e9ffad 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -314,10 +314,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 627258ff086c..bd4193094808 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) @@ -72,7 +72,7 @@ require ( require ( github.com/rogpeppe/go-internal v1.6.2 // indirect github.com/testcontainers/testcontainers-go v0.13.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) 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 90657421ac2f..ff94d0bc206a 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -779,10 +779,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index f8b48f5cd15b..91be7a2da0f6 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.59.0 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 2c0e637fd1ad..f5284d26dd78 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -564,10 +564,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index c5db7e60ab21..957b6ce4635b 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index a0850f0cc9df..110c21292fe7 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 27b97206daac..0cd4b76b00e4 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 951e668e5aee..72a551a5cd6e 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index e0d79187b5a1..c31f4196b8aa 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.opentelemetry.io/otel/sdk v1.9.0 // indirect ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index b6922e5dede6..982531e258b2 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -274,12 +274,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/awsxrayreceiver/internal/translator/translator.go b/receiver/awsxrayreceiver/internal/translator/translator.go index 0d4fd7bb7451..10f86d503f47 100644 --- a/receiver/awsxrayreceiver/internal/translator/translator.go +++ b/receiver/awsxrayreceiver/internal/translator/translator.go @@ -170,11 +170,11 @@ func populateSpan( return err } - span.SetTraceID(pcommon.NewTraceID(traceIDBytes)) - span.SetSpanID(pcommon.NewSpanID(spanIDBytes)) + span.SetTraceID(traceIDBytes) + span.SetSpanID(spanIDBytes) if parentIDBytes != [8]byte{} { - span.SetParentSpanID(pcommon.NewSpanID(parentIDBytes)) + span.SetParentSpanID(parentIDBytes) } else { span.SetKind(ptrace.SpanKindServer) } diff --git a/receiver/awsxrayreceiver/internal/translator/translator_test.go b/receiver/awsxrayreceiver/internal/translator/translator_test.go index 3e1cb2fe4213..80fee180eeb9 100644 --- a/receiver/awsxrayreceiver/internal/translator/translator_test.go +++ b/receiver/awsxrayreceiver/internal/translator/translator_test.go @@ -940,10 +940,10 @@ func initResourceSpans(expectedSeg *awsxray.Segment, for _, props := range propsPerSpan { sp := ls.Spans().AppendEmpty() spanIDBytes, _ := decodeXRaySpanID(&props.spanID) - sp.SetSpanID(pcommon.NewSpanID(spanIDBytes)) + sp.SetSpanID(spanIDBytes) if props.parentSpanID != nil { parentIDBytes, _ := decodeXRaySpanID(props.parentSpanID) - sp.SetParentSpanID(pcommon.NewSpanID(parentIDBytes)) + sp.SetParentSpanID(parentIDBytes) } sp.SetName(props.name) sp.SetStartTimestamp(pcommon.Timestamp(props.startTimeSec * float64(time.Second))) @@ -952,7 +952,7 @@ func initResourceSpans(expectedSeg *awsxray.Segment, } sp.SetKind(props.spanKind) traceIDBytes, _ := decodeXRayTraceID(&props.traceID) - sp.SetTraceID(pcommon.NewTraceID(traceIDBytes)) + sp.SetTraceID(traceIDBytes) sp.Status().SetMessage(props.spanStatus.message) sp.Status().SetCode(props.spanStatus.code) diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 804d28ea3149..922afa89cf3b 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.59.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index e0472e91c55a..1ad6e430f387 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index b5d3f691475b..79b2a68e3ccd 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.59.0 +require go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index 9003cfe599c6..9668d04f40ed 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 7b3c9e9dfaaf..a441e3c814d8 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 02a96a43955a..948a62b288bb 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/carbonreceiver/config.go b/receiver/carbonreceiver/config.go index 089a2203ec42..00178fc964f7 100644 --- a/receiver/carbonreceiver/config.go +++ b/receiver/carbonreceiver/config.go @@ -32,7 +32,7 @@ const ( parserConfigSection = "parser" ) -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) // Config defines configuration for the Carbon receiver. type Config struct { diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index b4eb23173835..4deb137014d3 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.59.0 // indirect - go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/sdk v1.9.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index da5e661571c8..c6fb22f0b2d0 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -270,12 +270,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index bc0f32104817..f49677aafa5d 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index 29e7e68d5b09..b36297f2ec27 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index a6b50bce64b3..d87a93bd3698 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index ef13c76cd425..86dd3742f950 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 696d303643ba..0e5cbcc11561 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.59.0 // indirect - go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index b9c01b3cf8ea..1327f7cc6551 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index a5eb3689dd8a..47c09d758c77 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 4b88dfb2b91e..8283251f3ce1 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index d7de81e09843..0b663bf2d8f7 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 08036e1bab7e..58f1287fc60b 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index f428baa5b9dc..234f5139d963 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 42dd84d9fe96..a060d8a5e340 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 244a39604292..4082f49df9d7 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect ) diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index afbef9b1bc7f..60ef54f2b4b7 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -780,10 +780,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index c5ae82257f48..7b059154075d 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 61eb21b70df5..e500efe45e30 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 8d29056148ba..1907bf07a477 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index c3a45578fb17..6bf09f681ead 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index a5c12bc38af4..de955d85b716 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.59.0 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.13.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 43b9646d3433..fde4029bc38c 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -779,10 +779,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 45b50ee7d95f..b1d3c28a5977 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 320db36809b8..4fa52403505a 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index c9b84b40f0b1..f8a4caaf1c36 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/api v0.95.0 diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index b8aa8bedcd62..13a5b24aa6b8 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -415,10 +415,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 86540f12937b..1415b9ad53b8 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.38.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 google.golang.org/api v0.95.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.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 50855378b41b..fbb542de960d 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -435,10 +435,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/hostmetricsreceiver/config.go b/receiver/hostmetricsreceiver/config.go index 2b466ecc5ed8..ad757bb7c894 100644 --- a/receiver/hostmetricsreceiver/config.go +++ b/receiver/hostmetricsreceiver/config.go @@ -36,7 +36,7 @@ type Config struct { } var _ config.Receiver = (*Config)(nil) -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 16826b6fd1e1..d0a168242c3d 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.59.0 github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 6b844aceb395..b8c5cd056c90 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -291,12 +291,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 27258b7c6f61..679c00de1fde 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index 2d71bb3b575c..1d4d19ed68af 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index f800083c192d..66607e6a27e5 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.27 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.59.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 7593b4414c09..5e6c510b8443 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/jaegerreceiver/config.go b/receiver/jaegerreceiver/config.go index cdc934e43baa..abfc5a8298e0 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -85,7 +85,7 @@ type Config struct { } var _ config.Receiver = (*Config)(nil) -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index d581d84bb6a4..f9e0853ad0f6 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.49.0 diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 6492e629c518..4c2fcab97797 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -445,12 +445,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index 683a584c6900..10d4fccc073c 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -36,7 +36,6 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "google.golang.org/grpc" @@ -250,8 +249,8 @@ func generateTraceData() ptrace.Traces { rs := td.ResourceSpans().AppendEmpty() rs.Resource().Attributes().UpsertString(conventions.AttributeServiceName, "test") span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty() - span.SetSpanID(pcommon.NewSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7})) - span.SetTraceID(pcommon.NewTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0})) + span.SetSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7}) + span.SetTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0}) span.SetStartTimestamp(1581452772000000000) span.SetEndTimestamp(1581452773000000000) return td diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 475f6b95eac1..a9feccce98dc 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -255,10 +255,10 @@ func TestGRPCReceptionWithTLS(t *testing.T) { } func expectedTraceData(t1, t2, t3 time.Time) ptrace.Traces { - traceID := pcommon.NewTraceID( + traceID := pcommon.TraceID( [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}) - parentSpanID := pcommon.NewSpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18}) - childSpanID := pcommon.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) + parentSpanID := pcommon.SpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18}) + childSpanID := pcommon.SpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) traces := ptrace.NewTraces() rs := traces.ResourceSpans().AppendEmpty() diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 054ce617c0d8..f992ea649478 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.13.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 5331f512c57e..37d619572c8c 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -824,10 +824,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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 6f85a03adc4b..3e561c931543 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 269e8e8a4523..6f69671b9b11 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index df70d52e81f4..d54d8348d973 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 2c7f07f38f50..9cc94a9a822f 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -438,12 +438,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index d6ae9070bce9..3ca2518d714a 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index 66b5bf60cef2..4a1fa766173c 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 39d1ecae749b..d806a8e63001 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 743a1e93d831..a90c474a25b7 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -441,12 +441,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 4345aff89323..c977df3f39a1 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 2d7a4d778011..68f8844b995a 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -450,12 +450,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/kafkareceiver/jaeger_unmarshaler_test.go b/receiver/kafkareceiver/jaeger_unmarshaler_test.go index 15224ec6a38f..9344fe450429 100644 --- a/receiver/kafkareceiver/jaeger_unmarshaler_test.go +++ b/receiver/kafkareceiver/jaeger_unmarshaler_test.go @@ -33,8 +33,8 @@ func TestUnmarshalJaeger(t *testing.T) { span.SetName("foo") span.SetStartTimestamp(pcommon.Timestamp(10)) span.SetEndTimestamp(pcommon.Timestamp(20)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) batches, err := jaeger.ProtoFromTraces(td) require.NoError(t, err) diff --git a/receiver/kafkareceiver/zipkin_unmarshaler_test.go b/receiver/kafkareceiver/zipkin_unmarshaler_test.go index c936bab53356..b2a8b1af3271 100644 --- a/receiver/kafkareceiver/zipkin_unmarshaler_test.go +++ b/receiver/kafkareceiver/zipkin_unmarshaler_test.go @@ -41,9 +41,9 @@ func TestUnmarshalZipkin(t *testing.T) { span.SetName("foo") span.SetStartTimestamp(pcommon.Timestamp(1597759000)) span.SetEndTimestamp(pcommon.Timestamp(1597769000)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) - span.SetParentSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) + span.SetParentSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0}) spans, err := v2FromTranslator.FromTraces(td) require.NoError(t, err) diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 70509ca6808c..6541af7c96ec 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 9b9091c02d92..2933957789f2 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index a371c6b6ebf0..851711e7a468 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index 0fe2e8a0302e..ab36405f1a39 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index b8dffec6433e..4819a8d86d6d 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -521,10 +521,10 @@ func compareScopeLogs(expected, actual plog.ScopeLogs) error { } func compareLogRecord(expected, actual plog.LogRecord) error { - if expected.FlagsStruct() != actual.FlagsStruct() { + if expected.Flags() != actual.Flags() { return fmt.Errorf("log record Flags doesn't match (expected: %d, actual: %d)", - expected.FlagsStruct(), - actual.FlagsStruct()) + expected.Flags(), + actual.Flags()) } if expected.DroppedAttributesCount() != actual.DroppedAttributesCount() { diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index aec7bfecdad0..364a9bc3d22c 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) @@ -45,7 +45,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index d8b272d611c4..744b45861fa0 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 4c25fb014b82..8c003c0b251a 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.59.0 github.com/testcontainers/testcontainers-go v0.13.0 go.mongodb.org/mongo-driver v1.10.2 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index f34120864a37..44c3b9894814 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -791,10 +791,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index de9d06b62c4c..2c0f48fd15cc 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) require ( github.com/testcontainers/testcontainers-go v0.13.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 7290f11ca1bd..8c75f2fe4874 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -768,10 +768,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 5e5287cc53b0..593228bd7d8e 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.59.0 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.13.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index e6743d3a3f1a..17e204683a8a 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -788,10 +788,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 35f72b2e5ef3..745b1fae8993 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.59.0 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 57b68e606226..160979563969 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 30b4df0218d8..57eaaa4a7ec2 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,7 +12,7 @@ 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 go.opentelemetry.io/otel v1.9.0 go.opentelemetry.io/otel/trace v1.9.0 @@ -21,7 +21,7 @@ require ( ) require ( - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.opentelemetry.io/otel/sdk v1.9.0 ) @@ -45,7 +45,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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel/metric v0.31.0 // 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 99f7b1abf806..e1728856365f 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -363,12 +363,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index a99d58ee29e7..e6c074a3ce3b 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index 75a15ce4ed4a..2ee055acc1b0 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -290,10 +290,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index cd1bbaae1787..16918d3f87b0 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 80b502d50246..e151781dd165 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index f832fcc635b4..b14d563251f4 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) require ( github.com/testcontainers/testcontainers-go v0.13.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 60a0b704b8ad..8abe1324ee36 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -771,10 +771,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 1e13554f20e8..d53315540d0c 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index 38d247e8043f..33cf333769a8 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -659,12 +659,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/prometheusreceiver/config.go b/receiver/prometheusreceiver/config.go index 16fffbc4082d..d479af48f1f0 100644 --- a/receiver/prometheusreceiver/config.go +++ b/receiver/prometheusreceiver/config.go @@ -81,7 +81,7 @@ type targetAllocator struct { } var _ config.Receiver = (*Config)(nil) -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) func checkFile(fn string) error { // Nothing set, nothing to error on. diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 6232c37a8534..60c82e8527a9 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 50bec4f44d02..f420094b55df 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -688,12 +688,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= diff --git a/receiver/prometheusreceiver/internal/metricfamily.go b/receiver/prometheusreceiver/internal/metricfamily.go index 1f37771911b1..c8e909257f8a 100644 --- a/receiver/prometheusreceiver/internal/metricfamily.go +++ b/receiver/prometheusreceiver/internal/metricfamily.go @@ -127,7 +127,7 @@ func (mg *metricGroup) toDistributionPoint(dest pmetric.HistogramDataPointSlice) point := dest.AppendEmpty() if pointIsStale { - point.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + point.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } else { point.SetCount(uint64(mg.count)) if mg.hasSum { @@ -171,7 +171,7 @@ func (mg *metricGroup) toSummaryPoint(dest pmetric.SummaryDataPointSlice) { point := dest.AppendEmpty() pointIsStale := value.IsStaleNaN(mg.sum) || value.IsStaleNaN(mg.count) if pointIsStale { - point.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + point.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } else { if mg.hasSum { point.SetSum(mg.sum) @@ -211,7 +211,7 @@ func (mg *metricGroup) toNumberDataPoint(dest pmetric.NumberDataPointSlice) { } point.SetTimestamp(tsNanos) if value.IsStaleNaN(mg.value) { - point.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + point.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) } else { point.SetDoubleVal(mg.value) } diff --git a/receiver/prometheusreceiver/internal/metricfamily_test.go b/receiver/prometheusreceiver/internal/metricfamily_test.go index 6f4b44713ecb..6e2db52615ae 100644 --- a/receiver/prometheusreceiver/internal/metricfamily_test.go +++ b/receiver/prometheusreceiver/internal/metricfamily_test.go @@ -108,11 +108,11 @@ func createNewExemplar(value float64, timestamp int64, traceid string) map[float t, _ := hex.DecodeString(traceid) copyToLowerBytes(tid[:], t) - ex.SetTraceID(pcommon.NewTraceID(tid)) + ex.SetTraceID(tid) s, _ := hex.DecodeString(traceid) copyToLowerBytes(sid[:], s) - ex.SetSpanID(pcommon.NewSpanID(sid)) + ex.SetSpanID(sid) exMap[value] = ex @@ -173,8 +173,8 @@ func TestMetricGroupData_toDistributionUnitTest(t *testing.T) { copyToLowerBytes(tid1[:], tr) sp, _ := hex.DecodeString("0000c5bd3caea93d") copyToLowerBytes(sid1[:], sp) - e1.SetTraceID(pcommon.NewTraceID(tid1)) - e1.SetSpanID(pcommon.NewSpanID(sid1)) + e1.SetTraceID(tid1) + e1.SetSpanID(sid1) e2 := exemplars.AppendEmpty() e2.SetTimestamp(pcommon.NewTimestampFromTime(time.UnixMilli(11))) @@ -183,8 +183,8 @@ func TestMetricGroupData_toDistributionUnitTest(t *testing.T) { copyToLowerBytes(tid2[:], tr1) sp1, _ := hex.DecodeString("0006f0ea595fa831") copyToLowerBytes(sid2[:], sp1) - e2.SetTraceID(pcommon.NewTraceID(tid2)) - e2.SetSpanID(pcommon.NewSpanID(sid2)) + e2.SetTraceID(tid2) + e2.SetSpanID(sid2) return point }, }, @@ -203,7 +203,7 @@ func TestMetricGroupData_toDistributionUnitTest(t *testing.T) { want: func() pmetric.HistogramDataPoint { point := pmetric.NewHistogramDataPoint() point.SetTimestamp(pcommon.Timestamp(11 * time.Millisecond)) // the time in milliseconds -> nanoseconds. - point.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + point.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) point.SetExplicitBounds(pcommon.NewImmutableFloat64Slice([]float64{0.75, 2.75})) point.SetBucketCounts(pcommon.NewImmutableUInt64Slice([]uint64{0, 0, 0})) point.SetStartTimestamp(pcommon.Timestamp(11 * time.Millisecond)) // the time in milliseconds -> nanoseconds. @@ -407,7 +407,7 @@ func TestMetricGroupData_toSummaryUnitTest(t *testing.T) { point := pmetric.NewSummaryDataPoint() qtL := point.QuantileValues() qn0 := qtL.AppendEmpty() - point.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + point.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) qn0.SetQuantile(0) qn0.SetValue(0) qn50 := qtL.AppendEmpty() diff --git a/receiver/prometheusreceiver/internal/metrics_adjuster.go b/receiver/prometheusreceiver/internal/metrics_adjuster.go index d5d5e2c61c2a..fdfc9dfef0b6 100644 --- a/receiver/prometheusreceiver/internal/metrics_adjuster.go +++ b/receiver/prometheusreceiver/internal/metrics_adjuster.go @@ -305,7 +305,7 @@ func (ma *MetricsAdjuster) adjustMetricHistogram(current pmetric.Metric) { continue } - if currentDist.FlagsImmutable().NoRecordedValue() { + if currentDist.Flags().NoRecordedValue() { // TODO: Investigate why this does not reset. currentDist.SetStartTimestamp(tsi.histogram.startTime) continue @@ -338,7 +338,7 @@ func (ma *MetricsAdjuster) adjustMetricSum(current pmetric.Metric) { continue } - if currentSum.FlagsImmutable().NoRecordedValue() { + if currentSum.Flags().NoRecordedValue() { // TODO: Investigate why this does not reset. currentSum.SetStartTimestamp(tsi.number.startTime) continue @@ -371,7 +371,7 @@ func (ma *MetricsAdjuster) adjustMetricSummary(current pmetric.Metric) { continue } - if currentSummary.FlagsImmutable().NoRecordedValue() { + if currentSummary.Flags().NoRecordedValue() { // TODO: Investigate why this does not reset. currentSummary.SetStartTimestamp(tsi.summary.startTime) continue diff --git a/receiver/prometheusreceiver/internal/metricsutil_test.go b/receiver/prometheusreceiver/internal/metricsutil_test.go index 4c6c004453d7..44a1ac1ea52f 100644 --- a/receiver/prometheusreceiver/internal/metricsutil_test.go +++ b/receiver/prometheusreceiver/internal/metricsutil_test.go @@ -68,7 +68,7 @@ func histogramPoint(attributes []*kv, startTimestamp, timestamp pcommon.Timestam func histogramPointNoValue(attributes []*kv, startTimestamp, timestamp pcommon.Timestamp) pmetric.HistogramDataPoint { hdp := histogramPointRaw(attributes, startTimestamp, timestamp) - hdp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + hdp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) return hdp } @@ -110,7 +110,7 @@ func doublePoint(attributes []*kv, startTimestamp, timestamp pcommon.Timestamp, func doublePointNoValue(attributes []*kv, startTimestamp, timestamp pcommon.Timestamp) pmetric.NumberDataPoint { ndp := doublePointRaw(attributes, startTimestamp, timestamp) - ndp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + ndp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) return ndp } @@ -174,7 +174,7 @@ func summaryPoint(attributes []*kv, startTimestamp, timestamp pcommon.Timestamp, func summaryPointNoValue(attributes []*kv, startTimestamp, timestamp pcommon.Timestamp) pmetric.SummaryDataPoint { sdp := summaryPointRaw(attributes, startTimestamp, timestamp) - sdp.SetFlagsImmutable(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) + sdp.SetFlags(pmetric.DefaultMetricDataPointFlags.WithNoRecordedValue(true)) return sdp } diff --git a/receiver/prometheusreceiver/internal/transaction.go b/receiver/prometheusreceiver/internal/transaction.go index c005f4d03240..29216978f280 100644 --- a/receiver/prometheusreceiver/internal/transaction.go +++ b/receiver/prometheusreceiver/internal/transaction.go @@ -126,12 +126,12 @@ func (t *transaction) AppendExemplar(ref storage.SeriesRef, l labels.Labels, e e var tid [16]byte b, _ := hex.DecodeString(lb.Value) copyToLowerBytes(tid[:], b) - exemplar.SetTraceID(pcommon.NewTraceID(tid)) + exemplar.SetTraceID(tid) case spanIDKey: var sid [8]byte b, _ := hex.DecodeString(lb.Value) copyToLowerBytes(sid[:], b) - exemplar.SetSpanID(pcommon.NewSpanID(sid)) + exemplar.SetSpanID(sid) default: exemplar.FilteredAttributes().UpsertString(lb.Name, lb.Value) } diff --git a/receiver/prometheusreceiver/internal/transaction_test.go b/receiver/prometheusreceiver/internal/transaction_test.go index 971ce8608e7c..36b0eb600097 100644 --- a/receiver/prometheusreceiver/internal/transaction_test.go +++ b/receiver/prometheusreceiver/internal/transaction_test.go @@ -159,14 +159,14 @@ func getTraceID(trace string) string { var tid [16]byte tr, _ := hex.DecodeString(trace) copyToLowerBytes(tid[:], tr) - return pcommon.NewTraceID(tid).HexString() + return pcommon.TraceID(tid).HexString() } func getSpanID(span string) string { var sid [8]byte sp, _ := hex.DecodeString(span) copyToLowerBytes(sid[:], sp) - return pcommon.NewSpanID(sid).HexString() + return pcommon.SpanID(sid).HexString() } func nopObsRecv() *obsreport.Receiver { diff --git a/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index 3797476bfe4c..6ebe8b09593a 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -267,25 +267,25 @@ func isFirstFailedScrape(metrics []pmetric.Metric) bool { switch m.DataType() { case pmetric.MetricDataTypeGauge: for i := 0; i < m.Gauge().DataPoints().Len(); i++ { - if !m.Gauge().DataPoints().At(i).FlagsImmutable().NoRecordedValue() { + if !m.Gauge().DataPoints().At(i).Flags().NoRecordedValue() { return false } } case pmetric.MetricDataTypeSum: for i := 0; i < m.Sum().DataPoints().Len(); i++ { - if !m.Sum().DataPoints().At(i).FlagsImmutable().NoRecordedValue() { + if !m.Sum().DataPoints().At(i).Flags().NoRecordedValue() { return false } } case pmetric.MetricDataTypeHistogram: for i := 0; i < m.Histogram().DataPoints().Len(); i++ { - if !m.Histogram().DataPoints().At(i).FlagsImmutable().NoRecordedValue() { + if !m.Histogram().DataPoints().At(i).Flags().NoRecordedValue() { return false } } case pmetric.MetricDataTypeSummary: for i := 0; i < m.Summary().DataPoints().Len(); i++ { - if !m.Summary().DataPoints().At(i).FlagsImmutable().NoRecordedValue() { + if !m.Summary().DataPoints().At(i).Flags().NoRecordedValue() { return false } } @@ -481,21 +481,21 @@ func compareHistogramAttributes(attributes map[string]string) histogramPointComp func assertNumberPointFlagNoRecordedValue() numberPointComparator { return func(t *testing.T, numberDataPoint pmetric.NumberDataPoint) { - assert.True(t, numberDataPoint.FlagsImmutable().NoRecordedValue(), + assert.True(t, numberDataPoint.Flags().NoRecordedValue(), "Datapoint flag for staleness marker not found as expected") } } func assertHistogramPointFlagNoRecordedValue() histogramPointComparator { return func(t *testing.T, histogramDataPoint pmetric.HistogramDataPoint) { - assert.True(t, histogramDataPoint.FlagsImmutable().NoRecordedValue(), + assert.True(t, histogramDataPoint.Flags().NoRecordedValue(), "Datapoint flag for staleness marker not found as expected") } } func assertSummaryPointFlagNoRecordedValue() summaryPointComparator { return func(t *testing.T, summaryDataPoint pmetric.SummaryDataPoint) { - assert.True(t, summaryDataPoint.FlagsImmutable().NoRecordedValue(), + assert.True(t, summaryDataPoint.Flags().NoRecordedValue(), "Datapoint flag for staleness marker not found as expected") } } diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index 029ea482f5b3..6379a6ade6d7 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.59.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index 7ebd575fcf2f..8bdfa71a7d9f 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -527,12 +527,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/pulsarreceiver/jaeger_unmarshaler_test.go b/receiver/pulsarreceiver/jaeger_unmarshaler_test.go index efc8da624620..27c033469a64 100644 --- a/receiver/pulsarreceiver/jaeger_unmarshaler_test.go +++ b/receiver/pulsarreceiver/jaeger_unmarshaler_test.go @@ -34,8 +34,8 @@ func TestUnmarshalJaeger(t *testing.T) { span.SetName("foo") span.SetStartTimestamp(pcommon.Timestamp(10)) span.SetEndTimestamp(pcommon.Timestamp(20)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) batches, err := jaeger.ProtoFromTraces(td) require.NoError(t, err) diff --git a/receiver/pulsarreceiver/zipkin_unmarshaler_test.go b/receiver/pulsarreceiver/zipkin_unmarshaler_test.go index e834979faad1..475375a1be16 100644 --- a/receiver/pulsarreceiver/zipkin_unmarshaler_test.go +++ b/receiver/pulsarreceiver/zipkin_unmarshaler_test.go @@ -42,9 +42,9 @@ func TestUnmarshalZipkin(t *testing.T) { span.SetName("foo") span.SetStartTimestamp(pcommon.Timestamp(1597759000)) span.SetEndTimestamp(pcommon.Timestamp(1597769000)) - span.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - span.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) - span.SetParentSpanID(pcommon.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})) + span.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) + span.SetSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}) + span.SetParentSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0}) spans, err := v2FromTranslator.FromTraces(td) require.NoError(t, err) diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 450b44eb662d..f7ba97c77529 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.59.0 github.com/stretchr/testify v1.8.0 github.com/testcontainers/testcontainers-go v0.13.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 7326557486c5..9f5194c4f5e4 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -780,10 +780,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/receivercreator/config.go b/receiver/receivercreator/config.go index a823290380d6..ffc03be3fa00 100644 --- a/receiver/receivercreator/config.go +++ b/receiver/receivercreator/config.go @@ -79,7 +79,7 @@ func newReceiverTemplate(name string, cfg userConfigMap) (receiverTemplate, erro }, nil } -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) // Config defines configuration for receiver_creator. type Config struct { diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index fec8f20628ed..4ba926a21160 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.59.0 github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 219a441fc8ed..e313e9b6fd86 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -417,12 +417,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= go.opentelemetry.io/contrib/propagators/b3 v1.9.0/go.mod h1:fyx3gFXn+4w5uWTTiqaI8oBNBW/6w9Ow5zxXf7NGixU= go.opentelemetry.io/contrib/zpages v0.34.0 h1:8ZXfrPkhegp/5GQYrO0pWMv2k3DQ7f+VBjaS6fMaBLM= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 65d60cf36923..e7cd159c337e 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 663357c0ae94..0809cb7e0be7 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index b0abc85d6fa4..747a7b4bed5f 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 github.com/testcontainers/testcontainers-go v0.13.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index afbef9b1bc7f..60ef54f2b4b7 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -780,10 +780,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index f57f414030fb..b8ba09a6a98e 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/SAP/go-hdb v0.108.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 763975c12bf1..5243fc3d91dd 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index efc69562608b..c77cc45b9b2f 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.59.0 github.com/signalfx/sapm-proto v0.11.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index fb5b4e4e661f..c67b2b091021 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -294,12 +294,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 20e5ede72487..d7cf94486fba 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -43,10 +43,10 @@ import ( ) func expectedTraceData(t1, t2, t3 time.Time) ptrace.Traces { - traceID := pcommon.NewTraceID( + traceID := pcommon.TraceID( [16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}) - parentSpanID := pcommon.NewSpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18}) - childSpanID := pcommon.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) + parentSpanID := pcommon.SpanID([8]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18}) + childSpanID := pcommon.SpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) traces := ptrace.NewTraces() rs := traces.ResourceSpans().AppendEmpty() diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 862d9c0b2a94..1bbc99349ed6 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index dd007d99f5e9..332bd46c4ce7 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -369,12 +369,12 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index b364d9b85a19..b46ab311a1ac 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.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 k8s.io/client-go v0.25.0 ) @@ -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.59.0 // indirect - go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 6e0f40c5dea2..dbbcc5357d86 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -663,12 +663,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= diff --git a/receiver/skywalkingreceiver/config.go b/receiver/skywalkingreceiver/config.go index adef61e0e2d3..a184251ca044 100644 --- a/receiver/skywalkingreceiver/config.go +++ b/receiver/skywalkingreceiver/config.go @@ -41,7 +41,7 @@ type Config struct { } var _ config.Receiver = (*Config)(nil) -var _ config.Unmarshallable = (*Config)(nil) +var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index bfdb8389fbf2..4f5fc8919b84 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 d6bccc596f87..b299a39a0571 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -402,12 +402,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= diff --git a/receiver/skywalkingreceiver/skywalkingproto_to_traces.go b/receiver/skywalkingreceiver/skywalkingproto_to_traces.go index a191f4e56946..bbd48d00cc94 100644 --- a/receiver/skywalkingreceiver/skywalkingproto_to_traces.go +++ b/receiver/skywalkingreceiver/skywalkingproto_to_traces.go @@ -277,11 +277,11 @@ func swTraceIDToTraceID(traceID string) pcommon.TraceID { if len(traceID) <= 36 { // 36: uuid length (rfc4122) uid, err := uuid.Parse(traceID) if err != nil { - return pcommon.EmptyTraceID + return pcommon.NewTraceIDEmpty() } - return pcommon.NewTraceID(uid) + return pcommon.TraceID(uid) } - return pcommon.NewTraceID(swStringToUUID(traceID, 0)) + return swStringToUUID(traceID, 0) } func segmentIDToSpanID(segmentID string, spanID uint32) pcommon.SpanID { @@ -290,9 +290,9 @@ func segmentIDToSpanID(segmentID string, spanID uint32) pcommon.SpanID { // 56a5e1c519ae4c76a2b8b11d92cead7f: from ParentTraceSegmentId if len(segmentID) < 32 { - return pcommon.EmptySpanID + return pcommon.NewSpanIDEmpty() } - return pcommon.NewSpanID(uuidTo8Bytes(swStringToUUID(segmentID, spanID))) + return uuidTo8Bytes(swStringToUUID(segmentID, spanID)) } func swStringToUUID(s string, extra uint32) (dst [16]byte) { diff --git a/receiver/skywalkingreceiver/skywalkingproto_to_traces_test.go b/receiver/skywalkingreceiver/skywalkingproto_to_traces_test.go index b0375b6d2f4a..f2fd6ddf1683 100644 --- a/receiver/skywalkingreceiver/skywalkingproto_to_traces_test.go +++ b/receiver/skywalkingreceiver/skywalkingproto_to_traces_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" agentV3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3" ) @@ -168,7 +169,7 @@ func Test_stringToTraceID(t *testing.T) { tests := []struct { name string segmentObject args - want [16]byte + want pcommon.TraceID }{ { name: "mock-sw-normal-trace-id-rfc4122v4", @@ -199,7 +200,7 @@ func Test_stringToTraceID(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { got := swTraceIDToTraceID(tt.segmentObject.traceID) - assert.Equal(t, tt.want, got.Bytes()) + assert.Equal(t, tt.want, got) }) } } @@ -227,7 +228,7 @@ func Test_stringToTraceID_Unique(t *testing.T) { tt := tests[i] t.Run(tt.name, func(t *testing.T) { got := swTraceIDToTraceID(tt.segmentObject.traceID) - results[i] = got.Bytes() + results[i] = got }) } assert.NotEqual(t, tests[0].segmentObject.traceID, t, tests[1].segmentObject.traceID) @@ -242,7 +243,7 @@ func Test_segmentIdToSpanId(t *testing.T) { tests := []struct { name string args args - want [8]byte + want pcommon.SpanID }{ { name: "mock-sw-span-id-normal", @@ -273,7 +274,7 @@ func Test_segmentIdToSpanId(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { got := segmentIDToSpanID(tt.args.segmentID, tt.args.spanID) - assert.Equal(t, tt.want, got.Bytes()) + assert.Equal(t, tt.want, got) }) } } @@ -301,7 +302,7 @@ func Test_segmentIdToSpanId_Unique(t *testing.T) { tt := tests[i] t.Run(tt.name, func(t *testing.T) { got := segmentIDToSpanID(tt.args.segmentID, tt.args.spanID) - results[i] = got.Bytes() + results[i] = got }) } diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 98d2e42d9a5c..d8e22ee0a3ac 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 73e0d2413cf2..cab02b42ba8c 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/solacereceiver/unmarshaller.go b/receiver/solacereceiver/unmarshaller.go index 4f3b082e7a23..f8407f0fc96f 100644 --- a/receiver/solacereceiver/unmarshaller.go +++ b/receiver/solacereceiver/unmarshaller.go @@ -153,16 +153,16 @@ func (u *solaceMessageUnmarshallerV1) mapClientSpanData(spanData *model_v1.SpanD // map trace ID var traceID [16]byte copy(traceID[:16], spanData.TraceId) - clientSpan.SetTraceID(pcommon.NewTraceID(traceID)) + clientSpan.SetTraceID(traceID) // map span ID var spanID [8]byte copy(spanID[:8], spanData.SpanId) - clientSpan.SetSpanID(pcommon.NewSpanID(spanID)) + clientSpan.SetSpanID(spanID) // conditional parent-span-id if len(spanData.ParentSpanId) == 8 { var parentSpanID [8]byte copy(parentSpanID[:8], spanData.ParentSpanId) - clientSpan.SetParentSpanID(pcommon.NewSpanID(parentSpanID)) + clientSpan.SetParentSpanID(parentSpanID) } // timestamps diff --git a/receiver/solacereceiver/unmarshaller_test.go b/receiver/solacereceiver/unmarshaller_test.go index 39f3e134d983..11e535cdc643 100644 --- a/receiver/solacereceiver/unmarshaller_test.go +++ b/receiver/solacereceiver/unmarshaller_test.go @@ -181,8 +181,8 @@ func TestSolaceMessageUnmarshallerUnmarshal(t *testing.T) { }) instrumentation := resource.ScopeSpans().AppendEmpty() span := instrumentation.Spans().AppendEmpty() - span.SetTraceID(pcommon.NewTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15})) - span.SetSpanID(pcommon.NewSpanID([8]byte{7, 6, 5, 4, 3, 2, 1, 0})) + span.SetTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}) + span.SetSpanID([8]byte{7, 6, 5, 4, 3, 2, 1, 0}) span.SetStartTimestamp(1234567890) span.SetEndTimestamp(2234567890) // expect some constants @@ -331,8 +331,8 @@ func TestUnmarshallerMapClientSpanData(t *testing.T) { EndTimeUnixNano: 2234567890, }, want: func(span *ptrace.Span) { - span.SetTraceID(pcommon.NewTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15})) - span.SetSpanID(pcommon.NewSpanID([8]byte{7, 6, 5, 4, 3, 2, 1, 0})) + span.SetTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}) + span.SetSpanID([8]byte{7, 6, 5, 4, 3, 2, 1, 0}) span.SetStartTimestamp(1234567890) span.SetEndTimestamp(2234567890) // expect some constants @@ -354,11 +354,11 @@ func TestUnmarshallerMapClientSpanData(t *testing.T) { ErrorDescription: "some error", }, want: func(span *ptrace.Span) { - span.SetTraceID(pcommon.NewTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15})) - span.SetSpanID(pcommon.NewSpanID([8]byte{7, 6, 5, 4, 3, 2, 1, 0})) + span.SetTraceID([16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}) + span.SetSpanID([8]byte{7, 6, 5, 4, 3, 2, 1, 0}) span.SetStartTimestamp(1234567890) span.SetEndTimestamp(2234567890) - span.SetParentSpanID(pcommon.NewSpanID([8]byte{15, 14, 13, 12, 11, 10, 9, 8})) + span.SetParentSpanID([8]byte{15, 14, 13, 12, 11, 10, 9, 8}) span.SetTraceState(ptrace.TraceState(someTraceState)) span.Status().SetCode(ptrace.StatusCodeError) span.Status().SetMessage("some error") diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index cbb33e6ad811..da5584ed3e58 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 18a309e2c819..2eeb4875047f 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 9c8ee11bb3d9..2635e83809de 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.13.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.opentelemetry.io/otel/trace v1.9.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 12045125f1c2..e4847dcd6621 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -884,10 +884,10 @@ 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 5d6f0d2e8910..2c742d0b5d1b 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 a47ad4795c34..2393128e10e1 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index e1da205be65f..1d29e41235a8 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.59.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.opentelemetry.io/otel v1.9.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 19cf5daa27f9..84c00736bcf2 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 78a81e360932..9f10d6365ec8 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) require ( diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 9edcbb3f3725..fe8dae0d51f6 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index c15f1dc8534e..ccb5872fcc6f 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 9a263b2d881c..be84cb4fcad1 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index b82635bc4101..caa5dae66bce 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 ) 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 269e8e8a4523..6f69671b9b11 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 38f33c6a635c..790c00744902 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 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 a7aca815f9b0..6895049fa0d2 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 9e869669068c..e1b35e38becd 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 google.golang.org/protobuf v1.28.1 ) @@ -28,8 +28,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.59.0 // indirect - go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index a5ba7c6e6cd6..b50c0cb851b0 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -267,12 +267,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 8bf5a351024d..79ba697317bc 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 // indirect + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 8e29d2232fec..e9ac8c78a32b 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index fcb32c83dfa0..fe00c63a6e27 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.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 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.59.0 github.com/pelletier/go-toml v1.9.4 // indirect - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 ) 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 66d4214c704b..8e7787002746 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index ca1376d096fb..59b1da7130c0 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.59.0 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 google.golang.org/protobuf v1.28.1 ) diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 025dfde1db38..8e9a99dcc9dd 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -340,12 +340,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= diff --git a/receiver/zipkinreceiver/proto_parse_test.go b/receiver/zipkinreceiver/proto_parse_test.go index d128aa03f390..fdcb2c9e977e 100644 --- a/receiver/zipkinreceiver/proto_parse_test.go +++ b/receiver/zipkinreceiver/proto_parse_test.go @@ -114,9 +114,9 @@ func TestConvertSpansToTraceSpans_protobuf(t *testing.T) { // First span/resource want.ResourceSpans().AppendEmpty().Resource().Attributes().UpsertString(conventions.AttributeServiceName, "svc-1") span0 := want.ResourceSpans().At(0).ScopeSpans().AppendEmpty().Spans().AppendEmpty() - span0.SetTraceID(pcommon.NewTraceID([16]byte{0x7F, 0x6F, 0x5F, 0x4F, 0x3F, 0x2F, 0x1F, 0x0F, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0})) - span0.SetSpanID(pcommon.NewSpanID([8]byte{0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0})) - span0.SetParentSpanID(pcommon.NewSpanID([8]byte{0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0})) + span0.SetTraceID([16]byte{0x7F, 0x6F, 0x5F, 0x4F, 0x3F, 0x2F, 0x1F, 0x0F, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0}) + span0.SetSpanID([8]byte{0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0}) + span0.SetParentSpanID([8]byte{0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0}) span0.SetName("ProtoSpan1") span0.SetStartTimestamp(pcommon.NewTimestampFromTime(now)) span0.SetEndTimestamp(pcommon.NewTimestampFromTime(now.Add(12 * time.Second))) @@ -130,9 +130,9 @@ func TestConvertSpansToTraceSpans_protobuf(t *testing.T) { // Second span/resource want.ResourceSpans().AppendEmpty().Resource().Attributes().UpsertString(conventions.AttributeServiceName, "search") span1 := want.ResourceSpans().At(1).ScopeSpans().AppendEmpty().Spans().AppendEmpty() - span1.SetTraceID(pcommon.NewTraceID([16]byte{0x7A, 0x6A, 0x5A, 0x4A, 0x3A, 0x2A, 0x1A, 0x0A, 0xC7, 0xC6, 0xC5, 0xC4, 0xC3, 0xC2, 0xC1, 0xC0})) - span1.SetSpanID(pcommon.NewSpanID([8]byte{0x67, 0x66, 0x65, 0x64, 0x63, 0x62, 0x61, 0x60})) - span1.SetParentSpanID(pcommon.NewSpanID([8]byte{0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10})) + span1.SetTraceID([16]byte{0x7A, 0x6A, 0x5A, 0x4A, 0x3A, 0x2A, 0x1A, 0x0A, 0xC7, 0xC6, 0xC5, 0xC4, 0xC3, 0xC2, 0xC1, 0xC0}) + span1.SetSpanID([8]byte{0x67, 0x66, 0x65, 0x64, 0x63, 0x62, 0x61, 0x60}) + span1.SetParentSpanID([8]byte{0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10}) span1.SetName("CacheWarmUp") span1.SetStartTimestamp(pcommon.NewTimestampFromTime(now.Add(-10 * time.Hour))) span1.SetEndTimestamp(pcommon.NewTimestampFromTime(now.Add(-10 * time.Hour).Add(7 * time.Second))) diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 82a38d06771a..9428ff3430e8 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.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index bd3b51f6f75e..f426cf91605d 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/testbed/datasenders/syslog.go b/testbed/datasenders/syslog.go index 64ddf2f28817..eaebfb0f0bca 100644 --- a/testbed/datasenders/syslog.go +++ b/testbed/datasenders/syslog.go @@ -104,7 +104,7 @@ func (f *SyslogWriter) Send(lr plog.LogRecord) error { sdid := strings.Builder{} sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", "trace_id", lr.TraceID().HexString())) sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", "span_id", lr.SpanID().HexString())) - sdid.WriteString(fmt.Sprintf("%s=\"%d\" ", "trace_flags", lr.FlagsStruct())) + 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())) return true diff --git a/testbed/datasenders/tcpudp.go b/testbed/datasenders/tcpudp.go index 1b8170ac9715..b93505f3f545 100644 --- a/testbed/datasenders/tcpudp.go +++ b/testbed/datasenders/tcpudp.go @@ -102,7 +102,7 @@ func (f *TCPUDPWriter) Send(lr plog.LogRecord) error { sdid := strings.Builder{} sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", "trace_id", lr.TraceID().HexString())) sdid.WriteString(fmt.Sprintf("%s=\"%s\" ", "span_id", lr.SpanID().HexString())) - sdid.WriteString(fmt.Sprintf("%s=\"%d\" ", "trace_flags", lr.FlagsStruct())) + 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())) return true diff --git a/testbed/go.mod b/testbed/go.mod index 3809e7cba5f5..ab5166f8d557 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 - go.opentelemetry.io/collector/semconv v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 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 2647408aaf5d..78b9e16d230a 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -832,12 +832,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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= -go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20 h1:ur8FbWNHLGlMzvzk0vIFDuqfZ/9SCnIQm7vTWRbDBhs= +go.opentelemetry.io/collector/semconv v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0/go.mod h1:fk1+icoN47ytLSgkoWHLJrtVTSQ+HgmkNgPTKrk/Nsc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index fd5c1e919475..85a79bc6bc8b 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.59.0 - go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 + go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 go.uber.org/zap v1.23.0 ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index e13c945084c4..afc1e1c64ede 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.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= -go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= -go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= -go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20 h1:HeGPhxjaJmHLxco2eNzIfHj5Rxt92zAMjK0EUnTYtig= +go.opentelemetry.io/collector v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:R5nd/echd99mUOhGvafTQMvL5BwvxYShF3gPgKCBiMk= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20 h1:u1pSjMTJNwDk7ADk5npVtYpRl24MV/LIvuNdO+cS94I= +go.opentelemetry.io/collector/pdata v0.59.1-0.20220907232555-bef9373cfc20/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index fd02d0f50a41..404c1c4572e6 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -161,7 +161,7 @@ func (dp *perfTestDataProvider) GenerateLogs() (plog.Logs, bool) { record.SetSeverityNumber(plog.SeverityNumberInfo3) record.SetSeverityText("INFO3") record.Body().SetStringVal("Load Generator Counter #" + strconv.Itoa(i)) - record.SetFlagsStruct(plog.DefaultLogRecordFlags.WithIsSampled(true)) + record.SetFlags(plog.DefaultLogRecordFlags.WithIsSampled(true)) record.SetTimestamp(now) attrs := record.Attributes()