update core, address pdata changes (#6137)

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>
open-telemetry · Nov 4, 2021 · d133d6e · d133d6e
1 parent b552c13
commit d133d6e
Show file tree

Hide file tree

Showing 287 changed files with 869 additions and 875 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.38.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.38.1-0.20211103011348-c24dfeb047a8
-	go.opentelemetry.io/collector/model v0.38.1-0.20211103011348-c24dfeb047a8
+	go.opentelemetry.io/collector v0.38.1-0.20211103215828-cffbecb2ac9e
+	go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
 	go.uber.org/zap v1.19.1
 )
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go
@@ -34,7 +34,7 @@ func getComplexAttributeValueMap() pdata.AttributeValue {
 	mapValReal.InsertInt("code", 200)
 	mapValReal.InsertNull("null")
 	arrayVal := pdata.NewAttributeValueArray()
-	arrayVal.ArrayVal().AppendEmpty().SetStringVal("array")
+	arrayVal.SliceVal().AppendEmpty().SetStringVal("array")
 	mapValReal.Insert("array", arrayVal)
 
 	subMapVal := pdata.NewAttributeValueMap()
@@ -76,7 +76,7 @@ func createLogData(numberOfLogs int) pdata.Logs {
 			logRecord.Body().SetStringVal("log contents")
 		case 6:
 			arrayVal := pdata.NewAttributeValueArray()
-			arrayVal.ArrayVal().AppendEmpty().SetStringVal("array")
+			arrayVal.SliceVal().AppendEmpty().SetStringVal("array")
 			logRecord.Attributes().Insert("array-value", arrayVal)
 			logRecord.Body().SetStringVal("log contents")
 		default:

diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go
@@ -229,7 +229,7 @@ func attrValue(value pdata.AttributeValue) interface{} {
 		})
 		return values
 	case pdata.AttributeValueTypeArray:
-		arrayVal := value.ArrayVal()
+		arrayVal := value.SliceVal()
 		values := make([]interface{}, arrayVal.Len())
 		for i := 0; i < arrayVal.Len(); i++ {
 			values[i] = attrValue(arrayVal.At(i))

diff --git a/exporter/awscloudwatchlogsexporter/exporter_test.go b/exporter/awscloudwatchlogsexporter/exporter_test.go
@@ -177,7 +177,7 @@ func TestAttrValue(t *testing.T) {
 			name: "array",
 			builder: func() pdata.AttributeValue {
 				arrAttr := pdata.NewAttributeValueArray()
-				arr := arrAttr.ArrayVal()
+				arr := arrAttr.SliceVal()
 				for _, av := range []pdata.AttributeValue{
 					pdata.NewAttributeValueDouble(1.2),
 					pdata.NewAttributeValueDouble(1.6),

diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -5,8 +5,8 @@ go 1.17
 require (
 	github.com/aws/aws-sdk-go v1.41.14
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.38.1-0.20211103011348-c24dfeb047a8
-	go.opentelemetry.io/collector/model v0.38.1-0.20211103011348-c24dfeb047a8
+	go.opentelemetry.io/collector v0.38.1-0.20211103215828-cffbecb2ac9e
+	go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
 	go.uber.org/zap v1.19.1
 )
 

diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum
diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -12,8 +12,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.38.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.38.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.38.1-0.20211103011348-c24dfeb047a8
-	go.opentelemetry.io/collector/model v0.38.1-0.20211103011348-c24dfeb047a8
+	go.opentelemetry.io/collector v0.38.1-0.20211103215828-cffbecb2ac9e
+	go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
 	go.uber.org/zap v1.19.1
 	google.golang.org/protobuf v1.27.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
@@ -7,8 +7,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.38.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.38.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.38.1-0.20211103011348-c24dfeb047a8
-	go.opentelemetry.io/collector/model v0.38.1-0.20211103011348-c24dfeb047a8
+	go.opentelemetry.io/collector v0.38.1-0.20211103215828-cffbecb2ac9e
+	go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
 	go.uber.org/zap v1.19.1
 )
 

diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/aws/aws-sdk-go v1.41.14
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.38.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.38.1-0.20211103011348-c24dfeb047a8
+	go.opentelemetry.io/collector v0.38.1-0.20211103215828-cffbecb2ac9e
 )
 
 require (
@@ -35,7 +35,7 @@ require (
 	github.com/tidwall/tinylru v1.1.0 // indirect
 	github.com/tidwall/wal v0.1.6 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/collector/model v0.38.1-0.20211103011348-c24dfeb047a8 // indirect
+	go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.0 // indirect
 	go.opentelemetry.io/otel v1.1.0 // indirect
 	go.opentelemetry.io/otel/internal/metric v0.24.0 // indirect

diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.38.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.38.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.38.1-0.20211103011348-c24dfeb047a8
-	go.opentelemetry.io/collector/model v0.38.1-0.20211103011348-c24dfeb047a8
+	go.opentelemetry.io/collector v0.38.1-0.20211103215828-cffbecb2ac9e
+	go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
 	go.uber.org/zap v1.19.1
 )
 

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
diff --git a/exporter/awsxrayexporter/internal/translator/aws.go b/exporter/awsxrayexporter/internal/translator/aws.go
@@ -56,8 +56,8 @@ func makeAws(attributes map[string]pdata.AttributeValue, resource pdata.Resource
 		taskArn      string
 		taskFamily   string
 		launchType   string
-		logGroups    pdata.AnyValueArray
-		logGroupArns pdata.AnyValueArray
+		logGroups    pdata.AttributeValueSlice
+		logGroupArns pdata.AttributeValueSlice
 		cwl          []awsxray.LogGroupMetadata
 		ec2          *awsxray.EC2Metadata
 		ecs          *awsxray.ECSMetadata
@@ -117,9 +117,9 @@ func makeAws(attributes map[string]pdata.AttributeValue, resource pdata.Resource
 		case conventions.AttributeAWSECSLaunchtype:
 			launchType = value.StringVal()
 		case conventions.AttributeAWSLogGroupNames:
-			logGroups = value.ArrayVal()
+			logGroups = value.SliceVal()
 		case conventions.AttributeAWSLogGroupARNs:
-			logGroupArns = value.ArrayVal()
+			logGroupArns = value.SliceVal()
 		}
 		return true
 	})
@@ -204,9 +204,9 @@ func makeAws(attributes map[string]pdata.AttributeValue, resource pdata.Resource
 
 	// Since we must couple log group ARNs and Log Group Names in the same CWLogs object, we first try to derive the
 	// names from the ARN, then fall back to just recording the names
-	if logGroupArns != (pdata.AnyValueArray{}) && logGroupArns.Len() > 0 {
+	if logGroupArns != (pdata.AttributeValueSlice{}) && logGroupArns.Len() > 0 {
 		cwl = getLogGroupMetadata(logGroupArns, true)
-	} else if logGroups != (pdata.AnyValueArray{}) && logGroups.Len() > 0 {
+	} else if logGroups != (pdata.AttributeValueSlice{}) && logGroups.Len() > 0 {
 		cwl = getLogGroupMetadata(logGroups, false)
 	}
 
@@ -243,7 +243,7 @@ func makeAws(attributes map[string]pdata.AttributeValue, resource pdata.Resource
 
 // Given an array of log group ARNs, create a corresponding amount of LogGroupMetadata objects with log_group and arn
 // populated, or given an array of just log group names, create the LogGroupMetadata objects with arn omitted
-func getLogGroupMetadata(logGroups pdata.AnyValueArray, isArn bool) []awsxray.LogGroupMetadata {
+func getLogGroupMetadata(logGroups pdata.AttributeValueSlice, isArn bool) []awsxray.LogGroupMetadata {
 	var lgm []awsxray.LogGroupMetadata
 	for i := 0; i < logGroups.Len(); i++ {
 		if isArn {

diff --git a/exporter/awsxrayexporter/internal/translator/aws_test.go b/exporter/awsxrayexporter/internal/translator/aws_test.go
@@ -363,7 +363,7 @@ func TestLogGroups(t *testing.T) {
 	attributes := make(map[string]pdata.AttributeValue)
 	resource := pdata.NewResource()
 	lg := pdata.NewAttributeValueArray()
-	ava := lg.ArrayVal()
+	ava := lg.SliceVal()
 	ava.EnsureCapacity(2)
 	ava.AppendEmpty().SetStringVal("group1")
 	ava.AppendEmpty().SetStringVal("group2")
@@ -394,7 +394,7 @@ func TestLogGroupsFromArns(t *testing.T) {
 	attributes := make(map[string]pdata.AttributeValue)
 	resource := pdata.NewResource()
 	lga := pdata.NewAttributeValueArray()
-	ava := lga.ArrayVal()
+	ava := lga.SliceVal()
 	ava.EnsureCapacity(2)
 	ava.AppendEmpty().SetStringVal(group1)
 	ava.AppendEmpty().SetStringVal(group2)

diff --git a/exporter/awsxrayexporter/internal/translator/segment.go b/exporter/awsxrayexporter/internal/translator/segment.go
@@ -425,7 +425,7 @@ func metadataValue(value pdata.AttributeValue) interface{} {
 		})
 		return converted
 	case pdata.AttributeValueTypeArray:
-		arrVal := value.ArrayVal()
+		arrVal := value.SliceVal()
 		converted := make([]interface{}, arrVal.Len())
 		for i := 0; i < arrVal.Len(); i++ {
 			converted[i] = metadataValue(arrVal.At(i))

diff --git a/exporter/awsxrayexporter/internal/translator/segment_test.go b/exporter/awsxrayexporter/internal/translator/segment_test.go
@@ -727,9 +727,9 @@ func TestFilteredAttributesMetadata(t *testing.T) {
 	attrs.InsertNull("null_value")
 
 	arrayValue := pdata.NewAttributeValueArray()
-	arrayValue.ArrayVal().AppendEmpty().SetIntVal(12)
-	arrayValue.ArrayVal().AppendEmpty().SetIntVal(34)
-	arrayValue.ArrayVal().AppendEmpty().SetIntVal(56)
+	arrayValue.SliceVal().AppendEmpty().SetIntVal(12)
+	arrayValue.SliceVal().AppendEmpty().SetIntVal(34)
+	arrayValue.SliceVal().AppendEmpty().SetIntVal(56)
 	attrs.Insert("array_value", arrayValue)
 
 	mapValue := pdata.NewAttributeValueMap()
@@ -851,7 +851,7 @@ func constructDefaultResource() pdata.Resource {
 	attrs.Insert(resourceMapKey, resourceMapVal)
 
 	resourceArrayVal := pdata.NewAttributeValueArray()
-	resourceArray := resourceArrayVal.ArrayVal()
+	resourceArray := resourceArrayVal.SliceVal()
 	resourceArray.AppendEmpty().SetStringVal("foo")
 	resourceArray.AppendEmpty().SetStringVal("bar")
 	attrs.Insert(resourceArrayKey, resourceArrayVal)