fix client and time (#11)

douban · Nov 21, 2022 · acd1eab · acd1eab
1 parent 6221346
commit acd1eab
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 37 deletions.
diff --git a/client.go b/client.go
diff --git a/collector/cdn_domain.go b/collector/cdn_domain.go
@@ -14,6 +14,7 @@ func GetDomains(cdnClient cdn.Client, status string) []string {
 	var domains []string
 	req := cdn.CreateDescribeUserDomainsRequest()
 	req.DomainStatus = status
+	req.Scheme = "https"
 
 	response, err := cdnClient.DescribeUserDomains(req)
 	if err != nil {

diff --git a/collector/project.go b/collector/project.go
@@ -39,8 +39,10 @@ func retrieve(metric string, p Project, rangeTime int64, delayTime int64) []data
 	request := cms.CreateDescribeMetricLastRequest()
 	request.Namespace = p.Namespace
 	request.MetricName = metric
-	request.StartTime = time.Now().UTC().Add(-time.Second * time.Duration(rangeTime)).Format(time.RFC3339)
-	request.EndTime = time.Now().UTC().Add(-time.Second * time.Duration(delayTime)).Format(time.RFC3339)
+	request.Scheme = "https"
+	loc, _:= time.LoadLocation("Asia/Shanghai")
+	request.StartTime = time.Now().UTC().Add(-time.Second * time.Duration(rangeTime)).In(loc).Format("2006-01-02 15:04:05")
+	request.EndTime = time.Now().UTC().Add(-time.Second * time.Duration(delayTime)).In(loc).Format("2006-01-02 15:04:05")
 	requestsStats.Inc()
 
 	datapoints := make([]datapoint, 0)

diff --git a/main.go b/main.go
@@ -3,6 +3,10 @@ package main
 import (
 	"aliyun-exporter/exporter"
 	"flag"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials"
+	"github.com/aliyun/alibaba-cloud-sdk-go/services/cdn"
+	"github.com/aliyun/alibaba-cloud-sdk-go/services/cms"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"log"
@@ -37,11 +41,22 @@ func main() {
 	flag.Int64Var(&(config.delayTime), "delayTime", 180, "时间偏移量, 结束时间=now-delayTime")
 	flag.Parse()
 
+	cdnConfig := sdk.NewConfig()
+	credential := credentials.NewAccessKeyCredential(config.accessKeyId, config.accessKeySecret)
+	cdnClient, err := cdn.NewClientWithOptions(config.regionId, cdnConfig, credential)
+	if err != nil {
+		log.Fatal("init cdn client error")
+	}
+	cmsClient, err := cms.NewClientWithOptions(config.regionId, cdnConfig, credential)
+	if err != nil {
+		log.Fatal("init cms client error")
+	}
+
 	serviceArr := strings.Split(config.service, ",")
 	for _, ae := range serviceArr {
 		switch ae {
 		case "acs_cdn":
-			cdn := exporter.CdnCloudExporter(CmsClient(), CdnClient(), config.rangeTime, config.delayTime)
+			cdn := exporter.CdnCloudExporter(cmsClient, cdnClient, config.rangeTime, config.delayTime)
 			prometheus.MustRegister(cdn)
 		default:
 			log.Println("暂不支持该服务，请根据提示选择服务。")