Skip to content

fix(aggregateSender): close transport on reload #191

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
linkdata wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(aggregateSender): close transport on reload #191

Show file tree
Hide file tree
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
29 changes: 16 additions & 13 deletions pkg/runner/aggregate_sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type aggregateSender struct {
aggrecURL *url.URL
caCertPool *x509.CertPool
signingHTTPClient *httpsign.Client
httpTransport *http.Transport
}

func (edm *dnstapMinimiser) newAggregateSender(aggrecURL *url.URL, signingJwk jwk.Key, caCertPool *x509.CertPool) (aggregateSender, error) {
Expand All @@ -37,21 +38,22 @@ func (edm *dnstapMinimiser) newAggregateSender(aggrecURL *url.URL, signingJwk jw
}

// Create HTTP handler for sending aggregate files to aggrec
httpClient := http.Client{
Transport: &http.Transport{
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
ResponseHeaderTimeout: 10 * time.Second,
TLSClientConfig: &tls.Config{
RootCAs: caCertPool,
GetClientCertificate: edm.httpClientCertStore.getClientCertificate,
MinVersion: tls.VersionTLS13,
},
httpTransport := &http.Transport{
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
ResponseHeaderTimeout: 10 * time.Second,
TLSClientConfig: &tls.Config{
RootCAs: caCertPool,
GetClientCertificate: edm.httpClientCertStore.getClientCertificate,
MinVersion: tls.VersionTLS13,
},
}
httpClient := http.Client{
Transport: httpTransport,
}

edm.log.Info("creating HTTP signer", "key_id", signingJwk.KeyID(), "key_alg", signingJwk.Algorithm())

Expand All @@ -70,6 +72,7 @@ func (edm *dnstapMinimiser) newAggregateSender(aggrecURL *url.URL, signingJwk jw
aggrecURL: aggrecURL,
caCertPool: caCertPool,
signingHTTPClient: client,
httpTransport: httpTransport,
}, nil
}

Expand Down
6 changes: 6 additions & 0 deletions pkg/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,12 +645,18 @@ func (edm *dnstapMinimiser) setupHistogramSender() error {
}

edm.aggregSenderMutex.Lock()
oldAggregSender := edm.aggregSender
edm.aggregSender, err = edm.newAggregateSender(httpURL, httpSigningJwk, httpCACertPool)
edm.aggregSenderMutex.Unlock()
if err != nil {
return fmt.Errorf("setupHistogramSender: unable to create aggregate sender: %w", err)
}

// Close idle connections in the old HTTP client to release resources
if oldAggregSender.httpTransport != nil {
oldAggregSender.httpTransport.CloseIdleConnections()
}

return nil
}

Expand Down