Remove AddAttribute()

Author: rockdaboot

.chloggen/profiles-PutAttributes.yaml

@@ -7,7 +7,7 @@ change_type: enhancement
 component: pdata/profile
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Introduce PutAttribute helper method to modify the content of attributable records.
+note: Replace AddAttribute with the PutAttribute helper method to modify the content of attributable records.
 
 # One or more tracking issues or pull requests related to the change
 issues: [12798]

pdata/pprofile/attributes.go

@@ -5,7 +5,6 @@ package pprofile // import "go.opentelemetry.io/collector/pdata/pprofile"
 
 import (
 	"errors"
-	"fmt"
 	"math"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -31,42 +30,6 @@ func FromAttributeIndices(table AttributeTableSlice, record attributable) pcommo
 	return m
 }
 
-// AddAttribute updates an AttributeTable and a record's AttributeIndices to
-// add a new attribute.
-// The record can by any struct that implements an `AttributeIndices` method.
-func AddAttribute(table AttributeTableSlice, record attributable, key string, value pcommon.Value) error {
-	for i := range table.Len() {
-		a := table.At(i)
-
-		if a.Key() == key && a.Value().Equal(value) {
-			if i >= math.MaxInt32 {
-				return fmt.Errorf("Attribute %s=%#v has too high an index to be added to AttributeIndices", key, value)
-			}
-
-			for j := range record.AttributeIndices().Len() {
-				v := record.AttributeIndices().At(j)
-				if v == int32(i) { //nolint:gosec // overflow checked
-					return nil
-				}
-			}
-
-			record.AttributeIndices().Append(int32(i)) //nolint:gosec // overflow checked
-			return nil
-		}
-	}
-
-	if table.Len() >= math.MaxInt32 {
-		return errors.New("AttributeTable can't take more attributes")
-	}
-	table.EnsureCapacity(table.Len() + 1)
-	entry := table.AppendEmpty()
-	entry.SetKey(key)
-	value.CopyTo(entry.Value())
-	record.AttributeIndices().Append(int32(table.Len()) - 1) //nolint:gosec // overflow checked
-
-	return nil
-}
-
 // PutAttribute updates an AttributeTable and a record's AttributeIndices to
 // add a new attribute.
 // The assumption is that attributes are a map as for other signals (metrics, logs, etc.), thus

pdata/pprofile/attributes_test.go

@@ -44,36 +44,6 @@ func TestFromAttributeIndices(t *testing.T) {
 	assert.Equal(t, attrs.AsRaw(), m)
 }
 
-func TestAddAttribute(t *testing.T) {
-	table := NewAttributeTableSlice()
-	att := table.AppendEmpty()
-	att.SetKey("hello")
-	att.Value().SetStr("world")
-
-	// Add a brand new attribute
-	loc := NewLocation()
-	err := AddAttribute(table, loc, "bonjour", pcommon.NewValueStr("monde"))
-	require.NoError(t, err)
-
-	assert.Equal(t, 2, table.Len())
-	assert.Equal(t, []int32{1}, loc.AttributeIndices().AsRaw())
-
-	// Add an already existing attribute
-	mapp := NewMapping()
-	err = AddAttribute(table, mapp, "hello", pcommon.NewValueStr("world"))
-	require.NoError(t, err)
-
-	assert.Equal(t, 2, table.Len())
-	assert.Equal(t, []int32{0}, mapp.AttributeIndices().AsRaw())
-
-	// Add a duplicate attribute
-	err = AddAttribute(table, mapp, "hello", pcommon.NewValueStr("world"))
-	require.NoError(t, err)
-
-	assert.Equal(t, 2, table.Len())
-	assert.Equal(t, []int32{0}, mapp.AttributeIndices().AsRaw())
-}
-
 func TestPutAttribute(t *testing.T) {
 	table := NewAttributeTableSlice()
 	indices := NewProfile()
@@ -136,75 +106,6 @@ func BenchmarkFromAttributeIndices(b *testing.B) {
 	}
 }
 
-func BenchmarkAddAttribute(b *testing.B) {
-	for _, bb := range []struct {
-		name  string
-		key   string
-		value pcommon.Value
-
-		runBefore func(*testing.B, AttributeTableSlice, attributable)
-	}{
-		{
-			name:  "with a new string attribute",
-			key:   "attribute",
-			value: pcommon.NewValueStr("test"),
-		},
-		{
-			name:  "with an existing attribute",
-			key:   "attribute",
-			value: pcommon.NewValueStr("test"),
-
-			runBefore: func(_ *testing.B, table AttributeTableSlice, _ attributable) {
-				entry := table.AppendEmpty()
-				entry.SetKey("attribute")
-				entry.Value().SetStr("test")
-			},
-		},
-		{
-			name:  "with a duplicate attribute",
-			key:   "attribute",
-			value: pcommon.NewValueStr("test"),
-
-			runBefore: func(_ *testing.B, table AttributeTableSlice, obj attributable) {
-				require.NoError(b, AddAttribute(table, obj, "attribute", pcommon.NewValueStr("test")))
-			},
-		},
-		{
-			name:  "with a hundred attributes to loop through",
-			key:   "attribute",
-			value: pcommon.NewValueStr("test"),
-
-			runBefore: func(_ *testing.B, table AttributeTableSlice, _ attributable) {
-				for i := range 100 {
-					entry := table.AppendEmpty()
-					entry.SetKey(fmt.Sprintf("attr_%d", i))
-					entry.Value().SetStr("test")
-				}
-
-				entry := table.AppendEmpty()
-				entry.SetKey("attribute")
-				entry.Value().SetStr("test")
-			},
-		},
-	} {
-		b.Run(bb.name, func(b *testing.B) {
-			table := NewAttributeTableSlice()
-			obj := NewLocation()
-
-			if bb.runBefore != nil {
-				bb.runBefore(b, table, obj)
-			}
-
-			b.ResetTimer()
-			b.ReportAllocs()
-
-			for n := 0; n < b.N; n++ {
-				_ = AddAttribute(table, obj, bb.key, bb.value)
-			}
-		})
-	}
-}
-
 func BenchmarkPutAttribute(b *testing.B) {
 	for _, bb := range []struct {
 		name  string