CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: re-init azure monitor http client on context deadline error (#11030)

This commit is contained in:
Joshua Powers 2022-05-10 15:24:01 -06:00 committed by GitHub
parent 9c02a47e8f
commit e28793cff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/outputs/azure_monitor/azure_monitor.go
View File

@ -3,12 +3,14 @@ package azure_monitor
import ( import (
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"context"
"encoding/binary" "encoding/binary"
"encoding/json" "encoding/json"
"fmt" "fmt"
"hash/fnv" "hash/fnv"
"io" "io"
"net/http" "net/http"
"net/url"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@ -109,12 +111,7 @@ func (a *AzureMonitor) Connect() error {
a.Timeout = config.Duration(defaultRequestTimeout) a.Timeout = config.Duration(defaultRequestTimeout)
} }
a.client = &http.Client{ a.initHTTPClient()
Transport: &http.Transport{
Proxy: http.ProxyFromEnvironment,
},
Timeout: time.Duration(a.Timeout),
}
var err error var err error
var region string var region string
@ -168,6 +165,15 @@ func (a *AzureMonitor) Connect() error {
return nil return nil
} }
func (a *AzureMonitor) initHTTPClient() {
a.client = &http.Client{
Transport: &http.Transport{
Proxy: http.ProxyFromEnvironment,
},
Timeout: time.Duration(a.Timeout),
}
}
// vmMetadata retrieves metadata about the current Azure VM // vmMetadata retrieves metadata about the current Azure VM
func vmInstanceMetadata(c *http.Client) (region string, resourceID string, err error) { func vmInstanceMetadata(c *http.Client) (region string, resourceID string, err error) {
req, err := http.NewRequest("GET", vmInstanceMetadataURL, nil) req, err := http.NewRequest("GET", vmInstanceMetadataURL, nil)
@ -313,6 +319,10 @@ func (a *AzureMonitor) send(body []byte) error {
resp, err := a.client.Do(req) resp, err := a.client.Do(req)
if err != nil { if err != nil {
if err.(*url.Error).Unwrap() == context.DeadlineExceeded {
a.initHTTPClient()
}
return err return err
} }
defer resp.Body.Close() defer resp.Body.Close()