From e1d60d44711b239a76b4b6d3d19de4fc35290d15 Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Fri, 28 Nov 2025 23:17:18 +0800 Subject: [PATCH 1/8] optimize map allocation Signed-off-by: leiwingqueen --- receiver/prometheusremotewritereceiver/receiver.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/receiver/prometheusremotewritereceiver/receiver.go b/receiver/prometheusremotewritereceiver/receiver.go index b54cf24de7a82..c4dc4af757022 100644 --- a/receiver/prometheusremotewritereceiver/receiver.go +++ b/receiver/prometheusremotewritereceiver/receiver.go @@ -737,7 +737,9 @@ func convertAbsoluteBuckets(spans []writev2.BucketSpan, counts []float64, bucket // extractAttributes return all attributes different from job, instance, metric name and scope name/version func extractAttributes(ls labels.Labels) pcommon.Map { attrs := pcommon.NewMap() - for labelName, labelValue := range ls.Map() { + labelMap := ls.Map() + attrs.EnsureCapacity(len(labelMap) - 5) // Exclude job, instance, metric name and scope name/version + for labelName, labelValue := range labelMap { if labelName == "instance" || labelName == "job" || // Become resource attributes labelName == labels.MetricName || // Becomes metric name labelName == "otel_scope_name" || labelName == "otel_scope_version" { // Becomes scope name and version From 6bc9c011f7dda04c51dd6263ce3d17702b1a9df6 Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Sat, 6 Dec 2025 00:31:49 +0800 Subject: [PATCH 2/8] change capacity init size Signed-off-by: leiwingqueen --- receiver/prometheusremotewritereceiver/receiver.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/receiver/prometheusremotewritereceiver/receiver.go b/receiver/prometheusremotewritereceiver/receiver.go index c4dc4af757022..e33c894ba9c9b 100644 --- a/receiver/prometheusremotewritereceiver/receiver.go +++ b/receiver/prometheusremotewritereceiver/receiver.go @@ -738,7 +738,8 @@ func convertAbsoluteBuckets(spans []writev2.BucketSpan, counts []float64, bucket func extractAttributes(ls labels.Labels) pcommon.Map { attrs := pcommon.NewMap() labelMap := ls.Map() - attrs.EnsureCapacity(len(labelMap) - 5) // Exclude job, instance, metric name and scope name/version + // job, instance and metric name will always become labels, but scope name and version may or may not be present + attrs.EnsureCapacity(len(labelMap) - 3) for labelName, labelValue := range labelMap { if labelName == "instance" || labelName == "job" || // Become resource attributes labelName == labels.MetricName || // Becomes metric name From 0bcaf83194c76f0bc773de00da6ffdec737e8507 Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Thu, 11 Dec 2025 23:00:10 +0800 Subject: [PATCH 3/8] add change log Signed-off-by: leiwingqueen --- ...writereceiver-optimize-map-allocation.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .chloggen/prometheusremotewritereceiver-optimize-map-allocation.yaml diff --git a/.chloggen/prometheusremotewritereceiver-optimize-map-allocation.yaml b/.chloggen/prometheusremotewritereceiver-optimize-map-allocation.yaml new file mode 100644 index 0000000000000..e70b2f6344cfb --- /dev/null +++ b/.chloggen/prometheusremotewritereceiver-optimize-map-allocation.yaml @@ -0,0 +1,27 @@ +# 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/filelog) +component: receiver/prometheusremotewrite + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Map.PutStr causes excessive memory allocations due to repeated slice expansions + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [44612] + +# (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: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# 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: [user] From 2aa795a0124e961489fb5a3e3a7acf6336b1b0e5 Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Thu, 11 Dec 2025 23:48:58 +0800 Subject: [PATCH 4/8] add benchmark test Signed-off-by: leiwingqueen --- .../receiver_bench_test.go | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 receiver/prometheusremotewritereceiver/receiver_bench_test.go diff --git a/receiver/prometheusremotewritereceiver/receiver_bench_test.go b/receiver/prometheusremotewritereceiver/receiver_bench_test.go new file mode 100644 index 0000000000000..78b68aaf5b417 --- /dev/null +++ b/receiver/prometheusremotewritereceiver/receiver_bench_test.go @@ -0,0 +1,65 @@ +package prometheusremotewritereceiver + +import ( + "fmt" + "testing" + + "github.com/prometheus/prometheus/model/labels" + "go.opentelemetry.io/collector/pdata/pcommon" +) + +// makeLabels builds a labels.Labels with the given total number of labels. +// It always includes "job", "instance", and the metric name label, plus (total-3) extra labels. +func makeLabels(total int) labels.Labels { + if total < 3 { + total = 3 + } + m := make(map[string]string, total) + m["job"] = "job" + m["instance"] = "instance" + m[labels.MetricName] = "metric" + for i := 0; i < total-3; i++ { + m[fmt.Sprintf("k%d", i)] = fmt.Sprintf("v%d", i) + } + return labels.FromMap(m) +} + +// extractAttributesNoEnsure is a copy of extractAttributes without the EnsureCapacity call. +// It intentionally avoids pre-sizing the returned pcommon.Map so we can compare allocations. +func extractAttributesNoEnsure(ls labels.Labels) pcommon.Map { + attrs := pcommon.NewMap() + labelMap := ls.Map() + for labelName, labelValue := range labelMap { + if labelName == "instance" || labelName == "job" || + labelName == labels.MetricName || + labelName == "otel_scope_name" || labelName == "otel_scope_version" { + continue + } + attrs.PutStr(labelName, labelValue) + } + return attrs +} + +func BenchmarkExtractAttributes(b *testing.B) { + sizes := []int{5, 20, 100, 500} + for _, sz := range sizes { + ls := makeLabels(sz) + b.Run(fmt.Sprintf("%d_withEnsure", sz), func(b *testing.B) { + b.ReportAllocs() + b.ResetTimer() + for i := 0; i < b.N; i++ { + m := extractAttributes(ls) + _ = m.Len() + } + }) + + b.Run(fmt.Sprintf("%d_withoutEnsure", sz), func(b *testing.B) { + b.ReportAllocs() + b.ResetTimer() + for i := 0; i < b.N; i++ { + m := extractAttributesNoEnsure(ls) + _ = m.Len() + } + }) + } +} From c4e2e9bcf916e31b969e5dfd388ba4a9ef96644e Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Fri, 12 Dec 2025 00:25:06 +0800 Subject: [PATCH 5/8] fix benchmark test Signed-off-by: leiwingqueen --- .../receiver_bench_test.go | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/receiver/prometheusremotewritereceiver/receiver_bench_test.go b/receiver/prometheusremotewritereceiver/receiver_bench_test.go index 78b68aaf5b417..cc758b84d4028 100644 --- a/receiver/prometheusremotewritereceiver/receiver_bench_test.go +++ b/receiver/prometheusremotewritereceiver/receiver_bench_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/prometheus/prometheus/model/labels" - "go.opentelemetry.io/collector/pdata/pcommon" ) // makeLabels builds a labels.Labels with the given total number of labels. @@ -24,27 +23,11 @@ func makeLabels(total int) labels.Labels { return labels.FromMap(m) } -// extractAttributesNoEnsure is a copy of extractAttributes without the EnsureCapacity call. -// It intentionally avoids pre-sizing the returned pcommon.Map so we can compare allocations. -func extractAttributesNoEnsure(ls labels.Labels) pcommon.Map { - attrs := pcommon.NewMap() - labelMap := ls.Map() - for labelName, labelValue := range labelMap { - if labelName == "instance" || labelName == "job" || - labelName == labels.MetricName || - labelName == "otel_scope_name" || labelName == "otel_scope_version" { - continue - } - attrs.PutStr(labelName, labelValue) - } - return attrs -} - func BenchmarkExtractAttributes(b *testing.B) { sizes := []int{5, 20, 100, 500} for _, sz := range sizes { ls := makeLabels(sz) - b.Run(fmt.Sprintf("%d_withEnsure", sz), func(b *testing.B) { + b.Run(fmt.Sprintf("%d", sz), func(b *testing.B) { b.ReportAllocs() b.ResetTimer() for i := 0; i < b.N; i++ { @@ -52,14 +35,5 @@ func BenchmarkExtractAttributes(b *testing.B) { _ = m.Len() } }) - - b.Run(fmt.Sprintf("%d_withoutEnsure", sz), func(b *testing.B) { - b.ReportAllocs() - b.ResetTimer() - for i := 0; i < b.N; i++ { - m := extractAttributesNoEnsure(ls) - _ = m.Len() - } - }) } } From 24028f3923c4705a127f4a8baac78597248c37f9 Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Sat, 13 Dec 2025 10:16:51 +0800 Subject: [PATCH 6/8] comment change Signed-off-by: leiwingqueen --- receiver/prometheusremotewritereceiver/receiver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/prometheusremotewritereceiver/receiver.go b/receiver/prometheusremotewritereceiver/receiver.go index e33c894ba9c9b..6e05ec8d7adea 100644 --- a/receiver/prometheusremotewritereceiver/receiver.go +++ b/receiver/prometheusremotewritereceiver/receiver.go @@ -738,7 +738,7 @@ func convertAbsoluteBuckets(spans []writev2.BucketSpan, counts []float64, bucket func extractAttributes(ls labels.Labels) pcommon.Map { attrs := pcommon.NewMap() labelMap := ls.Map() - // job, instance and metric name will always become labels, but scope name and version may or may not be present + // job, instance and metric name will always become labels attrs.EnsureCapacity(len(labelMap) - 3) for labelName, labelValue := range labelMap { if labelName == "instance" || labelName == "job" || // Become resource attributes From 62031e30acbf64de405914ea88b7e806c6361e84 Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Mon, 15 Dec 2025 21:35:41 +0800 Subject: [PATCH 7/8] add copyright header Signed-off-by: leiwingqueen --- receiver/prometheusremotewritereceiver/receiver_bench_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/receiver/prometheusremotewritereceiver/receiver_bench_test.go b/receiver/prometheusremotewritereceiver/receiver_bench_test.go index cc758b84d4028..fc72355f88443 100644 --- a/receiver/prometheusremotewritereceiver/receiver_bench_test.go +++ b/receiver/prometheusremotewritereceiver/receiver_bench_test.go @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + package prometheusremotewritereceiver import ( From ece1ad470fa1d3ac62892230f4fcdec00e7c7aff Mon Sep 17 00:00:00 2001 From: leiwingqueen Date: Mon, 15 Dec 2025 22:10:02 +0800 Subject: [PATCH 8/8] add more test case Signed-off-by: leiwingqueen --- receiver/prometheusremotewritereceiver/receiver_bench_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/receiver/prometheusremotewritereceiver/receiver_bench_test.go b/receiver/prometheusremotewritereceiver/receiver_bench_test.go index fc72355f88443..69dfa7a7f6e4e 100644 --- a/receiver/prometheusremotewritereceiver/receiver_bench_test.go +++ b/receiver/prometheusremotewritereceiver/receiver_bench_test.go @@ -19,7 +19,7 @@ func makeLabels(total int) labels.Labels { m := make(map[string]string, total) m["job"] = "job" m["instance"] = "instance" - m[labels.MetricName] = "metric" + m["__name__"] = "metric" for i := 0; i < total-3; i++ { m[fmt.Sprintf("k%d", i)] = fmt.Sprintf("v%d", i) } @@ -27,7 +27,7 @@ func makeLabels(total int) labels.Labels { } func BenchmarkExtractAttributes(b *testing.B) { - sizes := []int{5, 20, 100, 500} + sizes := []int{5, 20, 100, 500, 1000, 2000} for _, sz := range sizes { ls := makeLabels(sz) b.Run(fmt.Sprintf("%d", sz), func(b *testing.B) {