diff --git a/database/gredis/gredis_redis_tracing.go b/database/gredis/gredis_redis_tracing.go index b2d41c75b..2fd5fb2b3 100644 --- a/database/gredis/gredis_redis_tracing.go +++ b/database/gredis/gredis_redis_tracing.go @@ -10,13 +10,14 @@ import ( "context" "fmt" - "github.com/gogf/gf/v2" - "github.com/gogf/gf/v2/internal/json" - "github.com/gogf/gf/v2/net/gtrace" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" + + "github.com/gogf/gf/v2" + "github.com/gogf/gf/v2/internal/json" + "github.com/gogf/gf/v2/net/gtrace" ) // tracingItem holds the information for redis tracing. diff --git a/encoding/gtoml/gtoml.go b/encoding/gtoml/gtoml.go index 23fc52af0..fe636f610 100644 --- a/encoding/gtoml/gtoml.go +++ b/encoding/gtoml/gtoml.go @@ -11,6 +11,7 @@ import ( "bytes" "github.com/BurntSushi/toml" + "github.com/gogf/gf/v2/internal/json" ) diff --git a/encoding/gxml/gxml.go b/encoding/gxml/gxml.go index 9dc9a5780..f1c61d441 100644 --- a/encoding/gxml/gxml.go +++ b/encoding/gxml/gxml.go @@ -11,6 +11,7 @@ import ( "strings" "github.com/clbanning/mxj/v2" + "github.com/gogf/gf/v2/encoding/gcharset" "github.com/gogf/gf/v2/text/gregex" ) @@ -63,9 +64,8 @@ func ToJson(content []byte) ([]byte, error) { mv, err := mxj.NewMapXml(res) if err == nil { return mv.Json() - } else { - return nil, err } + return nil, err } // convert does convert the encoding of given XML content from XML root tag into UTF-8 encoding content. diff --git a/internal/intlog/intlog.go b/internal/intlog/intlog.go index 5247f75bc..602e16000 100644 --- a/internal/intlog/intlog.go +++ b/internal/intlog/intlog.go @@ -14,9 +14,10 @@ import ( "path/filepath" "time" + "go.opentelemetry.io/otel/trace" + "github.com/gogf/gf/v2/debug/gdebug" "github.com/gogf/gf/v2/internal/utils" - "go.opentelemetry.io/otel/trace" ) const ( diff --git a/net/ghttp/ghttp_middleware_tracing.go b/net/ghttp/ghttp_middleware_tracing.go index f7c71a512..8f885bf1b 100644 --- a/net/ghttp/ghttp_middleware_tracing.go +++ b/net/ghttp/ghttp_middleware_tracing.go @@ -11,6 +11,12 @@ import ( "io/ioutil" "net/http" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/propagation" + "go.opentelemetry.io/otel/trace" + "github.com/gogf/gf/v2" "github.com/gogf/gf/v2/internal/utils" "github.com/gogf/gf/v2/net/ghttp/internal/client" @@ -18,11 +24,6 @@ import ( "github.com/gogf/gf/v2/net/gtrace" "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/gconv" - "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/codes" - "go.opentelemetry.io/otel/propagation" - "go.opentelemetry.io/otel/trace" ) const ( diff --git a/net/ghttp/ghttp_server.go b/net/ghttp/ghttp_server.go index 9d2266d1f..7738d9a85 100644 --- a/net/ghttp/ghttp_server.go +++ b/net/ghttp/ghttp_server.go @@ -16,6 +16,8 @@ import ( "strings" "time" + "github.com/olekukonko/tablewriter" + "github.com/gogf/gf/v2/container/garray" "github.com/gogf/gf/v2/container/gtype" "github.com/gogf/gf/v2/debug/gdebug" @@ -34,7 +36,6 @@ import ( "github.com/gogf/gf/v2/text/gregex" "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/gconv" - "github.com/olekukonko/tablewriter" ) func init() { diff --git a/net/ghttp/internal/client/client.go b/net/ghttp/internal/client/client.go index c685b0f6a..1738495db 100644 --- a/net/ghttp/internal/client/client.go +++ b/net/ghttp/internal/client/client.go @@ -18,14 +18,14 @@ import ( "strings" "time" + "golang.org/x/net/proxy" + "github.com/gogf/gf/v2" "github.com/gogf/gf/v2/errors/gcode" "github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/os/gfile" - "github.com/gogf/gf/v2/text/gstr" - "golang.org/x/net/proxy" - "github.com/gogf/gf/v2/text/gregex" + "github.com/gogf/gf/v2/text/gstr" ) // Client is the HTTP client for HTTP request management. diff --git a/net/ghttp/internal/client/client_tracing.go b/net/ghttp/internal/client/client_tracing.go index 630617e6f..078ad4cb1 100644 --- a/net/ghttp/internal/client/client_tracing.go +++ b/net/ghttp/internal/client/client_tracing.go @@ -12,17 +12,18 @@ import ( "net/http" "net/http/httptrace" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/propagation" + "go.opentelemetry.io/otel/trace" + "github.com/gogf/gf/v2" "github.com/gogf/gf/v2/internal/utils" "github.com/gogf/gf/v2/net/ghttp/internal/httputil" "github.com/gogf/gf/v2/net/gtrace" "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/gconv" - "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/codes" - "go.opentelemetry.io/otel/propagation" - "go.opentelemetry.io/otel/trace" ) const (