fixed metadata hooks

.gitea/workflows/job_coverage.yml

@@ -3,9 +3,6 @@ name: coverage
 on:
   push:
     branches: [ main, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
   pull_request:
     branches: [ main, v3, v4 ]
   # Allows you to run this workflow manually from the Actions tab
@@ -14,7 +11,6 @@ on:
 jobs:
 
   build:
-    if: github.server_url != 'https://github.com'
     runs-on: ubuntu-latest
     steps:
     - name: checkout code
@@ -26,7 +22,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
+        go-version: 'stable' 
 
     - name: test coverage
       run: |
@@ -43,8 +39,8 @@ jobs:
       name: autocommit
       with:
         commit_message: Apply Code Coverage Badge
-        skip_fetch: false
-        skip_checkout: false
+        skip_fetch: true
+        skip_checkout: true
         file_pattern: ./README.md
 
     - name: push
@@ -52,4 +48,4 @@ jobs:
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ github.token }}
-        branch: ${{ github.ref }}
+        branch: ${{ github.ref }}

.gitea/workflows/job_lint.yml

@@ -3,10 +3,10 @@ name: lint
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
+    branches:
+    - master
+    - v3
+    - v4
 
 jobs:
   lint:
@@ -24,6 +24,6 @@ jobs:
     - name: setup deps
       run: go get -v ./...
     - name: run lint
-      uses: golangci/golangci-lint-action@v6
+      uses: https://github.com/golangci/golangci-lint-action@v6
       with:
         version: 'latest'

.gitea/workflows/job_test.yml

@@ -3,12 +3,15 @@ name: test
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
+    branches:
+    - master
+    - v3
+    - v4
   push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
+    branches:
+    - master
+    - v3
+    - v4
 
 jobs:
   test:

.gitea/workflows/job_tests.yml

@@ -3,12 +3,15 @@ name: test
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
+    branches:
+    - master
+    - v3
+    - v4
   push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
+    branches:
+    - master
+    - v3
+    - v4
 
 jobs:
   test:
@@ -32,19 +35,19 @@ jobs:
         go-version: 'stable'
     - name: setup go work
       env:
-        GOWORK: ${{ github.workspace }}/go.work
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
       run: |
         go work init
         go work use .
         go work use micro-tests
     - name: setup deps
       env:
-        GOWORK: ${{ github.workspace }}/go.work
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
       run: go get -v ./...
     - name: run tests
       env:
         INTEGRATION_TESTS: yes
-        GOWORK: ${{ github.workspace }}/go.work
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
       run: |
         cd micro-tests
         go test -mod readonly -v ./... || true

.github/workflows/job_sync.yml

@@ -1,57 +0,0 @@
-name: sync
-
-on:
-  schedule:
-    - cron: '*/5 * * * *'
-#  push:
-#    branches: [ master, v3, v4 ]
-#    paths-ignore:
-#      - '.github/**'
-#      - '.gitea/**'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  sync:
-    if: github.server_url != 'https://github.com'
-    runs-on: ubuntu-latest
-    steps:
-    - name: init
-      run: |
-        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
-        git config --global user.name "github-actions[bot]"
-        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
-        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
-
-    - name: sync master
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
-        git merge upstream/master
-        git push upstream master --progress
-        git push origin master --progress
-        cd ../
-        rm -rf repo
-
-    - name: sync v3
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
-        git merge upstream/v3
-        git push upstream v3 --progress
-        git push origin v3 --progress
-        cd ../
-        rm -rf repo
-
-    - name: sync v4
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
-        git merge upstream/v4
-        git push upstream v4 --progress
-        git push origin v4 --progress
-        cd ../
-        rm -rf repo

.golangci.yml

@@ -1,5 +1,5 @@
 run:
   concurrency: 8
-  timeout: 5m
+  deadline: 5m
   issues-exit-code: 1
   tests: true

README.md

@@ -1,5 +1,5 @@
 # Micro
-![Coverage](https://img.shields.io/badge/Coverage-45.4%25-yellow)
+![Coverage](https://img.shields.io/badge/Coverage-44.3%25-yellow)
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go.unistack.org/micro/v4?tab=overview)
 [![Status](https://git.unistack.org/unistack-org/micro/actions/workflows/job_tests.yml/badge.svg?branch=v4)](https://git.unistack.org/unistack-org/micro/actions?query=workflow%3Abuild+branch%3Av4+event%3Apush)

SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 3.7.x   | :white_check_mark: |
+| < 3.7.0 | :x:                |
+
+## Reporting a Vulnerability
+
+If you find any issue, please create github issue in this repo

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
 	github.com/spf13/cast v1.7.1
-	github.com/stretchr/testify v1.10.0
 	go.uber.org/atomic v1.11.0
 	go.uber.org/automaxprocs v1.6.0
 	go.unistack.org/micro-proto/v4 v4.1.0
@@ -27,6 +26,7 @@ require (
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect

hooks/metadata/metadata.go

@@ -36,8 +36,8 @@ func NewClientCallWrapper(keys ...string) client.CallWrapper {
 					omd = metadata.New(len(imd))
 				}
 				for _, k := range keys {
-					if v := imd.Get(k); v != nil {
-						omd.Set(k, v...)
+					if v, ok := imd.Get(k); ok {
+						omd.Add(k, v...)
 					}
 				}
 				if !ook {
@@ -59,8 +59,8 @@ func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{},
 			omd = metadata.New(len(imd))
 		}
 		for _, k := range w.keys {
-			if v := imd.Get(k); v != nil {
-				omd.Set(k, v...)
+			if v, ok := imd.Get(k); ok {
+				omd.Add(k, v...)
 			}
 		}
 		if !ook {
@@ -80,8 +80,8 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client
 			omd = metadata.New(len(imd))
 		}
 		for _, k := range w.keys {
-			if v := imd.Get(k); v != nil {
-				omd.Set(k, v...)
+			if v, ok := imd.Get(k); ok {
+				omd.Add(k, v...)
 			}
 		}
 		if !ook {
@@ -103,8 +103,8 @@ func NewServerHandlerWrapper(keys ...string) server.HandlerWrapper {
 					omd = metadata.New(len(imd))
 				}
 				for _, k := range keys {
-					if v := imd.Get(k); v != nil {
-						omd.Set(k, v...)
+					if v, ok := imd.Get(k); ok {
+						omd.Add(k, v...)
 					}
 				}
 				if !ook {

hooks/requestid/requestid.go

@@ -38,16 +38,18 @@ var DefaultMetadataFunc = func(ctx context.Context) (context.Context, error) {
 
 	if xid == "" {
 		var ids []string
-
-		for i := range imd.Get(DefaultMetadataKey) {
-			if ids[i] != "" {
-				xid = ids[i]
+		if ids, iok = imd.Get(DefaultMetadataKey); iok {
+			for i := range ids {
+				if ids[i] != "" {
+					xid = ids[i]
+				}
 			}
 		}
-
-		for i := range omd.Get(DefaultMetadataKey) {
-			if ids[i] != "" {
-				xid = ids[i]
+		if ids, ook = omd.Get(DefaultMetadataKey); ook {
+			for i := range ids {
+				if ids[i] != "" {
+					xid = ids[i]
+				}
 			}
 		}
 	}

hooks/requestid/requestid_test.go

@@ -2,7 +2,6 @@ package requestid
 
 import (
 	"context"
-	"slices"
 	"testing"
 
 	"go.unistack.org/micro/v4/metadata"
@@ -25,10 +24,10 @@ func TestDefaultMetadataFunc(t *testing.T) {
 		t.Fatalf("md missing in outgoing context")
 	}
 
-	iv := imd.Get(DefaultMetadataKey)
-	ov := omd.Get(DefaultMetadataKey)
+	_, iok := imd.Get(DefaultMetadataKey)
+	_, ook := omd.Get(DefaultMetadataKey)
 
-	if !slices.Equal(iv, ov) {
-		t.Fatalf("missing metadata key value %v != %v", iv, ov)
+	if !iok || !ook {
+		t.Fatalf("missing metadata key value")
 	}
 }

logger/slog/slog_test.go

@@ -406,7 +406,7 @@ func TestLogger(t *testing.T) {
 func Test_WithContextAttrFunc(t *testing.T) {
 	loggerContextAttrFuncs := []logger.ContextAttrFunc{
 		func(ctx context.Context) []interface{} {
-			md, ok := metadata.FromOutgoingContext(ctx)
+			md, ok := metadata.FromIncomingContext(ctx)
 			if !ok {
 				return nil
 			}
@@ -425,7 +425,7 @@ func Test_WithContextAttrFunc(t *testing.T) {
 	logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs, loggerContextAttrFuncs...)
 
 	ctx := context.TODO()
-	ctx = metadata.AppendOutgoingContext(ctx, "X-Request-Id", uuid.New().String(),
+	ctx = metadata.AppendIncomingContext(ctx, "X-Request-Id", uuid.New().String(),
 		"Source-Service", "Test-System")
 
 	buf := bytes.NewBuffer(nil)
@@ -445,9 +445,9 @@ func Test_WithContextAttrFunc(t *testing.T) {
 		t.Fatalf("logger info, buf %s", buf.Bytes())
 	}
 	buf.Reset()
-	omd, _ := metadata.FromOutgoingContext(ctx)
+	imd, _ := metadata.FromIncomingContext(ctx)
 	l.Info(ctx, "test message1")
-	omd.Set("Source-Service", "Test-System2")
+	imd.Set("Source-Service", "Test-System2")
 	l.Info(ctx, "test message2")
 
 	// t.Logf("xxx %s", buf.Bytes())

metadata/metadata.go

@@ -69,15 +69,6 @@ func (md Metadata) Copy() Metadata {
 	return out
 }
 
-// AsMap returns a copy of Metadata with map[string]string.
-func (md Metadata) AsMap() map[string]string {
-	out := make(map[string]string, len(md))
-	for k, v := range md {
-		out[k] = strings.Join(v, ",")
-	}
-	return out
-}
-
 // AsHTTP1 returns a copy of Metadata
 // with CanonicalMIMEHeaderKey.
 func (md Metadata) AsHTTP1() map[string][]string {
@@ -106,31 +97,65 @@ func (md Metadata) CopyTo(out Metadata) {
 }
 
 // Get obtains the values for a given key.
-func (md Metadata) Get(k string) []string {
+func (md Metadata) MustGet(k string) []string {
+	v, ok := md.Get(k)
+	if !ok {
+		panic("missing metadata key")
+	}
+	return v
+}
+
+// Get obtains the values for a given key.
+func (md Metadata) Get(k string) ([]string, bool) {
 	v, ok := md[k]
 	if !ok {
 		v, ok = md[strings.ToLower(k)]
 	}
 	if !ok {
-		v = md[textproto.CanonicalMIMEHeaderKey(k)]
+		v, ok = md[textproto.CanonicalMIMEHeaderKey(k)]
+	}
+	return v, ok
+}
+
+// MustGetJoined obtains the values for a given key
+// with joined values with "," symbol
+func (md Metadata) MustGetJoined(k string) string {
+	v, ok := md.GetJoined(k)
+	if !ok {
+		panic("missing metadata key")
 	}
 	return v
 }
 
 // GetJoined obtains the values for a given key
 // with joined values with "," symbol
-func (md Metadata) GetJoined(k string) string {
-	return strings.Join(md.Get(k), ",")
+func (md Metadata) GetJoined(k string) (string, bool) {
+	v, ok := md.Get(k)
+	if !ok {
+		return "", ok
+	}
+	return strings.Join(v, ","), true
 }
 
 // Set sets the value of a given key with a slice of values.
-func (md Metadata) Set(key string, vals ...string) {
+func (md Metadata) Add(key string, vals ...string) {
 	if len(vals) == 0 {
 		return
 	}
 	md[key] = vals
 }
 
+// Set sets the value of a given key with a slice of values.
+func (md Metadata) Set(kvs ...string) {
+	if len(kvs)%2 == 1 {
+		panic(fmt.Sprintf("metadata: Set got an odd number of input pairs for metadata: %d", len(kvs)))
+	}
+
+	for i := 0; i < len(kvs); i += 2 {
+		md[kvs[i]] = append(md[kvs[i]], kvs[i+1])
+	}
+}
+
 // Append adds the values to key k, not overwriting what was already stored at
 // that key.
 func (md Metadata) Append(key string, vals ...string) {
@@ -207,6 +232,24 @@ func AppendContext(ctx context.Context, kv ...string) context.Context {
 	return context.WithValue(ctx, metadataCurrentKey{}, rawMetadata{md: md.md, added: added})
 }
 
+// AppendIncomingContext returns a new context with the provided kv merged
+// with any existing metadata in the context. Please refer to the documentation
+// of Pairs for a description of kv.
+func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
+	if len(kv)%2 == 1 {
+		panic(fmt.Sprintf("metadata: AppendIncomingContext got an odd number of input pairs for metadata: %d", len(kv)))
+	}
+	md, _ := ctx.Value(metadataIncomingKey{}).(rawMetadata)
+	added := make([][]string, len(md.added)+1)
+	copy(added, md.added)
+	kvCopy := make([]string, 0, len(kv))
+	for i := 0; i < len(kv); i += 2 {
+		kvCopy = append(kvCopy, strings.ToLower(kv[i]), kv[i+1])
+	}
+	added[len(added)-1] = kvCopy
+	return context.WithValue(ctx, metadataIncomingKey{}, rawMetadata{md: md.md, added: added})
+}
+
 // AppendOutgoingContext returns a new context with the provided kv merged
 // with any existing metadata in the context. Please refer to the documentation
 // of Pairs for a description of kv.

metadata/metadata_test.go

@@ -5,15 +5,6 @@ import (
 	"testing"
 )
 
-func TesSet(t *testing.T) {
-	md := Pairs("key1", "val1", "key2", "val2")
-	md.Set("key1", "val2", "val3")
-	v := md.GetJoined("X-Request-Id")
-	if v != "val2, val3" {
-		t.Fatal("set not works")
-	}
-}
-
 /*
 func TestAppendOutgoingContextModify(t *testing.T) {
 	md := Pairs("key1", "val1")
@@ -28,8 +19,8 @@ func TestAppendOutgoingContextModify(t *testing.T) {
 func TestLowercase(t *testing.T) {
 	md := New(1)
 	md["x-request-id"] = []string{"12345"}
-	v := md.GetJoined("X-Request-Id")
-	if v == "" {
+	v, ok := md.GetJoined("X-Request-Id")
+	if !ok || v == "" {
 		t.Fatalf("metadata invalid %#+v", md)
 	}
 }
@@ -56,9 +47,33 @@ func TestMultipleUsage(t *testing.T) {
 	_ = omd
 }
 
+func TestMetadataSetMultiple(t *testing.T) {
+	md := New(4)
+	md.Set("key1", "val1", "key2", "val2")
+
+	if v, ok := md.GetJoined("key1"); !ok || v != "val1" {
+		t.Fatalf("invalid kv %#+v", md)
+	}
+	if v, ok := md.GetJoined("key2"); !ok || v != "val2" {
+		t.Fatalf("invalid kv %#+v", md)
+	}
+}
+
+func TestAppend(t *testing.T) {
+	ctx := context.Background()
+	ctx = AppendIncomingContext(ctx, "key1", "val1", "key2", "val2")
+	md, ok := FromIncomingContext(ctx)
+	if !ok {
+		t.Fatal("metadata empty")
+	}
+	if _, ok := md.Get("key1"); !ok {
+		t.Fatal("key1 not found")
+	}
+}
+
 func TestPairs(t *testing.T) {
 	md := Pairs("key1", "val1", "key2", "val2")
-	if v := md.Get("key1"); v == nil {
+	if _, ok := md.Get("key1"); !ok {
 		t.Fatal("key1 not found")
 	}
 }
@@ -82,7 +97,7 @@ func TestPassing(t *testing.T) {
 	if !ok {
 		t.Fatalf("missing metadata from outgoing context")
 	}
-	if v := md.Get("Key1"); v == nil || v[0] != "Val1" {
+	if v, ok := md.Get("Key1"); !ok || v[0] != "Val1" {
 		t.Fatalf("invalid metadata value %#+v", md)
 	}
 }
@@ -112,21 +127,21 @@ func TestIterator(t *testing.T) {
 func TestMedataCanonicalKey(t *testing.T) {
 	md := New(1)
 	md.Set("x-request-id", "12345")
-	v := md.GetJoined("x-request-id")
-	if v == "" {
+	v, ok := md.GetJoined("x-request-id")
+	if !ok {
 		t.Fatalf("failed to get x-request-id")
 	} else if v != "12345" {
 		t.Fatalf("invalid metadata value: %s != %s", "12345", v)
 	}
 
-	v = md.GetJoined("X-Request-Id")
-	if v == "" {
+	v, ok = md.GetJoined("X-Request-Id")
+	if !ok {
 		t.Fatalf("failed to get x-request-id")
 	} else if v != "12345" {
 		t.Fatalf("invalid metadata value: %s != %s", "12345", v)
 	}
-	v = md.GetJoined("X-Request-ID")
-	if v == "" {
+	v, ok = md.GetJoined("X-Request-ID")
+	if !ok {
 		t.Fatalf("failed to get x-request-id")
 	} else if v != "12345" {
 		t.Fatalf("invalid metadata value: %s != %s", "12345", v)
@@ -138,8 +153,8 @@ func TestMetadataSet(t *testing.T) {
 
 	md.Set("Key", "val")
 
-	val := md.GetJoined("Key")
-	if val == "" {
+	val, ok := md.GetJoined("Key")
+	if !ok {
 		t.Fatal("key Key not found")
 	}
 	if val != "val" {
@@ -154,8 +169,8 @@ func TestMetadataDelete(t *testing.T) {
 	}
 
 	md.Del("Baz")
-	v := md.Get("Baz")
-	if v != nil {
+	_, ok := md.Get("Baz")
+	if ok {
 		t.Fatal("key Baz not deleted")
 	}
 }
@@ -254,6 +269,20 @@ func TestNewOutgoingContext(t *testing.T) {
 	}
 }
 
+func TestAppendIncomingContext(t *testing.T) {
+	md := New(1)
+	md.Set("key1", "val1")
+	ctx := AppendIncomingContext(context.TODO(), "key2", "val2")
+
+	nmd, ok := FromIncomingContext(ctx)
+	if nmd == nil || !ok {
+		t.Fatal("AppendIncomingContext not works")
+	}
+	if v, ok := nmd.GetJoined("key2"); !ok || v != "val2" {
+		t.Fatal("AppendIncomingContext not works")
+	}
+}
+
 func TestAppendOutgoingContext(t *testing.T) {
 	md := New(1)
 	md.Set("key1", "val1")
@@ -263,7 +292,7 @@ func TestAppendOutgoingContext(t *testing.T) {
 	if nmd == nil || !ok {
 		t.Fatal("AppendOutgoingContext not works")
 	}
-	if v := nmd.GetJoined("key2"); v != "val2" {
+	if v, ok := nmd.GetJoined("key2"); !ok || v != "val2" {
 		t.Fatal("AppendOutgoingContext not works")
 	}
 }

service.go

@@ -99,7 +99,6 @@ type service struct {
 	done chan struct{}
 	opts Options
 	sync.RWMutex
-	stopped bool
 }
 
 // NewService creates and returns a new Service based on the packages within.
@@ -425,7 +424,7 @@ func (s *service) Stop() error {
 		}
 	}
 
-	s.notifyShutdown()
+	close(s.done)
 
 	return nil
 }
@@ -449,23 +448,10 @@ func (s *service) Run() error {
 		return err
 	}
 
+	// wait on context cancel
 	<-s.done
 
-	return nil
-}
-
-// notifyShutdown marks the service as stopped and closes the done channel.
-// It ensures the channel is closed only once, preventing multiple closures.
-func (s *service) notifyShutdown() {
-	s.Lock()
-	if s.stopped {
-		s.Unlock()
-		return
-	}
-	s.stopped = true
-	s.Unlock()
-
-	close(s.done)
+	return s.Stop()
 }
 
 type Namer interface {

service_test.go

@@ -3,9 +3,7 @@ package micro
 import (
 	"reflect"
 	"testing"
-	"time"
 
-	"github.com/stretchr/testify/require"
 	"go.unistack.org/micro/v4/broker"
 	"go.unistack.org/micro/v4/client"
 	"go.unistack.org/micro/v4/config"
@@ -739,41 +737,3 @@ func Test_getNameIndex(t *testing.T) {
 	}
 }
 */
-
-func TestServiceShutdown(t *testing.T) {
-	defer func() {
-		if r := recover(); r != nil {
-			t.Fatalf("service shutdown failed: %v", r)
-		}
-	}()
-
-	s, ok := NewService().(*service)
-	require.NotNil(t, s)
-	require.True(t, ok)
-
-	require.NoError(t, s.Start())
-	require.False(t, s.stopped)
-
-	require.NoError(t, s.Stop())
-	require.True(t, s.stopped)
-}
-
-func TestServiceMultipleShutdowns(t *testing.T) {
-	defer func() {
-		if r := recover(); r != nil {
-			t.Fatalf("service shutdown failed: %v", r)
-		}
-	}()
-
-	s := NewService()
-
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		// first call
-		require.NoError(t, s.Stop())
-		// duplicate call
-		require.NoError(t, s.Stop())
-	}()
-
-	require.NoError(t, s.Run())
-}

util/reflect/struct.go

@@ -489,74 +489,35 @@ func URLMap(query string) (map[string]interface{}, error) {
 	return mp.(map[string]interface{}), nil
 }
 
-// FlattenMap flattens a nested map into a single-level map using dot notation for nested keys.
-// In case of key conflicts, all nested levels will be discarded in favor of the first-level key.
-//
-// Example #1:
-//
-//	Input:
-//	  {
-//	    "user.name": "alex",
-//	    "user.document.id": "document_id"
-//	    "user.document.number": "document_number"
-//	  }
-//	Output:
-//	  {
-//	    "user": {
-//	      "name": "alex",
-//	      "document": {
-//	        "id": "document_id"
-//	        "number": "document_number"
-//	      }
-//	    }
-//	  }
-//
-// Example #2 (with conflicts):
-//
-//	Input:
-//	  {
-//	    "user": "alex",
-//	    "user.document.id": "document_id"
-//	    "user.document.number": "document_number"
-//	  }
-//	Output:
-//	  {
-//	    "user": "alex"
-//	  }
-func FlattenMap(input map[string]interface{}) map[string]interface{} {
-	result := make(map[string]interface{})
-
-	for k, v := range input {
-		parts := strings.Split(k, ".")
-
-		if len(parts) == 1 {
-			result[k] = v
+// FlattenMap expand key.subkey to nested map
+func FlattenMap(a map[string]interface{}) map[string]interface{} {
+	// preprocess map
+	nb := make(map[string]interface{}, len(a))
+	for k, v := range a {
+		ps := strings.Split(k, ".")
+		if len(ps) == 1 {
+			nb[k] = v
 			continue
 		}
-
-		current := result
-
-		for i, part := range parts {
-			// last element in the path
-			if i == len(parts)-1 {
-				current[part] = v
-				break
-			}
-
-			// initialize map for current level if not exist
-			if _, ok := current[part]; !ok {
-				current[part] = make(map[string]interface{})
-			}
-
-			if nested, ok := current[part].(map[string]interface{}); ok {
-				current = nested // continue to the nested map
-			} else {
-				break // if current element is not a map, ignore it
+		em := make(map[string]interface{})
+		em[ps[len(ps)-1]] = v
+		for i := len(ps) - 2; i > 0; i-- {
+			nm := make(map[string]interface{})
+			nm[ps[i]] = em
+			em = nm
+		}
+		if vm, ok := nb[ps[0]]; ok {
+			// nested map
+			nm := vm.(map[string]interface{})
+			for vk, vv := range em {
+				nm[vk] = vv
 			}
+			nb[ps[0]] = nm
+		} else {
+			nb[ps[0]] = em
 		}
 	}
-
-	return result
+	return nb
 }
 
 /*

util/reflect/struct_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
 	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
@@ -320,140 +319,3 @@ func TestIsZero(t *testing.T) {
 
 	// t.Logf("XX %#+v\n", ok)
 }
-
-func TestFlattenMap(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    map[string]interface{}
-		expected map[string]interface{}
-	}{
-		{
-			name:     "empty map",
-			input:    map[string]interface{}{},
-			expected: map[string]interface{}{},
-		},
-		{
-			name:     "nil map",
-			input:    nil,
-			expected: map[string]interface{}{},
-		},
-		{
-			name: "single level",
-			input: map[string]interface{}{
-				"username": "username",
-				"password": "password",
-			},
-			expected: map[string]interface{}{
-				"username": "username",
-				"password": "password",
-			},
-		},
-		{
-			name: "two level",
-			input: map[string]interface{}{
-				"order_id":      "order_id",
-				"user.name":     "username",
-				"user.password": "password",
-			},
-			expected: map[string]interface{}{
-				"order_id": "order_id",
-				"user": map[string]interface{}{
-					"name":     "username",
-					"password": "password",
-				},
-			},
-		},
-		{
-			name: "three level",
-			input: map[string]interface{}{
-				"order_id":             "order_id",
-				"user.name":            "username",
-				"user.password":        "password",
-				"user.document.id":     "document_id",
-				"user.document.number": "document_number",
-			},
-			expected: map[string]interface{}{
-				"order_id": "order_id",
-				"user": map[string]interface{}{
-					"name":     "username",
-					"password": "password",
-					"document": map[string]interface{}{
-						"id":     "document_id",
-						"number": "document_number",
-					},
-				},
-			},
-		},
-		{
-			name: "four level",
-			input: map[string]interface{}{
-				"order_id":                    "order_id",
-				"user.name":                   "username",
-				"user.password":               "password",
-				"user.document.id":            "document_id",
-				"user.document.number":        "document_number",
-				"user.info.permissions.read":  "available",
-				"user.info.permissions.write": "available",
-			},
-			expected: map[string]interface{}{
-				"order_id": "order_id",
-				"user": map[string]interface{}{
-					"name":     "username",
-					"password": "password",
-					"document": map[string]interface{}{
-						"id":     "document_id",
-						"number": "document_number",
-					},
-					"info": map[string]interface{}{
-						"permissions": map[string]interface{}{
-							"read":  "available",
-							"write": "available",
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "key conflicts",
-			input: map[string]interface{}{
-				"user":          "user",
-				"user.name":     "username",
-				"user.password": "password",
-			},
-			expected: map[string]interface{}{
-				"user": "user",
-			},
-		},
-		{
-			name: "overwriting conflicts",
-			input: map[string]interface{}{
-				"order_id":             "order_id",
-				"user.document.id":     "document_id",
-				"user.document.number": "document_number",
-				"user.info.address":    "address",
-				"user.info.phone":      "phone",
-			},
-			expected: map[string]interface{}{
-				"order_id": "order_id",
-				"user": map[string]interface{}{
-					"document": map[string]interface{}{
-						"id":     "document_id",
-						"number": "document_number",
-					},
-					"info": map[string]interface{}{
-						"address": "address",
-						"phone":   "phone",
-					},
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			for range 100 { // need to exclude the impact of key order in the map on the test.
-				require.Equal(t, tt.expected, rutil.FlattenMap(tt.input))
-			}
-		})
-	}
-}