diff --git a/.chloggen/mergectx-queuebatchsettings.yaml b/.chloggen/mergectx-queuebatchsettings.yaml new file mode 100644 index 000000000000..ddbb907f95b6 --- /dev/null +++ b/.chloggen/mergectx-queuebatchsettings.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. otlpreceiver) +component: exporter/exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Expose `MergeCtx` in exporterhelper's queue batch settings` + +# One or more tracking issues or pull requests related to the change +issues: [13742] + +# (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: [user] diff --git a/exporter/exporterhelper/internal/queuebatch/queue_batch.go b/exporter/exporterhelper/internal/queuebatch/queue_batch.go index 144049fceb90..b9e67f9c6fe0 100644 --- a/exporter/exporterhelper/internal/queuebatch/queue_batch.go +++ b/exporter/exporterhelper/internal/queuebatch/queue_batch.go @@ -21,6 +21,7 @@ type Settings[T any] struct { ItemsSizer request.Sizer[T] BytesSizer request.Sizer[T] Partitioner Partitioner[T] + MergeCtx func(context.Context, context.Context) context.Context } // AllSettings defines settings for creating a QueueBatch. @@ -29,7 +30,6 @@ type AllSettings[T any] struct { Signal pipeline.Signal ID component.ID Telemetry component.TelemetrySettings - MergeCtx func(context.Context, context.Context) context.Context } type QueueBatch struct {