[pdata] Rename ValueTypeArray to ValueTypeSlice

CHANGELOG.md

@@ -28,6 +28,9 @@
   - Deprecate `pdata.AttributeValueSlice` struct in favor of `pdata.Slice`
   - Deprecate `pdata.NewAttributeValueSlice` func in favor of `pdata.NewSlice`
 - Deprecate LogRecord.Name(), it was deprecated in the data model (#5054)
+- Rename `Array` type of `pdata.Value` to `Slice` (#5067)
+  - Deprecate `pdata.AttributeValueTypeArray` type in favor of `pdata.ValueTypeSlice`
+  - Deprecate `pdata.NewAttributeValueArray` func in favor of `pdata.NewValueSlice`
 - Deprecate global flag in `featuregates` (#5060)
 
 ### 💡 Enhancements 💡

internal/otlptext/databuffer.go

@@ -263,7 +263,7 @@ func attributeValueToString(v pdata.Value) string {
 		return strconv.FormatFloat(v.DoubleVal(), 'f', -1, 64)
 	case pdata.ValueTypeInt:
 		return strconv.FormatInt(v.IntVal(), 10)
-	case pdata.ValueTypeArray:
+	case pdata.ValueTypeSlice:
 		return sliceToString(v.SliceVal())
 	case pdata.ValueTypeMap:
 		return mapToString(v.MapVal())

internal/otlptext/databuffer_test.go

@@ -23,11 +23,11 @@ import (
 )
 
 func TestNestedArraySerializesCorrectly(t *testing.T) {
-	ava := pdata.NewValueArray()
+	ava := pdata.NewValueSlice()
 	ava.SliceVal().AppendEmpty().SetStringVal("foo")
 	ava.SliceVal().AppendEmpty().SetIntVal(42)
 
-	ava2 := pdata.NewValueArray()
+	ava2 := pdata.NewValueSlice()
 	ava2.SliceVal().AppendEmpty().SetStringVal("bar")
 	ava2.CopyTo(ava.SliceVal().AppendEmpty())
 

model/internal/cmd/pdatagen/internal/common_structs.go

@@ -28,7 +28,7 @@ var commonFile = &File{
 	},
 	structs: []baseStruct{
 		instrumentationLibrary,
-		attributeValueArray,
+		attributeValueSlice,
 	},
 }
 
@@ -109,7 +109,7 @@ var anyValue = &messageValueStruct{
 	originFullName: "otlpcommon.AnyValue",
 }
 
-var attributeValueArray = &sliceOfValues{
+var attributeValueSlice = &sliceOfValues{
 	structName: "Slice",
 	element:    anyValue,
 }

model/internal/pdata/common.go

@@ -39,7 +39,7 @@ const (
 	ValueTypeDouble
 	ValueTypeBool
 	ValueTypeMap
-	ValueTypeArray
+	ValueTypeSlice
 	ValueTypeBytes
 )
 
@@ -58,8 +58,8 @@ func (avt ValueType) String() string {
 		return "DOUBLE"
 	case ValueTypeMap:
 		return "MAP"
-	case ValueTypeArray:
-		return "ARRAY"
+	case ValueTypeSlice:
+		return "SLICE"
 	case ValueTypeBytes:
 		return "BYTES"
 	}
@@ -120,8 +120,8 @@ func NewValueMap() Value {
 	return Value{orig: &otlpcommon.AnyValue{Value: &otlpcommon.AnyValue_KvlistValue{KvlistValue: &otlpcommon.KeyValueList{}}}}
 }
 
-// NewValueArray creates a new Value of array type.
-func NewValueArray() Value {
+// NewValueSlice creates a new Value of array type.
+func NewValueSlice() Value {
 	return Value{orig: &otlpcommon.AnyValue{Value: &otlpcommon.AnyValue_ArrayValue{ArrayValue: &otlpcommon.ArrayValue{}}}}
 }
 
@@ -171,7 +171,7 @@ func newValueFromRaw(iv interface{}) Value {
 		NewMapFromRaw(tv).CopyTo(mv.MapVal())
 		return mv
 	case []interface{}:
-		av := NewValueArray()
+		av := NewValueSlice()
 		newSliceFromRaw(tv).CopyTo(av.SliceVal())
 		return av
 	default:
@@ -197,7 +197,7 @@ func (v Value) Type() ValueType {
 	case *otlpcommon.AnyValue_KvlistValue:
 		return ValueTypeMap
 	case *otlpcommon.AnyValue_ArrayValue:
-		return ValueTypeArray
+		return ValueTypeSlice
 	case *otlpcommon.AnyValue_BytesValue:
 		return ValueTypeBytes
 	}
@@ -246,7 +246,7 @@ func (v Value) MapVal() Map {
 }
 
 // SliceVal returns the slice value associated with this Value.
-// If the Type() is not ValueTypeArray then returns an invalid slice. Note that using
+// If the Type() is not ValueTypeSlice then returns an invalid slice. Note that using
 // such slice can cause panic.
 //
 // Calling this function on zero-initialized Value will cause a panic.
@@ -376,7 +376,7 @@ func (v Value) Equal(av Value) bool {
 			newAv := newValue(&vv[i])
 
 			// According to the specification, array values must be scalar.
-			if avType := newAv.Type(); avType == ValueTypeArray || avType == ValueTypeMap {
+			if avType := newAv.Type(); avType == ValueTypeSlice || avType == ValueTypeMap {
 				return false
 			}
 
@@ -439,7 +439,7 @@ func (v Value) AsString() string {
 	case ValueTypeBytes:
 		return base64.StdEncoding.EncodeToString(v.BytesVal())
 
-	case ValueTypeArray:
+	case ValueTypeSlice:
 		jsonStr, _ := json.Marshal(v.SliceVal().asRaw())
 		return string(jsonStr)
 
@@ -495,7 +495,7 @@ func (v Value) asRaw() interface{} {
 		return v.BytesVal()
 	case ValueTypeMap:
 		v.MapVal().AsRaw()
-	case ValueTypeArray:
+	case ValueTypeSlice:
 		v.SliceVal().asRaw()
 	}
 	return fmt.Sprintf("<Unknown OpenTelemetry value type %q>", v.Type())
@@ -939,7 +939,7 @@ func (m Map) AsRaw() map[string]interface{} {
 			rawMap[k] = nil
 		case ValueTypeMap:
 			rawMap[k] = v.MapVal().AsRaw()
-		case ValueTypeArray:
+		case ValueTypeSlice:
 			rawMap[k] = v.SliceVal().asRaw()
 		}
 		return true

model/internal/pdata/common_test.go

@@ -76,7 +76,7 @@ func TestAttributeValueType(t *testing.T) {
 	assert.EqualValues(t, "INT", ValueTypeInt.String())
 	assert.EqualValues(t, "DOUBLE", ValueTypeDouble.String())
 	assert.EqualValues(t, "MAP", ValueTypeMap.String())
-	assert.EqualValues(t, "ARRAY", ValueTypeArray.String())
+	assert.EqualValues(t, "SLICE", ValueTypeSlice.String())
 	assert.EqualValues(t, "BYTES", ValueTypeBytes.String())
 }
 
@@ -234,12 +234,12 @@ func TestAttributeValueEqual(t *testing.T) {
 	av1 = NewValueBytes([]byte{1, 2, 3})
 	assert.True(t, av1.Equal(av2))
 
-	av1 = NewValueArray()
+	av1 = NewValueSlice()
 	av1.SliceVal().AppendEmpty().SetIntVal(123)
 	assert.False(t, av1.Equal(av2))
 	assert.False(t, av2.Equal(av1))
 
-	av2 = NewValueArray()
+	av2 = NewValueSlice()
 	av2.SliceVal().AppendEmpty().SetDoubleVal(123)
 	assert.False(t, av1.Equal(av2))
 
@@ -976,17 +976,17 @@ func generateTestBytesMap() Map {
 	})
 }
 
-func TestAttributeValueArray(t *testing.T) {
-	a1 := NewValueArray()
-	assert.EqualValues(t, ValueTypeArray, a1.Type())
+func TestAttributeValueSlice(t *testing.T) {
+	a1 := NewValueSlice()
+	assert.EqualValues(t, ValueTypeSlice, a1.Type())
 	assert.EqualValues(t, NewSlice(), a1.SliceVal())
 	assert.EqualValues(t, 0, a1.SliceVal().Len())
 
 	a1.SliceVal().AppendEmpty().SetDoubleVal(123)
 	assert.EqualValues(t, 1, a1.SliceVal().Len())
 	assert.EqualValues(t, NewValueDouble(123), a1.SliceVal().At(0))
 	// Create a second array.
-	a2 := NewValueArray()
+	a2 := NewValueSlice()
 	assert.EqualValues(t, 0, a2.SliceVal().Len())
 
 	a2.SliceVal().AppendEmpty().SetStringVal("somestr")
@@ -1001,7 +1001,7 @@ func TestAttributeValueArray(t *testing.T) {
 
 	// Check that the array was correctly inserted.
 	childArray := a1.SliceVal().At(1)
-	assert.EqualValues(t, ValueTypeArray, childArray.Type())
+	assert.EqualValues(t, ValueTypeSlice, childArray.Type())
 	assert.EqualValues(t, 1, childArray.SliceVal().Len())
 
 	v := childArray.SliceVal().At(0)
@@ -1084,12 +1084,12 @@ func TestAsString(t *testing.T) {
 		},
 		{
 			name:     "empty_array",
-			input:    NewValueArray(),
+			input:    NewValueSlice(),
 			expected: "[]",
 		},
 		{
 			name:     "simple_array",
-			input:    simpleValueArray(),
+			input:    simpleValueSlice(),
 			expected: "[\"strVal\",7,18.6,false,null]",
 		},
 		{
@@ -1254,7 +1254,7 @@ func TestNewValueFromRaw(t *testing.T) {
 			name:  "slice",
 			input: []interface{}{"v1", "v2"},
 			expected: (func() Value {
-				s := NewValueArray()
+				s := NewValueSlice()
 				newSliceFromRaw([]interface{}{"v1", "v2"}).CopyTo(s.SliceVal())
 				return s
 			})(),
@@ -1281,8 +1281,8 @@ func simpleValueMap() Value {
 	return ret
 }
 
-func simpleValueArray() Value {
-	ret := NewValueArray()
+func simpleValueSlice() Value {
+	ret := NewValueSlice()
 	attrArr := ret.SliceVal()
 	attrArr.AppendEmpty().SetStringVal("strVal")
 	attrArr.AppendEmpty().SetIntVal(7)
@@ -1300,7 +1300,7 @@ func constructTestAttributeSubmap() Value {
 }
 
 func constructTestAttributeSubarray() Value {
-	value := NewValueArray()
+	value := NewValueSlice()
 	value.SliceVal().AppendEmpty().SetStringVal("strOne")
 	value.SliceVal().AppendEmpty().SetStringVal("strTwo")
 	return value
@@ -1315,8 +1315,8 @@ func BenchmarkAttributeValueMapAccessor(b *testing.B) {
 	}
 }
 
-func BenchmarkAttributeValueArrayAccessor(b *testing.B) {
-	val := simpleValueArray()
+func BenchmarkAttributeValueSliceAccessor(b *testing.B) {
+	val := simpleValueSlice()
 
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {

model/pdata/common_alias.go

@@ -33,7 +33,7 @@ const (
 	ValueTypeDouble = pdata.ValueTypeDouble
 	ValueTypeBool   = pdata.ValueTypeBool
 	ValueTypeMap    = pdata.ValueTypeMap
-	ValueTypeArray  = pdata.ValueTypeArray
+	ValueTypeSlice  = pdata.ValueTypeSlice
 	ValueTypeBytes  = pdata.ValueTypeBytes
 
 	// Deprecated: [v0.48.0] Use ValueTypeEmpty instead.
@@ -54,8 +54,8 @@ const (
 	// Deprecated: [v0.48.0] Use ValueTypeMap instead.
 	AttributeValueTypeMap = pdata.ValueTypeMap
 
-	// Deprecated: [v0.48.0] Use ValueTypeArray instead.
-	AttributeValueTypeArray = pdata.ValueTypeArray
+	// Deprecated: [v0.48.0] Use ValueTypeSlice instead.
+	AttributeValueTypeArray = pdata.ValueTypeSlice
 
 	// Deprecated: [v0.48.0] Use ValueTypeBytes instead.
 	AttributeValueTypeBytes = pdata.ValueTypeBytes
@@ -75,7 +75,7 @@ var (
 	NewValueDouble = pdata.NewValueDouble
 	NewValueBool   = pdata.NewValueBool
 	NewValueMap    = pdata.NewValueMap
-	NewValueArray  = pdata.NewValueArray
+	NewValueSlice  = pdata.NewValueSlice
 	NewValueBytes  = pdata.NewValueBytes
 
 	// Deprecated: [v0.48.0] Use NewValueEmpty instead.
@@ -96,8 +96,8 @@ var (
 	// Deprecated: [v0.48.0] Use NewValueMap instead.
 	NewAttributeValueMap = pdata.NewValueMap
 
-	// Deprecated: [v0.48.0] Use NewValueArray instead.
-	NewAttributeValueArray = pdata.NewValueArray
+	// Deprecated: [v0.48.0] Use NewValueSlice instead.
+	NewAttributeValueArray = pdata.NewValueSlice
 
 	// Deprecated: [v0.48.0] Use NewValueBytes instead.
 	NewAttributeValueBytes = pdata.NewValueBytes