[chore] Update otel core dependency and adopt to API changes (#13978)

open-telemetry · Sep 8, 2022 · db6987e · db6987e
1 parent 566a6dc
commit db6987e
Show file tree

Hide file tree

Showing 496 changed files with 1,784 additions and 1,799 deletions.
diff --git 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
diff --git 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
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
diff --git 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
diff --git 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
@@ -241,15 +241,15 @@ func newTraceID() pcommon.TraceID {
  if err != nil {
  panic(err)
  }
- return pcommon.NewTraceID(r)
+ return r
 }
 
 func constructW3CTraceID() pcommon.TraceID {
  var r [16]byte
  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
@@ -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
 )