Compare commits
No commits in common. "master" and "v4.0.16" have entirely different histories.
24
.gitea/workflows/autoupdate.yml
Normal file
24
.gitea/workflows/autoupdate.yml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- 'main'
|
||||||
|
- 'master'
|
||||||
|
- 'v3'
|
||||||
|
schedule:
|
||||||
|
#- cron: '* * * * *'
|
||||||
|
- cron: '@hourly'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
autoupdate:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: setup-go
|
||||||
|
uses: https://gitea.com/actions/setup-go@v3
|
||||||
|
with:
|
||||||
|
go-version: 1.21
|
||||||
|
- name: checkout
|
||||||
|
uses: https://gitea.com/actions/checkout@v3
|
||||||
|
- name: get pkgdashcli
|
||||||
|
run: GOPROXY=direct GONOSUMDB="git.unistack.org/*" GONOPROXY="git.unistack.org/*" GOBIN=/bin go install git.unistack.org/unistack-org/pkgdash/cmd/pkgdashcli@latest
|
||||||
|
- name: pkgdashcli check
|
||||||
|
run: /bin/pkgdashcli check
|
||||||
@ -1,30 +0,0 @@
|
|||||||
name: Go
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ master, v3 ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ master, v3 ]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: setup
|
|
||||||
uses: actions/setup-go@v4
|
|
||||||
with:
|
|
||||||
go-version: stable
|
|
||||||
|
|
||||||
- name: coverage
|
|
||||||
run: go test -v -coverprofile coverage.out ./...
|
|
||||||
|
|
||||||
- name: badge
|
|
||||||
uses: ncruces/go-coverage-report@main
|
|
||||||
with:
|
|
||||||
coverage-file: coverage.out
|
|
||||||
reuse-go: true
|
|
||||||
amend: true
|
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,8 +1,6 @@
|
|||||||
# Develop tools
|
# Develop tools
|
||||||
/.vscode/
|
/.vscode/
|
||||||
/.idea/
|
/.idea/
|
||||||
.idea
|
|
||||||
.vscode
|
|
||||||
|
|
||||||
# Binaries for programs and plugins
|
# Binaries for programs and plugins
|
||||||
*.exe
|
*.exe
|
||||||
@ -15,7 +13,6 @@
|
|||||||
_obj
|
_obj
|
||||||
_test
|
_test
|
||||||
_build
|
_build
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
# Architecture specific extensions/prefixes
|
# Architecture specific extensions/prefixes
|
||||||
*.[568vq]
|
*.[568vq]
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
run:
|
run:
|
||||||
concurrency: 4
|
concurrency: 4
|
||||||
|
deadline: 5m
|
||||||
issues-exit-code: 1
|
issues-exit-code: 1
|
||||||
tests: true
|
tests: true
|
||||||
|
|
||||||
@ -12,13 +13,15 @@ linters-settings:
|
|||||||
linters:
|
linters:
|
||||||
enable:
|
enable:
|
||||||
- govet
|
- govet
|
||||||
|
- deadcode
|
||||||
- errcheck
|
- errcheck
|
||||||
- govet
|
- govet
|
||||||
- ineffassign
|
- ineffassign
|
||||||
- staticcheck
|
- staticcheck
|
||||||
|
- structcheck
|
||||||
- typecheck
|
- typecheck
|
||||||
- unused
|
- unused
|
||||||
- spancheck
|
- varcheck
|
||||||
- bodyclose
|
- bodyclose
|
||||||
- gci
|
- gci
|
||||||
- goconst
|
- goconst
|
||||||
@ -38,5 +41,4 @@ linters:
|
|||||||
- prealloc
|
- prealloc
|
||||||
- unconvert
|
- unconvert
|
||||||
- unparam
|
- unparam
|
||||||
- unused
|
|
||||||
disable-all: false
|
disable-all: false
|
||||||
|
|||||||
@ -4,7 +4,6 @@ package broker // import "go.unistack.org/micro/v4/broker"
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"time"
|
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/metadata"
|
"go.unistack.org/micro/v4/metadata"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v4/options"
|
||||||
@ -20,8 +19,6 @@ var (
|
|||||||
ErrDisconnected = errors.New("broker disconnected")
|
ErrDisconnected = errors.New("broker disconnected")
|
||||||
// ErrInvalidMessage returns when message has nvalid format
|
// ErrInvalidMessage returns when message has nvalid format
|
||||||
ErrInvalidMessage = errors.New("broker message has invalid format")
|
ErrInvalidMessage = errors.New("broker message has invalid format")
|
||||||
// DefaultGracefulTimeout
|
|
||||||
DefaultGracefulTimeout = 5 * time.Second
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Broker is an interface used for asynchronous messaging.
|
// Broker is an interface used for asynchronous messaging.
|
||||||
|
|||||||
@ -37,10 +37,10 @@ func TestMemoryBatchBroker(t *testing.T) {
|
|||||||
msgs := make([]Message, 0, count)
|
msgs := make([]Message, 0, count)
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
message := &memoryMessage{
|
message := &memoryMessage{
|
||||||
header: metadata.Metadata{
|
header: map[string]string{
|
||||||
metadata.HeaderTopic: []string{topic},
|
metadata.HeaderTopic: topic,
|
||||||
"foo": []string{"bar"},
|
"foo": "bar",
|
||||||
"id": []string{fmt.Sprintf("%d", i)},
|
"id": fmt.Sprintf("%d", i),
|
||||||
},
|
},
|
||||||
body: []byte(`"hello world"`),
|
body: []byte(`"hello world"`),
|
||||||
}
|
}
|
||||||
@ -83,10 +83,10 @@ func TestMemoryBroker(t *testing.T) {
|
|||||||
msgs := make([]Message, 0, count)
|
msgs := make([]Message, 0, count)
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
message := &memoryMessage{
|
message := &memoryMessage{
|
||||||
header: metadata.Metadata{
|
header: map[string]string{
|
||||||
metadata.HeaderTopic: []string{topic},
|
metadata.HeaderTopic: topic,
|
||||||
"foo": []string{"bar"},
|
"foo": "bar",
|
||||||
"id": []string{fmt.Sprintf("%d", i)},
|
"id": fmt.Sprintf("%d", i),
|
||||||
},
|
},
|
||||||
body: []byte(`"hello world"`),
|
body: []byte(`"hello world"`),
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,7 +11,6 @@ import (
|
|||||||
"go.unistack.org/micro/v4/meter"
|
"go.unistack.org/micro/v4/meter"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v4/options"
|
||||||
"go.unistack.org/micro/v4/register"
|
"go.unistack.org/micro/v4/register"
|
||||||
"go.unistack.org/micro/v4/sync"
|
|
||||||
"go.unistack.org/micro/v4/tracer"
|
"go.unistack.org/micro/v4/tracer"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -37,41 +36,36 @@ type Options struct {
|
|||||||
Name string
|
Name string
|
||||||
// Address holds the broker address
|
// Address holds the broker address
|
||||||
Address []string
|
Address []string
|
||||||
|
|
||||||
Wait *sync.WaitGroup
|
|
||||||
|
|
||||||
GracefulTimeout time.Duration
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewOptions create new Options
|
// NewOptions create new Options
|
||||||
func NewOptions(opts ...options.Option) Options {
|
func NewOptions(opts ...options.Option) Options {
|
||||||
newOpts := Options{
|
options := Options{
|
||||||
Register: register.DefaultRegister,
|
Register: register.DefaultRegister,
|
||||||
Logger: logger.DefaultLogger,
|
Logger: logger.DefaultLogger,
|
||||||
Context: context.Background(),
|
Context: context.Background(),
|
||||||
Meter: meter.DefaultMeter,
|
Meter: meter.DefaultMeter,
|
||||||
Codecs: make(map[string]codec.Codec),
|
Codecs: make(map[string]codec.Codec),
|
||||||
Tracer: tracer.DefaultTracer,
|
Tracer: tracer.DefaultTracer,
|
||||||
GracefulTimeout: DefaultGracefulTimeout,
|
|
||||||
}
|
}
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
o(&newOpts)
|
o(&options)
|
||||||
}
|
}
|
||||||
return newOpts
|
return options
|
||||||
}
|
}
|
||||||
|
|
||||||
// PublishOptions struct
|
// PublishOptions struct
|
||||||
type PublishOptions struct {
|
type PublishOptions struct {
|
||||||
// Context holds external options
|
// Context holds external options
|
||||||
Context context.Context
|
Context context.Context
|
||||||
|
// BodyOnly flag says the message contains raw body bytes
|
||||||
|
BodyOnly bool
|
||||||
// Message metadata usually passed as message headers
|
// Message metadata usually passed as message headers
|
||||||
Metadata metadata.Metadata
|
Metadata metadata.Metadata
|
||||||
// Content-Type of message for marshal
|
// Content-Type of message for marshal
|
||||||
ContentType string
|
ContentType string
|
||||||
// Topic destination
|
// Topic destination
|
||||||
Topic string
|
Topic string
|
||||||
// BodyOnly flag says the message contains raw body bytes
|
|
||||||
BodyOnly bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewPublishOptions creates PublishOptions struct
|
// NewPublishOptions creates PublishOptions struct
|
||||||
|
|||||||
@ -19,8 +19,8 @@ var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
|
|||||||
|
|
||||||
// Is this an exported - upper case - name?
|
// Is this an exported - upper case - name?
|
||||||
func isExported(name string) bool {
|
func isExported(name string) bool {
|
||||||
r, _ := utf8.DecodeRuneInString(name)
|
rune, _ := utf8.DecodeRuneInString(name)
|
||||||
return unicode.IsUpper(r)
|
return unicode.IsUpper(rune)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Is this type exported or a builtin?
|
// Is this type exported or a builtin?
|
||||||
|
|||||||
@ -31,9 +31,6 @@ func (c *cfg) Validate() error {
|
|||||||
if c.IntValue != 10 {
|
if c.IntValue != 10 {
|
||||||
return fmt.Errorf("invalid IntValue %d != %d", 10, c.IntValue)
|
return fmt.Errorf("invalid IntValue %d != %d", 10, c.IntValue)
|
||||||
}
|
}
|
||||||
if c.MapValue["key1"] != true {
|
|
||||||
return fmt.Errorf("invalid MapValue %t != %t", true, c.MapValue["key1"])
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,19 +105,3 @@ func TestValidate(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestString(t *testing.T) {
|
|
||||||
cfg := config.NewConfig()
|
|
||||||
res := cfg.String()
|
|
||||||
if res != "default" {
|
|
||||||
t.Fatalf("string value invalid: %s", res)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestName(t *testing.T) {
|
|
||||||
cfg := config.NewConfig()
|
|
||||||
res := cfg.Name()
|
|
||||||
if res != "" {
|
|
||||||
t.Fatal("name value not empty")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -75,10 +75,7 @@ func ParseDSN(dsn string) (*Config, error) {
|
|||||||
// Find last '/' that goes before dbname
|
// Find last '/' that goes before dbname
|
||||||
foundSlash := false
|
foundSlash := false
|
||||||
for i := len(dsn) - 1; i >= 0; i-- {
|
for i := len(dsn) - 1; i >= 0; i-- {
|
||||||
if dsn[i] != '/' {
|
if dsn[i] == '/' {
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
foundSlash = true
|
foundSlash = true
|
||||||
var j, k int
|
var j, k int
|
||||||
|
|
||||||
@ -150,6 +147,7 @@ func ParseDSN(dsn string) (*Config, error) {
|
|||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if !foundSlash && len(dsn) > 0 {
|
if !foundSlash && len(dsn) > 0 {
|
||||||
return nil, ErrInvalidDSNNoSlash
|
return nil, ErrInvalidDSNNoSlash
|
||||||
|
|||||||
@ -1,36 +0,0 @@
|
|||||||
package flow
|
|
||||||
|
|
||||||
import (
|
|
||||||
"reflect"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func FuzzMarshall(f *testing.F) {
|
|
||||||
f.Fuzz(func(t *testing.T, ref []byte) {
|
|
||||||
rm := RawMessage(ref)
|
|
||||||
|
|
||||||
b, err := rm.MarshalJSON()
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Error MarshalJSON: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !reflect.DeepEqual(ref, b) {
|
|
||||||
t.Errorf("Error. Expected '%s', was '%s'", ref, b)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func FuzzUnmarshall(f *testing.F) {
|
|
||||||
f.Fuzz(func(t *testing.T, ref string) {
|
|
||||||
b := []byte(ref)
|
|
||||||
rm := RawMessage(b)
|
|
||||||
|
|
||||||
if err := rm.UnmarshalJSON(b); err != nil {
|
|
||||||
t.Errorf("Error UnmarshalJSON: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if ref != string(rm) {
|
|
||||||
t.Errorf("Error. Expected '%s', was '%s'", ref, rm)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
13
go.mod
13
go.mod
@ -5,16 +5,17 @@ go 1.20
|
|||||||
require (
|
require (
|
||||||
dario.cat/mergo v1.0.0
|
dario.cat/mergo v1.0.0
|
||||||
github.com/DATA-DOG/go-sqlmock v1.5.0
|
github.com/DATA-DOG/go-sqlmock v1.5.0
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.3.1
|
||||||
github.com/patrickmn/go-cache v2.1.0+incompatible
|
github.com/patrickmn/go-cache v2.1.0+incompatible
|
||||||
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
|
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
|
||||||
golang.org/x/sync v0.6.0
|
golang.org/x/sync v0.3.0
|
||||||
golang.org/x/sys v0.16.0
|
golang.org/x/sys v0.12.0
|
||||||
google.golang.org/grpc v1.62.1
|
google.golang.org/grpc v1.58.2
|
||||||
google.golang.org/protobuf v1.32.0
|
google.golang.org/protobuf v1.31.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/golang/protobuf v1.5.3 // indirect
|
github.com/golang/protobuf v1.5.3 // indirect
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
|
golang.org/x/net v0.15.0 // indirect
|
||||||
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
31
go.sum
31
go.sum
@ -6,28 +6,29 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
|
|||||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
||||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
|
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
|
||||||
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
|
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
|
||||||
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 h1:G/FZtUu7a6NTWl3KUHMV9jkLAh/Rvtf03NWMHaEDl+E=
|
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 h1:G/FZtUu7a6NTWl3KUHMV9jkLAh/Rvtf03NWMHaEDl+E=
|
||||||
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
|
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
|
||||||
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
|
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
|
||||||
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
|
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
||||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
|
||||||
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
|
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||||
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
|
||||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
|
||||||
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
|
google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
|
||||||
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
|
google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
|
||||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
|
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
|
||||||
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@ -48,10 +48,8 @@ type Logger interface {
|
|||||||
Fatal(ctx context.Context, msg string, attrs ...interface{})
|
Fatal(ctx context.Context, msg string, attrs ...interface{})
|
||||||
// Log logs message with needed level
|
// Log logs message with needed level
|
||||||
Log(ctx context.Context, level Level, msg string, attrs ...interface{})
|
Log(ctx context.Context, level Level, msg string, attrs ...interface{})
|
||||||
// String returns the type name of logger
|
|
||||||
String() string
|
|
||||||
// String returns the name of logger
|
// String returns the name of logger
|
||||||
Name() string
|
String() string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Info writes formatted msg to default logger on info level
|
// Info writes formatted msg to default logger on info level
|
||||||
@ -64,8 +62,8 @@ func Error(ctx context.Context, msg string, attrs ...interface{}) {
|
|||||||
DefaultLogger.Error(ctx, msg, attrs...)
|
DefaultLogger.Error(ctx, msg, attrs...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Debug writes formatted msg to default logger on debug level
|
// Debugf writes formatted msg to default logger on debug level
|
||||||
func Debug(ctx context.Context, msg string, attrs ...interface{}) {
|
func Debugf(ctx context.Context, msg string, attrs ...interface{}) {
|
||||||
DefaultLogger.Debug(ctx, msg, attrs...)
|
DefaultLogger.Debug(ctx, msg, attrs...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -45,10 +45,6 @@ func (l *noopLogger) Options() Options {
|
|||||||
return l.opts
|
return l.opts
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *noopLogger) Name() string {
|
|
||||||
return l.opts.Name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *noopLogger) String() string {
|
func (l *noopLogger) String() string {
|
||||||
return "noop"
|
return "noop"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,6 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"reflect"
|
"reflect"
|
||||||
"time"
|
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v4/options"
|
||||||
rutil "go.unistack.org/micro/v4/util/reflect"
|
rutil "go.unistack.org/micro/v4/util/reflect"
|
||||||
@ -18,34 +17,24 @@ type Options struct {
|
|||||||
Out io.Writer
|
Out io.Writer
|
||||||
// Context holds exernal options
|
// Context holds exernal options
|
||||||
Context context.Context
|
Context context.Context
|
||||||
// TimeFunc used to obtain current time
|
// Attrs holds additional attributes
|
||||||
TimeFunc func() time.Time
|
Attrs []interface{}
|
||||||
// TimeKey is the key used for the time of the log call
|
|
||||||
TimeKey string
|
|
||||||
// Name holds the logger name
|
// Name holds the logger name
|
||||||
Name string
|
Name string
|
||||||
|
// The logging level the logger should log
|
||||||
|
Level Level
|
||||||
|
// CallerSkipCount number of frmaes to skip
|
||||||
|
CallerSkipCount int
|
||||||
|
// ContextAttrFuncs contains funcs that executed before log func on context
|
||||||
|
ContextAttrFuncs []ContextAttrFunc
|
||||||
|
// TimeKey is the key used for the time of the log call
|
||||||
|
TimeKey string
|
||||||
// LevelKey is the key used for the level of the log call
|
// LevelKey is the key used for the level of the log call
|
||||||
LevelKey string
|
LevelKey string
|
||||||
// MessageKey is the key used for the message of the log call
|
// MessageKey is the key used for the message of the log call
|
||||||
MessageKey string
|
MessageKey string
|
||||||
// ErrorKey is the key used for the error info
|
|
||||||
ErrorKey string
|
|
||||||
// SourceKey is the key used for the source file and line of the log call
|
// SourceKey is the key used for the source file and line of the log call
|
||||||
SourceKey string
|
SourceKey string
|
||||||
// StacktraceKey is the key used for the stacktrace
|
|
||||||
StacktraceKey string
|
|
||||||
// Attrs holds additional attributes
|
|
||||||
Attrs []interface{}
|
|
||||||
// ContextAttrFuncs contains funcs that executed before log func on context
|
|
||||||
ContextAttrFuncs []ContextAttrFunc
|
|
||||||
// CallerSkipCount number of frmaes to skip
|
|
||||||
CallerSkipCount int
|
|
||||||
// The logging level the logger should log
|
|
||||||
Level Level
|
|
||||||
// AddStacktrace controls writing of stacktaces on error
|
|
||||||
AddStacktrace bool
|
|
||||||
// AddSource enabled writing source file and position in log
|
|
||||||
AddSource bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewOptions creates new options struct
|
// NewOptions creates new options struct
|
||||||
@ -57,14 +46,12 @@ func NewOptions(opts ...options.Option) Options {
|
|||||||
CallerSkipCount: DefaultCallerSkipCount,
|
CallerSkipCount: DefaultCallerSkipCount,
|
||||||
Context: context.Background(),
|
Context: context.Background(),
|
||||||
ContextAttrFuncs: DefaultContextAttrFuncs,
|
ContextAttrFuncs: DefaultContextAttrFuncs,
|
||||||
AddSource: true,
|
|
||||||
TimeFunc: time.Now,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_ = WithMicroKeys()(&options)
|
WithMicroKeys()(&options)
|
||||||
|
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
_ = o(&options)
|
o(&options)
|
||||||
}
|
}
|
||||||
return options
|
return options
|
||||||
}
|
}
|
||||||
@ -129,12 +116,6 @@ func WithZapKeys() options.Option {
|
|||||||
if err = options.Set(src, "caller", ".SourceKey"); err != nil {
|
if err = options.Set(src, "caller", ".SourceKey"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = options.Set(src, "error", ".ErrorKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -154,12 +135,6 @@ func WithZerologKeys() options.Option {
|
|||||||
if err = options.Set(src, "caller", ".SourceKey"); err != nil {
|
if err = options.Set(src, "caller", ".SourceKey"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = options.Set(src, "error", ".ErrorKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -179,12 +154,6 @@ func WithSlogKeys() options.Option {
|
|||||||
if err = options.Set(src, slog.SourceKey, ".SourceKey"); err != nil {
|
if err = options.Set(src, slog.SourceKey, ".SourceKey"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = options.Set(src, "error", ".ErrorKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -204,40 +173,6 @@ func WithMicroKeys() options.Option {
|
|||||||
if err = options.Set(src, "caller", ".SourceKey"); err != nil {
|
if err = options.Set(src, "caller", ".SourceKey"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = options.Set(src, "error", ".ErrorKey"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithAddCallerSkipCount add skip count for copy logger
|
|
||||||
func WithAddCallerSkipCount(n int) options.Option {
|
|
||||||
return func(src interface{}) error {
|
|
||||||
c, err := options.Get(src, ".CallerSkipCount")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = options.Set(src, c.(int)+n, ".CallerSkipCount"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithAddStacktrace controls writing stacktrace on error
|
|
||||||
func WithAddStacktrace(v bool) options.Option {
|
|
||||||
return func(src interface{}) error {
|
|
||||||
return options.Set(src, v, ".AddStacktrace")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WitAddSource controls writing source file and pos in log
|
|
||||||
func WithAddSource(v bool) options.Option {
|
|
||||||
return func(src interface{}) error {
|
|
||||||
return options.Set(src, v, ".AddSource")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -4,18 +4,15 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"sync"
|
"time"
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v4/options"
|
||||||
"go.unistack.org/micro/v4/tracer"
|
"go.unistack.org/micro/v4/tracer"
|
||||||
)
|
)
|
||||||
|
|
||||||
var reTrace = regexp.MustCompile(`.*/slog/logger\.go.*\n`)
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
traceValue = slog.StringValue("trace")
|
traceValue = slog.StringValue("trace")
|
||||||
debugValue = slog.StringValue("debug")
|
debugValue = slog.StringValue("debug")
|
||||||
@ -61,33 +58,38 @@ func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type slogLogger struct {
|
type slogLogger struct {
|
||||||
|
slog *slog.Logger
|
||||||
leveler *slog.LevelVar
|
leveler *slog.LevelVar
|
||||||
handler slog.Handler
|
|
||||||
opts logger.Options
|
opts logger.Options
|
||||||
mu sync.RWMutex
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Clone(opts ...options.Option) logger.Logger {
|
func (s *slogLogger) Clone(opts ...options.Option) logger.Logger {
|
||||||
s.mu.RLock()
|
|
||||||
options := s.opts
|
options := s.opts
|
||||||
s.mu.RUnlock()
|
|
||||||
|
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
_ = o(&options)
|
o(&options)
|
||||||
}
|
}
|
||||||
|
|
||||||
l := &slogLogger{
|
l := &slogLogger{
|
||||||
opts: options,
|
opts: options,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
|
||||||
|
l.slog = slog
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
l.leveler = new(slog.LevelVar)
|
l.leveler = new(slog.LevelVar)
|
||||||
handleOpt := &slog.HandlerOptions{
|
handleOpt := &slog.HandlerOptions{
|
||||||
ReplaceAttr: l.renameAttr,
|
ReplaceAttr: s.renameAttr,
|
||||||
Level: l.leveler,
|
Level: l.leveler,
|
||||||
AddSource: l.opts.AddSource,
|
AddSource: true,
|
||||||
}
|
}
|
||||||
l.leveler.Set(loggerToSlogLevel(l.opts.Level))
|
l.leveler.Set(loggerToSlogLevel(l.opts.Level))
|
||||||
l.handler = slog.New(slog.NewJSONHandler(options.Out, handleOpt)).With(options.Attrs...).Handler()
|
handler := slog.NewJSONHandler(options.Out, handleOpt)
|
||||||
|
l.slog = slog.New(handler).With(options.Attrs...)
|
||||||
|
|
||||||
return l
|
return l
|
||||||
}
|
}
|
||||||
@ -105,48 +107,48 @@ func (s *slogLogger) Options() logger.Options {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Attrs(attrs ...interface{}) logger.Logger {
|
func (s *slogLogger) Attrs(attrs ...interface{}) logger.Logger {
|
||||||
s.mu.RLock()
|
nl := &slogLogger{opts: s.opts}
|
||||||
level := s.leveler.Level()
|
nl.leveler = new(slog.LevelVar)
|
||||||
options := s.opts
|
nl.leveler.Set(s.leveler.Level())
|
||||||
s.mu.RUnlock()
|
|
||||||
|
|
||||||
l := &slogLogger{opts: options}
|
|
||||||
l.leveler = new(slog.LevelVar)
|
|
||||||
l.leveler.Set(level)
|
|
||||||
|
|
||||||
handleOpt := &slog.HandlerOptions{
|
handleOpt := &slog.HandlerOptions{
|
||||||
ReplaceAttr: l.renameAttr,
|
ReplaceAttr: nl.renameAttr,
|
||||||
Level: l.leveler,
|
Level: s.leveler,
|
||||||
AddSource: l.opts.AddSource,
|
AddSource: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
l.handler = slog.New(slog.NewJSONHandler(s.opts.Out, handleOpt)).With(attrs...).Handler()
|
handler := slog.NewJSONHandler(s.opts.Out, handleOpt)
|
||||||
|
nl.slog = slog.New(handler).With(attrs...)
|
||||||
|
|
||||||
return l
|
return nl
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Init(opts ...options.Option) error {
|
func (s *slogLogger) Init(opts ...options.Option) error {
|
||||||
s.mu.Lock()
|
|
||||||
|
|
||||||
if len(s.opts.ContextAttrFuncs) == 0 {
|
if len(s.opts.ContextAttrFuncs) == 0 {
|
||||||
s.opts.ContextAttrFuncs = logger.DefaultContextAttrFuncs
|
s.opts.ContextAttrFuncs = logger.DefaultContextAttrFuncs
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
if err := o(&s.opts); err != nil {
|
if err := o(&s.opts); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
|
||||||
|
s.slog = slog
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
s.leveler = new(slog.LevelVar)
|
s.leveler = new(slog.LevelVar)
|
||||||
handleOpt := &slog.HandlerOptions{
|
handleOpt := &slog.HandlerOptions{
|
||||||
ReplaceAttr: s.renameAttr,
|
ReplaceAttr: s.renameAttr,
|
||||||
Level: s.leveler,
|
Level: s.leveler,
|
||||||
AddSource: s.opts.AddSource,
|
AddSource: true,
|
||||||
}
|
}
|
||||||
s.leveler.Set(loggerToSlogLevel(s.opts.Level))
|
s.leveler.Set(loggerToSlogLevel(s.opts.Level))
|
||||||
s.handler = slog.New(slog.NewJSONHandler(s.opts.Out, handleOpt)).With(s.opts.Attrs...).Handler()
|
handler := slog.NewJSONHandler(s.opts.Out, handleOpt)
|
||||||
s.mu.Unlock()
|
s.slog = slog.New(handler).With(s.opts.Attrs...)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -157,36 +159,12 @@ func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, msg string, attr
|
|||||||
}
|
}
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
||||||
r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), msg, pcs[0])
|
r := slog.NewRecord(time.Now(), loggerToSlogLevel(lvl), msg, pcs[0])
|
||||||
for _, fn := range s.opts.ContextAttrFuncs {
|
for _, fn := range s.opts.ContextAttrFuncs {
|
||||||
attrs = append(attrs, fn(ctx)...)
|
attrs = append(attrs, fn(ctx)...)
|
||||||
}
|
}
|
||||||
for idx, attr := range attrs {
|
|
||||||
if ve, ok := attr.(error); ok && ve != nil {
|
|
||||||
attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if s.opts.AddStacktrace && lvl == logger.ErrorLevel {
|
|
||||||
stackInfo := make([]byte, 1024*1024)
|
|
||||||
if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 {
|
|
||||||
traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1)
|
|
||||||
if len(traceLines) != 0 {
|
|
||||||
attrs = append(attrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r.Add(attrs...)
|
r.Add(attrs...)
|
||||||
r.Attrs(func(a slog.Attr) bool {
|
_ = s.slog.Handler().Handle(ctx, r)
|
||||||
if a.Key == s.opts.ErrorKey {
|
|
||||||
if span, ok := tracer.SpanFromContext(ctx); ok {
|
|
||||||
span.SetStatus(tracer.SpanStatusError, a.Value.String())
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
_ = s.handler.Handle(ctx, r)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
|
func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
|
||||||
@ -195,18 +173,12 @@ func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{})
|
|||||||
}
|
}
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
||||||
r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelInfo, msg, pcs[0])
|
r := slog.NewRecord(time.Now(), slog.LevelInfo, msg, pcs[0])
|
||||||
for _, fn := range s.opts.ContextAttrFuncs {
|
for _, fn := range s.opts.ContextAttrFuncs {
|
||||||
attrs = append(attrs, fn(ctx)...)
|
attrs = append(attrs, fn(ctx)...)
|
||||||
}
|
}
|
||||||
for idx, attr := range attrs {
|
|
||||||
if ve, ok := attr.(error); ok && ve != nil {
|
|
||||||
attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r.Add(attrs...)
|
r.Add(attrs...)
|
||||||
_ = s.handler.Handle(ctx, r)
|
_ = s.slog.Handler().Handle(ctx, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
|
func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
|
||||||
@ -215,18 +187,12 @@ func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}
|
|||||||
}
|
}
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
||||||
r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug, msg, pcs[0])
|
r := slog.NewRecord(time.Now(), slog.LevelDebug, msg, pcs[0])
|
||||||
for _, fn := range s.opts.ContextAttrFuncs {
|
for _, fn := range s.opts.ContextAttrFuncs {
|
||||||
attrs = append(attrs, fn(ctx)...)
|
attrs = append(attrs, fn(ctx)...)
|
||||||
}
|
}
|
||||||
for idx, attr := range attrs {
|
|
||||||
if ve, ok := attr.(error); ok && ve != nil {
|
|
||||||
attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r.Add(attrs...)
|
r.Add(attrs...)
|
||||||
_ = s.handler.Handle(ctx, r)
|
_ = s.slog.Handler().Handle(ctx, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
|
func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
|
||||||
@ -235,18 +201,12 @@ func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}
|
|||||||
}
|
}
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
||||||
r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug-1, msg, pcs[0])
|
r := slog.NewRecord(time.Now(), slog.LevelDebug-1, msg, pcs[0])
|
||||||
for _, fn := range s.opts.ContextAttrFuncs {
|
for _, fn := range s.opts.ContextAttrFuncs {
|
||||||
attrs = append(attrs, fn(ctx)...)
|
attrs = append(attrs, fn(ctx)...)
|
||||||
}
|
}
|
||||||
for idx, attr := range attrs {
|
|
||||||
if ve, ok := attr.(error); ok && ve != nil {
|
|
||||||
attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r.Add(attrs...)
|
r.Add(attrs...)
|
||||||
_ = s.handler.Handle(ctx, r)
|
_ = s.slog.Handler().Handle(ctx, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
|
func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
|
||||||
@ -255,28 +215,13 @@ func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}
|
|||||||
}
|
}
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
||||||
r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError, msg, pcs[0])
|
r := slog.NewRecord(time.Now(), slog.LevelError, msg, pcs[0])
|
||||||
for _, fn := range s.opts.ContextAttrFuncs {
|
for _, fn := range s.opts.ContextAttrFuncs {
|
||||||
attrs = append(attrs, fn(ctx)...)
|
attrs = append(attrs, fn(ctx)...)
|
||||||
}
|
}
|
||||||
for idx, attr := range attrs {
|
|
||||||
if ve, ok := attr.(error); ok && ve != nil {
|
|
||||||
attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if s.opts.AddStacktrace {
|
|
||||||
stackInfo := make([]byte, 1024*1024)
|
|
||||||
if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 {
|
|
||||||
traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1)
|
|
||||||
if len(traceLines) != 0 {
|
|
||||||
attrs = append(attrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r.Add(attrs...)
|
r.Add(attrs...)
|
||||||
r.Attrs(func(a slog.Attr) bool {
|
r.Attrs(func(a slog.Attr) bool {
|
||||||
if a.Key == s.opts.ErrorKey {
|
if a.Key == "error" {
|
||||||
if span, ok := tracer.SpanFromContext(ctx); ok {
|
if span, ok := tracer.SpanFromContext(ctx); ok {
|
||||||
span.SetStatus(tracer.SpanStatusError, a.Value.String())
|
span.SetStatus(tracer.SpanStatusError, a.Value.String())
|
||||||
return false
|
return false
|
||||||
@ -284,7 +229,7 @@ func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}
|
|||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
_ = s.handler.Handle(ctx, r)
|
_ = s.slog.Handler().Handle(ctx, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
|
func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
|
||||||
@ -293,18 +238,12 @@ func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}
|
|||||||
}
|
}
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
||||||
r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError+1, msg, pcs[0])
|
r := slog.NewRecord(time.Now(), slog.LevelError+1, msg, pcs[0])
|
||||||
for _, fn := range s.opts.ContextAttrFuncs {
|
for _, fn := range s.opts.ContextAttrFuncs {
|
||||||
attrs = append(attrs, fn(ctx)...)
|
attrs = append(attrs, fn(ctx)...)
|
||||||
}
|
}
|
||||||
for idx, attr := range attrs {
|
|
||||||
if ve, ok := attr.(error); ok && ve != nil {
|
|
||||||
attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r.Add(attrs...)
|
r.Add(attrs...)
|
||||||
_ = s.handler.Handle(ctx, r)
|
_ = s.slog.Handler().Handle(ctx, r)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -314,22 +253,12 @@ func (s *slogLogger) Warn(ctx context.Context, msg string, attrs ...interface{})
|
|||||||
}
|
}
|
||||||
var pcs [1]uintptr
|
var pcs [1]uintptr
|
||||||
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
|
||||||
r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelWarn, msg, pcs[0])
|
r := slog.NewRecord(time.Now(), slog.LevelWarn, msg, pcs[0])
|
||||||
for _, fn := range s.opts.ContextAttrFuncs {
|
for _, fn := range s.opts.ContextAttrFuncs {
|
||||||
attrs = append(attrs, fn(ctx)...)
|
attrs = append(attrs, fn(ctx)...)
|
||||||
}
|
}
|
||||||
for idx, attr := range attrs {
|
|
||||||
if ve, ok := attr.(error); ok && ve != nil {
|
|
||||||
attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r.Add(attrs...)
|
r.Add(attrs...)
|
||||||
_ = s.handler.Handle(ctx, r)
|
_ = s.slog.Handler().Handle(ctx, r)
|
||||||
}
|
|
||||||
|
|
||||||
func (s *slogLogger) Name() string {
|
|
||||||
return s.opts.Name
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *slogLogger) String() string {
|
func (s *slogLogger) String() string {
|
||||||
|
|||||||
@ -3,26 +3,12 @@ package slog
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"log"
|
"log"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestError(t *testing.T) {
|
|
||||||
ctx := context.TODO()
|
|
||||||
buf := bytes.NewBuffer(nil)
|
|
||||||
l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf), logger.WithAddStacktrace(true))
|
|
||||||
if err := l.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
l.Error(ctx, "msg", fmt.Errorf("message"))
|
|
||||||
if !bytes.Contains(buf.Bytes(), []byte(`"stacktrace":"`)) {
|
|
||||||
t.Fatalf("logger stacktrace not works, buf contains: %s", buf.Bytes())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestContext(t *testing.T) {
|
func TestContext(t *testing.T) {
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
buf := bytes.NewBuffer(nil)
|
buf := bytes.NewBuffer(nil)
|
||||||
|
|||||||
@ -56,9 +56,9 @@ type Wrapper struct {
|
|||||||
s fmt.State
|
s fmt.State
|
||||||
pointers map[uintptr]int
|
pointers map[uintptr]int
|
||||||
opts *Options
|
opts *Options
|
||||||
takeMap map[int]bool
|
|
||||||
depth int
|
depth int
|
||||||
ignoreNextType bool
|
ignoreNextType bool
|
||||||
|
takeMap map[int]bool
|
||||||
protoWrapperType bool
|
protoWrapperType bool
|
||||||
sqlWrapperType bool
|
sqlWrapperType bool
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,11 +17,11 @@ func FromIncomingContext(ctx context.Context) (Metadata, bool) {
|
|||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
md, ok := ctx.Value(mdIncomingKey{}).(Metadata)
|
md, ok := ctx.Value(mdIncomingKey{}).(*rawMetadata)
|
||||||
if !ok || md == nil {
|
if !ok || md.md == nil {
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
return md, ok
|
return md.md, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
// FromOutgoingContext returns metadata from outgoing ctx
|
// FromOutgoingContext returns metadata from outgoing ctx
|
||||||
@ -30,11 +30,11 @@ func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
|
|||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
md, ok := ctx.Value(mdOutgoingKey{}).(Metadata)
|
md, ok := ctx.Value(mdOutgoingKey{}).(*rawMetadata)
|
||||||
if !ok || md == nil {
|
if !ok || md.md == nil {
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
return md, ok
|
return md.md, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
// FromContext returns metadata from the given context
|
// FromContext returns metadata from the given context
|
||||||
@ -43,11 +43,11 @@ func FromContext(ctx context.Context) (Metadata, bool) {
|
|||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
md, ok := ctx.Value(mdKey{}).(Metadata)
|
md, ok := ctx.Value(mdKey{}).(*rawMetadata)
|
||||||
if !ok || md == nil {
|
if !ok || md.md == nil {
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
return md, ok
|
return md.md, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewContext creates a new context with the given metadata
|
// NewContext creates a new context with the given metadata
|
||||||
@ -55,16 +55,45 @@ func NewContext(ctx context.Context, md Metadata) context.Context {
|
|||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
ctx = context.Background()
|
ctx = context.Background()
|
||||||
}
|
}
|
||||||
ctx = context.WithValue(ctx, mdKey{}, md)
|
ctx = context.WithValue(ctx, mdKey{}, &rawMetadata{md})
|
||||||
|
ctx = context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{})
|
||||||
|
ctx = context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{})
|
||||||
return ctx
|
return ctx
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetOutgoingContext modify outgoing context with given metadata
|
||||||
|
func SetOutgoingContext(ctx context.Context, md Metadata) bool {
|
||||||
|
if ctx == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if omd, ok := ctx.Value(mdOutgoingKey{}).(*rawMetadata); ok {
|
||||||
|
omd.md = md
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetIncomingContext modify incoming context with given metadata
|
||||||
|
func SetIncomingContext(ctx context.Context, md Metadata) bool {
|
||||||
|
if ctx == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if omd, ok := ctx.Value(mdIncomingKey{}).(*rawMetadata); ok {
|
||||||
|
omd.md = md
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// NewIncomingContext creates a new context with incoming metadata attached
|
// NewIncomingContext creates a new context with incoming metadata attached
|
||||||
func NewIncomingContext(ctx context.Context, md Metadata) context.Context {
|
func NewIncomingContext(ctx context.Context, md Metadata) context.Context {
|
||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
ctx = context.Background()
|
ctx = context.Background()
|
||||||
}
|
}
|
||||||
ctx = context.WithValue(ctx, mdIncomingKey{}, md)
|
ctx = context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{md})
|
||||||
|
if v, ok := ctx.Value(mdOutgoingKey{}).(*rawMetadata); !ok || v == nil {
|
||||||
|
ctx = context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{})
|
||||||
|
}
|
||||||
return ctx
|
return ctx
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,28 +102,41 @@ func NewOutgoingContext(ctx context.Context, md Metadata) context.Context {
|
|||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
ctx = context.Background()
|
ctx = context.Background()
|
||||||
}
|
}
|
||||||
ctx = context.WithValue(ctx, mdOutgoingKey{}, md)
|
ctx = context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{md})
|
||||||
|
if v, ok := ctx.Value(mdIncomingKey{}).(*rawMetadata); !ok || v == nil {
|
||||||
|
ctx = context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{})
|
||||||
|
}
|
||||||
return ctx
|
return ctx
|
||||||
}
|
}
|
||||||
|
|
||||||
// AppendOutgoingContext apends new md to context
|
// AppendOutgoingContext apends new md to context
|
||||||
func AppendOutgoingContext(ctx context.Context, kv ...string) context.Context {
|
func AppendOutgoingContext(ctx context.Context, kv ...string) context.Context {
|
||||||
md := Pairs(kv...)
|
md, ok := Pairs(kv...)
|
||||||
|
if !ok {
|
||||||
|
return ctx
|
||||||
|
}
|
||||||
omd, ok := FromOutgoingContext(ctx)
|
omd, ok := FromOutgoingContext(ctx)
|
||||||
if !ok {
|
if !ok {
|
||||||
return NewOutgoingContext(ctx, md)
|
return NewOutgoingContext(ctx, md)
|
||||||
}
|
}
|
||||||
nmd := Merge(omd, md, true)
|
for k, v := range md {
|
||||||
return NewOutgoingContext(ctx, nmd)
|
omd.Set(k, v)
|
||||||
|
}
|
||||||
|
return NewOutgoingContext(ctx, omd)
|
||||||
}
|
}
|
||||||
|
|
||||||
// AppendIncomingContext apends new md to context
|
// AppendIncomingContext apends new md to context
|
||||||
func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
|
func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
|
||||||
md := Pairs(kv...)
|
md, ok := Pairs(kv...)
|
||||||
|
if !ok {
|
||||||
|
return ctx
|
||||||
|
}
|
||||||
omd, ok := FromIncomingContext(ctx)
|
omd, ok := FromIncomingContext(ctx)
|
||||||
if !ok {
|
if !ok {
|
||||||
return NewIncomingContext(ctx, md)
|
return NewIncomingContext(ctx, md)
|
||||||
}
|
}
|
||||||
nmd := Merge(omd, md, true)
|
for k, v := range md {
|
||||||
return NewIncomingContext(ctx, nmd)
|
omd.Set(k, v)
|
||||||
|
}
|
||||||
|
return NewIncomingContext(ctx, omd)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,7 +24,7 @@ func TestNewNilContext(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestFromContext(t *testing.T) {
|
func TestFromContext(t *testing.T) {
|
||||||
ctx := context.WithValue(context.TODO(), mdKey{}, New(0))
|
ctx := context.WithValue(context.TODO(), mdKey{}, &rawMetadata{New(0)})
|
||||||
|
|
||||||
c, ok := FromContext(ctx)
|
c, ok := FromContext(ctx)
|
||||||
if c == nil || !ok {
|
if c == nil || !ok {
|
||||||
@ -42,7 +42,7 @@ func TestNewContext(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestFromIncomingContext(t *testing.T) {
|
func TestFromIncomingContext(t *testing.T) {
|
||||||
ctx := context.WithValue(context.TODO(), mdIncomingKey{}, New(0))
|
ctx := context.WithValue(context.TODO(), mdIncomingKey{}, &rawMetadata{New(0)})
|
||||||
|
|
||||||
c, ok := FromIncomingContext(ctx)
|
c, ok := FromIncomingContext(ctx)
|
||||||
if c == nil || !ok {
|
if c == nil || !ok {
|
||||||
@ -51,7 +51,7 @@ func TestFromIncomingContext(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestFromOutgoingContext(t *testing.T) {
|
func TestFromOutgoingContext(t *testing.T) {
|
||||||
ctx := context.WithValue(context.TODO(), mdOutgoingKey{}, New(0))
|
ctx := context.WithValue(context.TODO(), mdOutgoingKey{}, &rawMetadata{New(0)})
|
||||||
|
|
||||||
c, ok := FromOutgoingContext(ctx)
|
c, ok := FromOutgoingContext(ctx)
|
||||||
if c == nil || !ok {
|
if c == nil || !ok {
|
||||||
@ -59,6 +59,36 @@ func TestFromOutgoingContext(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestSetIncomingContext(t *testing.T) {
|
||||||
|
md := New(1)
|
||||||
|
md.Set("key", "val")
|
||||||
|
ctx := context.WithValue(context.TODO(), mdIncomingKey{}, &rawMetadata{})
|
||||||
|
if !SetIncomingContext(ctx, md) {
|
||||||
|
t.Fatal("SetIncomingContext not works")
|
||||||
|
}
|
||||||
|
md, ok := FromIncomingContext(ctx)
|
||||||
|
if md == nil || !ok {
|
||||||
|
t.Fatal("SetIncomingContext not works")
|
||||||
|
} else if v, ok := md.Get("key"); !ok || v != "val" {
|
||||||
|
t.Fatal("SetIncomingContext not works")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetOutgoingContext(t *testing.T) {
|
||||||
|
md := New(1)
|
||||||
|
md.Set("key", "val")
|
||||||
|
ctx := context.WithValue(context.TODO(), mdOutgoingKey{}, &rawMetadata{})
|
||||||
|
if !SetOutgoingContext(ctx, md) {
|
||||||
|
t.Fatal("SetOutgoingContext not works")
|
||||||
|
}
|
||||||
|
md, ok := FromOutgoingContext(ctx)
|
||||||
|
if md == nil || !ok {
|
||||||
|
t.Fatal("SetOutgoingContext not works")
|
||||||
|
} else if v, ok := md.Get("key"); !ok || v != "val" {
|
||||||
|
t.Fatal("SetOutgoingContext not works")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestNewIncomingContext(t *testing.T) {
|
func TestNewIncomingContext(t *testing.T) {
|
||||||
md := New(1)
|
md := New(1)
|
||||||
md.Set("key", "val")
|
md.Set("key", "val")
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
// Package metadata is a way of defining message headers
|
// Package metadata is a way of defining message headers
|
||||||
package metadata
|
package metadata // import "go.unistack.org/micro/v4/metadata"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net/textproto"
|
"net/textproto"
|
||||||
"strings"
|
"sort"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -24,7 +24,47 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Metadata is our way of representing request headers internally.
|
// Metadata is our way of representing request headers internally.
|
||||||
type Metadata map[string][]string
|
// They're used at the RPC level and translate back and forth
|
||||||
|
// from Transport headers.
|
||||||
|
type Metadata map[string]string
|
||||||
|
|
||||||
|
type rawMetadata struct {
|
||||||
|
md Metadata
|
||||||
|
}
|
||||||
|
|
||||||
|
// defaultMetadataSize used when need to init new Metadata
|
||||||
|
var defaultMetadataSize = 2
|
||||||
|
|
||||||
|
// Iterator used to iterate over metadata with order
|
||||||
|
type Iterator struct {
|
||||||
|
md Metadata
|
||||||
|
keys []string
|
||||||
|
cur int
|
||||||
|
cnt int
|
||||||
|
}
|
||||||
|
|
||||||
|
// Next advance iterator to next element
|
||||||
|
func (iter *Iterator) Next(k, v *string) bool {
|
||||||
|
if iter.cur+1 > iter.cnt {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
*k = iter.keys[iter.cur]
|
||||||
|
*v = iter.md[*k]
|
||||||
|
iter.cur++
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Iterator returns the itarator for metadata in sorted order
|
||||||
|
func (md Metadata) Iterator() *Iterator {
|
||||||
|
iter := &Iterator{md: md, cnt: len(md)}
|
||||||
|
iter.keys = make([]string, 0, iter.cnt)
|
||||||
|
for k := range md {
|
||||||
|
iter.keys = append(iter.keys, k)
|
||||||
|
}
|
||||||
|
sort.Strings(iter.keys)
|
||||||
|
return iter
|
||||||
|
}
|
||||||
|
|
||||||
// Get returns value from metadata by key
|
// Get returns value from metadata by key
|
||||||
func (md Metadata) Get(key string) (string, bool) {
|
func (md Metadata) Get(key string) (string, bool) {
|
||||||
@ -34,7 +74,7 @@ func (md Metadata) Get(key string) (string, bool) {
|
|||||||
// slow path
|
// slow path
|
||||||
val, ok = md[textproto.CanonicalMIMEHeaderKey(key)]
|
val, ok = md[textproto.CanonicalMIMEHeaderKey(key)]
|
||||||
}
|
}
|
||||||
return strings.Join(val, ","), ok
|
return val, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set is used to store value in metadata
|
// Set is used to store value in metadata
|
||||||
@ -43,19 +83,10 @@ func (md Metadata) Set(kv ...string) {
|
|||||||
kv = kv[:len(kv)-1]
|
kv = kv[:len(kv)-1]
|
||||||
}
|
}
|
||||||
for idx := 0; idx < len(kv); idx += 2 {
|
for idx := 0; idx < len(kv); idx += 2 {
|
||||||
md[textproto.CanonicalMIMEHeaderKey(kv[idx])] = []string{kv[idx+1]}
|
md[textproto.CanonicalMIMEHeaderKey(kv[idx])] = kv[idx+1]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Append is used to append value in metadata
|
|
||||||
func (md Metadata) Append(k string, v ...string) {
|
|
||||||
if len(v) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
k = textproto.CanonicalMIMEHeaderKey(k)
|
|
||||||
md[k] = append(md[k], v...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Del is used to remove value from metadata
|
// Del is used to remove value from metadata
|
||||||
func (md Metadata) Del(keys ...string) {
|
func (md Metadata) Del(keys ...string) {
|
||||||
for _, key := range keys {
|
for _, key := range keys {
|
||||||
@ -67,52 +98,46 @@ func (md Metadata) Del(keys ...string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Copy makes a copy of the metadata
|
// Copy makes a copy of the metadata
|
||||||
func Copy(md Metadata, exclude ...string) Metadata {
|
func Copy(md Metadata) Metadata {
|
||||||
nmd := make(Metadata, len(md))
|
nmd := New(len(md))
|
||||||
for k, v := range md {
|
for key, val := range md {
|
||||||
nmd[k] = v
|
nmd.Set(key, val)
|
||||||
}
|
}
|
||||||
nmd.Del(exclude...)
|
|
||||||
return nmd
|
return nmd
|
||||||
}
|
}
|
||||||
|
|
||||||
// New return new sized metadata
|
// New return new sized metadata
|
||||||
func New(size int) Metadata {
|
func New(size int) Metadata {
|
||||||
if size == 0 {
|
if size == 0 {
|
||||||
size = 2
|
size = defaultMetadataSize
|
||||||
}
|
}
|
||||||
return make(Metadata, size)
|
return make(Metadata, size)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge merges metadata to existing metadata, overwriting if specified
|
// Merge merges metadata to existing metadata, overwriting if specified
|
||||||
func Merge(omd Metadata, mmd Metadata, overwrite bool) Metadata {
|
func Merge(omd Metadata, mmd Metadata, overwrite bool) Metadata {
|
||||||
|
var ok bool
|
||||||
nmd := Copy(omd)
|
nmd := Copy(omd)
|
||||||
for key, val := range mmd {
|
for key, val := range mmd {
|
||||||
nval, ok := nmd[key]
|
_, ok = nmd[key]
|
||||||
switch {
|
switch {
|
||||||
case ok && overwrite:
|
|
||||||
nmd[key] = nval
|
|
||||||
continue
|
|
||||||
case ok && !overwrite:
|
case ok && !overwrite:
|
||||||
continue
|
continue
|
||||||
case !ok:
|
case val != "":
|
||||||
for _, v := range val {
|
nmd.Set(key, val)
|
||||||
if v != "" {
|
case ok && val == "":
|
||||||
nval = append(nval, v)
|
nmd.Del(key)
|
||||||
}
|
|
||||||
}
|
|
||||||
nmd[key] = nval
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nmd
|
return nmd
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pairs from which metadata created
|
// Pairs from which metadata created
|
||||||
func Pairs(kv ...string) Metadata {
|
func Pairs(kv ...string) (Metadata, bool) {
|
||||||
if len(kv)%2 == 1 {
|
if len(kv)%2 == 1 {
|
||||||
kv = kv[:len(kv)-1]
|
return nil, false
|
||||||
}
|
}
|
||||||
md := make(Metadata, len(kv)/2)
|
md := New(len(kv) / 2)
|
||||||
md.Set(kv...)
|
md.Set(kv...)
|
||||||
return md
|
return md, true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,52 +33,30 @@ func TestAppend(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPairs(t *testing.T) {
|
func TestPairs(t *testing.T) {
|
||||||
md := Pairs("key1", "val1", "key2", "val2")
|
md, ok := Pairs("key1", "val1", "key2", "val2")
|
||||||
|
if !ok {
|
||||||
if _, ok := md.Get("key1"); !ok {
|
t.Fatal("odd number of kv")
|
||||||
|
}
|
||||||
|
if _, ok = md.Get("key1"); !ok {
|
||||||
t.Fatal("key1 not found")
|
t.Fatal("key1 not found")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func testIncomingCtx(ctx context.Context) {
|
func testCtx(ctx context.Context) {
|
||||||
if md, ok := FromIncomingContext(ctx); ok && md != nil {
|
md := New(2)
|
||||||
md.Set("Key1", "Val1_new")
|
md.Set("Key1", "Val1_new")
|
||||||
md.Set("Key3", "Val3")
|
md.Set("Key3", "Val3")
|
||||||
}
|
SetOutgoingContext(ctx, md)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testOutgoingCtx(ctx context.Context) {
|
func TestPassing(t *testing.T) {
|
||||||
if md, ok := FromOutgoingContext(ctx); ok && md != nil {
|
|
||||||
md.Set("Key1", "Val1_new")
|
|
||||||
md.Set("Key3", "Val3")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestIncoming(t *testing.T) {
|
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
md1 := New(2)
|
md1 := New(2)
|
||||||
md1.Set("Key1", "Val1")
|
md1.Set("Key1", "Val1")
|
||||||
md1.Set("Key2", "Val2")
|
md1.Set("Key2", "Val2")
|
||||||
|
|
||||||
ctx = NewIncomingContext(ctx, md1)
|
ctx = NewIncomingContext(ctx, md1)
|
||||||
testIncomingCtx(ctx)
|
testCtx(ctx)
|
||||||
md, ok := FromIncomingContext(ctx)
|
|
||||||
if !ok {
|
|
||||||
t.Fatalf("missing metadata from incoming context")
|
|
||||||
}
|
|
||||||
if v, ok := md.Get("Key1"); !ok || v != "Val1_new" {
|
|
||||||
t.Fatalf("invalid metadata value %#+v", md)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestOutgoing(t *testing.T) {
|
|
||||||
ctx := context.TODO()
|
|
||||||
md1 := New(2)
|
|
||||||
md1.Set("Key1", "Val1")
|
|
||||||
md1.Set("Key2", "Val2")
|
|
||||||
|
|
||||||
ctx = NewOutgoingContext(ctx, md1)
|
|
||||||
testOutgoingCtx(ctx)
|
|
||||||
md, ok := FromOutgoingContext(ctx)
|
md, ok := FromOutgoingContext(ctx)
|
||||||
if !ok {
|
if !ok {
|
||||||
t.Fatalf("missing metadata from outgoing context")
|
t.Fatalf("missing metadata from outgoing context")
|
||||||
@ -90,10 +68,10 @@ func TestOutgoing(t *testing.T) {
|
|||||||
|
|
||||||
func TestMerge(t *testing.T) {
|
func TestMerge(t *testing.T) {
|
||||||
omd := Metadata{
|
omd := Metadata{
|
||||||
"key1": []string{"val1"},
|
"key1": "val1",
|
||||||
}
|
}
|
||||||
mmd := Metadata{
|
mmd := Metadata{
|
||||||
"key2": []string{"val2"},
|
"key2": "val2",
|
||||||
}
|
}
|
||||||
|
|
||||||
nmd := Merge(omd, mmd, true)
|
nmd := Merge(omd, mmd, true)
|
||||||
@ -102,6 +80,21 @@ func TestMerge(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestIterator(t *testing.T) {
|
||||||
|
md := Metadata{
|
||||||
|
"1Last": "last",
|
||||||
|
"2First": "first",
|
||||||
|
"3Second": "second",
|
||||||
|
}
|
||||||
|
|
||||||
|
iter := md.Iterator()
|
||||||
|
var k, v string
|
||||||
|
|
||||||
|
for iter.Next(&k, &v) {
|
||||||
|
// fmt.Printf("k: %s, v: %s\n", k, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestMedataCanonicalKey(t *testing.T) {
|
func TestMedataCanonicalKey(t *testing.T) {
|
||||||
md := New(1)
|
md := New(1)
|
||||||
md.Set("x-request-id", "12345")
|
md.Set("x-request-id", "12345")
|
||||||
@ -141,7 +134,10 @@ func TestMetadataSet(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestMetadataDelete(t *testing.T) {
|
func TestMetadataDelete(t *testing.T) {
|
||||||
md := Pairs("Foo", "bar", "Baz", "empty")
|
md := Metadata{
|
||||||
|
"Foo": "bar",
|
||||||
|
"Baz": "empty",
|
||||||
|
}
|
||||||
|
|
||||||
md.Del("Baz")
|
md.Del("Baz")
|
||||||
_, ok := md.Get("Baz")
|
_, ok := md.Get("Baz")
|
||||||
@ -160,19 +156,24 @@ func TestNilContext(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestMetadataCopy(t *testing.T) {
|
func TestMetadataCopy(t *testing.T) {
|
||||||
md := Pairs("Foo", "bar", "Bar", "baz")
|
md := Metadata{
|
||||||
|
"Foo": "bar",
|
||||||
|
"Bar": "baz",
|
||||||
|
}
|
||||||
|
|
||||||
cp := Copy(md)
|
cp := Copy(md)
|
||||||
|
|
||||||
for k, v := range md {
|
for k, v := range md {
|
||||||
if cv := cp[k]; len(cv) != len(v) {
|
if cv := cp[k]; cv != v {
|
||||||
t.Fatalf("Got %s:%s for %s:%s", k, cv, k, v)
|
t.Fatalf("Got %s:%s for %s:%s", k, cv, k, v)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestMetadataContext(t *testing.T) {
|
func TestMetadataContext(t *testing.T) {
|
||||||
md := Pairs("Foo", "bar")
|
md := Metadata{
|
||||||
|
"Foo": "bar",
|
||||||
|
}
|
||||||
|
|
||||||
ctx := NewContext(context.TODO(), md)
|
ctx := NewContext(context.TODO(), md)
|
||||||
|
|
||||||
@ -181,7 +182,7 @@ func TestMetadataContext(t *testing.T) {
|
|||||||
t.Errorf("Unexpected error retrieving metadata, got %t", ok)
|
t.Errorf("Unexpected error retrieving metadata, got %t", ok)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(emd["Foo"]) != len(md["Foo"]) {
|
if emd["Foo"] != md["Foo"] {
|
||||||
t.Errorf("Expected key: %s val: %s, got key: %s val: %s", "Foo", md["Foo"], "Foo", emd["Foo"])
|
t.Errorf("Expected key: %s val: %s, got key: %s val: %s", "Foo", md["Foo"], "Foo", emd["Foo"])
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -189,14 +190,3 @@ func TestMetadataContext(t *testing.T) {
|
|||||||
t.Errorf("Expected metadata length 1 got %d", i)
|
t.Errorf("Expected metadata length 1 got %d", i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCopy(t *testing.T) {
|
|
||||||
md := New(2)
|
|
||||||
md.Set("key1", "val1", "key2", "val2")
|
|
||||||
nmd := Copy(md, "key2")
|
|
||||||
if len(nmd) != 1 {
|
|
||||||
t.Fatal("Copy exclude not works")
|
|
||||||
} else if nmd["Key1"][0] != "val1" {
|
|
||||||
t.Fatal("Copy exclude not works")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
36
micro.go
36
micro.go
@ -65,8 +65,6 @@ func As(b any, target any) bool {
|
|||||||
break
|
break
|
||||||
case targetType.Implements(routerType):
|
case targetType.Implements(routerType):
|
||||||
break
|
break
|
||||||
case targetType.Implements(tracerType):
|
|
||||||
break
|
|
||||||
default:
|
default:
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@ -78,21 +76,19 @@ func As(b any, target any) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var brokerType = reflect.TypeOf((*broker.Broker)(nil)).Elem()
|
||||||
brokerType = reflect.TypeOf((*broker.Broker)(nil)).Elem()
|
var loggerType = reflect.TypeOf((*logger.Logger)(nil)).Elem()
|
||||||
loggerType = reflect.TypeOf((*logger.Logger)(nil)).Elem()
|
var clientType = reflect.TypeOf((*client.Client)(nil)).Elem()
|
||||||
clientType = reflect.TypeOf((*client.Client)(nil)).Elem()
|
var serverType = reflect.TypeOf((*server.Server)(nil)).Elem()
|
||||||
serverType = reflect.TypeOf((*server.Server)(nil)).Elem()
|
var codecType = reflect.TypeOf((*codec.Codec)(nil)).Elem()
|
||||||
codecType = reflect.TypeOf((*codec.Codec)(nil)).Elem()
|
var flowType = reflect.TypeOf((*flow.Flow)(nil)).Elem()
|
||||||
flowType = reflect.TypeOf((*flow.Flow)(nil)).Elem()
|
var fsmType = reflect.TypeOf((*fsm.FSM)(nil)).Elem()
|
||||||
fsmType = reflect.TypeOf((*fsm.FSM)(nil)).Elem()
|
var meterType = reflect.TypeOf((*meter.Meter)(nil)).Elem()
|
||||||
meterType = reflect.TypeOf((*meter.Meter)(nil)).Elem()
|
var registerType = reflect.TypeOf((*register.Register)(nil)).Elem()
|
||||||
registerType = reflect.TypeOf((*register.Register)(nil)).Elem()
|
var resolverType = reflect.TypeOf((*resolver.Resolver)(nil)).Elem()
|
||||||
resolverType = reflect.TypeOf((*resolver.Resolver)(nil)).Elem()
|
var routerType = reflect.TypeOf((*router.Router)(nil)).Elem()
|
||||||
routerType = reflect.TypeOf((*router.Router)(nil)).Elem()
|
var selectorType = reflect.TypeOf((*selector.Selector)(nil)).Elem()
|
||||||
selectorType = reflect.TypeOf((*selector.Selector)(nil)).Elem()
|
var storeType = reflect.TypeOf((*store.Store)(nil)).Elem()
|
||||||
storeType = reflect.TypeOf((*store.Store)(nil)).Elem()
|
var syncType = reflect.TypeOf((*sync.Sync)(nil)).Elem()
|
||||||
syncType = reflect.TypeOf((*sync.Sync)(nil)).Elem()
|
var tracerType = reflect.TypeOf((*tracer.Tracer)(nil)).Elem()
|
||||||
tracerType = reflect.TypeOf((*tracer.Tracer)(nil)).Elem()
|
var serviceType = reflect.TypeOf((*Service)(nil)).Elem()
|
||||||
serviceType = reflect.TypeOf((*Service)(nil)).Elem()
|
|
||||||
)
|
|
||||||
|
|||||||
@ -151,37 +151,15 @@ func ContentType(ct string) Option {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Metadata pass additional metadata
|
// Metadata pass additional metadata
|
||||||
func Metadata(md ...any) Option {
|
func Metadata(md any) Option {
|
||||||
var result metadata.Metadata
|
result := metadata.Metadata{}
|
||||||
if len(md) == 1 {
|
switch vt := md.(type) {
|
||||||
switch vt := md[0].(type) {
|
|
||||||
case metadata.Metadata:
|
case metadata.Metadata:
|
||||||
result = metadata.Copy(vt)
|
result = metadata.Copy(vt)
|
||||||
case map[string]string:
|
case map[string]string:
|
||||||
result = make(metadata.Metadata, len(vt))
|
|
||||||
for k, v := range vt {
|
|
||||||
result.Set(k, v)
|
|
||||||
}
|
|
||||||
case map[string][]string:
|
|
||||||
result = metadata.Copy(vt)
|
result = metadata.Copy(vt)
|
||||||
default:
|
|
||||||
result = metadata.New(0)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result = metadata.New(len(md) / 2)
|
|
||||||
for idx := 0; idx <= len(md)/2; idx += 2 {
|
|
||||||
k, ok := md[idx].(string)
|
|
||||||
switch vt := md[idx+1].(type) {
|
|
||||||
case string:
|
|
||||||
if ok {
|
|
||||||
result.Set(k, vt)
|
|
||||||
}
|
|
||||||
case []string:
|
case []string:
|
||||||
if ok {
|
result.Set(vt...)
|
||||||
result.Append(k, vt...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return func(src interface{}) error {
|
return func(src interface{}) error {
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package options_test
|
package options_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/codec"
|
"go.unistack.org/micro/v4/codec"
|
||||||
@ -99,29 +100,40 @@ func TestMetadataAny(t *testing.T) {
|
|||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
"strings_even",
|
"strings_even",
|
||||||
[]any{"Strkey1", []string{"val1"}, "Strkey2", []string{"val2"}},
|
[]string{"key1", "val1", "key2", "val2"},
|
||||||
metadata.Pairs("Strkey1", "val1", "Strkey2", "val2"),
|
metadata.Metadata{
|
||||||
|
"Key1": "val1",
|
||||||
|
"Key2": "val2",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"strings_odd",
|
"strings_odd",
|
||||||
[]any{"key1", "val1", "key2"},
|
[]string{"key1", "val1", "key2"},
|
||||||
metadata.Pairs("Key1", "val1"),
|
metadata.Metadata{
|
||||||
|
"Key1": "val1",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "map",
|
"map",
|
||||||
Data: map[string][]string{
|
map[string]string{
|
||||||
"Mapkey1": {"val1"},
|
"key1": "val1",
|
||||||
"Mapkey2": {"val2"},
|
"key2": "val2",
|
||||||
},
|
},
|
||||||
Expected: metadata.Metadata{
|
metadata.Metadata{
|
||||||
"Mapkey1": []string{"val1"},
|
"Key1": "val1",
|
||||||
"Mapkey2": []string{"val2"},
|
"Key2": "val2",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"metadata.Metadata",
|
"metadata.Metadata",
|
||||||
metadata.Pairs("key1", "val1", "key2", "val2"),
|
metadata.Metadata{
|
||||||
metadata.Pairs("Key1", "val1", "Key2", "val2"),
|
"key1": "val1",
|
||||||
|
"key2": "val2",
|
||||||
|
},
|
||||||
|
metadata.Metadata{
|
||||||
|
"Key1": "val1",
|
||||||
|
"Key2": "val2",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -129,19 +141,13 @@ func TestMetadataAny(t *testing.T) {
|
|||||||
t.Run(tt.Name, func(t *testing.T) {
|
t.Run(tt.Name, func(t *testing.T) {
|
||||||
src := &s{}
|
src := &s{}
|
||||||
var opts []options.Option
|
var opts []options.Option
|
||||||
switch valData := tt.Data.(type) {
|
opts = append(opts, options.Metadata(tt.Data))
|
||||||
case []any:
|
|
||||||
opts = append(opts, options.Metadata(valData...))
|
|
||||||
case map[string]string, map[string][]string, metadata.Metadata:
|
|
||||||
opts = append(opts, options.Metadata(valData))
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
if err := o(src); err != nil {
|
if err := o(src); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if !reflect.Equal(tt.Expected, src.Metadata) {
|
if !reflect.Equal(tt.Expected, src.Metadata) {
|
||||||
t.Fatalf("expected: %v, actual: %v", tt.Expected, src.Metadata)
|
t.Fatal(fmt.Sprintf("expected: %v, actual: %v", tt.Expected, src.Metadata))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,13 +1,10 @@
|
|||||||
package memory
|
package register
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/metadata"
|
|
||||||
"go.unistack.org/micro/v4/register"
|
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
"go.unistack.org/micro/v4/util/id"
|
"go.unistack.org/micro/v4/util/id"
|
||||||
)
|
)
|
||||||
@ -19,32 +16,32 @@ var (
|
|||||||
|
|
||||||
type node struct {
|
type node struct {
|
||||||
LastSeen time.Time
|
LastSeen time.Time
|
||||||
*register.Node
|
*Node
|
||||||
TTL time.Duration
|
TTL time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
type record struct {
|
type record struct {
|
||||||
Name string
|
Name string
|
||||||
Version string
|
Version string
|
||||||
Metadata metadata.Metadata
|
Metadata map[string]string
|
||||||
Nodes map[string]*node
|
Nodes map[string]*node
|
||||||
Endpoints []*register.Endpoint
|
Endpoints []*Endpoint
|
||||||
}
|
}
|
||||||
|
|
||||||
type memory struct {
|
type memory struct {
|
||||||
|
sync.RWMutex
|
||||||
records map[string]services
|
records map[string]services
|
||||||
watchers map[string]*watcher
|
watchers map[string]*watcher
|
||||||
opts register.Options
|
opts Options
|
||||||
sync.RWMutex
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// services is a KV map with service name as the key and a map of records as the value
|
// services is a KV map with service name as the key and a map of records as the value
|
||||||
type services map[string]map[string]*record
|
type services map[string]map[string]*record
|
||||||
|
|
||||||
// NewRegister returns an initialized in-memory register
|
// NewRegister returns an initialized in-memory register
|
||||||
func NewRegister(opts ...register.Option) register.Register {
|
func NewRegister(opts ...Option) Register {
|
||||||
r := &memory{
|
r := &memory{
|
||||||
opts: register.NewOptions(opts...),
|
opts: NewOptions(opts...),
|
||||||
records: make(map[string]services),
|
records: make(map[string]services),
|
||||||
watchers: make(map[string]*watcher),
|
watchers: make(map[string]*watcher),
|
||||||
}
|
}
|
||||||
@ -78,7 +75,7 @@ func (m *memory) ttlPrune() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) sendEvent(r *register.Result) {
|
func (m *memory) sendEvent(r *Result) {
|
||||||
m.RLock()
|
m.RLock()
|
||||||
watchers := make([]*watcher, 0, len(m.watchers))
|
watchers := make([]*watcher, 0, len(m.watchers))
|
||||||
for _, w := range m.watchers {
|
for _, w := range m.watchers {
|
||||||
@ -102,24 +99,14 @@ func (m *memory) sendEvent(r *register.Result) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) Connect(ctx context.Context) error {
|
func (m *memory) Connect(ctx context.Context) error {
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) Disconnect(ctx context.Context) error {
|
func (m *memory) Disconnect(ctx context.Context) error {
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) Init(opts ...register.Option) error {
|
func (m *memory) Init(opts ...Option) error {
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
o(&m.opts)
|
o(&m.opts)
|
||||||
}
|
}
|
||||||
@ -131,20 +118,15 @@ func (m *memory) Init(opts ...register.Option) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) Options() register.Options {
|
func (m *memory) Options() Options {
|
||||||
return m.opts
|
return m.opts
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) Register(ctx context.Context, s *register.Service, opts ...register.RegisterOption) error {
|
func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOption) error {
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
m.Lock()
|
m.Lock()
|
||||||
defer m.Unlock()
|
defer m.Unlock()
|
||||||
|
|
||||||
options := register.NewRegisterOptions(opts...)
|
options := NewRegisterOptions(opts...)
|
||||||
|
|
||||||
// get the services for this domain from the register
|
// get the services for this domain from the register
|
||||||
srvs, ok := m.records[options.Domain]
|
srvs, ok := m.records[options.Domain]
|
||||||
@ -154,11 +136,11 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
|
|||||||
|
|
||||||
// domain is set in metadata so it can be passed to watchers
|
// domain is set in metadata so it can be passed to watchers
|
||||||
if s.Metadata == nil {
|
if s.Metadata == nil {
|
||||||
s.Metadata = metadata.New(0)
|
s.Metadata = map[string]string{"domain": options.Domain}
|
||||||
|
} else {
|
||||||
|
s.Metadata["domain"] = options.Domain
|
||||||
}
|
}
|
||||||
|
|
||||||
s.Metadata.Set("domain", options.Domain)
|
|
||||||
|
|
||||||
// ensure the service name exists
|
// ensure the service name exists
|
||||||
r := serviceToRecord(s, options.TTL)
|
r := serviceToRecord(s, options.TTL)
|
||||||
if _, ok := srvs[s.Name]; !ok {
|
if _, ok := srvs[s.Name]; !ok {
|
||||||
@ -171,7 +153,7 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
|
|||||||
m.opts.Logger.Debug(m.opts.Context, "register added new service: "+s.Name+", version "+s.Version)
|
m.opts.Logger.Debug(m.opts.Context, "register added new service: "+s.Name+", version "+s.Version)
|
||||||
}
|
}
|
||||||
m.records[options.Domain] = srvs
|
m.records[options.Domain] = srvs
|
||||||
go m.sendEvent(®ister.Result{Action: "create", Service: s})
|
go m.sendEvent(&Result{Action: "create", Service: s})
|
||||||
}
|
}
|
||||||
|
|
||||||
var addedNodes bool
|
var addedNodes bool
|
||||||
@ -182,12 +164,19 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
metadata := metadata.Copy(n.Metadata)
|
metadata := make(map[string]string, len(n.Metadata))
|
||||||
metadata.Set("domain", options.Domain)
|
|
||||||
|
// make copy of metadata
|
||||||
|
for k, v := range n.Metadata {
|
||||||
|
metadata[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
// set the domain
|
||||||
|
metadata["domain"] = options.Domain
|
||||||
|
|
||||||
// add the node
|
// add the node
|
||||||
srvs[s.Name][s.Version].Nodes[n.ID] = &node{
|
srvs[s.Name][s.Version].Nodes[n.ID] = &node{
|
||||||
Node: ®ister.Node{
|
Node: &Node{
|
||||||
ID: n.ID,
|
ID: n.ID,
|
||||||
Address: n.Address,
|
Address: n.Address,
|
||||||
Metadata: metadata,
|
Metadata: metadata,
|
||||||
@ -203,7 +192,7 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
|
|||||||
if m.opts.Logger.V(logger.DebugLevel) {
|
if m.opts.Logger.V(logger.DebugLevel) {
|
||||||
m.opts.Logger.Debug(m.opts.Context, "register added new node to service: "+s.Name+", version "+s.Version)
|
m.opts.Logger.Debug(m.opts.Context, "register added new node to service: "+s.Name+", version "+s.Version)
|
||||||
}
|
}
|
||||||
go m.sendEvent(®ister.Result{Action: "update", Service: s})
|
go m.sendEvent(&Result{Action: "update", Service: s})
|
||||||
} else {
|
} else {
|
||||||
// refresh TTL and timestamp
|
// refresh TTL and timestamp
|
||||||
for _, n := range s.Nodes {
|
for _, n := range s.Nodes {
|
||||||
@ -219,17 +208,18 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...register.DeregisterOption) error {
|
func (m *memory) Deregister(ctx context.Context, s *Service, opts ...DeregisterOption) error {
|
||||||
m.Lock()
|
m.Lock()
|
||||||
defer m.Unlock()
|
defer m.Unlock()
|
||||||
|
|
||||||
options := register.NewDeregisterOptions(opts...)
|
options := NewDeregisterOptions(opts...)
|
||||||
|
|
||||||
// domain is set in metadata so it can be passed to watchers
|
// domain is set in metadata so it can be passed to watchers
|
||||||
if s.Metadata == nil {
|
if s.Metadata == nil {
|
||||||
s.Metadata = metadata.New(0)
|
s.Metadata = map[string]string{"domain": options.Domain}
|
||||||
|
} else {
|
||||||
|
s.Metadata["domain"] = options.Domain
|
||||||
}
|
}
|
||||||
s.Metadata.Set("domain", options.Domain)
|
|
||||||
|
|
||||||
// if the domain doesn't exist, there is nothing to deregister
|
// if the domain doesn't exist, there is nothing to deregister
|
||||||
services, ok := m.records[options.Domain]
|
services, ok := m.records[options.Domain]
|
||||||
@ -262,7 +252,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
|
|||||||
// is cleanup
|
// is cleanup
|
||||||
if len(version.Nodes) > 0 {
|
if len(version.Nodes) > 0 {
|
||||||
m.records[options.Domain][s.Name][s.Version] = version
|
m.records[options.Domain][s.Name][s.Version] = version
|
||||||
go m.sendEvent(®ister.Result{Action: "update", Service: s})
|
go m.sendEvent(&Result{Action: "update", Service: s})
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -270,7 +260,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
|
|||||||
// register and exit
|
// register and exit
|
||||||
if len(versions) == 1 {
|
if len(versions) == 1 {
|
||||||
delete(m.records[options.Domain], s.Name)
|
delete(m.records[options.Domain], s.Name)
|
||||||
go m.sendEvent(®ister.Result{Action: "delete", Service: s})
|
go m.sendEvent(&Result{Action: "delete", Service: s})
|
||||||
|
|
||||||
if m.opts.Logger.V(logger.DebugLevel) {
|
if m.opts.Logger.V(logger.DebugLevel) {
|
||||||
m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name)
|
m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name)
|
||||||
@ -280,7 +270,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
|
|||||||
|
|
||||||
// there are other versions of the service running, so only remove this version of it
|
// there are other versions of the service running, so only remove this version of it
|
||||||
delete(m.records[options.Domain][s.Name], s.Version)
|
delete(m.records[options.Domain][s.Name], s.Version)
|
||||||
go m.sendEvent(®ister.Result{Action: "delete", Service: s})
|
go m.sendEvent(&Result{Action: "delete", Service: s})
|
||||||
if m.opts.Logger.V(logger.DebugLevel) {
|
if m.opts.Logger.V(logger.DebugLevel) {
|
||||||
m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name+", version "+s.Version)
|
m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name+", version "+s.Version)
|
||||||
}
|
}
|
||||||
@ -288,20 +278,20 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) LookupService(ctx context.Context, name string, opts ...register.LookupOption) ([]*register.Service, error) {
|
func (m *memory) LookupService(ctx context.Context, name string, opts ...LookupOption) ([]*Service, error) {
|
||||||
options := register.NewLookupOptions(opts...)
|
options := NewLookupOptions(opts...)
|
||||||
|
|
||||||
// if it's a wildcard domain, return from all domains
|
// if it's a wildcard domain, return from all domains
|
||||||
if options.Domain == register.WildcardDomain {
|
if options.Domain == WildcardDomain {
|
||||||
m.RLock()
|
m.RLock()
|
||||||
recs := m.records
|
recs := m.records
|
||||||
m.RUnlock()
|
m.RUnlock()
|
||||||
|
|
||||||
var services []*register.Service
|
var services []*Service
|
||||||
|
|
||||||
for domain := range recs {
|
for domain := range recs {
|
||||||
srvs, err := m.LookupService(ctx, name, append(opts, register.LookupDomain(domain))...)
|
srvs, err := m.LookupService(ctx, name, append(opts, LookupDomain(domain))...)
|
||||||
if err == register.ErrNotFound {
|
if err == ErrNotFound {
|
||||||
continue
|
continue
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -310,7 +300,7 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(services) == 0 {
|
if len(services) == 0 {
|
||||||
return nil, register.ErrNotFound
|
return nil, ErrNotFound
|
||||||
}
|
}
|
||||||
return services, nil
|
return services, nil
|
||||||
}
|
}
|
||||||
@ -321,17 +311,17 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
|
|||||||
// check the domain exists
|
// check the domain exists
|
||||||
services, ok := m.records[options.Domain]
|
services, ok := m.records[options.Domain]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, register.ErrNotFound
|
return nil, ErrNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
// check the service exists
|
// check the service exists
|
||||||
versions, ok := services[name]
|
versions, ok := services[name]
|
||||||
if !ok || len(versions) == 0 {
|
if !ok || len(versions) == 0 {
|
||||||
return nil, register.ErrNotFound
|
return nil, ErrNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
// serialize the response
|
// serialize the response
|
||||||
result := make([]*register.Service, len(versions))
|
result := make([]*Service, len(versions))
|
||||||
|
|
||||||
var i int
|
var i int
|
||||||
|
|
||||||
@ -343,19 +333,19 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
|
|||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption) ([]*register.Service, error) {
|
func (m *memory) ListServices(ctx context.Context, opts ...ListOption) ([]*Service, error) {
|
||||||
options := register.NewListOptions(opts...)
|
options := NewListOptions(opts...)
|
||||||
|
|
||||||
// if it's a wildcard domain, list from all domains
|
// if it's a wildcard domain, list from all domains
|
||||||
if options.Domain == register.WildcardDomain {
|
if options.Domain == WildcardDomain {
|
||||||
m.RLock()
|
m.RLock()
|
||||||
recs := m.records
|
recs := m.records
|
||||||
m.RUnlock()
|
m.RUnlock()
|
||||||
|
|
||||||
var services []*register.Service
|
var services []*Service
|
||||||
|
|
||||||
for domain := range recs {
|
for domain := range recs {
|
||||||
srvs, err := m.ListServices(ctx, append(opts, register.ListDomain(domain))...)
|
srvs, err := m.ListServices(ctx, append(opts, ListDomain(domain))...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -371,11 +361,11 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
|
|||||||
// ensure the domain exists
|
// ensure the domain exists
|
||||||
services, ok := m.records[options.Domain]
|
services, ok := m.records[options.Domain]
|
||||||
if !ok {
|
if !ok {
|
||||||
return make([]*register.Service, 0), nil
|
return make([]*Service, 0), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// serialize the result, each version counts as an individual service
|
// serialize the result, each version counts as an individual service
|
||||||
var result []*register.Service
|
var result []*Service
|
||||||
|
|
||||||
for _, service := range services {
|
for _, service := range services {
|
||||||
for _, version := range service {
|
for _, version := range service {
|
||||||
@ -386,16 +376,16 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
|
|||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *memory) Watch(ctx context.Context, opts ...register.WatchOption) (register.Watcher, error) {
|
func (m *memory) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
|
||||||
id, err := id.New()
|
id, err := id.New()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
wo := register.NewWatchOptions(opts...)
|
wo := NewWatchOptions(opts...)
|
||||||
// construct the watcher
|
// construct the watcher
|
||||||
w := &watcher{
|
w := &watcher{
|
||||||
exit: make(chan bool),
|
exit: make(chan bool),
|
||||||
res: make(chan *register.Result),
|
res: make(chan *Result),
|
||||||
id: id,
|
id: id,
|
||||||
wo: wo,
|
wo: wo,
|
||||||
}
|
}
|
||||||
@ -416,13 +406,13 @@ func (m *memory) String() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type watcher struct {
|
type watcher struct {
|
||||||
res chan *register.Result
|
res chan *Result
|
||||||
exit chan bool
|
exit chan bool
|
||||||
wo register.WatchOptions
|
wo WatchOptions
|
||||||
id string
|
id string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *watcher) Next() (*register.Result, error) {
|
func (m *watcher) Next() (*Result, error) {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case r := <-m.res:
|
case r := <-m.res:
|
||||||
@ -434,28 +424,20 @@ func (m *watcher) Next() (*register.Result, error) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if m.wo.Domain == register.WildcardDomain {
|
|
||||||
return r, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if r.Service.Metadata == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// extract domain from service metadata
|
// extract domain from service metadata
|
||||||
var domain string
|
var domain string
|
||||||
if v, ok := r.Service.Metadata.Get("domain"); ok && v != "" {
|
if r.Service.Metadata != nil && len(r.Service.Metadata["domain"]) > 0 {
|
||||||
domain = v
|
domain = r.Service.Metadata["domain"]
|
||||||
} else {
|
} else {
|
||||||
domain = register.DefaultDomain
|
domain = DefaultDomain
|
||||||
}
|
}
|
||||||
|
|
||||||
// only send the event if watching the wildcard or this specific domain
|
// only send the event if watching the wildcard or this specific domain
|
||||||
if m.wo.Domain == domain {
|
if m.wo.Domain == WildcardDomain || m.wo.Domain == domain {
|
||||||
return r, nil
|
return r, nil
|
||||||
}
|
}
|
||||||
case <-m.exit:
|
case <-m.exit:
|
||||||
return nil, register.ErrWatcherStopped
|
return nil, ErrWatcherStopped
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -469,8 +451,11 @@ func (m *watcher) Stop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func serviceToRecord(s *register.Service, ttl time.Duration) *record {
|
func serviceToRecord(s *Service, ttl time.Duration) *record {
|
||||||
metadata := metadata.Copy(s.Metadata)
|
metadata := make(map[string]string, len(s.Metadata))
|
||||||
|
for k, v := range s.Metadata {
|
||||||
|
metadata[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
nodes := make(map[string]*node, len(s.Nodes))
|
nodes := make(map[string]*node, len(s.Nodes))
|
||||||
for _, n := range s.Nodes {
|
for _, n := range s.Nodes {
|
||||||
@ -481,8 +466,10 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
endpoints := make([]*register.Endpoint, len(s.Endpoints))
|
endpoints := make([]*Endpoint, len(s.Endpoints))
|
||||||
copy(endpoints, s.Endpoints)
|
for i, e := range s.Endpoints { // TODO: vtolstov use copy
|
||||||
|
endpoints[i] = e
|
||||||
|
}
|
||||||
|
|
||||||
return &record{
|
return &record{
|
||||||
Name: s.Name,
|
Name: s.Name,
|
||||||
@ -493,14 +480,23 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func recordToService(r *record, domain string) *register.Service {
|
func recordToService(r *record, domain string) *Service {
|
||||||
endpoints := make([]*register.Endpoint, len(r.Endpoints))
|
metadata := make(map[string]string, len(r.Metadata))
|
||||||
for i, e := range r.Endpoints {
|
for k, v := range r.Metadata {
|
||||||
md := metadata.Copy(e.Metadata)
|
metadata[k] = v
|
||||||
// set the domain in metadata so it can be determined when a wildcard query is performed
|
}
|
||||||
md.Set("domain", domain)
|
|
||||||
|
|
||||||
endpoints[i] = ®ister.Endpoint{
|
// set the domain in metadata so it can be determined when a wildcard query is performed
|
||||||
|
metadata["domain"] = domain
|
||||||
|
|
||||||
|
endpoints := make([]*Endpoint, len(r.Endpoints))
|
||||||
|
for i, e := range r.Endpoints {
|
||||||
|
md := make(map[string]string, len(e.Metadata))
|
||||||
|
for k, v := range e.Metadata {
|
||||||
|
md[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
endpoints[i] = &Endpoint{
|
||||||
Name: e.Name,
|
Name: e.Name,
|
||||||
Request: e.Request,
|
Request: e.Request,
|
||||||
Response: e.Response,
|
Response: e.Response,
|
||||||
@ -508,21 +504,26 @@ func recordToService(r *record, domain string) *register.Service {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nodes := make([]*register.Node, len(r.Nodes))
|
nodes := make([]*Node, len(r.Nodes))
|
||||||
i := 0
|
i := 0
|
||||||
for _, n := range r.Nodes {
|
for _, n := range r.Nodes {
|
||||||
nodes[i] = ®ister.Node{
|
md := make(map[string]string, len(n.Metadata))
|
||||||
|
for k, v := range n.Metadata {
|
||||||
|
md[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
nodes[i] = &Node{
|
||||||
ID: n.ID,
|
ID: n.ID,
|
||||||
Address: n.Address,
|
Address: n.Address,
|
||||||
Metadata: metadata.Copy(n.Metadata),
|
Metadata: md,
|
||||||
}
|
}
|
||||||
i++
|
i++
|
||||||
}
|
}
|
||||||
|
|
||||||
return ®ister.Service{
|
return &Service{
|
||||||
Name: r.Name,
|
Name: r.Name,
|
||||||
Version: r.Version,
|
Version: r.Version,
|
||||||
Metadata: metadata.Copy(r.Metadata),
|
Metadata: metadata,
|
||||||
Endpoints: endpoints,
|
Endpoints: endpoints,
|
||||||
Nodes: nodes,
|
Nodes: nodes,
|
||||||
}
|
}
|
||||||
@ -1,23 +1,19 @@
|
|||||||
package memory
|
package register
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.unistack.org/micro/v4"
|
|
||||||
"go.unistack.org/micro/v4/register"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var testData = map[string][]*register.Service{
|
var testData = map[string][]*Service{
|
||||||
"foo": {
|
"foo": {
|
||||||
{
|
{
|
||||||
Name: "foo",
|
Name: "foo",
|
||||||
Version: "1.0.0",
|
Version: "1.0.0",
|
||||||
Nodes: []*register.Node{
|
Nodes: []*Node{
|
||||||
{
|
{
|
||||||
ID: "foo-1.0.0-123",
|
ID: "foo-1.0.0-123",
|
||||||
Address: "localhost:9999",
|
Address: "localhost:9999",
|
||||||
@ -31,7 +27,7 @@ var testData = map[string][]*register.Service{
|
|||||||
{
|
{
|
||||||
Name: "foo",
|
Name: "foo",
|
||||||
Version: "1.0.1",
|
Version: "1.0.1",
|
||||||
Nodes: []*register.Node{
|
Nodes: []*Node{
|
||||||
{
|
{
|
||||||
ID: "foo-1.0.1-321",
|
ID: "foo-1.0.1-321",
|
||||||
Address: "localhost:6666",
|
Address: "localhost:6666",
|
||||||
@ -41,7 +37,7 @@ var testData = map[string][]*register.Service{
|
|||||||
{
|
{
|
||||||
Name: "foo",
|
Name: "foo",
|
||||||
Version: "1.0.3",
|
Version: "1.0.3",
|
||||||
Nodes: []*register.Node{
|
Nodes: []*Node{
|
||||||
{
|
{
|
||||||
ID: "foo-1.0.3-345",
|
ID: "foo-1.0.3-345",
|
||||||
Address: "localhost:8888",
|
Address: "localhost:8888",
|
||||||
@ -53,7 +49,7 @@ var testData = map[string][]*register.Service{
|
|||||||
{
|
{
|
||||||
Name: "bar",
|
Name: "bar",
|
||||||
Version: "default",
|
Version: "default",
|
||||||
Nodes: []*register.Node{
|
Nodes: []*Node{
|
||||||
{
|
{
|
||||||
ID: "bar-1.0.0-123",
|
ID: "bar-1.0.0-123",
|
||||||
Address: "localhost:9999",
|
Address: "localhost:9999",
|
||||||
@ -67,7 +63,7 @@ var testData = map[string][]*register.Service{
|
|||||||
{
|
{
|
||||||
Name: "bar",
|
Name: "bar",
|
||||||
Version: "latest",
|
Version: "latest",
|
||||||
Nodes: []*register.Node{
|
Nodes: []*Node{
|
||||||
{
|
{
|
||||||
ID: "bar-1.0.1-321",
|
ID: "bar-1.0.1-321",
|
||||||
Address: "localhost:6666",
|
Address: "localhost:6666",
|
||||||
@ -82,7 +78,7 @@ func TestMemoryRegistry(t *testing.T) {
|
|||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
m := NewRegister()
|
m := NewRegister()
|
||||||
|
|
||||||
fn := func(k string, v []*register.Service) {
|
fn := func(k string, v []*Service) {
|
||||||
services, err := m.LookupService(ctx, k)
|
services, err := m.LookupService(ctx, k)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Unexpected error getting service %s: %v", k, err)
|
t.Errorf("Unexpected error getting service %s: %v", k, err)
|
||||||
@ -159,8 +155,8 @@ func TestMemoryRegistry(t *testing.T) {
|
|||||||
for _, v := range testData {
|
for _, v := range testData {
|
||||||
for _, service := range v {
|
for _, service := range v {
|
||||||
services, err := m.LookupService(ctx, service.Name)
|
services, err := m.LookupService(ctx, service.Name)
|
||||||
if err != register.ErrNotFound {
|
if err != ErrNotFound {
|
||||||
t.Errorf("Expected error: %v, got: %v", register.ErrNotFound, err)
|
t.Errorf("Expected error: %v, got: %v", ErrNotFound, err)
|
||||||
}
|
}
|
||||||
if len(services) != 0 {
|
if len(services) != 0 {
|
||||||
t.Errorf("Expected %d services for %s, got %d", 0, service.Name, len(services))
|
t.Errorf("Expected %d services for %s, got %d", 0, service.Name, len(services))
|
||||||
@ -175,7 +171,7 @@ func TestMemoryRegistryTTL(t *testing.T) {
|
|||||||
|
|
||||||
for _, v := range testData {
|
for _, v := range testData {
|
||||||
for _, service := range v {
|
for _, service := range v {
|
||||||
if err := m.Register(ctx, service, register.RegisterTTL(time.Millisecond)); err != nil {
|
if err := m.Register(ctx, service, RegisterTTL(time.Millisecond)); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -204,15 +200,15 @@ func TestMemoryRegistryTTLConcurrent(t *testing.T) {
|
|||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
for _, v := range testData {
|
for _, v := range testData {
|
||||||
for _, service := range v {
|
for _, service := range v {
|
||||||
if err := m.Register(ctx, service, register.RegisterTTL(waitTime/2)); err != nil {
|
if err := m.Register(ctx, service, RegisterTTL(waitTime/2)); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
|
//if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
|
||||||
// t.Logf("test will wait %v, then check TTL timeouts", waitTime)
|
// t.Logf("test will wait %v, then check TTL timeouts", waitTime)
|
||||||
// }
|
//}
|
||||||
|
|
||||||
errChan := make(chan error, concurrency)
|
errChan := make(chan error, concurrency)
|
||||||
syncChan := make(chan struct{})
|
syncChan := make(chan struct{})
|
||||||
@ -253,41 +249,34 @@ func TestMemoryWildcard(t *testing.T) {
|
|||||||
m := NewRegister()
|
m := NewRegister()
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
|
|
||||||
if err := m.Init(); err != nil {
|
testSrv := &Service{Name: "foo", Version: "1.0.0"}
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := m.Connect(ctx); err != nil {
|
if err := m.Register(ctx, testSrv, RegisterDomain("one")); err != nil {
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
testSrv := ®ister.Service{Name: "foo", Version: "1.0.0"}
|
|
||||||
|
|
||||||
if err := m.Register(ctx, testSrv, register.RegisterDomain("one")); err != nil {
|
|
||||||
t.Fatalf("Register err: %v", err)
|
t.Fatalf("Register err: %v", err)
|
||||||
}
|
}
|
||||||
if err := m.Register(ctx, testSrv, register.RegisterDomain("two")); err != nil {
|
if err := m.Register(ctx, testSrv, RegisterDomain("two")); err != nil {
|
||||||
t.Fatalf("Register err: %v", err)
|
t.Fatalf("Register err: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if recs, err := m.ListServices(ctx, register.ListDomain("one")); err != nil {
|
if recs, err := m.ListServices(ctx, ListDomain("one")); err != nil {
|
||||||
t.Errorf("List err: %v", err)
|
t.Errorf("List err: %v", err)
|
||||||
} else if len(recs) != 1 {
|
} else if len(recs) != 1 {
|
||||||
t.Errorf("Expected 1 record, got %v", len(recs))
|
t.Errorf("Expected 1 record, got %v", len(recs))
|
||||||
}
|
}
|
||||||
|
|
||||||
if recs, err := m.ListServices(ctx, register.ListDomain("*")); err != nil {
|
if recs, err := m.ListServices(ctx, ListDomain("*")); err != nil {
|
||||||
t.Errorf("List err: %v", err)
|
t.Errorf("List err: %v", err)
|
||||||
} else if len(recs) != 2 {
|
} else if len(recs) != 2 {
|
||||||
t.Errorf("Expected 2 records, got %v", len(recs))
|
t.Errorf("Expected 2 records, got %v", len(recs))
|
||||||
}
|
}
|
||||||
|
|
||||||
if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("one")); err != nil {
|
if recs, err := m.LookupService(ctx, testSrv.Name, LookupDomain("one")); err != nil {
|
||||||
t.Errorf("Lookup err: %v", err)
|
t.Errorf("Lookup err: %v", err)
|
||||||
} else if len(recs) != 1 {
|
} else if len(recs) != 1 {
|
||||||
t.Errorf("Expected 1 record, got %v", len(recs))
|
t.Errorf("Expected 1 record, got %v", len(recs))
|
||||||
}
|
}
|
||||||
|
|
||||||
if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("*")); err != nil {
|
if recs, err := m.LookupService(ctx, testSrv.Name, LookupDomain("*")); err != nil {
|
||||||
t.Errorf("Lookup err: %v", err)
|
t.Errorf("Lookup err: %v", err)
|
||||||
} else if len(recs) != 2 {
|
} else if len(recs) != 2 {
|
||||||
t.Errorf("Expected 2 records, got %v", len(recs))
|
t.Errorf("Expected 2 records, got %v", len(recs))
|
||||||
@ -295,16 +284,12 @@ func TestMemoryWildcard(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestWatcher(t *testing.T) {
|
func TestWatcher(t *testing.T) {
|
||||||
testSrv := ®ister.Service{Name: "foo", Version: "1.0.0"}
|
testSrv := &Service{Name: "foo", Version: "1.0.0"}
|
||||||
|
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
m := NewRegister()
|
m := NewRegister()
|
||||||
if err := m.Init(); err != nil {
|
m.Init()
|
||||||
t.Fatal(err)
|
m.Connect(ctx)
|
||||||
}
|
|
||||||
if err := m.Connect(ctx); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
wc, err := m.Watch(ctx)
|
wc, err := m.Watch(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("cant watch: %v", err)
|
t.Fatalf("cant watch: %v", err)
|
||||||
@ -335,37 +320,3 @@ func TestWatcher(t *testing.T) {
|
|||||||
t.Fatal("expected error on Next()")
|
t.Fatal("expected error on Next()")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Test_service_Register(t *testing.T) {
|
|
||||||
t.Skip()
|
|
||||||
r := NewRegister()
|
|
||||||
|
|
||||||
type args struct {
|
|
||||||
names []string
|
|
||||||
}
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
opts []micro.Option
|
|
||||||
args args
|
|
||||||
want register.Register
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "service.Register",
|
|
||||||
opts: []micro.Option{micro.Register(r)},
|
|
||||||
args: args{
|
|
||||||
names: []string{"memory"},
|
|
||||||
},
|
|
||||||
want: r,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
s := micro.NewService(tt.opts...)
|
|
||||||
|
|
||||||
if got := s.Register(tt.args.names...); !reflect.DeepEqual(got, tt.want) {
|
|
||||||
t.Errorf("service.Register() = %v, want %v", got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
package register
|
|
||||||
|
|
||||||
import "context"
|
|
||||||
|
|
||||||
type noop struct {
|
|
||||||
opts Options
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRegister(opts ...Option) Register {
|
|
||||||
return &noop{
|
|
||||||
opts: NewOptions(opts...),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Name() string {
|
|
||||||
return n.opts.Name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Init(opts ...Option) error {
|
|
||||||
for _, o := range opts {
|
|
||||||
o(&n.opts)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Options() Options {
|
|
||||||
return n.opts
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Connect(ctx context.Context) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Disconnect(ctx context.Context) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Register(ctx context.Context, service *Service, option ...RegisterOption) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Deregister(ctx context.Context, service *Service, option ...DeregisterOption) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) LookupService(ctx context.Context, s string, option ...LookupOption) ([]*Service, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) ListServices(ctx context.Context, option ...ListOption) ([]*Service, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
|
|
||||||
wOpts := NewWatchOptions(opts...)
|
|
||||||
|
|
||||||
return &watcher{wo: wOpts}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *noop) String() string {
|
|
||||||
return "noop"
|
|
||||||
}
|
|
||||||
|
|
||||||
type watcher struct {
|
|
||||||
wo WatchOptions
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *watcher) Next() (*Result, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *watcher) Stop() {}
|
|
||||||
@ -4,6 +4,7 @@ package register // import "go.unistack.org/micro/v4/register"
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/metadata"
|
"go.unistack.org/micro/v4/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -17,6 +17,4 @@ var (
|
|||||||
SubscribeMessageTotal = "subscribe_message_total"
|
SubscribeMessageTotal = "subscribe_message_total"
|
||||||
// SubscribeMessageInflight specifies meter metric name
|
// SubscribeMessageInflight specifies meter metric name
|
||||||
SubscribeMessageInflight = "subscribe_message_inflight"
|
SubscribeMessageInflight = "subscribe_message_inflight"
|
||||||
// BrokerGroupLag specifies broker lag
|
|
||||||
BrokerGroupLag = "broker_lag"
|
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
package semconv
|
|
||||||
|
|
||||||
var (
|
|
||||||
// CacheRequestDurationSeconds specifies meter metric name
|
|
||||||
CacheRequestDurationSeconds = "cache_request_duration_seconds"
|
|
||||||
// ClientRequestLatencyMicroseconds specifies meter metric name
|
|
||||||
CacheRequestLatencyMicroseconds = "cache_request_latency_microseconds"
|
|
||||||
// CacheRequestTotal specifies meter metric name
|
|
||||||
CacheRequestTotal = "cache_request_total"
|
|
||||||
// CacheRequestInflight specifies meter metric name
|
|
||||||
CacheRequestInflight = "cache_request_inflight"
|
|
||||||
)
|
|
||||||
@ -112,8 +112,8 @@ func (n *noopServer) Register() error {
|
|||||||
}
|
}
|
||||||
n.RUnlock()
|
n.RUnlock()
|
||||||
|
|
||||||
service.Nodes[0].Metadata.Set("protocol", "noop")
|
service.Nodes[0].Metadata["protocol"] = "noop"
|
||||||
service.Nodes[0].Metadata.Set("transport", "noop")
|
service.Nodes[0].Metadata["transport"] = service.Nodes[0].Metadata["protocol"]
|
||||||
service.Endpoints = endpoints
|
service.Endpoints = endpoints
|
||||||
|
|
||||||
n.RLock()
|
n.RLock()
|
||||||
|
|||||||
@ -13,7 +13,6 @@ import (
|
|||||||
"go.unistack.org/micro/v4/meter"
|
"go.unistack.org/micro/v4/meter"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v4/options"
|
||||||
"go.unistack.org/micro/v4/register"
|
"go.unistack.org/micro/v4/register"
|
||||||
msync "go.unistack.org/micro/v4/sync"
|
|
||||||
"go.unistack.org/micro/v4/tracer"
|
"go.unistack.org/micro/v4/tracer"
|
||||||
"go.unistack.org/micro/v4/util/id"
|
"go.unistack.org/micro/v4/util/id"
|
||||||
)
|
)
|
||||||
@ -33,7 +32,7 @@ type Options struct {
|
|||||||
// Listener may be passed if already created
|
// Listener may be passed if already created
|
||||||
Listener net.Listener
|
Listener net.Listener
|
||||||
// Wait group
|
// Wait group
|
||||||
Wait *msync.WaitGroup
|
Wait *sync.WaitGroup
|
||||||
// TLSConfig specifies tls.Config for secure serving
|
// TLSConfig specifies tls.Config for secure serving
|
||||||
TLSConfig *tls.Config
|
TLSConfig *tls.Config
|
||||||
// Metadata holds the server metadata
|
// Metadata holds the server metadata
|
||||||
@ -66,8 +65,6 @@ type Options struct {
|
|||||||
DeregisterAttempts int
|
DeregisterAttempts int
|
||||||
// Hooks may contains HandleWrapper or Server func wrapper
|
// Hooks may contains HandleWrapper or Server func wrapper
|
||||||
Hooks options.Hooks
|
Hooks options.Hooks
|
||||||
// GracefulTimeout timeout for graceful stop server
|
|
||||||
GracefulTimeout time.Duration
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewOptions returns new options struct with default or passed values
|
// NewOptions returns new options struct with default or passed values
|
||||||
@ -87,7 +84,6 @@ func NewOptions(opts ...options.Option) Options {
|
|||||||
Name: DefaultName,
|
Name: DefaultName,
|
||||||
Version: DefaultVersion,
|
Version: DefaultVersion,
|
||||||
ID: id.Must(),
|
ID: id.Must(),
|
||||||
GracefulTimeout: DefaultGracefulTimeout,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
@ -147,11 +143,8 @@ func Wait(wg *sync.WaitGroup) options.Option {
|
|||||||
if wg == nil {
|
if wg == nil {
|
||||||
wg = new(sync.WaitGroup)
|
wg = new(sync.WaitGroup)
|
||||||
}
|
}
|
||||||
|
|
||||||
wrap := msync.WrapWaitGroup(wg)
|
|
||||||
|
|
||||||
return func(src interface{}) error {
|
return func(src interface{}) error {
|
||||||
return options.Set(src, wrap, ".Wait")
|
return options.Set(src, wg, ".Wait")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -169,12 +162,6 @@ func Listener(nl net.Listener) options.Option {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GracefulTimeout(td time.Duration) options.Option {
|
|
||||||
return func(src interface{}) error {
|
|
||||||
return options.Set(src, td, ".GracefulTimeout")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleOptions struct
|
// HandleOptions struct
|
||||||
type HandleOptions struct {
|
type HandleOptions struct {
|
||||||
// Context holds external options
|
// Context holds external options
|
||||||
|
|||||||
@ -77,8 +77,8 @@ func NewRegisterService(s Server) (*register.Service, error) {
|
|||||||
}
|
}
|
||||||
node.Metadata = metadata.Copy(opts.Metadata)
|
node.Metadata = metadata.Copy(opts.Metadata)
|
||||||
|
|
||||||
node.Metadata.Set("server", s.String())
|
node.Metadata["server"] = s.String()
|
||||||
node.Metadata.Set("register", opts.Register.String())
|
node.Metadata["register"] = opts.Register.String()
|
||||||
|
|
||||||
return ®ister.Service{
|
return ®ister.Service{
|
||||||
Name: opts.Name,
|
Name: opts.Name,
|
||||||
|
|||||||
@ -32,8 +32,6 @@ var (
|
|||||||
DefaultMaxMsgRecvSize = 1024 * 1024 * 4 // 4Mb
|
DefaultMaxMsgRecvSize = 1024 * 1024 * 4 // 4Mb
|
||||||
// DefaultMaxMsgSendSize holds default max send size
|
// DefaultMaxMsgSendSize holds default max send size
|
||||||
DefaultMaxMsgSendSize = 1024 * 1024 * 4 // 4Mb
|
DefaultMaxMsgSendSize = 1024 * 1024 * 4 // 4Mb
|
||||||
// DefaultGracefulTimeout default time for graceful stop
|
|
||||||
DefaultGracefulTimeout = 5 * time.Second
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Server is a simple micro server abstraction
|
// Server is a simple micro server abstraction
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
package micro
|
package micro
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"go.unistack.org/micro/v4/register/memory"
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@ -426,7 +425,7 @@ func Test_service_Store(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func Test_service_Register(t *testing.T) {
|
func Test_service_Register(t *testing.T) {
|
||||||
r := memory.NewRegister()
|
r := register.NewRegister()
|
||||||
type fields struct {
|
type fields struct {
|
||||||
opts Options
|
opts Options
|
||||||
}
|
}
|
||||||
@ -445,7 +444,7 @@ func Test_service_Register(t *testing.T) {
|
|||||||
opts: Options{Registers: []register.Register{r}},
|
opts: Options{Registers: []register.Register{r}},
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
names: []string{"memory"},
|
names: []string{"noop"},
|
||||||
},
|
},
|
||||||
want: r,
|
want: r,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,69 +0,0 @@
|
|||||||
package sync
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
type WaitGroup struct {
|
|
||||||
wg *sync.WaitGroup
|
|
||||||
c int
|
|
||||||
mu sync.Mutex
|
|
||||||
}
|
|
||||||
|
|
||||||
func WrapWaitGroup(wg *sync.WaitGroup) *WaitGroup {
|
|
||||||
g := &WaitGroup{
|
|
||||||
wg: wg,
|
|
||||||
}
|
|
||||||
return g
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewWaitGroup() *WaitGroup {
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
return WrapWaitGroup(&wg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (g *WaitGroup) Add(n int) {
|
|
||||||
g.mu.Lock()
|
|
||||||
g.c += n
|
|
||||||
g.wg.Add(n)
|
|
||||||
g.mu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (g *WaitGroup) Done() {
|
|
||||||
g.mu.Lock()
|
|
||||||
g.c += -1
|
|
||||||
g.wg.Add(-1)
|
|
||||||
g.mu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (g *WaitGroup) Wait() {
|
|
||||||
g.wg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (g *WaitGroup) WaitContext(ctx context.Context) {
|
|
||||||
done := make(chan struct{})
|
|
||||||
go func() {
|
|
||||||
g.wg.Wait()
|
|
||||||
close(done)
|
|
||||||
}()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
g.mu.Lock()
|
|
||||||
g.wg.Add(-g.c)
|
|
||||||
<-done
|
|
||||||
g.wg.Add(g.c)
|
|
||||||
g.mu.Unlock()
|
|
||||||
return
|
|
||||||
case <-done:
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (g *WaitGroup) Waiters() int {
|
|
||||||
g.mu.Lock()
|
|
||||||
c := g.c
|
|
||||||
g.mu.Unlock()
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
package sync
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestWaitGroupContext(t *testing.T) {
|
|
||||||
wg := NewWaitGroup()
|
|
||||||
_ = t
|
|
||||||
wg.Add(1)
|
|
||||||
ctx, cancel := context.WithTimeout(context.TODO(), 1*time.Second)
|
|
||||||
defer cancel()
|
|
||||||
wg.WaitContext(ctx)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestWaitGroupReuse(t *testing.T) {
|
|
||||||
wg := NewWaitGroup()
|
|
||||||
defer func() {
|
|
||||||
if wg.Waiters() != 0 {
|
|
||||||
t.Fatal("lost goroutines")
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
wg.Add(1)
|
|
||||||
defer wg.Done()
|
|
||||||
ctx, cancel := context.WithTimeout(context.TODO(), 1*time.Second)
|
|
||||||
defer cancel()
|
|
||||||
wg.WaitContext(ctx)
|
|
||||||
|
|
||||||
wg.Add(1)
|
|
||||||
defer wg.Done()
|
|
||||||
ctx, cancel = context.WithTimeout(context.TODO(), 1*time.Second)
|
|
||||||
defer cancel()
|
|
||||||
wg.WaitContext(ctx)
|
|
||||||
}
|
|
||||||
@ -1,143 +0,0 @@
|
|||||||
package memory
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/options"
|
|
||||||
"go.unistack.org/micro/v4/tracer"
|
|
||||||
"go.unistack.org/micro/v4/util/id"
|
|
||||||
)
|
|
||||||
|
|
||||||
var _ tracer.Tracer = (*Tracer)(nil)
|
|
||||||
|
|
||||||
type Tracer struct {
|
|
||||||
opts tracer.Options
|
|
||||||
spans []tracer.Span
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *Tracer) Spans() []tracer.Span {
|
|
||||||
return t.spans
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *Tracer) Start(ctx context.Context, name string, opts ...options.Option) (context.Context, tracer.Span) {
|
|
||||||
options := tracer.NewSpanOptions(opts...)
|
|
||||||
span := &Span{
|
|
||||||
name: name,
|
|
||||||
ctx: ctx,
|
|
||||||
tracer: t,
|
|
||||||
kind: options.Kind,
|
|
||||||
startTime: time.Now(),
|
|
||||||
}
|
|
||||||
span.spanID.s, _ = id.New()
|
|
||||||
span.traceID.s, _ = id.New()
|
|
||||||
if span.ctx == nil {
|
|
||||||
span.ctx = context.Background()
|
|
||||||
}
|
|
||||||
t.spans = append(t.spans, span)
|
|
||||||
return tracer.NewSpanContext(ctx, span), span
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *Tracer) Flush(_ context.Context) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *Tracer) Init(opts ...options.Option) error {
|
|
||||||
var err error
|
|
||||||
for _, o := range opts {
|
|
||||||
if err = o(&t.opts); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *Tracer) Name() string {
|
|
||||||
return t.opts.Name
|
|
||||||
}
|
|
||||||
|
|
||||||
type noopStringer struct {
|
|
||||||
s string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s noopStringer) String() string {
|
|
||||||
return s.s
|
|
||||||
}
|
|
||||||
|
|
||||||
type Span struct {
|
|
||||||
ctx context.Context
|
|
||||||
tracer tracer.Tracer
|
|
||||||
name string
|
|
||||||
statusMsg string
|
|
||||||
startTime time.Time
|
|
||||||
finishTime time.Time
|
|
||||||
traceID noopStringer
|
|
||||||
spanID noopStringer
|
|
||||||
events []*Event
|
|
||||||
labels []interface{}
|
|
||||||
logs []interface{}
|
|
||||||
kind tracer.SpanKind
|
|
||||||
status tracer.SpanStatus
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) Finish(opts ...options.Option) {
|
|
||||||
s.finishTime = time.Now()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) Context() context.Context {
|
|
||||||
return s.ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) Tracer() tracer.Tracer {
|
|
||||||
return s.tracer
|
|
||||||
}
|
|
||||||
|
|
||||||
type Event struct {
|
|
||||||
name string
|
|
||||||
labels []interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) AddEvent(name string, opts ...options.Option) {
|
|
||||||
options := tracer.NewEventOptions(opts...)
|
|
||||||
s.events = append(s.events, &Event{name: name, labels: options.Labels})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) SetName(name string) {
|
|
||||||
s.name = name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) AddLogs(kv ...interface{}) {
|
|
||||||
s.logs = append(s.logs, kv...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) AddLabels(kv ...interface{}) {
|
|
||||||
s.labels = append(s.labels, kv...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) Kind() tracer.SpanKind {
|
|
||||||
return s.kind
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) TraceID() string {
|
|
||||||
return s.traceID.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) SpanID() string {
|
|
||||||
return s.spanID.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) Status() (tracer.SpanStatus, string) {
|
|
||||||
return s.status, s.statusMsg
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Span) SetStatus(st tracer.SpanStatus, msg string) {
|
|
||||||
s.status = st
|
|
||||||
s.statusMsg = msg
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewTracer returns new memory tracer
|
|
||||||
func NewTracer(opts ...options.Option) *Tracer {
|
|
||||||
return &Tracer{
|
|
||||||
opts: tracer.NewOptions(opts...),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
package memory
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/logger"
|
|
||||||
"go.unistack.org/micro/v4/logger/slog"
|
|
||||||
"go.unistack.org/micro/v4/tracer"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestLoggerWithTracer(t *testing.T) {
|
|
||||||
ctx := context.TODO()
|
|
||||||
buf := bytes.NewBuffer(nil)
|
|
||||||
logger.DefaultLogger = slog.NewLogger(logger.WithOutput(buf))
|
|
||||||
|
|
||||||
if err := logger.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
var span tracer.Span
|
|
||||||
tr := NewTracer()
|
|
||||||
ctx, span = tr.Start(ctx, "test1")
|
|
||||||
|
|
||||||
logger.Error(ctx, "my test error", fmt.Errorf("error"))
|
|
||||||
|
|
||||||
if !strings.Contains(buf.String(), span.TraceID()) {
|
|
||||||
t.Fatalf("log does not contains trace id: %s", buf.Bytes())
|
|
||||||
}
|
|
||||||
|
|
||||||
_, _ = tr.Start(ctx, "test2")
|
|
||||||
|
|
||||||
for _, s := range tr.Spans() {
|
|
||||||
_ = s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -24,6 +24,7 @@ func (t *noopTracer) Start(ctx context.Context, name string, opts ...options.Opt
|
|||||||
name: name,
|
name: name,
|
||||||
ctx: ctx,
|
ctx: ctx,
|
||||||
tracer: t,
|
tracer: t,
|
||||||
|
labels: options.Labels,
|
||||||
kind: options.Kind,
|
kind: options.Kind,
|
||||||
}
|
}
|
||||||
span.spanID.s, _ = id.New()
|
span.spanID.s, _ = id.New()
|
||||||
@ -35,7 +36,7 @@ func (t *noopTracer) Start(ctx context.Context, name string, opts ...options.Opt
|
|||||||
return NewSpanContext(ctx, span), span
|
return NewSpanContext(ctx, span), span
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *noopTracer) Flush(_ context.Context) error {
|
func (t *noopTracer) Flush(ctx context.Context) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -50,6 +51,11 @@ func (t *noopTracer) Name() string {
|
|||||||
return t.opts.Name
|
return t.opts.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type noopEvent struct {
|
||||||
|
name string
|
||||||
|
labels []interface{}
|
||||||
|
}
|
||||||
|
|
||||||
type noopStringer struct {
|
type noopStringer struct {
|
||||||
s string
|
s string
|
||||||
}
|
}
|
||||||
@ -65,11 +71,14 @@ type noopSpan struct {
|
|||||||
statusMsg string
|
statusMsg string
|
||||||
traceID noopStringer
|
traceID noopStringer
|
||||||
spanID noopStringer
|
spanID noopStringer
|
||||||
|
events []*noopEvent
|
||||||
|
labels []interface{}
|
||||||
|
logs []interface{}
|
||||||
kind SpanKind
|
kind SpanKind
|
||||||
status SpanStatus
|
status SpanStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *noopSpan) Finish(_ ...options.Option) {
|
func (s *noopSpan) Finish(opts ...options.Option) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *noopSpan) Context() context.Context {
|
func (s *noopSpan) Context() context.Context {
|
||||||
@ -80,17 +89,21 @@ func (s *noopSpan) Tracer() Tracer {
|
|||||||
return s.tracer
|
return s.tracer
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *noopSpan) AddEvent(_ string, _ ...options.Option) {
|
func (s *noopSpan) AddEvent(name string, opts ...options.Option) {
|
||||||
|
options := NewEventOptions(opts...)
|
||||||
|
s.events = append(s.events, &noopEvent{name: name, labels: options.Labels})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *noopSpan) SetName(name string) {
|
func (s *noopSpan) SetName(name string) {
|
||||||
s.name = name
|
s.name = name
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *noopSpan) AddLogs(_ ...interface{}) {
|
func (s *noopSpan) AddLogs(kv ...interface{}) {
|
||||||
|
s.logs = append(s.logs, kv...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *noopSpan) AddLabels(_ ...interface{}) {
|
func (s *noopSpan) AddLabels(kv ...interface{}) {
|
||||||
|
s.labels = append(s.labels, kv...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *noopSpan) Kind() SpanKind {
|
func (s *noopSpan) Kind() SpanKind {
|
||||||
|
|||||||
@ -172,7 +172,6 @@ func NewEventOptions(opts ...options.Option) EventOptions {
|
|||||||
func NewOptions(opts ...options.Option) Options {
|
func NewOptions(opts ...options.Option) Options {
|
||||||
options := Options{
|
options := Options{
|
||||||
Logger: logger.DefaultLogger,
|
Logger: logger.DefaultLogger,
|
||||||
Context: context.Background(),
|
|
||||||
}
|
}
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
o(&options)
|
o(&options)
|
||||||
|
|||||||
@ -1,8 +1,10 @@
|
|||||||
// Package tracer provides an interface for distributed tracing
|
// Package tracer provides an interface for distributed tracing
|
||||||
package tracer
|
package tracer // import "go.unistack.org/micro/v4/tracer"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
|
||||||
"go.unistack.org/micro/v4/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
"go.unistack.org/micro/v4/options"
|
"go.unistack.org/micro/v4/options"
|
||||||
@ -11,26 +13,6 @@ import (
|
|||||||
// DefaultTracer is the global default tracer
|
// DefaultTracer is the global default tracer
|
||||||
var DefaultTracer = NewTracer()
|
var DefaultTracer = NewTracer()
|
||||||
|
|
||||||
var (
|
|
||||||
// TraceIDKey is the key used for the trace id in the log call
|
|
||||||
TraceIDKey = "trace-id"
|
|
||||||
// SpanIDKey is the key used for the span id in the log call
|
|
||||||
SpanIDKey = "span-id"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs,
|
|
||||||
func(ctx context.Context) []interface{} {
|
|
||||||
if span, ok := SpanFromContext(ctx); ok {
|
|
||||||
return []interface{}{
|
|
||||||
TraceIDKey, span.TraceID(),
|
|
||||||
SpanIDKey, span.SpanID(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Tracer is an interface for distributed tracing
|
// Tracer is an interface for distributed tracing
|
||||||
type Tracer interface {
|
type Tracer interface {
|
||||||
// Name return tracer name
|
// Name return tracer name
|
||||||
@ -69,3 +51,46 @@ type Span interface {
|
|||||||
// SpanID returns span id
|
// SpanID returns span id
|
||||||
SpanID() string
|
SpanID() string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs, func(ctx context.Context) []interface{} {
|
||||||
|
span, ok := SpanFromContext(ctx)
|
||||||
|
if !ok || span == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return []interface{}{"trace", span.TraceID(), "span", span.SpanID()}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// sort labels alphabeticaly by label name
|
||||||
|
type byKey []interface{}
|
||||||
|
|
||||||
|
func (k byKey) Len() int { return len(k) / 2 }
|
||||||
|
func (k byKey) Less(i, j int) bool { return fmt.Sprintf("%s", k[i*2]) < fmt.Sprintf("%s", k[j*2]) }
|
||||||
|
func (k byKey) Swap(i, j int) {
|
||||||
|
k[i*2], k[j*2] = k[j*2], k[i*2]
|
||||||
|
k[i*2+1], k[j*2+1] = k[j*2+1], k[i*2+1]
|
||||||
|
}
|
||||||
|
|
||||||
|
func UniqLabels(labels []interface{}) []interface{} {
|
||||||
|
if len(labels)%2 == 1 {
|
||||||
|
labels = labels[:len(labels)-1]
|
||||||
|
}
|
||||||
|
if len(labels) > 2 {
|
||||||
|
sort.Sort(byKey(labels))
|
||||||
|
|
||||||
|
idx := 0
|
||||||
|
for {
|
||||||
|
if labels[idx] == labels[idx+2] {
|
||||||
|
copy(labels[idx:], labels[idx+2:])
|
||||||
|
labels = labels[:len(labels)-2]
|
||||||
|
} else {
|
||||||
|
idx += 2
|
||||||
|
}
|
||||||
|
if idx+2 >= len(labels) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return labels
|
||||||
|
}
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
package reflect
|
package reflect // import "go.unistack.org/micro/v4/util/reflect"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
@ -46,23 +45,15 @@ func SliceAppend(b bool) Option {
|
|||||||
|
|
||||||
// Merge merges map[string]interface{} to destination struct
|
// Merge merges map[string]interface{} to destination struct
|
||||||
func Merge(dst interface{}, mp map[string]interface{}, opts ...Option) error {
|
func Merge(dst interface{}, mp map[string]interface{}, opts ...Option) error {
|
||||||
|
var err error
|
||||||
|
var sval reflect.Value
|
||||||
|
var fname string
|
||||||
|
|
||||||
options := Options{}
|
options := Options{}
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
o(&options)
|
o(&options)
|
||||||
}
|
}
|
||||||
|
|
||||||
if unmarshaler, ok := dst.(json.Unmarshaler); ok {
|
|
||||||
buf, err := json.Marshal(mp)
|
|
||||||
if err == nil {
|
|
||||||
err = unmarshaler.UnmarshalJSON(buf)
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var err error
|
|
||||||
var sval reflect.Value
|
|
||||||
var fname string
|
|
||||||
|
|
||||||
dviface := reflect.ValueOf(dst)
|
dviface := reflect.ValueOf(dst)
|
||||||
if dviface.Kind() == reflect.Ptr {
|
if dviface.Kind() == reflect.Ptr {
|
||||||
dviface = dviface.Elem()
|
dviface = dviface.Elem()
|
||||||
@ -541,9 +532,6 @@ func Equal(src interface{}, dst interface{}, excptFields ...string) bool {
|
|||||||
}
|
}
|
||||||
s := srcVal.MapIndex(key)
|
s := srcVal.MapIndex(key)
|
||||||
d := dstVal.MapIndex(key)
|
d := dstVal.MapIndex(key)
|
||||||
if !s.IsValid() || !d.IsValid() {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if !Equal(s.Interface(), d.Interface(), excptFields...) {
|
if !Equal(s.Interface(), d.Interface(), excptFields...) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@ -109,12 +109,13 @@ func Merge(olist []*register.Service, nlist []*register.Service) []*register.Ser
|
|||||||
seen = true
|
seen = true
|
||||||
srv = append(srv, sp)
|
srv = append(srv, sp)
|
||||||
break
|
break
|
||||||
}
|
} else {
|
||||||
sp := ®ister.Service{}
|
sp := ®ister.Service{}
|
||||||
// make copy
|
// make copy
|
||||||
*sp = *o
|
*sp = *o
|
||||||
srv = append(srv, sp)
|
srv = append(srv, sp)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if !seen {
|
if !seen {
|
||||||
srv = append(srv, Copy([]*register.Service{n})...)
|
srv = append(srv, Copy([]*register.Service{n})...)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,40 +0,0 @@
|
|||||||
package sort
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"sort"
|
|
||||||
)
|
|
||||||
|
|
||||||
// sort labels alphabeticaly by label name
|
|
||||||
type byKey []interface{}
|
|
||||||
|
|
||||||
func (k byKey) Len() int { return len(k) / 2 }
|
|
||||||
func (k byKey) Less(i, j int) bool { return fmt.Sprintf("%s", k[i*2]) < fmt.Sprintf("%s", k[j*2]) }
|
|
||||||
func (k byKey) Swap(i, j int) {
|
|
||||||
k[i*2], k[j*2] = k[j*2], k[i*2]
|
|
||||||
k[i*2+1], k[j*2+1] = k[j*2+1], k[i*2+1]
|
|
||||||
}
|
|
||||||
|
|
||||||
func Uniq(labels []interface{}) []interface{} {
|
|
||||||
if len(labels)%2 == 1 {
|
|
||||||
labels = labels[:len(labels)-1]
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(labels) > 2 {
|
|
||||||
sort.Sort(byKey(labels))
|
|
||||||
|
|
||||||
idx := 0
|
|
||||||
for {
|
|
||||||
if labels[idx] == labels[idx+2] {
|
|
||||||
copy(labels[idx:], labels[idx+2:])
|
|
||||||
labels = labels[:len(labels)-2]
|
|
||||||
} else {
|
|
||||||
idx += 2
|
|
||||||
}
|
|
||||||
if idx+2 >= len(labels) {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return labels
|
|
||||||
}
|
|
||||||
@ -12,7 +12,7 @@ type EC2Metadata struct {
|
|||||||
InstanceType string `json:"instance-type"`
|
InstanceType string `json:"instance-type"`
|
||||||
LocalHostname string `json:"local-hostname"`
|
LocalHostname string `json:"local-hostname"`
|
||||||
LocalIPv4 string `json:"local-ipv4"`
|
LocalIPv4 string `json:"local-ipv4"`
|
||||||
KernelID int `json:"kernel-id"`
|
kernelID int `json:"kernel-id"`
|
||||||
Placement string `json:"placement"`
|
Placement string `json:"placement"`
|
||||||
AvailabilityZone string `json:"availability-zone"`
|
AvailabilityZone string `json:"availability-zone"`
|
||||||
ProductCodes string `json:"product-codes"`
|
ProductCodes string `json:"product-codes"`
|
||||||
|
|||||||
@ -67,9 +67,9 @@ func (fi *fileInfo) Name() string {
|
|||||||
|
|
||||||
func (fi *fileInfo) Mode() os.FileMode {
|
func (fi *fileInfo) Mode() os.FileMode {
|
||||||
if strings.HasSuffix(fi.name, "/") {
|
if strings.HasSuffix(fi.name, "/") {
|
||||||
return os.FileMode(0o755) | os.ModeDir
|
return os.FileMode(0755) | os.ModeDir
|
||||||
}
|
}
|
||||||
return os.FileMode(0o644)
|
return os.FileMode(0644)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (fi *fileInfo) IsDir() bool {
|
func (fi *fileInfo) IsDir() bool {
|
||||||
@ -112,14 +112,15 @@ func (f *file) Readdir(count int) ([]os.FileInfo, error) {
|
|||||||
func (f *file) Seek(offset int64, whence int) (int64, error) {
|
func (f *file) Seek(offset int64, whence int) (int64, error) {
|
||||||
// log.Printf("seek %d %d %s\n", offset, whence, f.name)
|
// log.Printf("seek %d %d %s\n", offset, whence, f.name)
|
||||||
switch whence {
|
switch whence {
|
||||||
case io.SeekStart:
|
case os.SEEK_SET:
|
||||||
f.offset = offset
|
f.offset = offset
|
||||||
case io.SeekCurrent:
|
case os.SEEK_CUR:
|
||||||
f.offset += offset
|
f.offset += offset
|
||||||
case io.SeekEnd:
|
case os.SEEK_END:
|
||||||
f.offset = int64(len(f.data)) + offset
|
f.offset = int64(len(f.data)) + offset
|
||||||
}
|
}
|
||||||
return f.offset, nil
|
return f.offset, nil
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *file) Stat() (os.FileInfo, error) {
|
func (f *file) Stat() (os.FileInfo, error) {
|
||||||
|
|||||||
@ -2,7 +2,7 @@ package structfs
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io"
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
@ -82,7 +82,7 @@ func get(path string) ([]byte, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer res.Body.Close()
|
defer res.Body.Close()
|
||||||
return io.ReadAll(res.Body)
|
return ioutil.ReadAll(res.Body)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAll(t *testing.T) {
|
func TestAll(t *testing.T) {
|
||||||
|
|||||||
@ -35,7 +35,7 @@ func TestUnmarshalJSON(t *testing.T) {
|
|||||||
err = json.Unmarshal([]byte(`{"ttl":"1y"}`), v)
|
err = json.Unmarshal([]byte(`{"ttl":"1y"}`), v)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
} else if v.TTL != 31622400000000000 {
|
} else if v.TTL != 31536000000000000 {
|
||||||
t.Fatalf("invalid duration %v != 31536000000000000", v.TTL)
|
t.Fatalf("invalid duration %v != 31536000000000000", v.TTL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -55,7 +55,7 @@ func TestParseDuration(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("ParseDuration error: %v", err)
|
t.Fatalf("ParseDuration error: %v", err)
|
||||||
}
|
}
|
||||||
if td.String() != "8784h0m0s" {
|
if td.String() != "8760h0m0s" {
|
||||||
t.Fatalf("ParseDuration 1y != 8760h0m0s : %s", td.String())
|
t.Fatalf("ParseDuration 1y != 8760h0m0s : %s", td.String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,25 +0,0 @@
|
|||||||
package pool
|
|
||||||
|
|
||||||
import "sync"
|
|
||||||
|
|
||||||
type Pool[T any] struct {
|
|
||||||
p *sync.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewPool[T any](fn func() T) Pool[T] {
|
|
||||||
return Pool[T]{
|
|
||||||
p: &sync.Pool{
|
|
||||||
New: func() interface{} {
|
|
||||||
return fn()
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p Pool[T]) Get() T {
|
|
||||||
return p.p.Get().(T)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p Pool[T]) Put(t T) {
|
|
||||||
p.p.Put(t)
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
package pool
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestBytes(t *testing.T) {
|
|
||||||
p := NewPool(func() *bytes.Buffer { return bytes.NewBuffer(nil) })
|
|
||||||
b := p.Get()
|
|
||||||
b.Write([]byte(`test`))
|
|
||||||
if b.String() != "test" {
|
|
||||||
t.Fatal("pool not works")
|
|
||||||
}
|
|
||||||
p.Put(b)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStrings(t *testing.T) {
|
|
||||||
p := NewPool(func() *strings.Builder { return &strings.Builder{} })
|
|
||||||
b := p.Get()
|
|
||||||
b.Write([]byte(`test`))
|
|
||||||
if b.String() != "test" {
|
|
||||||
t.Fatal("pool not works")
|
|
||||||
}
|
|
||||||
p.Put(b)
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user