move opentelemetry into trace package, and refactoring (#996)

* move opentelemetry into trace package, and refactoring

* rename rewritten package names

core/service/serviceconf.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/tal-tech/go-zero/core/load"
 	"github.com/tal-tech/go-zero/core/logx"
-	"github.com/tal-tech/go-zero/core/opentelemetry"
 	"github.com/tal-tech/go-zero/core/prometheus"
 	"github.com/tal-tech/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/trace/opentelemetry"
 )
 
 const (

core/trace/opentelemetry/agent.go

@@ -29,6 +29,7 @@ func StartAgent(c Config) {
 		if len(c.Endpoint) == 0 {
 			return
 		}
+
 		// Just support jaeger now
 		if c.Batcher != "jaeger" {
 			return
@@ -46,9 +47,7 @@ func StartAgent(c Config) {
 			// Always be sure to batch in production.
 			tracesdk.WithBatcher(exp),
 			// Record information about this application in an Resource.
-			tracesdk.WithResource(resource.NewSchemaless(
+			tracesdk.WithResource(resource.NewSchemaless(semconv.ServiceNameKey.String(c.Name))),
-				semconv.ServiceNameKey.String(c.Name),
-			)),
 		)
 
 		otel.SetTracerProvider(tp)

core/trace/opentelemetry/clientstream.go

@@ -6,7 +6,6 @@ import (
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
-	"google.golang.org/protobuf/proto"
 )
 
 const (
@@ -14,26 +13,24 @@ const (
 	errorEvent
 )
 
-var _ = proto.Marshal
+type (
+	streamEventType int
 
-type streamEventType int
+	streamEvent struct {
-
-type streamEvent struct {
 		Type streamEventType
 		Err  error
 	}
 
-type clientStream struct {
+	clientStream struct {
 		grpc.ClientStream
-
+		Finished          chan error
 		desc              *grpc.StreamDesc
 		events            chan streamEvent
 		eventsDone        chan struct{}
-	Finished   chan error
-
 		receivedMessageID int
 		sentMessageID     int
 	}
+)
 
 func (w *clientStream) RecvMsg(m interface{}) error {
 	err := w.ClientStream.RecvMsg(m)

core/trace/opentelemetry/message.go

@@ -8,6 +8,8 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
+const messageEvent = "message"
+
 var (
 	// MessageSent is the type of sent messages.
 	MessageSent = messageType(RPCMessageTypeSent)
@@ -22,13 +24,13 @@ type messageType attribute.KeyValue
 func (m messageType) Event(ctx context.Context, id int, message interface{}) {
 	span := trace.SpanFromContext(ctx)
 	if p, ok := message.(proto.Message); ok {
-		span.AddEvent("message", trace.WithAttributes(
+		span.AddEvent(messageEvent, trace.WithAttributes(
 			attribute.KeyValue(m),
 			RPCMessageIDKey.Int(id),
 			RPCMessageUncompressedSizeKey.Int(proto.Size(p)),
 		))
 	} else {
-		span.AddEvent("message", trace.WithAttributes(
+		span.AddEvent(messageEvent, trace.WithAttributes(
 			attribute.KeyValue(m),
 			RPCMessageIDKey.Int(id),
 		))

core/trace/opentelemetry/serverstream.go

@@ -22,7 +22,6 @@ func (w *serverStream) Context() context.Context {
 
 func (w *serverStream) RecvMsg(m interface{}) error {
 	err := w.ServerStream.RecvMsg(m)
-
 	if err == nil {
 		w.receivedMessageID++
 		MessageReceived.Event(w.Context(), w.receivedMessageID, m)
@@ -33,7 +32,6 @@ func (w *serverStream) RecvMsg(m interface{}) error {
 
 func (w *serverStream) SendMsg(m interface{}) error {
 	err := w.ServerStream.SendMsg(m)
-
 	w.sentMessageID++
 	MessageSent.Event(w.Context(), w.sentMessageID, m)
 

core/trace/opentelemetry/tracer.go

@@ -9,18 +9,19 @@ import (
 	"google.golang.org/grpc/metadata"
 )
 
+// assert that metadataSupplier implements the TextMapCarrier interface
+var _ propagation.TextMapCarrier = new(metadataSupplier)
+
 type metadataSupplier struct {
 	metadata *metadata.MD
 }
 
-// assert that metadataSupplier implements the TextMapCarrier interface
-var _ propagation.TextMapCarrier = &metadataSupplier{}
-
 func (s *metadataSupplier) Get(key string) string {
 	values := s.metadata.Get(key)
 	if len(values) == 0 {
 		return ""
 	}
+
 	return values[0]
 }
 
@@ -33,6 +34,7 @@ func (s *metadataSupplier) Keys() []string {
 	for key := range *s.metadata {
 		out = append(out, key)
 	}
+
 	return out
 }
 

core/trace/opentelemetry/utils.go

@@ -10,6 +10,8 @@ import (
 	"google.golang.org/grpc/peer"
 )
 
+const localhost = "127.0.0.1"
+
 // PeerFromCtx returns the peer from ctx.
 func PeerFromCtx(ctx context.Context) string {
 	p, ok := peer.FromContext(ctx)
@@ -56,8 +58,8 @@ func PeerAttr(addr string) []attribute.KeyValue {
 		return []attribute.KeyValue(nil)
 	}
 
-	if host == "" {
+	if len(host) == 0 {
-		host = "127.0.0.1"
+		host = localhost
 	}
 
 	return []attribute.KeyValue{

rest/handler/otelhandler.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"net/http"
 
-	"github.com/tal-tech/go-zero/core/opentelemetry"
+	"github.com/tal-tech/go-zero/core/trace/opentelemetry"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/propagation"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"

rest/handler/otelhandler_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tal-tech/go-zero/core/opentelemetry"
+	"github.com/tal-tech/go-zero/core/trace/opentelemetry"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"

zrpc/internal/clientinterceptors/opentracinginterceptor.go

@@ -3,7 +3,7 @@ package clientinterceptors
 import (
 	"context"
 
-	"github.com/tal-tech/go-zero/core/opentelemetry"
+	"github.com/tal-tech/go-zero/core/trace/opentelemetry"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"

zrpc/internal/clientinterceptors/opentracinginterceptor_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tal-tech/go-zero/core/opentelemetry"
+	"github.com/tal-tech/go-zero/core/trace/opentelemetry"
 	"google.golang.org/grpc"
 )
 

zrpc/internal/serverinterceptors/opentracinginterceptor.go

@@ -3,7 +3,7 @@ package serverinterceptors
 import (
 	"context"
 
-	"github.com/tal-tech/go-zero/core/opentelemetry"
+	"github.com/tal-tech/go-zero/core/trace/opentelemetry"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/codes"

zrpc/internal/serverinterceptors/opentracinginterceptor_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tal-tech/go-zero/core/opentelemetry"
+	"github.com/tal-tech/go-zero/core/trace/opentelemetry"
 	"google.golang.org/grpc"
 )