This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 4db1daffd9 [INLONG-10676][SDK] Fix type asserttion and type switch
warnings in Golang SDK (#10679)
4db1daffd9 is described below
commit 4db1daffd94b97a7619aa56cbe093c72f07865cb
Author: gunli <[email protected]>
AuthorDate: Sun Jul 21 23:05:26 2024 +0800
[INLONG-10676][SDK] Fix type asserttion and type switch warnings in Golang
SDK (#10679)
Co-authored-by: gunli <[email protected]>
---
.../dataproxy-sdk-golang/connpool/connpool.go | 2 +-
.../dataproxy-sdk-golang/dataproxy/metrics.go | 24 ++++++++++++++--------
.../dataproxy-sdk-golang/dataproxy/worker.go | 6 ++++--
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git
a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/connpool/connpool.go
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/connpool/connpool.go
index 8cd61fe525..0c5b215fff 100755
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/connpool/connpool.go
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/connpool/connpool.go
@@ -621,7 +621,7 @@ func (p *connPool) getExpectedConnPerEndpoint() int {
initialVal := float64(p.connsPerEndpoint)
p.log.Info("conns per endpoint of initialization: ", initialVal)
- result := averageVal
+ result := averageVal // nolint:ineffassign
if estimatedVal < initialVal {
// if estimatedVal is less than initialVal, it indicates new
endpoints are added,
// we need to add new conn for the newly added endpoints,
delete conn for old endpoints,
diff --git
a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/metrics.go
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/metrics.go
index 218f87b96b..25466f7619 100755
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/metrics.go
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/metrics.go
@@ -90,7 +90,8 @@ func (m *metrics) init() error {
}, []string{"name", "code"})
err := m.registry.Register(m.errorCounter)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
@@ -103,7 +104,8 @@ func (m *metrics) init() error {
}, []string{"name", "worker"})
err = m.registry.Register(m.retryCounter)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
@@ -116,7 +118,8 @@ func (m *metrics) init() error {
}, []string{"name", "worker"})
err = m.registry.Register(m.timeoutCounter)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
@@ -129,7 +132,8 @@ func (m *metrics) init() error {
}, []string{"name", "code"})
err = m.registry.Register(m.messageCounter)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
@@ -142,7 +146,8 @@ func (m *metrics) init() error {
}, []string{"name", "code"})
err = m.registry.Register(m.updateConnCounter)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
@@ -155,7 +160,8 @@ func (m *metrics) init() error {
}, []string{"name", "worker"})
err = m.registry.Register(m.pendingMessageGauge)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
@@ -169,7 +175,8 @@ func (m *metrics) init() error {
}, []string{"name", "code"})
err = m.registry.Register(m.batchSizeHistogram)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
@@ -183,7 +190,8 @@ func (m *metrics) init() error {
}, []string{"name", "code"})
err = m.registry.Register(m.batchTimeHistogram)
if err != nil {
- are, ok := err.(prometheus.AlreadyRegisteredError)
+ var are prometheus.AlreadyRegisteredError
+ ok := errors.As(err, &are)
if !ok {
return err
}
diff --git
a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/worker.go
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/worker.go
index 935c69732c..c67942ccde 100755
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/worker.go
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/worker.go
@@ -18,6 +18,7 @@ package dataproxy
import (
"context"
+ "errors"
"math/rand"
"runtime/debug"
"strconv"
@@ -93,8 +94,9 @@ func getErrorCode(err error) string {
return errOK.getStrCode()
}
- switch t := err.(type) {
- case *errNo:
+ var t *errNo
+ switch {
+ case errors.As(err, &t):
return t.getStrCode()
default:
return errUnknown.getStrCode()
