Skip to content

Add context to Kibana client Send method. #16515

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

Merged
simitt merged 3 commits into from
Feb 25, 2020
Merged

Add context to Kibana client Send method. #16515

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c93a46
Add context to Kibana client Send method.
simitt Feb 24, 2020
0b164d0
Introduce dedicated method
simitt Feb 24, 2020
77c6c7b
Merge remote-tracking branch 'elastic/master' into kibana-context
simitt Feb 24, 2020
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
10 changes: 9 additions & 1 deletion libbeat/kibana/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package kibana

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
Expand Down Expand Up @@ -181,9 +182,16 @@ func (conn *Connection) Request(method, extraPath string,
func (conn *Connection) Send(method, extraPath string,
params url.Values, headers http.Header, body io.Reader) (*http.Response, error) {

return conn.SendWithContext(context.Background(), method, extraPath, params, headers, body)
}

// SendWithContext sends an application/json request to Kibana with appropriate kbn headers and the given context.
func (conn *Connection) SendWithContext(ctx context.Context, method, extraPath string,
params url.Values, headers http.Header, body io.Reader) (*http.Response, error) {

reqURL := addToURL(conn.URL, extraPath, params)

req, err := http.NewRequest(method, reqURL, body)
req, err := http.NewRequestWithContext(ctx, method, reqURL, body)
if err != nil {
return nil, fmt.Errorf("fail to create the HTTP %s request: %+v", method, err)
}
Expand Down