Skip to content

Commit 51c3659

Browse files
authored
Enable support to do batching using bytes sizer (open-telemetry#12751)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 45d3af7 commit 51c3659

File tree

7 files changed

+212
-106
lines changed

7 files changed

+212
-106
lines changed

.chloggen/enable-bytes-batching.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Enable support to do batching using `bytes` sizer
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12751]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [user]

exporter/exporterhelper/internal/queuebatch/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ func (cfg *Config) Validate() error {
9393
}
9494

9595
// Only support items sizer for batch at this moment.
96-
if cfg.Batch != nil && cfg.Sizer != request.SizerTypeItems {
97-
return errors.New("`batch` supports only `items` sizer")
96+
if cfg.Batch != nil && (cfg.Sizer != request.SizerTypeItems && cfg.Sizer != request.SizerTypeBytes) {
97+
return errors.New("`batch` supports only `items` or `bytes` sizer")
9898
}
9999

100100
return nil

exporter/exporterhelper/internal/queuebatch/config_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ func TestConfig_Validate(t *testing.T) {
4848

4949
cfg = newTestConfig()
5050
cfg.Sizer = request.SizerTypeRequests
51-
require.EqualError(t, cfg.Validate(), "`batch` supports only `items` sizer")
51+
require.EqualError(t, cfg.Validate(), "`batch` supports only `items` or `bytes` sizer")
5252

5353
cfg = newTestConfig()
5454
cfg.Sizer = request.SizerTypeBytes
55-
require.EqualError(t, cfg.Validate(), "`batch` supports only `items` sizer")
55+
require.NoError(t, cfg.Validate())
5656

5757
// Confirm Validate doesn't return error with invalid config when feature is disabled
5858
cfg.Enabled = false

0 commit comments

Comments
 (0)