[add] support custom http client

client.go

@@ -88,6 +88,7 @@ type Client struct {
 	UserAgent       string // default defaultLogUserAgent
 	RequestTimeOut  time.Duration
 	RetryTimeOut    time.Duration
+	HTTPClient      *http.Client
 
 	accessKeyLock sync.RWMutex
 }
@@ -102,6 +103,9 @@ func convertLocked(c *Client, projName string) *LogProject {
 	p, _ := NewLogProject(projName, c.Endpoint, c.AccessKeyID, c.AccessKeySecret)
 	p.SecurityToken = c.SecurityToken
 	p.UserAgent = c.UserAgent
+	if c.HTTPClient != nil {
+		p.httpClient = c.HTTPClient
+	}
 	if c.RequestTimeOut != time.Duration(0) {
 		p.WithRequestTimeout(c.RequestTimeOut)
 	}
@@ -112,6 +116,11 @@ func convertLocked(c *Client, projName string) *LogProject {
 	return p
 }
 
+// SetHTTPClient set a custom http client, all request will send to sls by this client
+func (c *Client) SetHTTPClient(client *http.Client) {
+	c.HTTPClient = client
+}
+
 // ResetAccessKeyToken reset client's access key token
 func (c *Client) ResetAccessKeyToken(accessKeyID, accessKeySecret, securityToken string) {
 	c.accessKeyLock.Lock()

client_interface.go

@@ -1,6 +1,7 @@
 package sls
 
 import (
+	"net/http"
 	"time"
 )
 
@@ -40,6 +41,8 @@ func CreateTokenAutoUpdateClient(endpoint string, tokenUpdateFunc UpdateTokenFun
 
 // ClientInterface for all log's open api
 type ClientInterface interface {
+	// SetHTTPClient set a custom http client, all request will send to sls by this client
+	SetHTTPClient(client *http.Client)
 	// #################### Client Operations #####################
 	// ResetAccessKeyToken reset client's access key token
 	ResetAccessKeyToken(accessKeyID, accessKeySecret, securityToken string)

client_request.go

@@ -106,7 +106,11 @@ func (c *Client) request(project, method, uri string, headers map[string]string,
 	}
 
 	// Get ready to do request
-	resp, err := defaultHttpClient.Do(req)
+	httpClient := c.HTTPClient
+	if httpClient == nil {
+		httpClient = defaultHttpClient
+	}
+	resp, err := httpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}

log_project.go

@@ -71,7 +71,7 @@ func (p *LogProject) WithToken(token string) (*LogProject, error) {
 
 // WithRequestTimeout with custom timeout for a request
 func (p *LogProject) WithRequestTimeout(timeout time.Duration) *LogProject {
-	if p.httpClient == defaultHttpClient {
+	if p.httpClient == defaultHttpClient || p.httpClient == nil {
 		p.httpClient = &http.Client{
 			Timeout: timeout,
 		}
@@ -1079,7 +1079,9 @@ func (p *LogProject) DeleteLogging() (err error) {
 
 func (p *LogProject) init() {
 	if p.retryTimeout == time.Duration(0) {
-		p.httpClient = defaultHttpClient
+		if p.httpClient == nil {
+			p.httpClient = defaultHttpClient
+		}
 		p.retryTimeout = defaultRetryTimeout
 		p.parseEndpoint()
 	}
@@ -1111,11 +1113,17 @@ func (p *LogProject) parseEndpoint() {
 	if ipRegex.MatchString(host) { // ip format
 		// use direct ip proxy
 		url, _ := url.Parse(fmt.Sprintf("%s%s", scheme, host))
-		p.httpClient = &http.Client{
-			Transport: &http.Transport{
+		if p.httpClient == nil || p.httpClient == defaultHttpClient {
+			p.httpClient = &http.Client{
+				Transport: &http.Transport{
+					Proxy: http.ProxyURL(url),
+				},
+				Timeout: defaultRequestTimeout,
+			}
+		} else {
+			p.httpClient.Transport = &http.Transport{
 				Proxy: http.ProxyURL(url),
-			},
-			Timeout: defaultRequestTimeout,
+			}
 		}
 
 	}

token_auto_update_client.go

@@ -2,6 +2,7 @@ package sls
 
 import (
 	"errors"
+	"net/http"
 	"sync"
 	"time"
 
@@ -136,6 +137,11 @@ func (c *TokenAutoUpdateClient) processError(err error) (retry bool) {
 
 }
 
+// SetHTTPClient set a custom http client, all request will send to sls by this client
+func (c *TokenAutoUpdateClient) SetHTTPClient(client *http.Client) {
+	c.logClient.SetHTTPClient(client)
+}
+
 func (c *TokenAutoUpdateClient) Close() error {
 	c.closeFlag = true
 	return nil