upgrade elasticsearch exporter

Author: dmathieu

exporter/elasticsearchexporter/internal/serializer/otelserializer/profile_test.go

@@ -44,7 +44,7 @@ func basicProfiles() pprofiletest.Profiles {
 								Sample: []pprofiletest.Sample{
 									{
 										TimestampsUnixNano: []uint64{0},
-										Value:              []int64{1},
+										Values:             []int64{1},
 										Locations: []pprofiletest.Location{
 											{
 												Mapping: &pprofiletest.Mapping{},
@@ -78,30 +78,38 @@ func TestSerializeProfile(t *testing.T) {
 				dic.StringTable().Append("samples", "count", "cpu", "nanoseconds")
 
 				a := dic.AttributeTable().AppendEmpty()
-				a.SetKey("process.executable.build_id.htlhash")
+				a.SetKeyStrindex(4)
+				dic.StringTable().Append("process.executable.build_id.htlhash")
 				a.Value().SetStr("600DCAFE4A110000F2BF38C493F5FB92")
 				a = dic.AttributeTable().AppendEmpty()
-				a.SetKey("profile.frame.type")
+				a.SetKeyStrindex(5)
+				dic.StringTable().Append("profile.frame.type")
 				a.Value().SetStr("native")
 				a = dic.AttributeTable().AppendEmpty()
-				a.SetKey("host.id")
+				a.SetKeyStrindex(6)
+				dic.StringTable().Append("host.id")
 				a.Value().SetStr("localhost")
 				a = dic.AttributeTable().AppendEmpty()
-				a.SetKey("process.executable.name")
+				a.SetKeyStrindex(7)
+				dic.StringTable().Append("process.executable.name")
 				a.Value().SetStr("libc.so.6")
 
+				dic.MappingTable().AppendEmpty()
 				m := dic.MappingTable().AppendEmpty()
 				m.AttributeIndices().Append(0)
 
 				l := dic.LocationTable().AppendEmpty()
-				l.SetMappingIndex(0)
+				l.SetMappingIndex(1)
 				l.SetAddress(111)
 				l.AttributeIndices().Append(1)
 
+				stack := dic.StackTable().AppendEmpty()
+				stack.LocationIndices().Append(0)
+
 				return dic
 			},
 			profileCustomizer: func(_ pcommon.Resource, _ pcommon.InstrumentationScope, profile pprofile.Profile) {
-				st := profile.SampleType().AppendEmpty()
+				st := profile.SampleType()
 				st.SetTypeStrindex(0)
 				st.SetUnitStrindex(1)
 				pt := profile.PeriodType()
@@ -110,12 +118,11 @@ func TestSerializeProfile(t *testing.T) {
 				profile.SetPeriod(1e9 / 20)
 
 				profile.AttributeIndices().Append(2)
-				profile.LocationIndices().Append(0)
 
 				sample := profile.Sample().AppendEmpty()
 				sample.TimestampsUnixNano().Append(0)
-				sample.SetLocationsLength(1)
 				sample.AttributeIndices().Append(3)
+				sample.SetStackIndex(0)
 			},
 			wantErr: false,
 			expected: []map[string]any{

exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles/benchmark_test.go

@@ -19,14 +19,19 @@ func BenchmarkTransform(b *testing.B) {
 			name: "with a basic recorded sample",
 			buildDictionary: func() pprofile.ProfilesDictionary {
 				dic := pprofile.NewProfilesDictionary()
+				dic.StringTable().Append("")
+
 				a := dic.AttributeTable().AppendEmpty()
-				a.SetKey("profile.frame.type")
+				dic.StringTable().Append("profile.frame.type")
+				a.SetKeyStrindex(1)
 				a.Value().SetStr("native")
 				a = dic.AttributeTable().AppendEmpty()
-				a.SetKey("process.executable.build_id.htlhash")
+				a.SetKeyStrindex(2)
+				dic.StringTable().Append("process.executable.build_id.htlhash")
 				a.Value().SetStr(buildIDEncoded)
 				a = dic.AttributeTable().AppendEmpty()
-				a.SetKey("process.executable.build_id.htlhash")
+				a.SetKeyStrindex(3)
+				dic.StringTable().Append("process.executable.build_id.htlhash")
 				a.Value().SetStr(buildID2Encoded)
 
 				dic.StringTable().Append("firefox", "libc.so", "samples", "count", "cpu", "nanoseconds")
@@ -55,7 +60,7 @@ func BenchmarkTransform(b *testing.B) {
 				sp := rp.ScopeProfiles().AppendEmpty()
 				p := sp.Profiles().AppendEmpty()
 
-				st := p.SampleType().AppendEmpty()
+				st := p.SampleType()
 				st.SetTypeStrindex(2)
 				st.SetUnitStrindex(3)
 				pt := p.PeriodType()
@@ -64,9 +69,7 @@ func BenchmarkTransform(b *testing.B) {
 
 				s := p.Sample().AppendEmpty()
 				s.TimestampsUnixNano().Append(42)
-				s.Value().Append(1)
-				s.SetLocationsLength(2)
-				s.SetLocationsStartIndex(0)
+				s.Values().Append(1)
 
 				return rp
 			},

exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles/transform.go

@@ -46,12 +46,9 @@ func Transform(dic pprofile.ProfilesDictionary, resource pcommon.Resource, scope
 // and mixing profiles will make profiling information unusable.
 func checkProfileType(dic pprofile.ProfilesDictionary, profile pprofile.Profile) error {
 	sampleType := profile.SampleType()
-	if sampleType.Len() != 1 {
-		return fmt.Errorf("expected 1 sample type but got %d", sampleType.Len())
-	}
 
-	sType := getString(dic, int(sampleType.At(0).TypeStrindex()))
-	sUnit := getString(dic, int(sampleType.At(0).UnitStrindex()))
+	sType := getString(dic, int(sampleType.TypeStrindex()))
+	sUnit := getString(dic, int(sampleType.UnitStrindex()))
 
 	// Make sure only on-CPU profiling data is accepted at the moment.
 	// This needs to match with
@@ -94,7 +91,7 @@ func stackPayloads(dic pprofile.ProfilesDictionary, resource pcommon.Resource, s
 	}
 
 	for _, sample := range profile.Sample().All() {
-		frames, frameTypes, leafFrame, err := stackFrames(dic, profile, sample)
+		frames, frameTypes, leafFrame, err := stackFrames(dic, sample)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create stackframes: %w", err)
 		}
@@ -141,8 +138,8 @@ func stackPayloads(dic pprofile.ProfilesDictionary, resource pcommon.Resource, s
 			event.TimeStamp = newUnixTime64(t)
 
 			count := 1
-			if j < sample.Value().Len() {
-				count = int(sample.Value().At(j))
+			if j < sample.Values().Len() {
+				count = int(sample.Values().At(j))
 			}
 			for range count {
 				stackPayload = append(stackPayload, StackPayload{
@@ -234,8 +231,9 @@ func stackTraceEvent(dic pprofile.ProfilesDictionary, traceID string, sample ppr
 			continue
 		}
 		attr := dic.AttributeTable().At(int(idx))
+		key := dic.StringTable().At(int(attr.KeyStrindex()))
 
-		switch attribute.Key(attr.Key()) {
+		switch attribute.Key(key) {
 		case semconv.ThreadNameKey:
 			event.ThreadName = attr.Value().AsString()
 		case semconv.ProcessExecutableNameKey:
@@ -270,10 +268,11 @@ func stackTrace(stackTraceID string, frames []StackFrame, frameTypes []libpf.Fra
 	}
 }
 
-func stackFrames(dic pprofile.ProfilesDictionary, profile pprofile.Profile, sample pprofile.Sample) ([]StackFrame, []libpf.FrameType, *frameID, error) {
-	frames := make([]StackFrame, 0, sample.LocationsLength())
+func stackFrames(dic pprofile.ProfilesDictionary, sample pprofile.Sample) ([]StackFrame, []libpf.FrameType, *frameID, error) {
+	stack := dic.StackTable().At(int(sample.StackIndex()))
+	frames := make([]StackFrame, 0, stack.LocationIndices().Len())
 
-	locations := getLocations(dic, profile, sample)
+	locations := getLocations(dic, stack)
 	totalFrames := 0
 	for _, location := range locations {
 		totalFrames += location.Line().Len()
@@ -328,7 +327,8 @@ func stackFrames(dic pprofile.ProfilesDictionary, profile pprofile.Profile, samp
 func getFrameID(dic pprofile.ProfilesDictionary, location pprofile.Location) *frameID {
 	// The MappingIndex is known to be valid.
 	fileID := libpf.FileID{}
-	if location.HasMappingIndex() {
+
+	if location.MappingIndex() > 0 {
 		mapping := dic.MappingTable().At(int(location.MappingIndex()))
 		fileID, _ = getBuildID(dic, mapping)
 	}
@@ -377,7 +377,9 @@ func getStringFromAttribute(dic pprofile.ProfilesDictionary, record attributable
 			return "", fmt.Errorf("requested attribute index (%d) "+
 				"exceeds size of attribute table (%d)", idx, lenAttrTable)
 		}
-		if dic.AttributeTable().At(idx).Key() == attrKey {
+
+		key := dic.StringTable().At(int(dic.AttributeTable().At(idx).KeyStrindex()))
+		if key == attrKey {
 			return dic.AttributeTable().At(idx).Value().AsString(), nil
 		}
 	}
@@ -405,7 +407,11 @@ func executables(dic pprofile.ProfilesDictionary, mappings pprofile.MappingSlice
 	metadata := make([]ExeMetadata, 0, mappings.Len())
 	lastSeen := GetStartOfWeekFromTime(time.Now())
 
-	for _, mapping := range mappings.All() {
+	for i, mapping := range mappings.All() {
+		if i == 0 {
+			continue
+		}
+
 		filename := dic.StringTable().At(int(mapping.FilenameStrindex()))
 		if filename == "" {
 			// This is true for interpreted languages like Python.
@@ -460,18 +466,13 @@ func stackTraceID(frames []StackFrame) (string, error) {
 	return traceHash.Base64(), nil
 }
 
-func getLocations(dic pprofile.ProfilesDictionary, profile pprofile.Profile, sample pprofile.Sample) []pprofile.Location {
-	locations := make([]pprofile.Location, 0, sample.LocationsLength())
+func getLocations(dic pprofile.ProfilesDictionary, stack pprofile.Stack) []pprofile.Location {
+	locations := make([]pprofile.Location, 0, stack.LocationIndices().Len())
 
-	firstIndexPos := int(sample.LocationsStartIndex())
-	lastIndexPos := int(sample.LocationsStartIndex() + sample.LocationsLength())
-	lastIndexPos = min(lastIndexPos, profile.LocationIndices().Len())
-	for i := firstIndexPos; i < lastIndexPos; i++ {
-		locationIndex := int(profile.LocationIndices().At(i))
-		if locationIndex < dic.LocationTable().Len() {
-			locations = append(locations, dic.LocationTable().At(locationIndex))
-		}
+	for i := range stack.LocationIndices().All() {
+		locations = append(locations, dic.LocationTable().At(i))
 	}
+
 	return locations
 }
 
@@ -498,7 +499,7 @@ func newHostMetadata(dic pprofile.ProfilesDictionary, resource pcommon.Resource,
 
 	addEventHostData(attrs, resource.Attributes())
 	addEventHostData(attrs, scope.Attributes())
-	addEventHostData(attrs, pprofile.FromAttributeIndices(dic.AttributeTable(), profile))
+	addEventHostData(attrs, pprofile.FromAttributeIndices(dic.AttributeTable(), profile, dic))
 
 	if len(attrs) == 0 {
 		return nil