From 19d88cbab06e36c312e763104f22841799044755 Mon Sep 17 00:00:00 2001 From: Peter Brachwitz Date: Tue, 21 Apr 2020 10:33:19 +0200 Subject: [PATCH 1/2] Implement CloseIdleConnections on apmelasticsearch --- module/apmelasticsearch/client.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module/apmelasticsearch/client.go b/module/apmelasticsearch/client.go index 9222c732e..9e45ae66b 100644 --- a/module/apmelasticsearch/client.go +++ b/module/apmelasticsearch/client.go @@ -99,6 +99,16 @@ func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) { return resp, err } +// CloseIdleConnections calls r.r.CloseIdleConnections if the method exists. +func (r *roundTripper) CloseIdleConnections() { + type closeIdler interface { + CloseIdleConnections() + } + if tr, ok := r.r.(closeIdler); ok { + tr.CloseIdleConnections() + } +} + type responseBody struct { span *apm.Span body io.ReadCloser From f54bd30079221af4eb8add7e91d4821e29c614ea Mon Sep 17 00:00:00 2001 From: Peter Brachwitz Date: Tue, 21 Apr 2020 10:45:55 +0200 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 6b8b14664..f63ce6cd6 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -25,6 +25,7 @@ https://github.com/elastic/apm-agent-go/compare/v1.7.2...master[View commits] - Add "recording" config option, to dynamically disable event recording {pull}737[(#737)] - Enable central configuration of "stack_frames_min_duration" and "stack_trace_limit" {pull}742[(#742)] +- Implement "CloseIdleConnections" on the Elasticsearch RoundTripper {pull}750[(#750)] [[release-notes-1.x]] === Go Agent version 1.x