extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-07 08:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent using expired ctx when sending metrics (#2088)

Browse Source
This commit is contained in:
Maycon Santos 2024-06-03 12:41:15 +02:00 committed by GitHub
parent c311d0d19e
commit 456629811b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
management/server/metrics/selfhosted.go
View File

@ -26,7 +26,7 @@ const (
// defaultPushInterval default interval to push metrics // defaultPushInterval default interval to push metrics
defaultPushInterval = 24 * time.Hour defaultPushInterval = 24 * time.Hour
// requestTimeout http request timeout // requestTimeout http request timeout
requestTimeout = 30 * time.Second requestTimeout = 45 * time.Second
) )
type getTokenResponse struct { type getTokenResponse struct {
@ -98,10 +98,7 @@ func (w *Worker) Run() {
} }
func (w *Worker) sendMetrics() error { func (w *Worker) sendMetrics() error {
ctx, cancel := context.WithTimeout(w.ctx, requestTimeout) apiKey, err := getAPIKey(w.ctx)
defer cancel()
apiKey, err := getAPIKey(ctx)
if err != nil { if err != nil {
return err return err
} }
@ -115,7 +112,7 @@ func (w *Worker) sendMetrics() error {
httpClient := http.Client{} httpClient := http.Client{}
exportJobReq, err := createPostRequest(ctx, payloadEndpoint+"/capture/", payloadString) exportJobReq, err := createPostRequest(w.ctx, payloadEndpoint+"/capture/", payloadString)
if err != nil { if err != nil {
return fmt.Errorf("unable to create metrics post request %v", err) return fmt.Errorf("unable to create metrics post request %v", err)
} }
@ -328,6 +325,8 @@ func (w *Worker) generateProperties() properties {
} }
func getAPIKey(ctx context.Context) (string, error) { func getAPIKey(ctx context.Context) (string, error) {
ctx, cancel := context.WithTimeout(ctx, requestTimeout)
defer cancel()
httpClient := http.Client{} httpClient := http.Client{}
@ -375,6 +374,8 @@ func buildMetricsPayload(payload pushPayload) (string, error) {
} }
func createPostRequest(ctx context.Context, endpoint string, payloadStr string) (*http.Request, error) { func createPostRequest(ctx context.Context, endpoint string, payloadStr string) (*http.Request, error) {
ctx, cancel := context.WithTimeout(ctx, requestTimeout)
defer cancel()
reqURL := endpoint reqURL := endpoint
payload := strings.NewReader(payloadStr) payload := strings.NewReader(payloadStr)