handle comment str indices

Author: dmathieu

pdata/pprofile/profile.go

@@ -8,6 +8,35 @@ import "fmt"
 // switchDictionary updates the Profile, switching its indices from one
 // dictionary to another.
 func (ms Profile) switchDictionary(src, dst ProfilesDictionary) error {
+	for i, v := range ms.AttributeIndices().All() {
+		if src.AttributeTable().Len() < int(v) {
+			return fmt.Errorf("invalid attribute index %d", v)
+		}
+
+		attr := src.AttributeTable().At(int(v))
+		err := attr.switchDictionary(src, dst)
+		if err != nil {
+			return fmt.Errorf("couldn't switch dictionary for attribute %d: %w", i, err)
+		}
+		idx, err := SetAttribute(dst.AttributeTable(), attr)
+		if err != nil {
+			return fmt.Errorf("couldn't set attribute %d: %w", i, err)
+		}
+		ms.AttributeIndices().SetAt(i, idx)
+	}
+
+	for i, v := range ms.CommentStrindices().All() {
+		if src.StringTable().Len() < int(v) {
+			return fmt.Errorf("invalid comment index %d", v)
+		}
+
+		idx, err := SetString(dst.StringTable(), src.StringTable().At(int(v)))
+		if err != nil {
+			return fmt.Errorf("couldn't set key: %w", err)
+		}
+		ms.CommentStrindices().SetAt(i, idx)
+	}
+
 	for i, v := range ms.Sample().All() {
 		err := v.switchDictionary(src, dst)
 		if err != nil {

pdata/pprofile/profile_test.go

@@ -4,6 +4,7 @@
 package pprofile
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -34,6 +35,118 @@ func TestProfileSwitchDictionary(t *testing.T) {
 			wantProfile:    NewProfile(),
 			wantDictionary: NewProfilesDictionary(),
 		},
+		{
+			name: "with an existing attribute",
+			profile: func() Profile {
+				p := NewProfile()
+				p.AttributeIndices().Append(1)
+				return p
+			}(),
+
+			src: func() ProfilesDictionary {
+				d := NewProfilesDictionary()
+				d.StringTable().Append("", "test")
+
+				d.AttributeTable().AppendEmpty()
+				a := d.AttributeTable().AppendEmpty()
+				a.SetKeyStrindex(1)
+
+				return d
+			}(),
+			dst: func() ProfilesDictionary {
+				d := NewProfilesDictionary()
+				d.StringTable().Append("", "foo")
+
+				d.AttributeTable().AppendEmpty()
+				d.AttributeTable().AppendEmpty()
+				return d
+			}(),
+
+			wantProfile: func() Profile {
+				p := NewProfile()
+				p.AttributeIndices().Append(2)
+				return p
+			}(),
+			wantDictionary: func() ProfilesDictionary {
+				d := NewProfilesDictionary()
+				d.StringTable().Append("", "foo", "test")
+
+				d.AttributeTable().AppendEmpty()
+				d.AttributeTable().AppendEmpty()
+				a := d.AttributeTable().AppendEmpty()
+				a.SetKeyStrindex(2)
+				return d
+			}(),
+		},
+		{
+			name: "with an attribute index that does not match anything",
+			profile: func() Profile {
+				p := NewProfile()
+				p.AttributeIndices().Append(1)
+				return p
+			}(),
+
+			src: NewProfilesDictionary(),
+			dst: NewProfilesDictionary(),
+
+			wantProfile: func() Profile {
+				p := NewProfile()
+				p.AttributeIndices().Append(1)
+				return p
+			}(),
+			wantDictionary: NewProfilesDictionary(),
+			wantErr:        errors.New("invalid attribute index 1"),
+		},
+		{
+			name: "with an existing comment",
+			profile: func() Profile {
+				p := NewProfile()
+				p.CommentStrindices().Append(1)
+				return p
+			}(),
+
+			src: func() ProfilesDictionary {
+				d := NewProfilesDictionary()
+				d.StringTable().Append("", "test")
+				return d
+			}(),
+			dst: func() ProfilesDictionary {
+				d := NewProfilesDictionary()
+				d.StringTable().Append("", "foo")
+				return d
+			}(),
+
+			wantProfile: func() Profile {
+				p := NewProfile()
+				p.CommentStrindices().Append(2)
+				return p
+			}(),
+			wantDictionary: func() ProfilesDictionary {
+				d := NewProfilesDictionary()
+				d.StringTable().Append("", "foo", "test")
+
+				return d
+			}(),
+		},
+		{
+			name: "with a comment index that does not match anything",
+			profile: func() Profile {
+				p := NewProfile()
+				p.CommentStrindices().Append(1)
+				return p
+			}(),
+
+			src: NewProfilesDictionary(),
+			dst: NewProfilesDictionary(),
+
+			wantProfile: func() Profile {
+				p := NewProfile()
+				p.CommentStrindices().Append(1)
+				return p
+			}(),
+			wantDictionary: NewProfilesDictionary(),
+			wantErr:        errors.New("invalid comment index 1"),
+		},
 		{
 			name: "with a profile that has a sample",
 			profile: func() Profile {

pdata/pprofile/sample_test.go

@@ -79,10 +79,10 @@ func TestSampleSwitchDictionary(t *testing.T) {
 			}(),
 		},
 		{
-			name: "with a link index that does not match anything",
+			name: "with an attribute index that does not match anything",
 			sample: func() Sample {
 				s := NewSample()
-				s.SetLinkIndex(1)
+				s.AttributeIndices().Append(1)
 				return s
 			}(),
 
@@ -91,11 +91,11 @@ func TestSampleSwitchDictionary(t *testing.T) {
 
 			wantSample: func() Sample {
 				s := NewSample()
-				s.SetLinkIndex(1)
+				s.AttributeIndices().Append(1)
 				return s
 			}(),
 			wantDictionary: NewProfilesDictionary(),
-			wantErr:        errors.New("invalid link index 1"),
+			wantErr:        errors.New("invalid attribute index 1"),
 		},
 		{
 			name: "with an existing link",