Close HTTP2 connections on timeout in influxdb outputs (#7517)

This commit is contained in:
Daniel Nelson
2020-05-19 11:53:10 -07:00
committed by GitHub
parent 443ac6df23
commit edd8338180
5 changed files with 20 additions and 30 deletions

View File

@@ -210,7 +210,7 @@ func (c *httpClient) Write(ctx context.Context, metrics []telegraf.Metric) error
}
func (c *httpClient) writeBatch(ctx context.Context, bucket string, metrics []telegraf.Metric) error {
url, err := makeWriteURL(*c.url, c.Organization, bucket)
loc, err := makeWriteURL(*c.url, c.Organization, bucket)
if err != nil {
return err
}
@@ -221,13 +221,14 @@ func (c *httpClient) writeBatch(ctx context.Context, bucket string, metrics []te
}
defer reader.Close()
req, err := c.makeWriteRequest(url, reader)
req, err := c.makeWriteRequest(loc, reader)
if err != nil {
return err
}
resp, err := c.client.Do(req.WithContext(ctx))
if err != nil {
internal.OnClientError(c.client, err)
return err
}
defer resp.Body.Close()
@@ -347,5 +348,5 @@ func makeWriteURL(loc url.URL, org, bucket string) (string, error) {
}
func (c *httpClient) Close() {
internal.CloseIdleConnections(c.client)
c.client.CloseIdleConnections()
}