Merge pull request #7 from numary/chore/models-in-sharedpublishkafka

Antoine Gelloz · web-flow · commit 253ee7797d1c · 2022-08-26T11:29:12.000+02:00
chore: bump dependencies
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/go.mod b/go.mod
@@ -3,58 +3,63 @@ module github.com/numary/go-libs
 go 1.18
 
 require (
-	github.com/Shopify/sarama v1.32.0
+	github.com/Shopify/sarama v1.36.0
 	github.com/ThreeDotsLabs/watermill v1.1.1
 	github.com/ThreeDotsLabs/watermill-http v1.1.4
-	github.com/ThreeDotsLabs/watermill-kafka/v2 v2.2.1
+	github.com/ThreeDotsLabs/watermill-kafka/v2 v2.2.2
 	github.com/dgraph-io/ristretto v0.1.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/pborman/uuid v1.2.1
+	github.com/google/uuid v1.3.0
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.0
-	github.com/xdg-go/scram v1.1.0
-	go.uber.org/fx v1.17.1
+	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.8.0
+	github.com/xdg-go/scram v1.1.1
+	go.uber.org/fx v1.18.1
 )
 
 require (
+	github.com/ajg/form v1.5.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/eapache/go-resiliency v1.2.0 // indirect
+	github.com/eapache/go-resiliency v1.3.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
-	github.com/go-chi/chi v4.0.2+incompatible // indirect
-	github.com/go-chi/render v1.0.1 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/go-chi/chi v4.1.2+incompatible // indirect
+	github.com/go-chi/render v1.0.2 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.1.2 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
-	github.com/hashicorp/go-uuid v1.0.2 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
-	github.com/jcmturner/gofork v1.0.0 // indirect
-	github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
+	github.com/jcmturner/gofork v1.7.6 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
-	github.com/klauspost/compress v1.14.4 // indirect
-	github.com/lithammer/shortuuid/v3 v3.0.4 // indirect
+	github.com/klauspost/compress v1.15.9 // indirect
+	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/dig v1.14.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama v0.34.0 // indirect
+	go.opentelemetry.io/otel v1.9.0 // indirect
+	go.opentelemetry.io/otel/trace v1.9.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/dig v1.15.0 // indirect
 	go.uber.org/goleak v1.1.12 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
-	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 // indirect
+	golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c // indirect
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
+	golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/sharedauth/bearer.go b/sharedauth/bearer.go
@@ -82,7 +82,7 @@ func (v *introspectionValidator) Validate(ctx context.Context, token string) err
 		if !v.audienceValidator.Validate(ctx, aud) {
 			return errors.New("audience mismatch")
 		}
-	case []interface{}:
+	case []any:
 		match := false
 		for _, aud := range aud {
 			if v.audienceValidator.Validate(ctx, aud.(string)) {
diff --git a/sharedauth/middleware.go b/sharedauth/middleware.go
@@ -14,7 +14,7 @@ func Middleware(methods ...Method) func(handler http.Handler) http.Handler {
 				if m.IsMatching(r) {
 					agent, err := m.Check(r)
 					if err != nil {
-						sharedlogging.GetLogger(r.Context()).WithFields(map[string]interface{}{
+						sharedlogging.GetLogger(r.Context()).WithFields(map[string]any{
 							"err": err,
 						}).Infof("Access denied")
 						w.WriteHeader(http.StatusForbidden)
diff --git a/sharedhealth/pkg/controller_test.go b/sharedhealth/pkg/controller_test.go
@@ -17,15 +17,15 @@ import (
 func TestHealthController(t *testing.T) {
 	type testCase struct {
 		name                 string
-		healthChecksProvider []interface{}
+		healthChecksProvider []any
 		expectedStatus       int
 		expectedResult       map[string]string
 	}
 
 	var tests = []testCase{
 		{
 			name: "all-ok",
-			healthChecksProvider: []interface{}{
+			healthChecksProvider: []any{
 				func() sharedhealth.NamedCheck {
 					return sharedhealth.NewNamedCheck("test1", sharedhealth.CheckFn(func(ctx context.Context) error {
 						return nil
@@ -45,7 +45,7 @@ func TestHealthController(t *testing.T) {
 		},
 		{
 			name: "one-failing",
-			healthChecksProvider: []interface{}{
+			healthChecksProvider: []any{
 				func() sharedhealth.NamedCheck {
 					return sharedhealth.NewNamedCheck("test1", sharedhealth.CheckFn(func(ctx context.Context) error {
 						return nil
diff --git a/sharedhealth/pkg/module.go b/sharedhealth/pkg/module.go
@@ -4,7 +4,7 @@ import "go.uber.org/fx"
 
 const HealthCheckKey = `group:"_healthCheck"`
 
-func ProvideHealthCheck(provider interface{}) fx.Option {
+func ProvideHealthCheck(provider any) fx.Option {
 	return fx.Provide(
 		fx.Annotate(provider, fx.ResultTags(HealthCheckKey)),
 	)
diff --git a/sharedlogging/logging.go b/sharedlogging/logging.go
@@ -3,13 +3,13 @@ package sharedlogging
 import "context"
 
 type Logger interface {
-	Debugf(fmt string, args ...interface{})
-	Infof(fmt string, args ...interface{})
-	Errorf(fmt string, args ...interface{})
-	Debug(args ...interface{})
-	Info(args ...interface{})
-	Error(args ...interface{})
-	WithFields(map[string]interface{}) Logger
+	Debugf(fmt string, args ...any)
+	Infof(fmt string, args ...any)
+	Errorf(fmt string, args ...any)
+	Debug(args ...any)
+	Info(args ...any)
+	Error(args ...any)
+	WithFields(map[string]any) Logger
 	WithContext(ctx context.Context) Logger
 }
 
@@ -34,13 +34,13 @@ func (n noOpLogger) WithContext(ctx context.Context) Logger {
 	return n
 }
 
-func (n noOpLogger) Debug(args ...interface{})              {}
-func (n noOpLogger) Info(args ...interface{})               {}
-func (n noOpLogger) Error(args ...interface{})              {}
-func (n noOpLogger) Debugf(fmt string, args ...interface{}) {}
-func (n noOpLogger) Infof(fmt string, args ...interface{})  {}
-func (n noOpLogger) Errorf(fmt string, args ...interface{}) {}
-func (n noOpLogger) WithFields(m map[string]interface{}) Logger {
+func (n noOpLogger) Debug(args ...any)              {}
+func (n noOpLogger) Info(args ...any)               {}
+func (n noOpLogger) Error(args ...any)              {}
+func (n noOpLogger) Debugf(fmt string, args ...any) {}
+func (n noOpLogger) Infof(fmt string, args ...any)  {}
+func (n noOpLogger) Errorf(fmt string, args ...any) {}
+func (n noOpLogger) WithFields(m map[string]any) Logger {
 	return n
 }
 
@@ -63,24 +63,24 @@ func GetLogger(ctx context.Context) Logger {
 	return loggerFactory.Get(ctx)
 }
 
-func Debugf(fmt string, args ...interface{}) {
+func Debugf(fmt string, args ...any) {
 	GetLogger(context.Background()).Debugf(fmt, args...)
 }
-func Infof(fmt string, args ...interface{}) {
+func Infof(fmt string, args ...any) {
 	GetLogger(context.Background()).Infof(fmt, args...)
 }
-func Errorf(fmt string, args ...interface{}) {
+func Errorf(fmt string, args ...any) {
 	GetLogger(context.Background()).Errorf(fmt, args...)
 }
-func Debug(args ...interface{}) {
+func Debug(args ...any) {
 	GetLogger(context.Background()).Debug(args...)
 }
-func Info(args ...interface{}) {
+func Info(args ...any) {
 	GetLogger(context.Background()).Info(args...)
 }
-func Error(args ...interface{}) {
+func Error(args ...any) {
 	GetLogger(context.Background()).Error(args...)
 }
-func WithFields(v map[string]interface{}) Logger {
+func WithFields(v map[string]any) Logger {
 	return GetLogger(context.Background()).WithFields(v)
 }
diff --git a/sharedlogging/sharedlogginglogrus/logrus.go b/sharedlogging/sharedlogginglogrus/logrus.go
@@ -9,12 +9,12 @@ import (
 
 type logrusLogger struct {
 	entry interface {
-		Debugf(format string, args ...interface{})
-		Debug(args ...interface{})
-		Infof(format string, args ...interface{})
-		Info(args ...interface{})
-		Errorf(format string, args ...interface{})
-		Error(args ...interface{})
+		Debugf(format string, args ...any)
+		Debug(args ...any)
+		Infof(format string, args ...any)
+		Info(args ...any)
+		Errorf(format string, args ...any)
+		Error(args ...any)
 		WithFields(fields logrus.Fields) *logrus.Entry
 		WithContext(ctx context.Context) *logrus.Entry
 	}
@@ -26,25 +26,25 @@ func (l *logrusLogger) WithContext(ctx context.Context) sharedlogging.Logger {
 	}
 }
 
-func (l *logrusLogger) Debug(args ...interface{}) {
+func (l *logrusLogger) Debug(args ...any) {
 	l.entry.Debug(args...)
 }
-func (l *logrusLogger) Debugf(fmt string, args ...interface{}) {
+func (l *logrusLogger) Debugf(fmt string, args ...any) {
 	l.entry.Debugf(fmt, args...)
 }
-func (l *logrusLogger) Infof(fmt string, args ...interface{}) {
+func (l *logrusLogger) Infof(fmt string, args ...any) {
 	l.entry.Infof(fmt, args...)
 }
-func (l *logrusLogger) Info(args ...interface{}) {
+func (l *logrusLogger) Info(args ...any) {
 	l.entry.Info(args...)
 }
-func (l *logrusLogger) Errorf(fmt string, args ...interface{}) {
+func (l *logrusLogger) Errorf(fmt string, args ...any) {
 	l.entry.Errorf(fmt, args...)
 }
-func (l *logrusLogger) Error(args ...interface{}) {
+func (l *logrusLogger) Error(args ...any) {
 	l.entry.Error(args...)
 }
-func (l *logrusLogger) WithFields(fields map[string]interface{}) sharedlogging.Logger {
+func (l *logrusLogger) WithFields(fields map[string]any) sharedlogging.Logger {
 	return &logrusLogger{
 		entry: l.entry.WithFields(fields),
 	}
diff --git a/sharedotlp/pkg/error.go b/sharedotlp/pkg/error.go
@@ -17,7 +17,7 @@ func RecordError(ctx context.Context, e error) {
 	span.RecordError(e, trace.WithStackTrace(true))
 }
 
-func RecordAsError(ctx context.Context, e interface{}) {
+func RecordAsError(ctx context.Context, e any) {
 	if e == nil {
 		return
 	}
diff --git a/sharedotlp/pkg/sharedotlpmetrics/otlpexporter.go b/sharedotlp/pkg/sharedotlpmetrics/otlpexporter.go
@@ -35,7 +35,7 @@ func OTLPMeterModule() fx.Option {
 
 const OTLPMeterGRPCOptionsKey = `group:"_otlpMeterGrpcOptions"`
 
-func ProvideOTLPMeterGRPCClientOption(provider interface{}) fx.Option {
+func ProvideOTLPMeterGRPCClientOption(provider any) fx.Option {
 	return fx.Provide(
 		fx.Annotate(provider, fx.ResultTags(OTLPMeterGRPCOptionsKey), fx.As(new(otlpmetricgrpc.Option))),
 	)
@@ -51,7 +51,7 @@ func OTLPMeterGRPCClientModule() fx.Option {
 
 const OTLPMeterHTTPOptionsKey = `group:"_otlpMeterHTTPOptions"`
 
-func ProvideOTLPMeterHTTPClientOption(provider interface{}) fx.Option {
+func ProvideOTLPMeterHTTPClientOption(provider any) fx.Option {
 	return fx.Provide(
 		fx.Annotate(provider, fx.ResultTags(OTLPMeterHTTPOptionsKey), fx.As(new(otlpmetrichttp.Option))),
 	)
diff --git a/sharedotlp/pkg/sharedotlptraces/jaegerexporter.go b/sharedotlp/pkg/sharedotlptraces/jaegerexporter.go
@@ -14,7 +14,7 @@ const (
 	JaegerCollectorEndpointGroupKey = `group:"_tracerCollectorEndpointOptions"`
 )
 
-func ProvideJaegerTracerCollectorEndpoint(provider interface{}) fx.Option {
+func ProvideJaegerTracerCollectorEndpoint(provider any) fx.Option {
 	return fx.Provide(fx.Annotate(provider, fx.ResultTags(JaegerCollectorEndpointGroupKey)))
 }
 
diff --git a/sharedotlp/pkg/sharedotlptraces/otlpexporter.go b/sharedotlp/pkg/sharedotlptraces/otlpexporter.go
@@ -32,7 +32,7 @@ func OTLPTracerModule() fx.Option {
 
 const OTLPTracerGRPCOptionsKey = `group:"_otlpTracerGrpcOptions"`
 
-func ProvideOTLPTracerGRPCClientOption(provider interface{}) fx.Option {
+func ProvideOTLPTracerGRPCClientOption(provider any) fx.Option {
 	return fx.Provide(
 		fx.Annotate(provider, fx.ResultTags(OTLPTracerGRPCOptionsKey), fx.As(new(otlptracegrpc.Option))),
 	)
@@ -48,7 +48,7 @@ func OTLPTracerGRPCClientModule() fx.Option {
 
 const OTLPTracerHTTPOptionsKey = `group:"_otlpTracerHTTPOptions"`
 
-func ProvideOTLPTracerHTTPClientOption(provider interface{}) fx.Option {
+func ProvideOTLPTracerHTTPClientOption(provider any) fx.Option {
 	return fx.Provide(
 		fx.Annotate(provider, fx.ResultTags(OTLPTracerHTTPOptionsKey), fx.As(new(otlptracehttp.Option))),
 	)
diff --git a/sharedotlp/pkg/sharedotlptraces/traces.go b/sharedotlp/pkg/sharedotlptraces/traces.go
@@ -41,7 +41,7 @@ type ModuleConfig struct {
 	OTLPConfig   *OTLPConfig
 }
 
-func ProvideTracerProviderOption(v interface{}, annotations ...fx.Annotation) fx.Option {
+func ProvideTracerProviderOption(v any, annotations ...fx.Annotation) fx.Option {
 	annotations = append(annotations, fx.ResultTags(TracerProviderOptionKey))
 	return fx.Provide(fx.Annotate(v, annotations...))
 }
diff --git a/sharedpublish/publisher.go b/sharedpublish/publisher.go
@@ -5,22 +5,22 @@ import (
 	"encoding/json"
 
 	"github.com/ThreeDotsLabs/watermill/message"
+	"github.com/google/uuid"
 	"github.com/numary/go-libs/sharedlogging"
-	"github.com/pborman/uuid"
 	"go.uber.org/fx"
 )
 
 type Publisher interface {
-	Publish(ctx context.Context, topic string, ev interface{}) error
+	Publish(ctx context.Context, topic string, ev any) error
 }
 
 // TODO: Inject OpenTracing context
-func newMessage(ctx context.Context, m interface{}) *message.Message {
+func newMessage(ctx context.Context, m any) *message.Message {
 	data, err := json.Marshal(m)
 	if err != nil {
 		panic(err)
 	}
-	msg := message.NewMessage(uuid.New(), data)
+	msg := message.NewMessage(uuid.NewString(), data)
 	msg.SetContext(ctx)
 	return msg
 }
@@ -30,7 +30,7 @@ type TopicMapperPublisher struct {
 	topics    map[string]string
 }
 
-func (l *TopicMapperPublisher) publish(ctx context.Context, topic string, ev interface{}) error {
+func (l *TopicMapperPublisher) publish(ctx context.Context, topic string, ev any) error {
 	err := l.publisher.Publish(topic, newMessage(ctx, ev))
 	if err != nil {
 		sharedlogging.GetLogger(ctx).Errorf("Publishing message: %s", err)
@@ -39,7 +39,7 @@ func (l *TopicMapperPublisher) publish(ctx context.Context, topic string, ev int
 	return nil
 }
 
-func (l *TopicMapperPublisher) Publish(ctx context.Context, topic string, ev interface{}) error {
+func (l *TopicMapperPublisher) Publish(ctx context.Context, topic string, ev any) error {
 	mappedTopic, ok := l.topics[topic]
 	if ok {
 		return l.publish(ctx, mappedTopic, ev)

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (v *introspectionValidator) Validate(ctx context.Context, token string) err`
`82`	`82`	`if !v.audienceValidator.Validate(ctx, aud) {`
`83`	`83`	`return errors.New("audience mismatch")`
`84`	`84`	`}`
`85`		`- case []interface{}:`
	`85`	`+ case []any:`
`86`	`86`	`match := false`
`87`	`87`	`for _, aud := range aud {`
`88`	`88`	`if v.audienceValidator.Validate(ctx, aud.(string)) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import "go.uber.org/fx"`
`4`	`4`
`5`	`5`	const HealthCheckKey = `group:"_healthCheck"`
`6`	`6`
`7`		`-func ProvideHealthCheck(provider interface{}) fx.Option {`
	`7`	`+func ProvideHealthCheck(provider any) fx.Option {`
`8`	`8`	`return fx.Provide(`
`9`	`9`	`fx.Annotate(provider, fx.ResultTags(HealthCheckKey)),`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ import (`
`9`	`9`
`10`	`10`	`type logrusLogger struct {`
`11`	`11`	`entry interface {`
`12`		`- Debugf(format string, args ...interface{})`
`13`		`- Debug(args ...interface{})`
`14`		`- Infof(format string, args ...interface{})`
`15`		`- Info(args ...interface{})`
`16`		`- Errorf(format string, args ...interface{})`
`17`		`- Error(args ...interface{})`
	`12`	`+ Debugf(format string, args ...any)`
	`13`	`+ Debug(args ...any)`
	`14`	`+ Infof(format string, args ...any)`
	`15`	`+ Info(args ...any)`
	`16`	`+ Errorf(format string, args ...any)`
	`17`	`+ Error(args ...any)`
`18`	`18`	`WithFields(fields logrus.Fields) *logrus.Entry`
`19`	`19`	`WithContext(ctx context.Context) *logrus.Entry`
`20`	`20`	`}`
`@@ -26,25 +26,25 @@ func (l *logrusLogger) WithContext(ctx context.Context) sharedlogging.Logger {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-func (l *logrusLogger) Debug(args ...interface{}) {`
	`29`	`+func (l *logrusLogger) Debug(args ...any) {`
`30`	`30`	`l.entry.Debug(args...)`
`31`	`31`	`}`
`32`		`-func (l *logrusLogger) Debugf(fmt string, args ...interface{}) {`
	`32`	`+func (l *logrusLogger) Debugf(fmt string, args ...any) {`
`33`	`33`	`l.entry.Debugf(fmt, args...)`
`34`	`34`	`}`
`35`		`-func (l *logrusLogger) Infof(fmt string, args ...interface{}) {`
	`35`	`+func (l *logrusLogger) Infof(fmt string, args ...any) {`
`36`	`36`	`l.entry.Infof(fmt, args...)`
`37`	`37`	`}`
`38`		`-func (l *logrusLogger) Info(args ...interface{}) {`
	`38`	`+func (l *logrusLogger) Info(args ...any) {`
`39`	`39`	`l.entry.Info(args...)`
`40`	`40`	`}`
`41`		`-func (l *logrusLogger) Errorf(fmt string, args ...interface{}) {`
	`41`	`+func (l *logrusLogger) Errorf(fmt string, args ...any) {`
`42`	`42`	`l.entry.Errorf(fmt, args...)`
`43`	`43`	`}`
`44`		`-func (l *logrusLogger) Error(args ...interface{}) {`
	`44`	`+func (l *logrusLogger) Error(args ...any) {`
`45`	`45`	`l.entry.Error(args...)`
`46`	`46`	`}`
`47`		`-func (l *logrusLogger) WithFields(fields map[string]interface{}) sharedlogging.Logger {`
	`47`	`+func (l *logrusLogger) WithFields(fields map[string]any) sharedlogging.Logger {`
`48`	`48`	`return &logrusLogger{`
`49`	`49`	`entry: l.entry.WithFields(fields),`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func RecordError(ctx context.Context, e error) {`
`17`	`17`	`span.RecordError(e, trace.WithStackTrace(true))`
`18`	`18`	`}`
`19`	`19`
`20`		`-func RecordAsError(ctx context.Context, e interface{}) {`
	`20`	`+func RecordAsError(ctx context.Context, e any) {`
`21`	`21`	`if e == nil {`
`22`	`22`	`return`
`23`	`23`	`}`