From 328d3082d9e0c643edc1a39611674b83caf2d3f5 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Thu, 27 Nov 2025 15:57:27 +0100 Subject: [PATCH 1/2] Introduce MergeFrom for profiles Signed-off-by: Israel Blancas --- .chloggen/14091-add-megeto-profiles.yaml | 25 ++++++++++ pdata/pprofile/profiles_merge.go | 24 +++++++++ pdata/pprofile/profiles_merge_test.go | 62 ++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 .chloggen/14091-add-megeto-profiles.yaml create mode 100644 pdata/pprofile/profiles_merge.go create mode 100644 pdata/pprofile/profiles_merge_test.go diff --git a/.chloggen/14091-add-megeto-profiles.yaml b/.chloggen/14091-add-megeto-profiles.yaml new file mode 100644 index 00000000000..eb482498f3b --- /dev/null +++ b/.chloggen/14091-add-megeto-profiles.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp) +component: pdata/pprofile + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Introduce `MergeTo` method + +# One or more tracking issues or pull requests related to the change +issues: [14091] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/pdata/pprofile/profiles_merge.go b/pdata/pprofile/profiles_merge.go new file mode 100644 index 00000000000..851bf739d99 --- /dev/null +++ b/pdata/pprofile/profiles_merge.go @@ -0,0 +1,24 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package pprofile // import "go.opentelemetry.io/collector/pdata/pprofile" + +// MergeTo merges the current Profiles into dest, updating the destination +// dictionary as needed and appending the resource profiles. +// The source Profiles is consumed and marked read-only after this operation. +func (ms Profiles) MergeTo(dest Profiles) error { + ms.getState().AssertMutable() + dest.getState().AssertMutable() + if ms.getOrig() == dest.getOrig() { + return nil + } + + if err := ms.switchDictionary(ms.Dictionary(), dest.Dictionary()); err != nil { + return err + } + + ms.ResourceProfiles().MoveAndAppendTo(dest.ResourceProfiles()) + ms.MarkReadOnly() + + return nil +} diff --git a/pdata/pprofile/profiles_merge_test.go b/pdata/pprofile/profiles_merge_test.go new file mode 100644 index 00000000000..7d08241c649 --- /dev/null +++ b/pdata/pprofile/profiles_merge_test.go @@ -0,0 +1,62 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package pprofile + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestProfilesMergeTo(t *testing.T) { + src := NewProfiles() + dest := NewProfiles() + + src.ResourceProfiles().AppendEmpty() + src.ResourceProfiles().AppendEmpty() + dest.ResourceProfiles().AppendEmpty() + + require.NoError(t, src.MergeTo(dest)) + + assert.Equal(t, 3, dest.ResourceProfiles().Len()) + assert.Equal(t, 0, src.ResourceProfiles().Len()) + assert.True(t, src.IsReadOnly()) +} + +func TestProfilesMergeToSelf(t *testing.T) { + profiles := NewProfiles() + profiles.Dictionary().StringTable().Append("test") + profiles.ResourceProfiles().AppendEmpty() + + require.NoError(t, profiles.MergeTo(profiles)) + + assert.Equal(t, 1, profiles.Dictionary().StringTable().Len()) + assert.Equal(t, 1, profiles.ResourceProfiles().Len()) +} + +func TestProfilesMergeToError(t *testing.T) { + src := NewProfiles() + dest := NewProfiles() + + stackTable := src.Dictionary().StackTable() + stackTable.AppendEmpty() + stack := stackTable.AppendEmpty() + stack.LocationIndices().Append(1) + + locationTable := src.Dictionary().LocationTable() + locationTable.AppendEmpty() + locationTable.AppendEmpty().SetMappingIndex(1) + + sample := src.ResourceProfiles().AppendEmpty(). + ScopeProfiles().AppendEmpty(). + Profiles().AppendEmpty(). + Samples().AppendEmpty() + sample.SetStackIndex(1) + + err := src.MergeTo(dest) + require.Error(t, err) + + assert.Equal(t, 0, dest.ResourceProfiles().Len()) +} From a3051d10ac718c06f76a4a5df9b88d52442844a6 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Thu, 27 Nov 2025 17:56:08 +0100 Subject: [PATCH 2/2] Apply changes requested in code review Signed-off-by: Israel Blancas --- ...d-megeto-profiles.yaml => 14091-add-mergeto-profiles.yaml} | 2 +- pdata/pprofile/profiles_merge_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename .chloggen/{14091-add-megeto-profiles.yaml => 14091-add-mergeto-profiles.yaml} (98%) diff --git a/.chloggen/14091-add-megeto-profiles.yaml b/.chloggen/14091-add-mergeto-profiles.yaml similarity index 98% rename from .chloggen/14091-add-megeto-profiles.yaml rename to .chloggen/14091-add-mergeto-profiles.yaml index eb482498f3b..194e33830e8 100644 --- a/.chloggen/14091-add-megeto-profiles.yaml +++ b/.chloggen/14091-add-mergeto-profiles.yaml @@ -22,4 +22,4 @@ subtext: # Include 'user' if the change is relevant to end users. # Include 'api' if there is a change to a library API. # Default: '[user]' -change_logs: [] +change_logs: [api] diff --git a/pdata/pprofile/profiles_merge_test.go b/pdata/pprofile/profiles_merge_test.go index 7d08241c649..03d451e1abe 100644 --- a/pdata/pprofile/profiles_merge_test.go +++ b/pdata/pprofile/profiles_merge_test.go @@ -27,12 +27,12 @@ func TestProfilesMergeTo(t *testing.T) { func TestProfilesMergeToSelf(t *testing.T) { profiles := NewProfiles() - profiles.Dictionary().StringTable().Append("test") + profiles.Dictionary().StringTable().Append("", "test") profiles.ResourceProfiles().AppendEmpty() require.NoError(t, profiles.MergeTo(profiles)) - assert.Equal(t, 1, profiles.Dictionary().StringTable().Len()) + assert.Equal(t, 2, profiles.Dictionary().StringTable().Len()) assert.Equal(t, 1, profiles.ResourceProfiles().Len()) }