Skip to content

update http output pugin #957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lixoi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update http output pugin #957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions plugin/output/http/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ type Config struct {
// > Enable split big batches
SplitBatch bool `json:"split_batch" default:"false"` // *

// > @3@4@5@6
// >
// > Enable partial shipment big batches
// > Only one flag out of two (SplitBatch or ItemizeBatch) can be initialized
ItemizeBatch bool `json:"itemize_batch" default:"false"` // *

// > @3@4@5@6
// >
// > Retention milliseconds for retry to DB.
Expand Down Expand Up @@ -334,9 +340,12 @@ func (p *Plugin) out(workerData *pipeline.WorkerData, batch *pipeline.Batch) err
var statusCode int
var err error

if p.config.SplitBatch {
switch true {
case p.config.SplitBatch:
statusCode, err = p.sendSplit(0, eventsCount, data.begin, data.outBuf)
} else {
case p.config.ItemizeBatch:
statusCode, err = p.sendItemize(0, eventsCount, data.begin, data.outBuf)
default:
statusCode, err = p.send(data.outBuf)
}

Expand Down Expand Up @@ -407,6 +416,40 @@ func (p *Plugin) sendSplit(left int, right int, begin []int, data []byte) (int,
return http.StatusOK, nil
}

func (p *Plugin) sendItemize(left int, right int, begin []int, data []byte) (statusCode int, err error) {
statusCode = http.StatusOK
err = nil
if left == right {
return statusCode, err
}

for i := left; i < right; i++ {
sc, r := p.client.DoTimeout(
http.MethodPost,
p.config.ContentType,
data[begin[i]:begin[i+1]],
p.config.ConnectionTimeout_,
nil)
if r != nil {
p.sendErrorMetric.WithLabelValues(strconv.Itoa(sc)).Inc()

switch sc {
case http.StatusRequestEntityTooLarge:
// can't save even one log
if right-i == 1 {
statusCode = sc
err = r
}
Comment on lines +438 to +442

@timggggggg timggggggg Jul 13, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The switch / right-i == 1 handling here is unnecessary. Since each POST is a single event, right-i == 1 is only true on the last iteration, so a http.StatusRequestEntityTooLarge on any earlier event is dropped silently while a http.StatusRequestEntityTooLarge on the last one is returned.

But the whole error branch is redundant: if we just return (statusCode, err) on the first failing request, out() already increments the metric, logs it, and decides retry vs. drop by status code. And continuing the loop after a failure is pointless - on a retryable error the whole batch is resent anyway, and on http.StatusRequestEntityTooLarge out() drops the batch. So SendItemize can be represented like this:

func (p *Plugin) sendItemize(left int, right int, begin []int, data []byte) (int, error) {
    for i := left; i < right; i++ {
        if statusCode, err := p.send(data[begin[i]:begin[i+1]]); err != nil {
            return statusCode, err
        }
    }
    return http.StatusOK, nil
}

default:
statusCode = sc
err = r
}
}
}

return statusCode, err
}

func (p *Plugin) getAuthHeader() string {
if p.config.APIKey != "" {
return "ApiKey " + p.config.APIKey
Expand Down