From 3e86864ce7c623539fca3c70e9af0e867ff615af Mon Sep 17 00:00:00 2001 From: pugnack Date: Wed, 15 Oct 2025 23:33:32 +0500 Subject: [PATCH] [v3] remove using global map for default codecs (#224) * remove using global map for default codecs * fix tests --- client/noop.go | 8 -------- client/noop_test.go | 4 +++- client/options.go | 2 +- logger/slog/slog_test.go | 5 ++--- server/noop.go | 8 -------- 5 files changed, 6 insertions(+), 21 deletions(-) diff --git a/client/noop.go b/client/noop.go index 02be926d..b52b88f1 100644 --- a/client/noop.go +++ b/client/noop.go @@ -17,11 +17,6 @@ import ( "go.unistack.org/micro/v3/tracer" ) -// DefaultCodecs will be used to encode/decode data -var DefaultCodecs = map[string]codec.Codec{ - "application/octet-stream": codec.NewCodec(), -} - type noopClient struct { funcPublish FuncPublish funcBatchPublish FuncBatchPublish @@ -178,9 +173,6 @@ func (n *noopClient) newCodec(contentType string) (codec.Codec, error) { if cf, ok := n.opts.Codecs[contentType]; ok { return cf, nil } - if cf, ok := DefaultCodecs[contentType]; ok { - return cf, nil - } return nil, codec.ErrUnknownContentType } diff --git a/client/noop_test.go b/client/noop_test.go index cc05204c..c19bfc3e 100644 --- a/client/noop_test.go +++ b/client/noop_test.go @@ -3,6 +3,8 @@ package client import ( "context" "testing" + + "go.unistack.org/micro/v3/codec" ) type testHook struct { @@ -19,7 +21,7 @@ func (t *testHook) Publish(fn FuncPublish) FuncPublish { func TestNoopHook(t *testing.T) { h := &testHook{} - c := NewClient(Hooks(HookPublish(h.Publish))) + c := NewClient(Codec("application/octet-stream", codec.NewCodec()), Hooks(HookPublish(h.Publish))) if err := c.Init(); err != nil { t.Fatal(err) diff --git a/client/options.go b/client/options.go index 905d8da4..8228de3c 100644 --- a/client/options.go +++ b/client/options.go @@ -198,7 +198,7 @@ func NewOptions(opts ...Option) Options { options := Options{ Context: context.Background(), ContentType: DefaultContentType, - Codecs: DefaultCodecs, + Codecs: make(map[string]codec.Codec), CallOptions: CallOptions{ Context: context.Background(), Backoff: DefaultBackoff, diff --git a/logger/slog/slog_test.go b/logger/slog/slog_test.go index 4ac6dbc4..2d605058 100644 --- a/logger/slog/slog_test.go +++ b/logger/slog/slog_test.go @@ -62,7 +62,7 @@ func TestTime(t *testing.T) { WithHandlerFunc(slog.NewTextHandler), logger.WithAddStacktrace(true), logger.WithTimeFunc(func() time.Time { - return time.Unix(0, 0) + return time.Unix(0, 0).UTC() }), ) if err := l.Init(logger.WithFields("key1", "val1")); err != nil { @@ -71,8 +71,7 @@ func TestTime(t *testing.T) { l.Error(ctx, "msg1", errors.New("err")) - if !bytes.Contains(buf.Bytes(), []byte(`timestamp=1970-01-01T03:00:00.000000000+03:00`)) && - !bytes.Contains(buf.Bytes(), []byte(`timestamp=1970-01-01T00:00:00.000000000Z`)) { + if !bytes.Contains(buf.Bytes(), []byte(`timestamp=1970-01-01T00:00:00.000000000Z`)) { t.Fatalf("logger error not works, buf contains: %s", buf.Bytes()) } } diff --git a/server/noop.go b/server/noop.go index a8ca50a6..bd05f52d 100644 --- a/server/noop.go +++ b/server/noop.go @@ -21,11 +21,6 @@ import ( "go.unistack.org/micro/v3/util/rand" ) -// DefaultCodecs will be used to encode/decode -var DefaultCodecs = map[string]codec.Codec{ - "application/octet-stream": codec.NewCodec(), -} - const ( defaultContentType = "application/json" ) @@ -93,9 +88,6 @@ func (n *noopServer) newCodec(contentType string) (codec.Codec, error) { if cf, ok := n.opts.Codecs[contentType]; ok { return cf, nil } - if cf, ok := DefaultCodecs[contentType]; ok { - return cf, nil - } return nil, codec.ErrUnknownContentType }