propagtor V1

cwmetrics/option.go

@@ -0,0 +1 @@
+package cwmetrics

go.mod

@@ -50,7 +50,7 @@ require (
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/pprof v0.0.0-20230509042627-b1315fad0c5a // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect

logging/zerolog/go.mod

@@ -1,6 +1,6 @@
 module github.com/cloudwego-contrib/obs-opentelemetry/logging/zerolog
 
-go 1.19
+go 1.21
 
 require (
 	github.com/cloudwego/hertz v0.4.0

obs-logging/slog/logger.go

@@ -28,10 +28,15 @@ func NewLogger(opts ...Option) *Logger {
 		Logger: *cfg.logger,
 		config: cfg,
 	}
-	logger.SetTraceLogger()
+	logger.setTraceLogger()
 	return logger
 }
 
+func (l *Logger) setTraceLogger() {
+	log := slog.New(NewTraceHandler(l.GetOutput(), l.config.logger.GetHandler(), l.config.traceConfig))
+	l.Logger.SetLogger(log)
+}
+
 func (l *Logger) SetOutput(writer io.Writer) {
 	log := slog.New(NewTraceHandler(writer, l.config.logger.GetHandler(), l.config.traceConfig))
 	l.config.logger.SetOutput(writer)
@@ -40,7 +45,3 @@ func (l *Logger) SetOutput(writer io.Writer) {
 func (l *Logger) SetLevel(level logging.Level) {
 	l.Logger.SetLevel(level)
 }
-func (l *Logger) SetTraceLogger() {
-	log := slog.New(NewTraceHandler(l.GetOutput(), l.config.logger.GetHandler(), l.config.traceConfig))
-	l.Logger.SetLogger(log)
-}

tracing/hertz/middleware.go

@@ -47,7 +47,7 @@ func (sh *StringHeader) Visit(f func(k, v string)) {
 }
 
 func ClientMiddleware(opts ...Option) client.Middleware {
-	cfg := newConfig(opts)
+	cfg := NewConfig(opts)
 	histogramRecorder := make(map[string]metric.Float64Histogram)
 	counters := make(map[string]metric.Int64Counter)
 

tracing/hertz/options.go

@@ -61,7 +61,7 @@ type Config struct {
 	shouldIgnore          ConditionFunc
 }
 
-func newConfig(opts []Option) *Config {
+func NewConfig(opts []Option) *Config {
 	cfg := defaultConfig()
 
 	for _, opt := range opts {
@@ -119,6 +119,9 @@ func defaultConfig() *Config {
 		},
 	}
 }
+func (c Config) GetTextMapPropagator() propagation.TextMapPropagator {
+	return c.textMapPropagator
+}
 
 // WithRecordSourceOperation configures record source operation dimension
 func WithRecordSourceOperation(recordSourceOperation bool) Option {

tracing/hertz/propagator_test.go

@@ -16,10 +16,10 @@ package hertz
 
 import (
 	"context"
+	"github.com/bytedance/gopkg/cloud/metainfo"
 	"reflect"
 	"testing"
 
-	"github.com/bytedance/gopkg/cloud/metainfo"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/contrib/propagators/b3"
@@ -74,7 +74,7 @@ func TestExtract(t *testing.T) {
 }
 
 func TestInject(t *testing.T) {
-	cfg := newConfig([]Option{WithTextMapPropagator(propagation.NewCompositeTextMapPropagator(
+	cfg := NewConfig([]Option{WithTextMapPropagator(propagation.NewCompositeTextMapPropagator(
 		b3.New(),
 		ot.OT{},
 		propagation.Baggage{},

tracing/hertz/tracer_server.go

@@ -45,7 +45,7 @@ type serverTracer struct {
 }
 
 func NewServerTracer(opts ...Option) (serverconfig.Option, *Config) {
-	cfg := newConfig(opts)
+	cfg := NewConfig(opts)
 	st := &serverTracer{
 		config:            cfg,
 		counters:          make(map[string]metric.Int64Counter),

tracing/kitex/middleware.go

@@ -28,7 +28,7 @@ import (
 )
 
 // ClientMiddleware inject span context into req meta
-func ClientMiddleware(cfg *config) endpoint.Middleware {
+func ClientMiddleware(cfg *Config) endpoint.Middleware {
 	return func(next endpoint.Endpoint) endpoint.Endpoint {
 		return func(ctx context.Context, req, resp interface{}) (err error) {
 			span := oteltrace.SpanFromContext(ctx)
@@ -53,7 +53,7 @@ func ClientMiddleware(cfg *config) endpoint.Middleware {
 }
 
 // ServerMiddleware extract req meta into span context
-func ServerMiddleware(cfg *config) endpoint.Middleware {
+func ServerMiddleware(cfg *Config) endpoint.Middleware {
 	return func(next endpoint.Endpoint) endpoint.Endpoint {
 		return func(ctx context.Context, req, resp interface{}) (err error) {
 			tc := internal.TraceCarrierFromContext(ctx)

tracing/kitex/options.go

@@ -27,16 +27,16 @@ const (
 
 // Option opts for opentelemetry tracer provider
 type Option interface {
-	apply(cfg *config)
+	apply(cfg *Config)
 }
 
-type option func(cfg *config)
+type option func(cfg *Config)
 
-func (fn option) apply(cfg *config) {
+func (fn option) apply(cfg *Config) {
 	fn(cfg)
 }
 
-type config struct {
+type Config struct {
 	tracer trace.Tracer
 	meter  metric.Meter
 
@@ -47,7 +47,7 @@ type config struct {
 	recordSourceOperation bool
 }
 
-func newConfig(opts []Option) *config {
+func newConfig(opts []Option) *Config {
 	cfg := defaultConfig()
 
 	for _, opt := range opts {
@@ -67,24 +67,27 @@ func newConfig(opts []Option) *config {
 	return cfg
 }
 
-func defaultConfig() *config {
-	return &config{
+func defaultConfig() *Config {
+	return &Config{
 		tracerProvider:    otel.GetTracerProvider(),
 		meterProvider:     otel.GetMeterProvider(),
 		textMapPropagator: otel.GetTextMapPropagator(),
 	}
 }
+func (c Config) GetTextMapPropagator() propagation.TextMapPropagator {
+	return c.textMapPropagator
+}
 
 // WithRecordSourceOperation configures record source operation dimension
 func WithRecordSourceOperation(recordSourceOperation bool) Option {
-	return option(func(cfg *config) {
+	return option(func(cfg *Config) {
 		cfg.recordSourceOperation = recordSourceOperation
 	})
 }
 
 // WithTextMapPropagator configures propagation
 func WithTextMapPropagator(p propagation.TextMapPropagator) Option {
-	return option(func(cfg *config) {
+	return option(func(cfg *Config) {
 		cfg.textMapPropagator = p
 	})
 }

tracing/kitex/propagator.go

@@ -53,12 +53,12 @@ func (m *metadataProvider) Keys() []string {
 }
 
 // Inject injects span context into the kitex metadata info
-func Inject(ctx context.Context, c *config, metadata map[string]string) {
+func Inject(ctx context.Context, c *Config, metadata map[string]string) {
 	c.textMapPropagator.Inject(ctx, &metadataProvider{metadata: metadata})
 }
 
 // Extract returns the baggage and span context
-func Extract(ctx context.Context, c *config, metadata map[string]string) (baggage.Baggage, trace.SpanContext) {
+func Extract(ctx context.Context, c *Config, metadata map[string]string) (baggage.Baggage, trace.SpanContext) {
 	ctx = c.textMapPropagator.Extract(ctx, &metadataProvider{metadata: CGIVariableToHTTPHeaderMetadata(metadata)})
 	return baggage.FromContext(ctx), trace.SpanContextFromContext(ctx)
 }

tracing/kitex/propagator_test.go

@@ -37,7 +37,7 @@ func TestExtract(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		c        *config
+		c        *Config
 		metadata map[string]string
 	}
 	tests := []struct {
@@ -95,7 +95,7 @@ func TestInject(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		c        *config
+		c        *Config
 		metadata map[string]string
 	}
 	tests := []struct {

tracing/kitex/tracer_client.go

@@ -31,11 +31,11 @@ import (
 var _ stats.Tracer = (*clientTracer)(nil)
 
 type clientTracer struct {
-	config            *config
+	config            *Config
 	histogramRecorder map[string]metric.Float64Histogram
 }
 
-func newClientOption(opts ...Option) (client.Option, *config) {
+func newClientOption(opts ...Option) (client.Option, *Config) {
 	cfg := newConfig(opts)
 	ct := &clientTracer{config: cfg}
 

tracing/kitex/tracer_server.go

@@ -33,11 +33,11 @@ import (
 var _ stats.Tracer = (*serverTracer)(nil)
 
 type serverTracer struct {
-	config            *config
+	config            *Config
 	histogramRecorder map[string]metric.Float64Histogram
 }
 
-func newServerOption(opts ...Option) (server.Option, *config) {
+func newServerOption(opts ...Option) (server.Option, *Config) {
 	cfg := newConfig(opts)
 	st := &serverTracer{
 		config: cfg,

tracing/propagation/metadataProvider.go

@@ -0,0 +1,117 @@
+package propagation
+
+import (
+	"context"
+	"github.com/bytedance/gopkg/cloud/metainfo"
+	"github.com/cloudwego-contrib/obs-opentelemetry/tracing/hertz"
+	"github.com/cloudwego-contrib/obs-opentelemetry/tracing/kitex"
+	"github.com/cloudwego/hertz/pkg/protocol"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/baggage"
+	"go.opentelemetry.io/otel/propagation"
+	"go.opentelemetry.io/otel/trace"
+)
+
+var _ propagation.TextMapCarrier = &metadataProviderHttp{}
+
+type metadataProviderHttp struct {
+	metadata map[string]string
+	headers  *protocol.RequestHeader
+}
+
+// Get a value from metadata by key
+func (m *metadataProviderHttp) Get(key string) string {
+	return m.headers.Get(key)
+}
+
+// Set a value to metadata by k/v
+func (m *metadataProviderHttp) Set(key, value string) {
+	m.headers.Set(key, value)
+}
+
+// Keys Iteratively get all keys of metadata
+func (m *metadataProviderHttp) Keys() []string {
+	out := make([]string, 0, len(m.metadata))
+
+	m.headers.VisitAll(func(key, value []byte) {
+		out = append(out, string(key))
+	})
+
+	return out
+}
+func getMetadataProviderHTTP(headers *protocol.RequestHeader) *metadataProviderHttp {
+	return &metadataProviderHttp{headers: headers}
+}
+
+// Inject injects span context into the hertz metadata info
+func InjectHTTP(ctx context.Context, c *hertz.Config, headers *protocol.RequestHeader) {
+	c.GetTextMapPropagator().Inject(ctx, getMetadataProviderHTTP(headers))
+}
+
+// Extract returns the baggage and span context
+func ExtractHTTP(ctx context.Context, c *hertz.Config, headers *protocol.RequestHeader) (baggage.Baggage, trace.SpanContext) {
+	ctx = c.GetTextMapPropagator().Extract(ctx, getMetadataProviderHTTP(headers))
+	return baggage.FromContext(ctx), trace.SpanContextFromContext(ctx)
+}
+
+var _ propagation.TextMapCarrier = &metadataProviderRPC{}
+
+type metadataProviderRPC struct {
+	metadata map[string]string
+}
+
+// Get a value from metadata by key
+func (m *metadataProviderRPC) Get(key string) string {
+	if v, ok := m.metadata[key]; ok {
+		return v
+	}
+	return ""
+}
+
+// Set a value to metadata by k/v
+func (m *metadataProviderRPC) Set(key, value string) {
+	m.metadata[key] = value
+}
+
+// Keys Iteratively get all keys of metadata
+func (m *metadataProviderRPC) Keys() []string {
+	out := make([]string, 0, len(m.metadata))
+	for k := range m.metadata {
+		out = append(out, k)
+	}
+	return out
+}
+func getMetadataProviderRPC(metadata map[string]string) *metadataProviderRPC {
+	return &metadataProviderRPC{metadata: metadata}
+}
+
+// Inject injects span context into the kitex metadata info
+func InjectRPC(ctx context.Context, c *kitex.Config, metadata map[string]string) {
+	c.GetTextMapPropagator().Inject(ctx, getMetadataProviderRPC(metadata))
+}
+
+// Extract returns the baggage and span context
+func ExtractRPC(ctx context.Context, c *kitex.Config, metadata map[string]string) (baggage.Baggage, trace.SpanContext) {
+	ctx = c.GetTextMapPropagator().Extract(ctx, getMetadataProviderRPC(CGIVariableToHTTPHeaderMetadata(metadata)))
+	return baggage.FromContext(ctx), trace.SpanContextFromContext(ctx)
+}
+
+// CGIVariableToHTTPHeaderMetadata converts all CGI variable into HTTP header key.
+// For example, `ABC_DEF` will be converted to `abc-def`.
+func CGIVariableToHTTPHeaderMetadata(metadata map[string]string) map[string]string {
+	res := make(map[string]string, len(metadata))
+	for k, v := range metadata {
+		res[metainfo.CGIVariableToHTTPHeader(k)] = v
+	}
+	return res
+}
+
+// ExtractFromPropagator get metadata from propagator
+func ExtractFromPropagator(ctx context.Context) map[string]string {
+	metadata := metainfo.GetAllValues(ctx)
+	if metadata == nil {
+		metadata = make(map[string]string)
+	}
+	otel.GetTextMapPropagator().Inject(ctx, getMetadataProviderRPC(metadata))
+	return metadata
+}