.gitea/workflows/job_lint.yml

@@ -1,29 +0,0 @@
-name: lint
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-    - name: setup deps
-      run: go get -v ./...
-    - name: run lint
-      uses: https://github.com/golangci/golangci-lint-action@v6
-      with:
-        version: 'latest'

.gitea/workflows/job_test.yml

@@ -1,34 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup deps
-      run: go get -v ./...
-    - name: run test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -1,53 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: checkout tests
-      uses: actions/checkout@v4
-      with:
-        ref: master
-        filter: 'blob:none'
-        repository: unistack-org/micro-tests
-        path: micro-tests
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup go work
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        go work init
-        go work use .
-        go work use micro-tests
-    - name: setup deps
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: go get -v ./...
-    - name: run tests
-      env:
-        INTEGRATION_TESTS: yes
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        cd micro-tests
-        go test -mod readonly -v ./... || true

.github/stale.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -ex
+
+export PATH=$PATH:$(pwd)/bin
+export GO111MODULE=on
+export GOBIN=$(pwd)/bin
+
+#go get github.com/rvflash/goup@v0.4.1
+
+#goup -v ./...
+#go get github.com/psampaz/go-mod-outdated@v0.6.0
+go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
+
+#go list -u -m -json all | go-mod-outdated -update

.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: build
+on:
+ push:
+    branches:
+    - master
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.15
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: cache
+      uses: actions/cache@v2
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: lint
+        uses: golangci/golangci-lint-action@v1
+        continue-on-error: true
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.github/workflows/pr.yml

@@ -0,0 +1,46 @@
+name: prbuild
+on:
+  pull_request:
+    branches:
+    - master
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.15
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: cache
+      uses: actions/cache@v2
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: lint
+        uses: golangci/golangci-lint-action@v1
+        continue-on-error: true
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.golangci.yml

@@ -1,44 +0,0 @@
-run:
-  concurrency: 4
-  deadline: 5m
-  issues-exit-code: 1
-  tests: true
-
-linters-settings:
-  govet:
-    check-shadowing: true
-    enable:
-      - fieldalignment
-
-linters:
-  enable:
-    - govet
-    - deadcode
-    - errcheck
-    - govet
-    - ineffassign
-    - staticcheck
-    - structcheck
-    - typecheck
-    - unused
-    - varcheck
-    - bodyclose
-    - gci
-    - goconst
-    - gocritic
-    - gosimple
-    - gofmt
-    - gofumpt
-    - goimports
-    - golint
-    - gosec
-    - makezero
-    - misspell
-    - nakedret
-    - nestif
-    - nilerr
-    - noctx
-    - prealloc
-    - unconvert
-    - unparam
-  disable-all: false

.synced

@@ -1 +0,0 @@
-0a6e451539fd046bbfea625b05ef2e3006c69214

LICENSE

@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2020 Unistack LLC.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

go.mod

@@ -1,367 +1,8 @@
-module go.unistack.org/micro-router-register/v3
+module github.com/unistack-org/micro-router-registry
 
-go 1.22.0
+go 1.15
-
-toolchain go1.23.4
-
-require go.unistack.org/micro/v3 v3.11.38
 
 require (
-	cel.dev/expr v0.16.2 // indirect
+	github.com/google/uuid v1.1.2
-	cloud.google.com/go v0.112.1 // indirect
+	github.com/unistack-org/micro/v3 v3.0.0-gamma.0.20200920124807-9b11ea527aeb
-	cloud.google.com/go/accessapproval v1.7.5 // indirect
-	cloud.google.com/go/accesscontextmanager v1.8.5 // indirect
-	cloud.google.com/go/aiplatform v1.60.0 // indirect
-	cloud.google.com/go/analytics v0.23.0 // indirect
-	cloud.google.com/go/apigateway v1.6.5 // indirect
-	cloud.google.com/go/apigeeconnect v1.6.5 // indirect
-	cloud.google.com/go/apigeeregistry v0.8.3 // indirect
-	cloud.google.com/go/apikeys v0.6.0 // indirect
-	cloud.google.com/go/appengine v1.8.5 // indirect
-	cloud.google.com/go/area120 v0.8.5 // indirect
-	cloud.google.com/go/artifactregistry v1.14.7 // indirect
-	cloud.google.com/go/asset v1.17.2 // indirect
-	cloud.google.com/go/assuredworkloads v1.11.5 // indirect
-	cloud.google.com/go/automl v1.13.5 // indirect
-	cloud.google.com/go/baremetalsolution v1.2.4 // indirect
-	cloud.google.com/go/batch v1.8.0 // indirect
-	cloud.google.com/go/beyondcorp v1.0.4 // indirect
-	cloud.google.com/go/bigquery v1.59.1 // indirect
-	cloud.google.com/go/billing v1.18.2 // indirect
-	cloud.google.com/go/binaryauthorization v1.8.1 // indirect
-	cloud.google.com/go/certificatemanager v1.7.5 // indirect
-	cloud.google.com/go/channel v1.17.5 // indirect
-	cloud.google.com/go/cloudbuild v1.15.1 // indirect
-	cloud.google.com/go/clouddms v1.7.4 // indirect
-	cloud.google.com/go/cloudtasks v1.12.6 // indirect
-	cloud.google.com/go/compute v1.25.1 // indirect
-	cloud.google.com/go/compute/metadata v0.5.2 // indirect
-	cloud.google.com/go/contactcenterinsights v1.13.0 // indirect
-	cloud.google.com/go/container v1.31.0 // indirect
-	cloud.google.com/go/containeranalysis v0.11.4 // indirect
-	cloud.google.com/go/datacatalog v1.19.3 // indirect
-	cloud.google.com/go/dataflow v0.9.5 // indirect
-	cloud.google.com/go/dataform v0.9.2 // indirect
-	cloud.google.com/go/datafusion v1.7.5 // indirect
-	cloud.google.com/go/datalabeling v0.8.5 // indirect
-	cloud.google.com/go/dataplex v1.14.2 // indirect
-	cloud.google.com/go/dataproc v1.12.0 // indirect
-	cloud.google.com/go/dataproc/v2 v2.4.0 // indirect
-	cloud.google.com/go/dataqna v0.8.5 // indirect
-	cloud.google.com/go/datastore v1.15.0 // indirect
-	cloud.google.com/go/datastream v1.10.4 // indirect
-	cloud.google.com/go/deploy v1.17.1 // indirect
-	cloud.google.com/go/dialogflow v1.49.0 // indirect
-	cloud.google.com/go/dlp v1.11.2 // indirect
-	cloud.google.com/go/documentai v1.25.0 // indirect
-	cloud.google.com/go/domains v0.9.5 // indirect
-	cloud.google.com/go/edgecontainer v1.1.5 // indirect
-	cloud.google.com/go/errorreporting v0.3.0 // indirect
-	cloud.google.com/go/essentialcontacts v1.6.6 // indirect
-	cloud.google.com/go/eventarc v1.13.4 // indirect
-	cloud.google.com/go/filestore v1.8.1 // indirect
-	cloud.google.com/go/firestore v1.14.0 // indirect
-	cloud.google.com/go/functions v1.16.0 // indirect
-	cloud.google.com/go/gaming v1.10.1 // indirect
-	cloud.google.com/go/gkebackup v1.3.5 // indirect
-	cloud.google.com/go/gkeconnect v0.8.5 // indirect
-	cloud.google.com/go/gkehub v0.14.5 // indirect
-	cloud.google.com/go/gkemulticloud v1.1.1 // indirect
-	cloud.google.com/go/grafeas v0.3.4 // indirect
-	cloud.google.com/go/gsuiteaddons v1.6.5 // indirect
-	cloud.google.com/go/iam v1.1.6 // indirect
-	cloud.google.com/go/iap v1.9.4 // indirect
-	cloud.google.com/go/ids v1.4.5 // indirect
-	cloud.google.com/go/iot v1.7.5 // indirect
-	cloud.google.com/go/kms v1.15.7 // indirect
-	cloud.google.com/go/language v1.12.3 // indirect
-	cloud.google.com/go/lifesciences v0.9.5 // indirect
-	cloud.google.com/go/logging v1.9.0 // indirect
-	cloud.google.com/go/longrunning v0.5.5 // indirect
-	cloud.google.com/go/managedidentities v1.6.5 // indirect
-	cloud.google.com/go/maps v1.6.4 // indirect
-	cloud.google.com/go/mediatranslation v0.8.5 // indirect
-	cloud.google.com/go/memcache v1.10.5 // indirect
-	cloud.google.com/go/metastore v1.13.4 // indirect
-	cloud.google.com/go/monitoring v1.18.0 // indirect
-	cloud.google.com/go/networkconnectivity v1.14.4 // indirect
-	cloud.google.com/go/networkmanagement v1.9.4 // indirect
-	cloud.google.com/go/networksecurity v0.9.5 // indirect
-	cloud.google.com/go/notebooks v1.11.3 // indirect
-	cloud.google.com/go/optimization v1.6.3 // indirect
-	cloud.google.com/go/orchestration v1.8.5 // indirect
-	cloud.google.com/go/orgpolicy v1.12.1 // indirect
-	cloud.google.com/go/osconfig v1.12.5 // indirect
-	cloud.google.com/go/oslogin v1.13.1 // indirect
-	cloud.google.com/go/phishingprotection v0.8.5 // indirect
-	cloud.google.com/go/policytroubleshooter v1.10.3 // indirect
-	cloud.google.com/go/privatecatalog v0.9.5 // indirect
-	cloud.google.com/go/pubsub v1.36.1 // indirect
-	cloud.google.com/go/pubsublite v1.8.1 // indirect
-	cloud.google.com/go/recaptchaenterprise v1.3.1 // indirect
-	cloud.google.com/go/recaptchaenterprise/v2 v2.9.2 // indirect
-	cloud.google.com/go/recommendationengine v0.8.5 // indirect
-	cloud.google.com/go/recommender v1.12.1 // indirect
-	cloud.google.com/go/redis v1.14.2 // indirect
-	cloud.google.com/go/resourcemanager v1.9.5 // indirect
-	cloud.google.com/go/resourcesettings v1.6.5 // indirect
-	cloud.google.com/go/retail v1.16.0 // indirect
-	cloud.google.com/go/run v1.3.4 // indirect
-	cloud.google.com/go/scheduler v1.10.6 // indirect
-	cloud.google.com/go/secretmanager v1.11.5 // indirect
-	cloud.google.com/go/security v1.15.5 // indirect
-	cloud.google.com/go/securitycenter v1.24.4 // indirect
-	cloud.google.com/go/servicecontrol v1.11.1 // indirect
-	cloud.google.com/go/servicedirectory v1.11.4 // indirect
-	cloud.google.com/go/servicemanagement v1.8.0 // indirect
-	cloud.google.com/go/serviceusage v1.6.0 // indirect
-	cloud.google.com/go/shell v1.7.5 // indirect
-	cloud.google.com/go/spanner v1.56.0 // indirect
-	cloud.google.com/go/speech v1.21.1 // indirect
-	cloud.google.com/go/storage v1.38.0 // indirect
-	cloud.google.com/go/storagetransfer v1.10.4 // indirect
-	cloud.google.com/go/talent v1.6.6 // indirect
-	cloud.google.com/go/texttospeech v1.7.5 // indirect
-	cloud.google.com/go/tpu v1.6.5 // indirect
-	cloud.google.com/go/trace v1.10.5 // indirect
-	cloud.google.com/go/translate v1.10.1 // indirect
-	cloud.google.com/go/video v1.20.4 // indirect
-	cloud.google.com/go/videointelligence v1.11.5 // indirect
-	cloud.google.com/go/vision v1.2.0 // indirect
-	cloud.google.com/go/vision/v2 v2.8.0 // indirect
-	cloud.google.com/go/vmmigration v1.7.5 // indirect
-	cloud.google.com/go/vmwareengine v1.1.1 // indirect
-	cloud.google.com/go/vpcaccess v1.7.5 // indirect
-	cloud.google.com/go/webrisk v1.9.5 // indirect
-	cloud.google.com/go/websecurityscanner v1.6.5 // indirect
-	cloud.google.com/go/workflows v1.12.4 // indirect
-	dario.cat/mergo v1.0.1 // indirect
-	dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 // indirect
-	gioui.org v0.0.0-20210308172011-57750fc8a0a6 // indirect
-	git.sr.ht/~sbinet/gg v0.3.1 // indirect
-	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 // indirect
-	github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.2 // indirect
-	github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
-	github.com/KimMachineGun/automemlimit v0.6.1 // indirect
-	github.com/OneOfOne/xxhash v1.2.2 // indirect
-	github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9 // indirect
-	github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 // indirect
-	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
-	github.com/alecthomas/assert/v2 v2.3.0 // indirect
-	github.com/alecthomas/participle/v2 v2.1.0 // indirect
-	github.com/alecthomas/repr v0.2.0 // indirect
-	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/antihax/optional v1.0.0 // indirect
-	github.com/apache/arrow/go/v10 v10.0.1 // indirect
-	github.com/apache/arrow/go/v11 v11.0.0 // indirect
-	github.com/apache/arrow/go/v12 v12.0.1 // indirect
-	github.com/apache/arrow/go/v14 v14.0.2 // indirect
-	github.com/apache/thrift v0.17.0 // indirect
-	github.com/ash3in/uuidv8 v1.2.0 // indirect
-	github.com/bazelbuild/rules_go v0.49.0 // indirect
-	github.com/boombuler/barcode v1.0.1 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/chzyer/logex v1.2.0 // indirect
-	github.com/chzyer/readline v1.5.0 // indirect
-	github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect
-	github.com/cilium/ebpf v0.16.0 // indirect
-	github.com/client9/misspell v0.3.4 // indirect
-	github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
-	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
-	github.com/containerd/cgroups/v3 v3.0.4 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/creack/pty v1.1.9 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/envoyproxy/go-control-plane v0.13.1 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
-	github.com/fatih/color v1.15.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/flowstack/go-jsonschema v0.1.1 // indirect
-	github.com/fogleman/gg v1.3.0 // indirect
-	github.com/frankban/quicktest v1.14.5 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-fonts/dejavu v0.1.0 // indirect
-	github.com/go-fonts/latin-modern v0.2.0 // indirect
-	github.com/go-fonts/liberation v0.2.0 // indirect
-	github.com/go-fonts/stix v0.1.0 // indirect
-	github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 // indirect
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 // indirect
-	github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-pdf/fpdf v0.6.0 // indirect
-	github.com/go-playground/assert/v2 v2.0.1 // indirect
-	github.com/go-playground/locales v0.13.0 // indirect
-	github.com/go-playground/universal-translator v0.17.0 // indirect
-	github.com/go-playground/validator/v10 v10.4.1 // indirect
-	github.com/go-quicktest/qt v1.101.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/goccy/go-yaml v1.11.0 // indirect
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/golang/glog v1.2.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/mock v1.7.0-rc.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/btree v1.0.0 // indirect
-	github.com/google/flatbuffers v23.5.26+incompatible // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9 // indirect
-	github.com/google/gofuzz v1.0.0 // indirect
-	github.com/google/martian v2.1.0+incompatible // indirect
-	github.com/google/martian/v3 v3.3.2 // indirect
-	github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
-	github.com/google/renameio v0.1.0 // indirect
-	github.com/google/s2a-go v0.1.7 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.2 // indirect
-	github.com/googleapis/go-type-adapters v1.0.0 // indirect
-	github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.1 // indirect
-	github.com/hexops/gotextdiff v1.0.3 // indirect
-	github.com/iancoleman/strcase v0.3.0 // indirect
-	github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
-	github.com/josharian/native v1.1.0 // indirect
-	github.com/jsimonetti/rtnetlink/v2 v2.0.1 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/jstemmer/go-junit-report v0.9.1 // indirect
-	github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 // indirect
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/kisielk/errcheck v1.5.0 // indirect
-	github.com/kisielk/gotool v1.0.0 // indirect
-	github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect
-	github.com/klauspost/asmfmt v1.3.2 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
-	github.com/kr/fs v0.1.0 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/kr/pty v1.1.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/leodido/go-urn v1.2.0 // indirect
-	github.com/lyft/protoc-gen-star v0.6.1 // indirect
-	github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4 // indirect
-	github.com/matoous/go-nanoid v1.5.1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-sqlite3 v1.14.16 // indirect
-	github.com/mdlayher/netlink v1.7.2 // indirect
-	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
-	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
-	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/opencontainers/runtime-spec v1.2.0 // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
-	github.com/phpdave11/gofpdf v1.4.2 // indirect
-	github.com/phpdave11/gofpdi v1.0.13 // indirect
-	github.com/pierrec/lz4/v4 v4.1.18 // indirect
-	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pkg/sftp v1.13.1 // indirect
-	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prashantv/gostub v1.1.0 // indirect
-	github.com/prometheus/client_model v0.6.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rogpeppe/fastuuid v1.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 // indirect
-	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 // indirect
-	github.com/spf13/afero v1.10.0 // indirect
-	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
-	github.com/substrait-io/substrait-go v0.4.2 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/yuin/goldmark v1.4.13 // indirect
-	github.com/zeebo/assert v1.3.0 // indirect
-	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.einride.tech/aip v0.66.0 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.31.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.31.0 // indirect
-	go.opentelemetry.io/otel/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/trace v1.31.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	go.uber.org/automaxprocs v1.6.0 // indirect
-	go.uber.org/goleak v1.3.0 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
-	golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
-	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.28.0 // indirect
-	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	gonum.org/v1/gonum v0.12.0 // indirect
-	gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 // indirect
-	gonum.org/v1/plot v0.10.1 // indirect
-	google.golang.org/api v0.169.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
-	google.golang.org/genproto/googleapis/bytestream v0.0.0-20240304161311-37d4d3c04a78 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
-	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 // indirect
-	google.golang.org/protobuf v1.36.3 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/errgo.v2 v2.1.0 // indirect
-	gopkg.in/yaml.v2 v2.2.3 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.5.1 // indirect
-	honnef.co/go/tools v0.1.3 // indirect
-	lukechampine.com/uint128 v1.3.0 // indirect
-	modernc.org/cc/v3 v3.40.0 // indirect
-	modernc.org/ccgo/v3 v3.16.13 // indirect
-	modernc.org/ccorpus v1.11.6 // indirect
-	modernc.org/httpfs v1.0.6 // indirect
-	modernc.org/libc v1.22.4 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
-	modernc.org/opt v0.1.3 // indirect
-	modernc.org/sqlite v1.21.2 // indirect
-	modernc.org/strutil v1.1.3 // indirect
-	modernc.org/tcl v1.15.1 // indirect
-	modernc.org/token v1.1.0 // indirect
-	modernc.org/z v1.7.0 // indirect
-	rsc.io/binaryregexp v0.2.0 // indirect
-	rsc.io/pdf v0.1.1 // indirect
-	rsc.io/quote/v3 v3.1.0 // indirect
-	rsc.io/sampler v1.3.0 // indirect
 )

registry.go

@@ -1,13 +1,13 @@
-package register // import "go.unistack.org/micro-router-register/v3"
+package registry
 
 import (
 	"fmt"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v3/logger"
+	"github.com/unistack-org/micro/v3/logger"
-	"go.unistack.org/micro/v3/register"
+	"github.com/unistack-org/micro/v3/registry"
-	"go.unistack.org/micro/v3/router"
+	"github.com/unistack-org/micro/v3/router"
 )
 
 var (
@@ -20,20 +20,27 @@ var (
 // rtr implements router interface
 type rtr struct {
 	sync.RWMutex
+
+	running  bool
 	table    *table
+	options  router.Options
 	exit     chan bool
 	initChan chan bool
-	opts     router.Options
-	running  bool
 }
 
 // NewRouter creates new router and returns it
 func NewRouter(opts ...router.Option) router.Router {
-	options := router.NewOptions(opts...)
+	// get default options
+	options := router.NewOptions()
+
+	// apply requested options
+	for _, o := range opts {
+		o(&options)
+	}
 
 	// construct the router
 	r := &rtr{
-		opts:     options,
+		options:  options,
 		initChan: make(chan bool),
 	}
 
@@ -50,16 +57,16 @@ func NewRouter(opts ...router.Option) router.Router {
 func (r *rtr) Init(opts ...router.Option) error {
 	r.Lock()
 	for _, o := range opts {
-		o(&r.opts)
+		o(&r.options)
 	}
 	r.Unlock()
 
-	if r.opts.Register == nil {
+	if r.options.Registry == nil {
-		return fmt.Errorf("register not set")
+		return fmt.Errorf("registry not set")
 	}
 
 	// push a message to the init chan so the watchers
-	// can reset in the case the register was changed
+	// can reset in the case the registry was changed
 	go func() {
 		r.initChan <- true
 	}()
@@ -72,7 +79,7 @@ func (r *rtr) Options() router.Options {
 	r.RLock()
 	defer r.RUnlock()
 
-	options := r.opts
+	options := r.options
 
 	return options
 }
@@ -84,18 +91,32 @@ func (r *rtr) Table() router.Table {
 	return r.table
 }
 
+func getDomain(srv *registry.Service) string {
+	// check the service metadata for domain
+	// TODO: domain as Domain field in registry?
+	if srv.Metadata != nil && len(srv.Metadata["domain"]) > 0 {
+		return srv.Metadata["domain"]
+	} else if len(srv.Nodes) > 0 && srv.Nodes[0].Metadata != nil {
+		return srv.Nodes[0].Metadata["domain"]
+	}
+
+	// otherwise return wildcard
+	// TODO: return GlobalDomain or PublicDomain
+	return registry.DefaultDomain
+}
+
 // manageRoute applies action on a given route
-func (r *rtr) manageRoute(route router.Route, action register.EventType) error {
+func (r *rtr) manageRoute(route router.Route, action string) error {
 	switch action {
-	case register.EventCreate:
+	case "create":
 		if err := r.table.Create(route); err != nil && err != router.ErrDuplicateRoute {
 			return fmt.Errorf("failed adding route for service %s: %s", route.Service, err)
 		}
-	case register.EventDelete:
+	case "delete":
 		if err := r.table.Delete(route); err != nil && err != router.ErrRouteNotFound {
 			return fmt.Errorf("failed deleting route for service %s: %s", route.Service, err)
 		}
-	case register.EventUpdate:
+	case "update":
 		if err := r.table.Update(route); err != nil {
 			return fmt.Errorf("failed updating route for service %s: %s", route.Service, err)
 		}
@@ -107,7 +128,7 @@ func (r *rtr) manageRoute(route router.Route, action register.EventType) error {
 }
 
 // createRoutes turns a service into a list routes basically converting nodes to routes
-func (r *rtr) createRoutes(service *register.Service) []router.Route {
+func (r *rtr) createRoutes(service *registry.Service, network string) []router.Route {
 	routes := make([]router.Route, 0, len(service.Nodes))
 
 	for _, node := range service.Nodes {
@@ -115,8 +136,8 @@ func (r *rtr) createRoutes(service *register.Service) []router.Route {
 			Service:  service.Name,
 			Address:  node.Address,
 			Gateway:  "",
-			Network:  service.Namespace,
+			Network:  network,
-			Router:   r.opts.ID,
+			Router:   r.options.Id,
 			Link:     router.DefaultLink,
 			Metric:   router.DefaultLocalMetric,
 			Metadata: node.Metadata,
@@ -128,23 +149,23 @@ func (r *rtr) createRoutes(service *register.Service) []router.Route {
 
 // manageServiceRoutes applies action to all routes of the service.
 // It returns error of the action fails with error.
-func (r *rtr) manageRoutes(service *register.Service, action register.EventType) error {
+func (r *rtr) manageRoutes(service *registry.Service, action, network string) error {
 	// create a set of routes from the service
-	routes := r.createRoutes(service)
+	routes := r.createRoutes(service, network)
 
 	// if its a delete action and there's no nodes
 	// it means we need to wipe out all the routes
 	// for that service
-	if action == register.EventDelete && len(routes) == 0 {
+	if action == "delete" && len(routes) == 0 {
 		// delete the service entirely
-		r.table.deleteService(service.Name, service.Namespace)
+		r.table.deleteService(service.Name, network)
 		return nil
 	}
 
 	// create the routes in the table
 	for _, route := range routes {
-		if r.opts.Logger.V(logger.TraceLevel) {
+		if logger.V(logger.TraceLevel) {
-			r.opts.Logger.Trace(r.opts.Context, "Creating route %v namespace: %v", route, service.Namespace)
+			logger.Tracef("Creating route %v domain: %v", route, network)
 		}
 		if err := r.manageRoute(route, action); err != nil {
 			return err
@@ -154,24 +175,26 @@ func (r *rtr) manageRoutes(service *register.Service, action register.EventType)
 	return nil
 }
 
-// manageRegisterRoutes applies action to all routes of each service found in the register.
+// manageRegistryRoutes applies action to all routes of each service found in the registry.
 // It returns error if either the services failed to be listed or the routing table action fails.
-func (r *rtr) loadRoutes(reg register.Register) error {
+func (r *rtr) loadRoutes(reg registry.Registry) error {
-	services, err := reg.ListServices(r.opts.Context, register.ListNamespace(register.WildcardNamespace))
+	services, err := reg.ListServices(registry.ListDomain(registry.WildcardDomain))
 	if err != nil {
 		return fmt.Errorf("failed listing services: %v", err)
 	}
 
 	// add each service node as a separate route
 	for _, service := range services {
+		// get the services domain from metadata. Fallback to wildcard.
+		domain := getDomain(service)
 
 		// create the routes
-		routes := r.createRoutes(service)
+		routes := r.createRoutes(service, domain)
 
 		// if the routes exist save them
 		if len(routes) > 0 {
-			if r.opts.Logger.V(logger.TraceLevel) {
+			if logger.V(logger.TraceLevel) {
-				r.opts.Logger.Trace(r.opts.Context, fmt.Sprintf("Creating routes for service %v", service))
+				logger.Tracef("Creating routes for service %v domain: %v", service, domain)
 			}
 			for _, rt := range routes {
 				err := r.table.Create(rt)
@@ -182,8 +205,8 @@ func (r *rtr) loadRoutes(reg register.Register) error {
 				}
 
 				if err != nil {
-					if r.opts.Logger.V(logger.ErrorLevel) {
+					if logger.V(logger.ErrorLevel) {
-						r.opts.Logger.Error(r.opts.Context, fmt.Sprintf("Error creating route for service %v: %v", service, err))
+						logger.Errorf("Error creating route for service %v in domain %v: %v", service, domain, err)
 					}
 				}
 			}
@@ -193,21 +216,21 @@ func (r *rtr) loadRoutes(reg register.Register) error {
 		// otherwise get all the service info
 
 		// get the service to retrieve all its info
-		srvs, err := reg.LookupService(r.opts.Context, service.Name, register.LookupNamespace(service.Namespace))
+		srvs, err := reg.GetService(service.Name, registry.GetDomain(domain))
 		if err != nil {
-			if r.opts.Logger.V(logger.TraceLevel) {
+			if logger.V(logger.TraceLevel) {
-				r.opts.Logger.Trace(r.opts.Context, fmt.Sprintf("Failed to get service %s", service.Name))
+				logger.Tracef("Failed to get service %s domain: %s", service.Name, domain)
 			}
 			continue
 		}
 
 		// manage the routes for all returned services
 		for _, srv := range srvs {
-			routes := r.createRoutes(srv)
+			routes := r.createRoutes(srv, domain)
 
 			if len(routes) > 0 {
-				if r.opts.Logger.V(logger.TraceLevel) {
+				if logger.V(logger.TraceLevel) {
-					r.opts.Logger.Trace(r.opts.Context, fmt.Sprintf("Creating routes for service %v", srv))
+					logger.Tracef("Creating routes for service %v domain: %v", srv, domain)
 				}
 				for _, rt := range routes {
 					err := r.table.Create(rt)
@@ -218,8 +241,8 @@ func (r *rtr) loadRoutes(reg register.Register) error {
 					}
 
 					if err != nil {
-						if r.opts.Logger.V(logger.ErrorLevel) {
+						if logger.V(logger.ErrorLevel) {
-							r.opts.Logger.Error(r.opts.Context, fmt.Sprintf("Error creating route for service %v: %v", service, err))
+							logger.Errorf("Error creating route for service %v in domain %v: %v", service, domain, err)
 						}
 					}
 				}
@@ -232,19 +255,19 @@ func (r *rtr) loadRoutes(reg register.Register) error {
 
 // lookup retrieves all the routes for a given service and creates them in the routing table
 func (r *rtr) lookup(service string) ([]router.Route, error) {
-	if r.opts.Logger.V(logger.TraceLevel) {
+	if logger.V(logger.TraceLevel) {
-		r.opts.Logger.Trace(r.opts.Context, fmt.Sprintf("Fetching route for %s domain: %v", service, register.WildcardNamespace))
+		logger.Tracef("Fetching route for %s domain: %v", service, registry.WildcardDomain)
 	}
 
-	services, err := r.opts.Register.LookupService(r.opts.Context, service, register.LookupNamespace(register.WildcardNamespace))
+	services, err := r.options.Registry.GetService(service, registry.GetDomain(registry.WildcardDomain))
-	if err == register.ErrNotFound {
+	if err == registry.ErrNotFound {
-		if r.opts.Logger.V(logger.TraceLevel) {
+		if logger.V(logger.TraceLevel) {
-			r.opts.Logger.Trace(r.opts.Context, fmt.Sprintf("Failed to find route for %s", service))
+			logger.Tracef("Failed to find route for %s", service)
 		}
 		return nil, router.ErrRouteNotFound
 	} else if err != nil {
-		if r.opts.Logger.V(logger.TraceLevel) {
+		if logger.V(logger.TraceLevel) {
-			r.opts.Logger.Trace(r.opts.Context, fmt.Sprintf("Failed to find route for %s: %v", service, err))
+			logger.Tracef("Failed to find route for %s: %v", service, err)
 		}
 		return nil, fmt.Errorf("failed getting services: %v", err)
 	}
@@ -252,17 +275,18 @@ func (r *rtr) lookup(service string) ([]router.Route, error) {
 	var routes []router.Route
 
 	for _, srv := range services {
+		domain := getDomain(srv)
 		// TODO: should we continue to send the event indicating we created a route?
 		// lookup is only called in the query path so probably not
-		routes = append(routes, r.createRoutes(srv)...)
+		routes = append(routes, r.createRoutes(srv, domain)...)
 	}
 
 	return routes, nil
 }
 
-// watchRegister watches register and updates routing table based on the received events.
+// watchRegistry watches registry and updates routing table based on the received events.
-// It returns error if either the register watcher fails with error or if the routing table update fails.
+// It returns error if either the registry watcher fails with error or if the routing table update fails.
-func (r *rtr) watchRegister(w register.Watcher) error {
+func (r *rtr) watchRegistry(w registry.Watcher) error {
 	exit := make(chan bool)
 
 	defer func() {
@@ -286,30 +310,29 @@ func (r *rtr) watchRegister(w register.Watcher) error {
 		// get the next service
 		res, err := w.Next()
 		if err != nil {
-			if err != register.ErrWatcherStopped {
+			if err != registry.ErrWatcherStopped {
 				return err
 			}
 			break
 		}
-		if res == nil {
-			continue
-		}
 
 		// don't process nil entries
 		if res.Service == nil {
-			if r.opts.Logger.V(logger.TraceLevel) {
+			if logger.V(logger.TraceLevel) {
-				r.opts.Logger.Trace(r.opts.Context, "Received a nil service")
+				logger.Trace("Received a nil service")
 			}
 			continue
 		}
 
-		if r.opts.Logger.V(logger.TraceLevel) {
+		if logger.V(logger.TraceLevel) {
-			r.opts.Logger.Trace(r.opts.Context, fmt.Sprintf("Router dealing with next route %s %+v", res.Action, res.Service))
+			logger.Tracef("Router dealing with next route %s %+v\n", res.Action, res.Service)
 		}
 
 		// get the services domain from metadata. Fallback to wildcard.
+		domain := getDomain(res.Service)
+
 		// create/update or delete the route
-		if err := r.manageRoutes(res.Service, res.Action); err != nil {
+		if err := r.manageRoutes(res.Service, res.Action, domain); err != nil {
 			return err
 		}
 	}
@@ -323,22 +346,22 @@ func (r *rtr) start() error {
 		return nil
 	}
 
-	if r.opts.Precache {
+	if r.options.Precache {
 		// add all local service routes into the routing table
-		if err := r.loadRoutes(r.opts.Register); err != nil {
+		if err := r.loadRoutes(r.options.Registry); err != nil {
-			return fmt.Errorf("failed loading register routes: %s", err)
+			return fmt.Errorf("failed loading registry routes: %s", err)
 		}
 	}
 
 	// add default gateway into routing table
-	if r.opts.Gateway != "" {
+	if r.options.Gateway != "" {
 		// note, the only non-default value is the gateway
 		route := router.Route{
 			Service: "*",
 			Address: "*",
-			Gateway: r.opts.Gateway,
+			Gateway: r.options.Gateway,
 			Network: "*",
-			Router:  r.opts.ID,
+			Router:  r.options.Id,
 			Link:    router.DefaultLink,
 			Metric:  router.DefaultLocalMetric,
 		}
@@ -365,10 +388,8 @@ func (r *rtr) start() error {
 			case <-t2.C:
 				r.table.pruneRoutes(RefreshInterval)
 			case <-t1.C:
-				if err := r.loadRoutes(r.opts.Register); err != nil {
+				if err := r.loadRoutes(r.options.Registry); err != nil {
-					if r.opts.Logger.V(logger.DebugLevel) {
+					logger.Debugf("failed refreshing registry routes: %s", err)
-						r.opts.Logger.Debug(r.opts.Context, fmt.Sprintf("failed refreshing register routes: %s", err))
-					}
 				}
 			}
 		}
@@ -380,22 +401,22 @@ func (r *rtr) start() error {
 			case <-r.exit:
 				return
 			default:
-				if r.opts.Logger.V(logger.TraceLevel) {
+				if logger.V(logger.TraceLevel) {
-					r.opts.Logger.Trace(r.opts.Context, "Router starting register watch")
+					logger.Tracef("Router starting registry watch")
 				}
-				w, err := r.opts.Register.Watch(r.opts.Context, register.WatchNamespace(register.WildcardNamespace))
+				w, err := r.options.Registry.Watch(registry.WatchDomain(registry.WildcardDomain))
 				if err != nil {
-					if r.opts.Logger.V(logger.DebugLevel) {
+					if logger.V(logger.DebugLevel) {
-						r.opts.Logger.Debug(r.opts.Context, fmt.Sprintf("failed creating register watcher: %v", err))
+						logger.Debugf("failed creating registry watcher: %v", err)
 					}
 					time.Sleep(time.Second)
 					continue
 				}
 
-				// watchRegister calls stop when it's done
+				// watchRegistry calls stop when it's done
-				if err := r.watchRegister(w); err != nil {
+				if err := r.watchRegistry(w); err != nil {
-					if r.opts.Logger.V(logger.DebugLevel) {
+					if logger.V(logger.DebugLevel) {
-						r.opts.Logger.Debug(r.opts.Context, fmt.Sprintf("Error watching the register: %v", err))
+						logger.Debugf("Error watching the registry: %v", err)
 					}
 					time.Sleep(time.Second)
 				}
@@ -440,9 +461,5 @@ func (r *rtr) Close() error {
 
 // String prints debugging information about router
 func (r *rtr) String() string {
-	return "register"
+	return "registry"
-}
-
-func (r *rtr) Name() string {
-	return r.opts.Name
 }

registry_test.go

@@ -1,19 +1,18 @@
-//go:build ignore
 // +build ignore
 
-package register
+package registry
 
 import (
 	"os"
 	"testing"
 
-	"go.unistack.org/micro/v3/register/memory"
+	"github.com/unistack-org/micro/v3/registry/memory"
-	"go.unistack.org/micro/v3/router"
+	"github.com/unistack-org/micro/v3/router"
 )
 
 func routerTestSetup() router.Router {
-	r := memory.NewRegister()
+	r := memory.NewRegistry()
-	return NewRouter(router.Register(r))
+	return NewRouter(router.Registry(r))
 }
 
 func TestRouterClose(t *testing.T) {

table.go

@@ -1,13 +1,12 @@
-package register
+package registry
 
 import (
-	"fmt"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v3/logger"
+	"github.com/google/uuid"
-	"go.unistack.org/micro/v3/router"
+	"github.com/unistack-org/micro/v3/logger"
-	"go.unistack.org/micro/v3/util/id"
+	"github.com/unistack-org/micro/v3/router"
 )
 
 // table is an in-memory routing table
@@ -19,12 +18,11 @@ type table struct {
 	routes map[string]map[uint64]*route
 	// watchers stores table watchers
 	watchers map[string]*tableWatcher
-	opts     router.Options
 }
 
 type route struct {
-	updated time.Time
 	route   router.Route
+	updated time.Time
 }
 
 // newtable creates a new routing table and returns it
@@ -33,7 +31,6 @@ func newTable(lookup func(string) ([]router.Route, error), opts ...router.Option
 		lookup:   lookup,
 		routes:   make(map[string]map[uint64]*route),
 		watchers: make(map[string]*tableWatcher),
-		opts:     router.NewOptions(opts...),
 	}
 }
 
@@ -97,8 +94,8 @@ func (t *table) sendEvent(e *router.Event) {
 	t.RLock()
 	defer t.RUnlock()
 
-	if len(e.ID) == 0 {
+	if len(e.Id) == 0 {
-		e.ID, _ = id.New()
+		e.Id = uuid.New().String()
 	}
 
 	for _, w := range t.watchers {
@@ -130,10 +127,10 @@ func (t *table) Create(r router.Route) error {
 	}
 
 	// create the route
-	t.routes[service][sum] = &route{updated: time.Now(), route: r}
+	t.routes[service][sum] = &route{r, time.Now()}
 
-	if t.opts.Logger.V(logger.DebugLevel) {
+	if logger.V(logger.DebugLevel) {
-		t.opts.Logger.Debug(t.opts.Context, fmt.Sprintf("Router emitting %s for route: %s", router.Create, r.Address))
+		logger.Debugf("Router emitting %s for route: %s", router.Create, r.Address)
 	}
 
 	// send a route created event
@@ -166,8 +163,8 @@ func (t *table) Delete(r router.Route) error {
 		delete(t.routes, service)
 	}
 
-	if t.opts.Logger.V(logger.DebugLevel) {
+	if logger.V(logger.DebugLevel) {
-		t.opts.Logger.Debug(t.opts.Context, fmt.Sprintf("Router emitting %s for route: %s", router.Delete, r.Address))
+		logger.Debugf("Router emitting %s for route: %s", router.Delete, r.Address)
 	}
 	go t.sendEvent(&router.Event{Type: router.Delete, Timestamp: time.Now(), Route: r})
 
@@ -189,17 +186,17 @@ func (t *table) Update(r router.Route) error {
 
 	if _, ok := t.routes[service][sum]; !ok {
 		// update the route
-		t.routes[service][sum] = &route{updated: time.Now(), route: r}
+		t.routes[service][sum] = &route{r, time.Now()}
 
-		if t.opts.Logger.V(logger.DebugLevel) {
+		if logger.V(logger.DebugLevel) {
-			t.opts.Logger.Debug(t.opts.Context, fmt.Sprintf("Router emitting %s for route: %s", router.Update, r.Address))
+			logger.Debugf("Router emitting %s for route: %s", router.Update, r.Address)
 		}
 		go t.sendEvent(&router.Event{Type: router.Update, Timestamp: time.Now(), Route: r})
 		return nil
 	}
 
 	// just update the route, but dont emit Update event
-	t.routes[service][sum] = &route{updated: time.Now(), route: r}
+	t.routes[service][sum] = &route{r, time.Now()}
 
 	return nil
 }
@@ -365,11 +362,11 @@ func (t *table) Watch(opts ...router.WatchOption) (router.Watcher, error) {
 	}
 
 	w := &tableWatcher{
+		id:      uuid.New().String(),
 		opts:    wopts,
 		resChan: make(chan *router.Event, 10),
 		done:    make(chan struct{}),
 	}
-	w.id, _ = id.New()
 
 	// when the watcher is stopped delete it
 	go func() {

table_test.go

@@ -1,13 +1,12 @@
-//go:build ignore
 // +build ignore
 
-package register
+package registry
 
 import (
 	"fmt"
 	"testing"
 
-	"go.unistack.org/micro/v3/router"
+	"github.com/unistack-org/micro/v3/router"
 )
 
 func testSetup(t *testing.T) (*table, router.Route) {
@@ -302,12 +301,13 @@ func TestQuery(t *testing.T) {
 }
 
 func TestFallback(t *testing.T) {
+
 	r := &rtr{
 		options: router.NewOptions(),
 	}
 	route := router.Route{
 		Service: "go.micro.service.foo",
-		Router:  r.options.ID,
+		Router:  r.options.Id,
 		Link:    router.DefaultLink,
 		Metric:  router.DefaultLocalMetric,
 	}
@@ -336,6 +336,7 @@ func TestFallback(t *testing.T) {
 	if len(rts) != 1 {
 		t.Fatalf("incorrect number of routes returned %d", len(rts))
 	}
+
 }
 
 func TestFallbackError(t *testing.T) {
@@ -350,4 +351,5 @@ func TestFallbackError(t *testing.T) {
 	if err == nil {
 		t.Fatalf("expected error looking up service but none returned")
 	}
+
 }

watcher.go

@@ -1,18 +1,18 @@
-package register
+package registry
 
 import (
 	"sync"
 
-	"go.unistack.org/micro/v3/router"
+	"github.com/unistack-org/micro/v3/router"
 )
 
 // tableWatcher implements routing table Watcher
 type tableWatcher struct {
 	sync.RWMutex
-	resChan chan *router.Event
-	done    chan struct{}
 	id      string
 	opts    router.WatchOptions
+	resChan chan *router.Event
+	done    chan struct{}
 }
 
 // Next returns the next noticed action taken on table