mirror of
https://gitee.com/johng/gf
synced 2026-07-04 21:03:13 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
287 lines
6.8 KiB
Go
287 lines
6.8 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
// https://github.com/open-telemetry/opentelemetry-go-contrib/blob/master/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go
|
|
|
|
package tracing
|
|
|
|
// gRPC tracing middleware
|
|
// https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/rpc.md
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"strings"
|
|
|
|
"go.opentelemetry.io/otel/attribute"
|
|
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
|
|
"go.opentelemetry.io/otel/trace"
|
|
"google.golang.org/grpc"
|
|
grpcCodes "google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/metadata"
|
|
"google.golang.org/grpc/peer"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
type messageType attribute.KeyValue
|
|
|
|
// Event adds an event of the messageType to the span associated with the
|
|
// passed context with id and size (if message is a proto message).
|
|
func (m messageType) Event(ctx context.Context, id int, message any) {
|
|
span := trace.SpanFromContext(ctx)
|
|
if p, ok := message.(proto.Message); ok {
|
|
span.AddEvent("message", trace.WithAttributes(
|
|
attribute.KeyValue(m),
|
|
attribute.Key("message.id").Int(id),
|
|
attribute.Key("message.uncompressed_size").Int(proto.Size(p)),
|
|
))
|
|
} else {
|
|
span.AddEvent("message", trace.WithAttributes(
|
|
attribute.KeyValue(m),
|
|
attribute.Key("message.id").Int(id),
|
|
))
|
|
}
|
|
}
|
|
|
|
var (
|
|
messageSent = messageType(attribute.Key("message.type").String("SENT"))
|
|
messageReceived = messageType(attribute.Key("message.type").String("RECEIVED"))
|
|
)
|
|
|
|
type streamEventType int
|
|
|
|
type streamEvent struct {
|
|
Type streamEventType
|
|
Err error
|
|
}
|
|
|
|
const (
|
|
closeEvent streamEventType = iota
|
|
receiveEndEvent
|
|
errorEvent
|
|
)
|
|
|
|
// clientStream wraps around the embedded grpc.ClientStream, and intercepts the RecvMsg and
|
|
// SendMsg method call.
|
|
type clientStream struct {
|
|
grpc.ClientStream
|
|
|
|
desc *grpc.StreamDesc
|
|
events chan streamEvent
|
|
eventsDone chan struct{}
|
|
finished chan error
|
|
|
|
receivedMessageID int
|
|
sentMessageID int
|
|
}
|
|
|
|
var _ = proto.Marshal
|
|
|
|
func (w *clientStream) RecvMsg(m any) error {
|
|
err := w.ClientStream.RecvMsg(m)
|
|
|
|
if err == nil && !w.desc.ServerStreams {
|
|
w.sendStreamEvent(receiveEndEvent, nil)
|
|
} else if errors.Is(err, io.EOF) {
|
|
w.sendStreamEvent(receiveEndEvent, nil)
|
|
} else if err != nil {
|
|
w.sendStreamEvent(errorEvent, err)
|
|
} else {
|
|
w.receivedMessageID++
|
|
messageReceived.Event(w.Context(), w.receivedMessageID, m)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (w *clientStream) SendMsg(m any) error {
|
|
err := w.ClientStream.SendMsg(m)
|
|
|
|
w.sentMessageID++
|
|
messageSent.Event(w.Context(), w.sentMessageID, m)
|
|
|
|
if err != nil {
|
|
w.sendStreamEvent(errorEvent, err)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (w *clientStream) Header() (metadata.MD, error) {
|
|
md, err := w.ClientStream.Header()
|
|
|
|
if err != nil {
|
|
w.sendStreamEvent(errorEvent, err)
|
|
}
|
|
|
|
return md, err
|
|
}
|
|
|
|
func (w *clientStream) CloseSend() error {
|
|
err := w.ClientStream.CloseSend()
|
|
|
|
if err != nil {
|
|
w.sendStreamEvent(errorEvent, err)
|
|
} else {
|
|
w.sendStreamEvent(closeEvent, nil)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
const (
|
|
clientClosedState byte = 1 << iota
|
|
receiveEndedState
|
|
)
|
|
|
|
func wrapClientStream(s grpc.ClientStream, desc *grpc.StreamDesc) *clientStream {
|
|
var (
|
|
events = make(chan streamEvent)
|
|
eventsDone = make(chan struct{})
|
|
finished = make(chan error)
|
|
)
|
|
go func() {
|
|
defer close(eventsDone)
|
|
// Both streams have to be closed
|
|
state := byte(0)
|
|
for event := range events {
|
|
switch event.Type {
|
|
case closeEvent:
|
|
state |= clientClosedState
|
|
case receiveEndEvent:
|
|
state |= receiveEndedState
|
|
case errorEvent:
|
|
finished <- event.Err
|
|
return
|
|
}
|
|
|
|
if state == clientClosedState|receiveEndedState {
|
|
finished <- nil
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
|
|
return &clientStream{
|
|
ClientStream: s,
|
|
desc: desc,
|
|
events: events,
|
|
eventsDone: eventsDone,
|
|
finished: finished,
|
|
}
|
|
}
|
|
|
|
func (w *clientStream) sendStreamEvent(eventType streamEventType, err error) {
|
|
select {
|
|
case <-w.eventsDone:
|
|
case w.events <- streamEvent{Type: eventType, Err: err}:
|
|
}
|
|
}
|
|
|
|
// serverStream wraps around the embedded grpc.ServerStream, and intercepts the RecvMsg and
|
|
// SendMsg method call.
|
|
type serverStream struct {
|
|
grpc.ServerStream
|
|
ctx context.Context
|
|
|
|
receivedMessageID int
|
|
sentMessageID int
|
|
}
|
|
|
|
func (w *serverStream) Context() context.Context {
|
|
return w.ctx
|
|
}
|
|
|
|
func (w *serverStream) RecvMsg(m any) error {
|
|
err := w.ServerStream.RecvMsg(m)
|
|
|
|
if err == nil {
|
|
w.receivedMessageID++
|
|
messageReceived.Event(w.Context(), w.receivedMessageID, m)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (w *serverStream) SendMsg(m any) error {
|
|
err := w.ServerStream.SendMsg(m)
|
|
|
|
w.sentMessageID++
|
|
messageSent.Event(w.Context(), w.sentMessageID, m)
|
|
|
|
return err
|
|
}
|
|
|
|
func wrapServerStream(ctx context.Context, ss grpc.ServerStream) *serverStream {
|
|
return &serverStream{
|
|
ServerStream: ss,
|
|
ctx: ctx,
|
|
}
|
|
}
|
|
|
|
// spanInfo returns a span name and all appropriate attributes from the gRPC
|
|
// method and peer address.
|
|
func spanInfo(fullMethod, peerAddress string) (string, []attribute.KeyValue) {
|
|
attrs := []attribute.KeyValue{attribute.Key("rpc.system").String("grpc")}
|
|
name, mAttrs := parseFullMethod(fullMethod)
|
|
attrs = append(attrs, mAttrs...)
|
|
attrs = append(attrs, peerAttr(peerAddress)...)
|
|
return name, attrs
|
|
}
|
|
|
|
// peerAttr returns attributes about the peer address.
|
|
func peerAttr(addr string) []attribute.KeyValue {
|
|
host, port, err := net.SplitHostPort(addr)
|
|
if err != nil {
|
|
return []attribute.KeyValue(nil)
|
|
}
|
|
|
|
if host == "" {
|
|
host = "127.0.0.1"
|
|
}
|
|
|
|
return []attribute.KeyValue{
|
|
semconv.NetPeerIPKey.String(host),
|
|
semconv.NetPeerPortKey.String(port),
|
|
}
|
|
}
|
|
|
|
// peerFromCtx returns a peer address from a context, if one exists.
|
|
func peerFromCtx(ctx context.Context) string {
|
|
p, ok := peer.FromContext(ctx)
|
|
if !ok {
|
|
return ""
|
|
}
|
|
return p.Addr.String()
|
|
}
|
|
|
|
// parseFullMethod returns a span name following the OpenTelemetry semantic
|
|
// conventions as well as all applicable span attribute.KeyValue attributes based
|
|
// on a gRPC's FullMethod.
|
|
func parseFullMethod(fullMethod string) (string, []attribute.KeyValue) {
|
|
name := strings.TrimLeft(fullMethod, "/")
|
|
parts := strings.SplitN(name, "/", 2)
|
|
if len(parts) != 2 {
|
|
// Invalid format, does not follow `/package.service/method`.
|
|
return name, []attribute.KeyValue(nil)
|
|
}
|
|
|
|
var attrs []attribute.KeyValue
|
|
if service := parts[0]; service != "" {
|
|
attrs = append(attrs, semconv.RPCServiceKey.String(service))
|
|
}
|
|
if method := parts[1]; method != "" {
|
|
attrs = append(attrs, semconv.RPCMethodKey.String(method))
|
|
}
|
|
return name, attrs
|
|
}
|
|
|
|
// statusCodeAttr returns status code attribute based on given gRPC code.
|
|
func statusCodeAttr(c grpcCodes.Code) attribute.KeyValue {
|
|
return GRPCStatusCodeKey.Int64(int64(c))
|
|
}
|