Merge pull request #94 from TencentBlueKing/develop

v1.10.4

VERSION

@@ -1 +1 @@
-1.10.3
+1.10.4

pkg/component/init.go

@@ -77,7 +77,7 @@ func AsCurlCommand(request *gorequest.SuperAgent) (string, error) {
 	return cmd.String(), nil
 }
 
-func logFailHTTPRequest(
+func logHTTPRequest(
 	start time.Time,
 	request *gorequest.SuperAgent,
 	response gorequest.Response,
@@ -87,18 +87,19 @@ func logFailHTTPRequest(
 ) {
 	logger := logging.GetComponentLogger()
 
+	duration := time.Since(start)
+	// to ms
+	latency := float64(duration / time.Millisecond)
+
 	responseBodyErr := data.Error()
 	// check will log or not?
-	willLog := logger.GetLevel() == log.DebugLevel ||
-		len(errs) != 0 || response.StatusCode != http.StatusOK || responseBodyErr != nil
+	willLog := latency > 200 || (logger.GetLevel() == log.DebugLevel ||
+		len(errs) != 0 || response.StatusCode != http.StatusOK || responseBodyErr != nil)
 
 	if !willLog {
 		return
 	}
 
-	// duration
-	duration := time.Since(start)
-
 	// curl dump
 	dump, err := AsCurlCommand(request)
 	if err != nil {

pkg/component/init_test.go

@@ -43,7 +43,7 @@ var _ = Describe("Init", func() {
 
 		time.Sleep(20 * time.Millisecond)
 
-		logFailHTTPRequest(start, request, resp, respBody, errs, &result)
+		logHTTPRequest(start, request, resp, respBody, errs, &result)
 	})
 
 })

pkg/component/remote_resource.go

@@ -110,7 +110,7 @@ func (c *remoteResourceClient) QueryResources(
 		Send(data).
 		EndStruct(&result, callbackFunc)
 
-	logFailHTTPRequest(start, request, resp, respBody, errs, &result)
+	logHTTPRequest(start, request, resp, respBody, errs, &result)
 
 	if len(errs) != 0 {
 		// 敏感信息泄漏 ip+端口号, 替换为 *.*.*.*

pkg/database/dao/expression.go

@@ -193,8 +193,10 @@ func (m *expressionManager) bulkDeleteByPKsWithTx(tx *sqlx.Tx, pks []int64) (int
 func (m *expressionManager) updateUnreferencedExpressionType(fromType int64, toType int64) error {
 	sql := `UPDATE expression SET 
 		type=? 
-		WHERE type=? 
-		AND pk NOT IN (SELECT expression_pk FROM policy)`
+		WHERE pk IN (SELECT pk FROM 
+			(SELECT pk FROM expression 
+				WHERE type=? AND pk NOT IN (SELECT expression_pk FROM policy)
+			) AS e)`
 	return database.SqlxExec(m.DB, sql, toType, fromType)
 }
 

release.md

@@ -1,3 +1,8 @@
+# 1.10.4
+
+- bugfix: /api/v1/web/unreferenced-expressions timeout
+- upgrade: component log request if latency is greater than 200ms
+
 # 1.10.3
 
 - upgrade: release environment attributes