Merge branch 'main' into pr-identity-fix

Author: farhan11166

.chloggen/config.yaml

@@ -93,6 +93,7 @@ components:
     - pkg/xscraperhelper
     - processor/batch
     - processor/memory_limiter
+    - processor/queuebatch
     - processor/sample
     - provider/env
     - provider/file

.chloggen/description-fix-extline.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: 'bug_fix'
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
+component: cmd/mdatagen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Removes the extra line in the documentation.md around description
+
+# One or more tracking issues or pull requests related to the change
+issues: [15664]
+
+# (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: []

.chloggen/queuebatchprocessor.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: new_component
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
+component: processor/queuebatch
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "New `queuebatchprocessor` to replace the legacy `batchprocessor`."
+
+# One or more tracking issues or pull requests related to the change
+issues: [15047, 13582, 12022, 11308, 8272, 6046]
+
+# (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: "New implementation is based exporterhelper, uses same configuration as `sending_queue`."
+
+# 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]

.github/CODEOWNERS

@@ -99,6 +99,7 @@ processor/memorylimiterprocessor/                      @open-telemetry/collector
 processor/processorhelper/                             @open-telemetry/collector-approvers
 processor/processorhelper/xprocessorhelper/            @open-telemetry/collector-approvers
 processor/processortest/                               @open-telemetry/collector-approvers
+processor/queuebatchprocessor/                         @open-telemetry/collector-approvers @jmacd @iblancasa
 processor/xprocessor/                                  @open-telemetry/collector-approvers @mx-psi @dmathieu
 receiver/                                              @open-telemetry/collector-approvers
 receiver/nopreceiver/                                  @open-telemetry/collector-approvers @evan-bradley

.github/workflows/utils/cspell.json

@@ -282,6 +282,7 @@
       "httpprovider",
       "httpsprovider",
       "httptest",
+      "iblancasa",
       "icmpcheck",
       "icmpcheckreceiver",
       "illumos",

cmd/mdatagen/internal/loader_test.go

@@ -466,7 +466,7 @@ func TestLoadMetadata(t *testing.T) {
 					"default.metric.to_be_removed": {
 						Signal: Signal{
 							Enabled:               true,
-							Description:           "[DEPRECATED] Non-monotonic delta sum double metric enabled by default.",
+							Description:           "[DEPRECATED] Non-monotonic delta sum double metric enabled by default.\n",
 							ExtendedDocumentation: "The metric will be removed soon.\n",
 							Stability:             component.StabilityLevelDeprecated,
 							Warnings: Warnings{
@@ -514,7 +514,7 @@ func TestLoadMetadata(t *testing.T) {
 					"default.event.to_be_renamed": {
 						Signal: Signal{
 							Enabled:               false,
-							Description:           "[DEPRECATED] Example event disabled by default.",
+							Description:           "[DEPRECATED] Example event disabled by default.\n",
 							ExtendedDocumentation: "The event will be renamed soon.\n",
 							Warnings: Warnings{
 								IfConfigured: "This event is deprecated and will be renamed soon.",

cmd/mdatagen/internal/samplereceiver/metadata.yaml

@@ -227,7 +227,8 @@ events:
 
   default.event.to_be_renamed:
     enabled: false
-    description: "[DEPRECATED] Example event disabled by default."
+    description: |
+            [DEPRECATED] Example event disabled by default.
     extended_documentation: |
             The event will be renamed soon.
     attributes: [string_attr, boolean_attr, boolean_attr2, conditional_string_attr]
@@ -264,7 +265,8 @@ metrics:
 
   default.metric.to_be_removed:
     enabled: true
-    description: "[DEPRECATED] Non-monotonic delta sum double metric enabled by default."
+    description: |
+            [DEPRECATED] Non-monotonic delta sum double metric enabled by default.
     extended_documentation: |
             The metric will be removed soon.
     stability: deprecated

cmd/mdatagen/internal/templates/documentation.md.tmpl

@@ -4,7 +4,7 @@
 
 ### {{ $metricName }}
 
-{{ $metric.Description }}
+{{ trimRight $metric.Description "\n" }}
 
 {{- if $metric.ExtendedDocumentation }}
 
@@ -64,7 +64,7 @@ When the disable-old gate is enabled, emission of this metric is suppressed. Whe
 
 ### {{ $eventName }}
 
-{{ $event.Description }}
+{{ trimRight $event.Description "\n" }}
 
 {{- if $event.ExtendedDocumentation }}
 

cmd/mdatagen/internal/templates/metrics.go.tmpl

@@ -141,7 +141,7 @@ type metric{{ $name.Render }} struct {
 // init fills {{ $name }} metric with initial data.
 func (m *metric{{ $name.Render }}) init() {
 	m.data.SetName("{{ $name.EmittedName }}")
-	m.data.SetDescription("{{ $metric.Description }}")
+	m.data.SetDescription("{{ trimRight $metric.Description "\n" }}")
 	m.data.SetUnit("{{ $metric.Unit }}")
 	m.data.SetEmpty{{ $metric.Data.Type }}()
 	{{- if $metric.Data.HasMonotonic }}

cmd/mdatagen/internal/templates/metrics_test.go.tmpl

@@ -321,7 +321,7 @@ func TestMetricsBuilder(t *testing.T) {
 						validatedMetrics["{{ $name }}"] = true
 						assert.Equal(t, pmetric.MetricType{{ $metric.Data.Type }}, mi.Type())
 						assert.Equal(t, 1, mi.{{ $metric.Data.Type }}().DataPoints().Len())
-						assert.Equal(t, "{{ $metric.Description }}", mi.Description())
+						assert.Equal(t, "{{ trimRight $metric.Description "\n" }}", mi.Description())
 						{{- if len $metric.Unit}}
 						assert.Equal(t, "{{ $metric.Unit }}", mi.Unit())
 						{{- else }}
@@ -354,7 +354,7 @@ func TestMetricsBuilder(t *testing.T) {
 						validatedMetrics["{{ $name }}"] = true
 						assert.Equal(t, pmetric.MetricType{{ $metric.Data.Type }}, mi.Type())
 						assert.Equal(t, 1, mi.{{ $metric.Data.Type }}().DataPoints().Len())
-						assert.Equal(t, "{{ $metric.Description }}", mi.Description())
+						assert.Equal(t, "{{ trimRight $metric.Description "\n" }}", mi.Description())
 						{{- if len $metric.Unit}}
 						assert.Equal(t, "{{ $metric.Unit }}", mi.Unit())
 						{{- else }}
@@ -412,7 +412,7 @@ func TestMetricsBuilder(t *testing.T) {
 					validatedMetrics["{{ $name }}"] = true
 					assert.Equal(t, pmetric.MetricType{{ $metric.Data.Type }}, mi.Type())
 					assert.Equal(t, 1, mi.{{ $metric.Data.Type }}().DataPoints().Len())
-					assert.Equal(t, "{{ $metric.Description }}", mi.Description())
+					assert.Equal(t, "{{ trimRight $metric.Description "\n" }}", mi.Description())
 					{{- if len $metric.Unit}}
 					assert.Equal(t, "{{ $metric.Unit }}", mi.Unit())
 					{{- else }}