Skip to content

Commit 9aadead

Browse files
author
Damian Murphy
authored
datadogexporter: read response body on pushSketches (#36779)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description The pushSketches function in the datadogexporter does not read the contents of the HTTP response's Body on return. The Go documentation states that the full response body from the http request should be read and closed to ensure that connections can be properly re-used: https://pkg.go.dev/net/http#Client.Do We saw this manifest as a high load of incoming metric traffic through the exporter creating a connection per request and essentially killing platform infrastructure (proxy, DNS) as a result. <!--Describe what testing was performed and which tests were added.--> #### Testing No additional testing added. Fix is running to great effect in private internal fork at extremely high scale.
1 parent 7502a1e commit 9aadead

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: datadogexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: read response body on pushSketches to allow connection re-use
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues:
14+
- 36779
15+
16+
# (Optional) One or more lines of additional information to render under the primary note.
17+
# These lines will be padded with 2 spaces and then inserted directly into the document.
18+
# Use pipe (|) for multiline entries.
19+
subtext:
20+
21+
# If your change doesn't affect end users or the exported elements of any package,
22+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
23+
# Optional: The change log or logs in which this entry should be included.
24+
# e.g. '[user]' or '[user, api]'
25+
# Include 'user' if the change is relevant to end users.
26+
# Include 'api' if there is a change to a library API.
27+
# Default: '[user]'
28+
change_logs: []

exporter/datadogexporter/metrics_exporter.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"context"
99
"errors"
1010
"fmt"
11+
"io"
1112
"net/http"
1213
"sync"
1314
"time"
@@ -154,6 +155,13 @@ func (exp *metricsExporter) pushSketches(ctx context.Context, sl sketches.Sketch
154155
}
155156
defer resp.Body.Close()
156157

158+
// We must read the full response body from the http request to ensure that connections can be
159+
// properly re-used. https://pkg.go.dev/net/http#Client.Do
160+
_, err = io.Copy(io.Discard, resp.Body)
161+
if err != nil {
162+
return clientutil.WrapError(fmt.Errorf("failed to read response body from sketches HTTP request: %w", err), resp)
163+
}
164+
157165
if resp.StatusCode >= 400 {
158166
return clientutil.WrapError(fmt.Errorf("error when sending payload to %s: %s", sketches.SketchSeriesEndpoint, resp.Status), resp)
159167
}

0 commit comments

Comments
 (0)