Compare commits
	
		
			1 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4e7a852b8b | 
							
								
								
									
										19
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,19 @@ | |||||||
|  | # To get started with Dependabot version updates, you'll need to specify which | ||||||
|  | # package ecosystems to update and where the package manifests are located. | ||||||
|  | # Please see the documentation for all configuration options: | ||||||
|  | # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates | ||||||
|  |  | ||||||
|  | version: 2 | ||||||
|  | updates: | ||||||
|  |  | ||||||
|  |   # Maintain dependencies for GitHub Actions | ||||||
|  |   - package-ecosystem: "github-actions" | ||||||
|  |     directory: "/" | ||||||
|  |     schedule: | ||||||
|  |       interval: "daily" | ||||||
|  |  | ||||||
|  |   # Maintain dependencies for Golang | ||||||
|  |   - package-ecosystem: "gomod" | ||||||
|  |     directory: "/" | ||||||
|  |     schedule: | ||||||
|  |       interval: "daily" | ||||||
							
								
								
									
										46
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -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@v2 | ||||||
|  |       with: | ||||||
|  |         go-version: 1.16 | ||||||
|  |     - 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@v2 | ||||||
|  |         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 | ||||||
							
								
								
									
										78
									
								
								.github/workflows/codeql-analysis.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										78
									
								
								.github/workflows/codeql-analysis.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,78 @@ | |||||||
|  | # For most projects, this workflow file will not need changing; you simply need | ||||||
|  | # to commit it to your repository. | ||||||
|  | # | ||||||
|  | # You may wish to alter this file to override the set of languages analyzed, | ||||||
|  | # or to provide custom queries or build logic. | ||||||
|  | # | ||||||
|  | # ******** NOTE ******** | ||||||
|  | # We have attempted to detect the languages in your repository. Please check | ||||||
|  | # the `language` matrix defined below to confirm you have the correct set of | ||||||
|  | # supported CodeQL languages. | ||||||
|  | # | ||||||
|  | name: "codeql" | ||||||
|  |  | ||||||
|  | on: | ||||||
|  |   workflow_run: | ||||||
|  |     workflows: ["prbuild"] | ||||||
|  |     types: | ||||||
|  |       - completed | ||||||
|  |   push: | ||||||
|  |     branches: [ master, v3 ] | ||||||
|  |   pull_request: | ||||||
|  |     # The branches below must be a subset of the branches above | ||||||
|  |     branches: [ master, v3 ] | ||||||
|  |   schedule: | ||||||
|  |     - cron: '34 1 * * 0' | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |   analyze: | ||||||
|  |     name: analyze | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     permissions: | ||||||
|  |       actions: read | ||||||
|  |       contents: read | ||||||
|  |       security-events: write | ||||||
|  |  | ||||||
|  |     strategy: | ||||||
|  |       fail-fast: false | ||||||
|  |       matrix: | ||||||
|  |         language: [ 'go' ] | ||||||
|  |         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] | ||||||
|  |         # Learn more: | ||||||
|  |         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed | ||||||
|  |  | ||||||
|  |     steps: | ||||||
|  |     - name: checkout | ||||||
|  |       uses: actions/checkout@v2 | ||||||
|  |     - name: setup | ||||||
|  |       uses: actions/setup-go@v2 | ||||||
|  |       with: | ||||||
|  |         go-version: 1.16 | ||||||
|  |     # Initializes the CodeQL tools for scanning. | ||||||
|  |     - name: init | ||||||
|  |       uses: github/codeql-action/init@v1 | ||||||
|  |       with: | ||||||
|  |         languages: ${{ matrix.language }} | ||||||
|  |         # If you wish to specify custom queries, you can do so here or in a config file. | ||||||
|  |         # By default, queries listed here will override any specified in a config file. | ||||||
|  |         # Prefix the list here with "+" to use these queries and those in the config file. | ||||||
|  |         # queries: ./path/to/local/query, your-org/your-repo/queries@main | ||||||
|  |  | ||||||
|  |     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java). | ||||||
|  |     # If this step fails, then you should remove it and run the build manually (see below) | ||||||
|  |     - name: autobuild | ||||||
|  |       uses: github/codeql-action/autobuild@v1 | ||||||
|  |  | ||||||
|  |     # ℹ️ Command-line programs to run using the OS shell. | ||||||
|  |     # 📚 https://git.io/JvXDl | ||||||
|  |  | ||||||
|  |     # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines | ||||||
|  |     #    and modify them (or add more) to build your code if your project | ||||||
|  |     #    uses a compiled language | ||||||
|  |  | ||||||
|  |     #- run: | | ||||||
|  |     #   make bootstrap | ||||||
|  |     #   make release | ||||||
|  |  | ||||||
|  |     - name: analyze | ||||||
|  |       uses: github/codeql-action/analyze@v1 | ||||||
							
								
								
									
										31
									
								
								.github/workflows/dependabot-automerge.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								.github/workflows/dependabot-automerge.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,31 @@ | |||||||
|  | name: "prautomerge" | ||||||
|  |  | ||||||
|  | on: | ||||||
|  |   pull_request_target: | ||||||
|  |     types: [assigned, opened, synchronize, reopened] | ||||||
|  |  | ||||||
|  | permissions: | ||||||
|  |   pull-requests: write | ||||||
|  |   contents: write | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |   dependabot: | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     if: ${{ github.actor == 'dependabot[bot]' }} | ||||||
|  |     steps: | ||||||
|  |       - name: metadata | ||||||
|  |         id: metadata | ||||||
|  |         uses: dependabot/fetch-metadata@v1.1.1 | ||||||
|  |         with: | ||||||
|  |           github-token: "${{ secrets.TOKEN }}" | ||||||
|  |       - name: approve | ||||||
|  |         run: gh pr review --approve "$PR_URL" | ||||||
|  |         env: | ||||||
|  |           PR_URL: ${{github.event.pull_request.html_url}} | ||||||
|  |           GITHUB_TOKEN: ${{secrets.TOKEN}} | ||||||
|  |       - name: merge | ||||||
|  |         if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}} | ||||||
|  |         run: gh pr merge --auto --merge "$PR_URL" | ||||||
|  |         env: | ||||||
|  |           PR_URL: ${{github.event.pull_request.html_url}} | ||||||
|  |           GITHUB_TOKEN: ${{secrets.TOKEN}} | ||||||
							
								
								
									
										53
									
								
								.github/workflows/job_coverage.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										53
									
								
								.github/workflows/job_coverage.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,53 +0,0 @@ | |||||||
| name: coverage |  | ||||||
|  |  | ||||||
| on: |  | ||||||
|   push: |  | ||||||
|     branches: [ main, v3, v4 ] |  | ||||||
|     paths-ignore: |  | ||||||
|       - '.github/**' |  | ||||||
|       - '.gitea/**' |  | ||||||
|   pull_request: |  | ||||||
|     branches: [ main, v3, v4 ] |  | ||||||
|  |  | ||||||
| jobs: |  | ||||||
|  |  | ||||||
|   build: |  | ||||||
|     if: github.server_url != 'https://github.com' |  | ||||||
|     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: test coverage |  | ||||||
|       run: | |  | ||||||
|         go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./... |  | ||||||
|         go tool cover -func coverage.out -o coverage.out |  | ||||||
|  |  | ||||||
|     - name: coverage badge |  | ||||||
|       uses: tj-actions/coverage-badge-go@v3 |  | ||||||
|       with: |  | ||||||
|         green: 80 |  | ||||||
|         filename: coverage.out |  | ||||||
|  |  | ||||||
|     - uses: stefanzweifel/git-auto-commit-action@v4 |  | ||||||
|       name: autocommit |  | ||||||
|       with: |  | ||||||
|         commit_message: Apply Code Coverage Badge |  | ||||||
|         skip_fetch: false |  | ||||||
|         skip_checkout: false |  | ||||||
|         file_pattern: ./README.md |  | ||||||
|  |  | ||||||
|     - name: push |  | ||||||
|       if: steps.auto-commit-action.outputs.changes_detected == 'true' |  | ||||||
|       uses: ad-m/github-push-action@master |  | ||||||
|       with: |  | ||||||
|         github_token: ${{ github.token }} |  | ||||||
|         branch: ${{ github.ref }} |  | ||||||
							
								
								
									
										29
									
								
								.github/workflows/job_lint.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										29
									
								
								.github/workflows/job_lint.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,29 +0,0 @@ | |||||||
| name: lint |  | ||||||
|  |  | ||||||
| on: |  | ||||||
|   pull_request: |  | ||||||
|     types: [opened, reopened, synchronize] |  | ||||||
|     branches: [ master, v3, v4 ] |  | ||||||
|     paths-ignore: |  | ||||||
|       - '.github/**' |  | ||||||
|       - '.gitea/**' |  | ||||||
|  |  | ||||||
| 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: golangci/golangci-lint-action@v6 |  | ||||||
|       with: |  | ||||||
|         version: 'latest' |  | ||||||
							
								
								
									
										94
									
								
								.github/workflows/job_sync.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										94
									
								
								.github/workflows/job_sync.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,94 +0,0 @@ | |||||||
| name: sync |  | ||||||
|  |  | ||||||
| on: |  | ||||||
|   schedule: |  | ||||||
|     - cron: '*/5 * * * *' |  | ||||||
|   # 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: check master |  | ||||||
|       id: check_master |  | ||||||
|       run: | |  | ||||||
|         src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/master | cut -f1) |  | ||||||
|         dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/master | cut -f1) |  | ||||||
|         echo "src_hash=$src_hash" |  | ||||||
|         echo "dst_hash=$dst_hash" |  | ||||||
|         if [ "$src_hash" != "$dst_hash" ]; then |  | ||||||
|           echo "sync_needed=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "sync_needed=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|  |  | ||||||
|     - name: sync master |  | ||||||
|       if: steps.check_master.outputs.sync_needed == 'true' |  | ||||||
|       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 pull --rebase upstream master |  | ||||||
|         git push upstream master --progress |  | ||||||
|         git push origin master --progress |  | ||||||
|         cd ../ |  | ||||||
|         rm -rf repo |  | ||||||
|  |  | ||||||
|     - name: check v3 |  | ||||||
|       id: check_v3 |  | ||||||
|       run: | |  | ||||||
|         src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1) |  | ||||||
|         dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1) |  | ||||||
|         echo "src_hash=$src_hash" |  | ||||||
|         echo "dst_hash=$dst_hash" |  | ||||||
|         if [ "$src_hash" != "$dst_hash" ]; then |  | ||||||
|           echo "sync_needed=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "sync_needed=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|  |  | ||||||
|     - name: sync v3 |  | ||||||
|       if: steps.check_v3.outputs.sync_needed == 'true' |  | ||||||
|       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 pull --rebase upstream v3 |  | ||||||
|         git push upstream v3 --progress |  | ||||||
|         git push origin v3 --progress |  | ||||||
|         cd ../ |  | ||||||
|         rm -rf repo |  | ||||||
|  |  | ||||||
|     - name: check v4 |  | ||||||
|       id: check_v4 |  | ||||||
|       run: | |  | ||||||
|         src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1) |  | ||||||
|         dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1) |  | ||||||
|         echo "src_hash=$src_hash" |  | ||||||
|         echo "dst_hash=$dst_hash" |  | ||||||
|         if [ "$src_hash" != "$dst_hash" ]; then |  | ||||||
|           echo "sync_needed=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "sync_needed=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|  |  | ||||||
|     - name: sync v4 |  | ||||||
|       if: steps.check_v4.outputs.sync_needed == 'true' |  | ||||||
|       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 pull --rebase upstream v4 |  | ||||||
|         git push upstream v4 --progress |  | ||||||
|         git push origin v4 --progress |  | ||||||
|         cd ../ |  | ||||||
|         rm -rf repo |  | ||||||
							
								
								
									
										31
									
								
								.github/workflows/job_test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										31
									
								
								.github/workflows/job_test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,31 +0,0 @@ | |||||||
| name: test |  | ||||||
|  |  | ||||||
| on: |  | ||||||
|   pull_request: |  | ||||||
|     types: [opened, reopened, synchronize] |  | ||||||
|     branches: [ master, v3, v4 ] |  | ||||||
|   push: |  | ||||||
|     branches: [ master, v3, v4 ] |  | ||||||
|     paths-ignore: |  | ||||||
|       - '.github/**' |  | ||||||
|       - '.gitea/**' |  | ||||||
|  |  | ||||||
| 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 ./... |  | ||||||
							
								
								
									
										50
									
								
								.github/workflows/job_tests.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										50
									
								
								.github/workflows/job_tests.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,50 +0,0 @@ | |||||||
| name: test |  | ||||||
|  |  | ||||||
| on: |  | ||||||
|   pull_request: |  | ||||||
|     types: [opened, reopened, synchronize] |  | ||||||
|     branches: [ master, v3, v4 ] |  | ||||||
|   push: |  | ||||||
|     branches: [ master, v3, v4 ] |  | ||||||
|     paths-ignore: |  | ||||||
|       - '.github/**' |  | ||||||
|       - '.gitea/**' |  | ||||||
|  |  | ||||||
| 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: ${{ github.workspace }}/go.work |  | ||||||
|       run: | |  | ||||||
|         go work init |  | ||||||
|         go work use . |  | ||||||
|         go work use micro-tests |  | ||||||
|     - name: setup deps |  | ||||||
|       env: |  | ||||||
|         GOWORK: ${{ github.workspace }}/go.work |  | ||||||
|       run: go get -v ./... |  | ||||||
|     - name: run tests |  | ||||||
|       env: |  | ||||||
|         INTEGRATION_TESTS: yes |  | ||||||
|         GOWORK: ${{ github.workspace }}/go.work |  | ||||||
|       run: | |  | ||||||
|         cd micro-tests |  | ||||||
|         go test -mod readonly -v ./... || true |  | ||||||
							
								
								
									
										46
									
								
								.github/workflows/pr.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								.github/workflows/pr.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -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@v2 | ||||||
|  |       with: | ||||||
|  |         go-version: 1.16 | ||||||
|  |     - 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@v2 | ||||||
|  |         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 | ||||||
| @@ -1,5 +0,0 @@ | |||||||
| run: |  | ||||||
|   concurrency: 8 |  | ||||||
|   timeout: 5m |  | ||||||
|   issues-exit-code: 1 |  | ||||||
|   tests: true |  | ||||||
| @@ -1,5 +1,4 @@ | |||||||
| # VictoriaMetrics | # VictoriaMetrics | ||||||
|  |  | ||||||
|  |  | ||||||
| Wrappers are a form of middleware that can be used with go-micro services. They can wrap both the Client and Server handlers.  | Wrappers are a form of middleware that can be used with go-micro services. They can wrap both the Client and Server handlers.  | ||||||
| This plugin implements the HandlerWrapper interface to provide automatic prometheus metric handling | This plugin implements the HandlerWrapper interface to provide automatic prometheus metric handling | ||||||
|   | |||||||
							
								
								
									
										23
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								go.mod
									
									
									
									
									
								
							| @@ -1,23 +1,8 @@ | |||||||
| module go.unistack.org/micro-meter-victoriametrics/v4 | module go.unistack.org/micro-meter-victoriametrics/v3 | ||||||
|  |  | ||||||
| go 1.24.0 | go 1.16 | ||||||
|  |  | ||||||
| toolchain go1.24.4 |  | ||||||
|  |  | ||||||
| require ( | require ( | ||||||
| 	github.com/VictoriaMetrics/metrics v1.40.2 | 	github.com/VictoriaMetrics/metrics v1.18.1 | ||||||
| 	go.unistack.org/micro/v4 v4.1.22 | 	go.unistack.org/micro/v3 v3.8.21 | ||||||
| ) |  | ||||||
|  |  | ||||||
| require ( |  | ||||||
| 	github.com/google/uuid v1.6.0 // indirect |  | ||||||
| 	github.com/matoous/go-nanoid v1.5.1 // indirect |  | ||||||
| 	github.com/spf13/cast v1.8.0 // indirect |  | ||||||
| 	github.com/valyala/fastrand v1.1.0 // indirect |  | ||||||
| 	github.com/valyala/histogram v1.2.0 // indirect |  | ||||||
| 	go.unistack.org/micro-proto/v4 v4.1.0 // indirect |  | ||||||
| 	golang.org/x/sys v0.37.0 // indirect |  | ||||||
| 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect |  | ||||||
| 	google.golang.org/grpc v1.72.0 // indirect |  | ||||||
| 	google.golang.org/protobuf v1.36.6 // indirect |  | ||||||
| ) | ) | ||||||
|   | |||||||
							
								
								
									
										198
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										198
									
								
								go.sum
									
									
									
									
									
								
							| @@ -1,48 +1,158 @@ | |||||||
| github.com/VictoriaMetrics/metrics v1.40.2 h1:OVSjKcQEx6JAwGeu8/KQm9Su5qJ72TMEW4xYn5vw3Ac= | cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= | ||||||
| github.com/VictoriaMetrics/metrics v1.40.2/go.mod h1:XE4uudAAIRaJE614Tl5HMrtoEU6+GDZO4QTnNSsZRuA= | cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= | ||||||
| github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= | github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= | ||||||
| github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= | ||||||
| github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= | github.com/VictoriaMetrics/metrics v1.18.1 h1:OZ0+kTTto8oPfHnVAnTOoyl0XlRhRkoQrD2n2cOuRw0= | ||||||
| github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= | github.com/VictoriaMetrics/metrics v1.18.1/go.mod h1:ArjwVz7WpgpegX/JpB0zpNF2h2232kErkEnzH1sxMmA= | ||||||
| github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= | github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= | ||||||
| github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= | github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= | ||||||
| github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= | github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= | ||||||
| github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= | github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= | ||||||
| github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= | github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= | ||||||
| github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= | ||||||
| github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= | github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= | ||||||
| github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= | github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= | ||||||
| github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
| github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
| github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4= | github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= | ||||||
| github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U= | github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg= | ||||||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= | github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= | ||||||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= | ||||||
| github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= | github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= | ||||||
| github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= | github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= | ||||||
| github.com/spf13/cast v1.8.0 h1:gEN9K4b8Xws4EX0+a0reLmhq8moKn7ntRlQYgjPeCDk= | github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= | ||||||
| github.com/spf13/cast v1.8.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= | github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= | ||||||
| github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= | github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= | ||||||
| github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= | github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= | ||||||
|  | github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= | ||||||
|  | github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= | ||||||
|  | github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= | ||||||
|  | github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | ||||||
|  | github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | ||||||
|  | github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= | ||||||
|  | github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= | ||||||
|  | github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= | ||||||
|  | github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= | ||||||
|  | github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= | ||||||
|  | github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= | ||||||
|  | github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= | ||||||
|  | github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= | ||||||
|  | github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= | ||||||
|  | github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= | ||||||
|  | github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= | ||||||
|  | github.com/google/gnostic v0.6.6/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= | ||||||
|  | github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= | ||||||
|  | github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= | ||||||
|  | github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= | ||||||
|  | github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | ||||||
|  | github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | ||||||
|  | github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= | ||||||
|  | github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | ||||||
|  | github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||||
|  | github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= | ||||||
|  | github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= | ||||||
|  | github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= | ||||||
|  | github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | ||||||
|  | github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||||||
|  | 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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||||
|  | github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= | ||||||
|  | github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= | ||||||
|  | github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= | ||||||
|  | github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= | ||||||
|  | github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= | ||||||
|  | github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||||
|  | github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= | ||||||
|  | github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= | ||||||
| github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8= | github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8= | ||||||
| github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ= | github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ= | ||||||
| github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ= | github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ= | ||||||
| github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY= | github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY= | ||||||
| go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk= | github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= | ||||||
| go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec= | github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= | ||||||
| go.unistack.org/micro/v4 v4.1.22 h1:CBRwTxj53gtFkQKyzUeoIad9LyyJaMCJDcsmzUwXHdI= | github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= | ||||||
| go.unistack.org/micro/v4 v4.1.22/go.mod h1:nlBXTbx0rQrSZX4HPp2m57PHmpuGPWUd0O+jpUIiPto= | go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= | ||||||
| golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= | go.unistack.org/micro-proto/v3 v3.2.1 h1:z7+V97LcAwMbBiYStmf8b6fFk2UPJTzni+rxNqk4NrI= | ||||||
| golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= | go.unistack.org/micro-proto/v3 v3.2.1/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM= | ||||||
| golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= | go.unistack.org/micro/v3 v3.8.21 h1:8vYxtIlPnCBZ888BrQSP6+b0CFQcn5FiaqDpI5XqorQ= | ||||||
| golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= | go.unistack.org/micro/v3 v3.8.21/go.mod h1:aBOCQ6SkAwKMRI7Q1CIsQA2S88ibyJfweJZlT1M2qpE= | ||||||
| golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= | golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||||
| golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= | golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a h1:51aaUVRocpvUOSQKM6Q7VuoaktNIaMCLuhZB6DKksq4= | golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= | ||||||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a/go.mod h1:uRxBH1mhmO8PGhU89cMcHaXKZqO+OfakD8QQO0oYwlQ= | golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | ||||||
| google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM= | golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= | ||||||
| google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= | golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= | ||||||
| google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= | golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | ||||||
| google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= | golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | ||||||
| gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | ||||||
| gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | ||||||
|  | golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||||
|  | golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||||
|  | golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= | ||||||
|  | golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= | ||||||
|  | golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | ||||||
|  | golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | ||||||
|  | golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= | ||||||
|  | golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | ||||||
|  | golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
|  | golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
|  | golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
|  | golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
|  | golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||||
|  | golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||||
|  | golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
|  | golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
|  | golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
|  | golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
|  | golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
|  | golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
|  | golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||||||
|  | golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||||
|  | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
|  | golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
|  | golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
|  | golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||||
|  | golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||||
|  | golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= | ||||||
|  | golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= | ||||||
|  | golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= | ||||||
|  | golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||||
|  | golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= | ||||||
|  | golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||||
|  | google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= | ||||||
|  | google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | ||||||
|  | google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= | ||||||
|  | google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= | ||||||
|  | google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= | ||||||
|  | google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= | ||||||
|  | google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= | ||||||
|  | google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= | ||||||
|  | google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= | ||||||
|  | google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= | ||||||
|  | google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= | ||||||
|  | google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= | ||||||
|  | google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= | ||||||
|  | google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= | ||||||
|  | google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= | ||||||
|  | google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= | ||||||
|  | google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= | ||||||
|  | google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= | ||||||
|  | google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= | ||||||
|  | google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= | ||||||
|  | google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= | ||||||
|  | google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= | ||||||
|  | google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= | ||||||
|  | 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.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= | ||||||
|  | google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= | ||||||
|  | gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||||
|  | gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||||
|  | gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||||
|  | gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||||
|  | gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||||
|  | gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||||
|  | gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||||
|  | honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | ||||||
|  | honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | ||||||
|   | |||||||
| @@ -5,44 +5,35 @@ import ( | |||||||
| 	"time" | 	"time" | ||||||
|  |  | ||||||
| 	"github.com/VictoriaMetrics/metrics" | 	"github.com/VictoriaMetrics/metrics" | ||||||
| 	"go.unistack.org/micro/v4/meter" | 	"go.unistack.org/micro/v3/meter" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| type victoriametricsMeter struct { | type victoriametricsMeter struct { | ||||||
| 	set              *metrics.Set | 	set  *metrics.Set | ||||||
| 	opts             meter.Options | 	opts meter.Options | ||||||
| 	prometheusCompat bool |  | ||||||
| } | } | ||||||
|  |  | ||||||
| func NewMeter(opts ...meter.Option) meter.Meter { | func NewMeter(opts ...meter.Option) meter.Meter { | ||||||
| 	m := &victoriametricsMeter{set: metrics.NewSet(), opts: meter.NewOptions(opts...)} | 	return &victoriametricsMeter{set: metrics.NewSet(), opts: meter.NewOptions(opts...)} | ||||||
| 	if v, ok := m.opts.Context.Value(prometheusCompatKey{}).(bool); ok && v { |  | ||||||
| 		m.prometheusCompat = v |  | ||||||
| 	} |  | ||||||
| 	return m |  | ||||||
| } | } | ||||||
|  |  | ||||||
| func (r *victoriametricsMeter) Name() string { | func (r *victoriametricsMeter) Name() string { | ||||||
| 	return r.opts.Name | 	return r.opts.Name | ||||||
| } | } | ||||||
|  |  | ||||||
| func (r *victoriametricsMeter) Unregister(name string, labels ...string) bool { |  | ||||||
| 	return r.set.UnregisterMetric(r.buildName(name, labels...)) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (r *victoriametricsMeter) Clone(opts ...meter.Option) meter.Meter { | func (r *victoriametricsMeter) Clone(opts ...meter.Option) meter.Meter { | ||||||
| 	options := r.opts | 	options := r.opts | ||||||
| 	for _, o := range opts { | 	for _, o := range opts { | ||||||
| 		o(&options) | 		o(&options) | ||||||
| 	} | 	} | ||||||
| 	m := &victoriametricsMeter{set: r.set, opts: options} | 	return &victoriametricsMeter{set: r.set, opts: options} | ||||||
| 	if v, ok := m.opts.Context.Value(prometheusCompatKey{}).(bool); ok && v { |  | ||||||
| 		m.prometheusCompat = v |  | ||||||
| 	} |  | ||||||
| 	return m |  | ||||||
| } | } | ||||||
|  |  | ||||||
| func (r *victoriametricsMeter) buildName(name string, labels ...string) string { | func (r *victoriametricsMeter) buildName(name string, labels ...string) string { | ||||||
|  | 	if len(r.opts.MetricPrefix) > 0 { | ||||||
|  | 		name = r.opts.MetricPrefix + name | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	nl := len(r.opts.Labels) + len(labels) | 	nl := len(r.opts.Labels) + len(labels) | ||||||
| 	if nl == 0 { | 	if nl == 0 { | ||||||
| 		return name | 		return name | ||||||
| @@ -52,6 +43,14 @@ func (r *victoriametricsMeter) buildName(name string, labels ...string) string { | |||||||
| 	nlabels = append(nlabels, r.opts.Labels...) | 	nlabels = append(nlabels, r.opts.Labels...) | ||||||
| 	nlabels = append(nlabels, labels...) | 	nlabels = append(nlabels, labels...) | ||||||
|  |  | ||||||
|  | 	if len(r.opts.LabelPrefix) == 0 { | ||||||
|  | 		return meter.BuildName(name, nlabels...) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	for idx := 0; idx < nl; idx++ { | ||||||
|  | 		nlabels[idx] = r.opts.LabelPrefix + nlabels[idx] | ||||||
|  | 		idx++ | ||||||
|  | 	} | ||||||
| 	return meter.BuildName(name, nlabels...) | 	return meter.BuildName(name, nlabels...) | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -68,9 +67,6 @@ func (r *victoriametricsMeter) Gauge(name string, f func() float64, labels ...st | |||||||
| } | } | ||||||
|  |  | ||||||
| func (r *victoriametricsMeter) Histogram(name string, labels ...string) meter.Histogram { | func (r *victoriametricsMeter) Histogram(name string, labels ...string) meter.Histogram { | ||||||
| 	if r.prometheusCompat { |  | ||||||
| 		return r.set.GetOrCreatePrometheusHistogram(r.buildName(name, labels...)) |  | ||||||
| 	} |  | ||||||
| 	return r.set.GetOrCreateHistogram(r.buildName(name, labels...)) | 	return r.set.GetOrCreateHistogram(r.buildName(name, labels...)) | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -83,7 +79,7 @@ func (r *victoriametricsMeter) SummaryExt(name string, window time.Duration, qua | |||||||
| } | } | ||||||
|  |  | ||||||
| func (r *victoriametricsMeter) Set(opts ...meter.Option) meter.Meter { | func (r *victoriametricsMeter) Set(opts ...meter.Option) meter.Meter { | ||||||
| 	m := &victoriametricsMeter{opts: r.opts, prometheusCompat: r.prometheusCompat} | 	m := &victoriametricsMeter{opts: r.opts} | ||||||
| 	for _, o := range opts { | 	for _, o := range opts { | ||||||
| 		o(&m.opts) | 		o(&m.opts) | ||||||
| 	} | 	} | ||||||
| @@ -95,9 +91,7 @@ func (r *victoriametricsMeter) Init(opts ...meter.Option) error { | |||||||
| 	for _, o := range opts { | 	for _, o := range opts { | ||||||
| 		o(&r.opts) | 		o(&r.opts) | ||||||
| 	} | 	} | ||||||
| 	if v, ok := r.opts.Context.Value(prometheusCompatKey{}).(bool); ok && v { |  | ||||||
| 		r.prometheusCompat = v |  | ||||||
| 	} |  | ||||||
| 	return nil | 	return nil | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -124,9 +118,3 @@ func (r *victoriametricsMeter) Options() meter.Options { | |||||||
| func (r *victoriametricsMeter) String() string { | func (r *victoriametricsMeter) String() string { | ||||||
| 	return "victoriametrics" | 	return "victoriametrics" | ||||||
| } | } | ||||||
|  |  | ||||||
| type prometheusCompatKey struct{} |  | ||||||
|  |  | ||||||
| func PrometheusCompat(b bool) meter.Option { |  | ||||||
| 	return meter.SetOption(prometheusCompatKey{}, b) |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -5,29 +5,17 @@ import ( | |||||||
| 	"context" | 	"context" | ||||||
| 	"testing" | 	"testing" | ||||||
|  |  | ||||||
| 	"go.unistack.org/micro/v4/client" | 	"go.unistack.org/micro/v3/client" | ||||||
| 	"go.unistack.org/micro/v4/codec" | 	"go.unistack.org/micro/v3/codec" | ||||||
| 	"go.unistack.org/micro/v4/meter" | 	"go.unistack.org/micro/v3/meter" | ||||||
|  | 	"go.unistack.org/micro/v3/meter/wrapper" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| func BenchmarkBuildName(b *testing.B) { |  | ||||||
| 	m := NewMeter(meter.Labels("pod", "xxx")) |  | ||||||
| 	if err := m.Init(); err != nil { |  | ||||||
| 		b.Fatal(err) |  | ||||||
| 	} |  | ||||||
| 	im := m.(*victoriametricsMeter) |  | ||||||
| 	b.ResetTimer() |  | ||||||
| 	for i := 0; i < b.N; i++ { |  | ||||||
| 		name := im.buildName("micro_foo", "bar", "baz", "aaa", "b", "ccc", "d") |  | ||||||
| 		_ = name |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func TestBuildName(t *testing.T) { | func TestBuildName(t *testing.T) { | ||||||
| 	m := NewMeter() | 	m := NewMeter() | ||||||
| 	im := m.(*victoriametricsMeter) | 	im := m.(*victoriametricsMeter) | ||||||
| 	check := `micro_foo{bar="baz",aaa="b",ccc="d"}` | 	check := `micro_foo{micro_aaa="b",micro_bar="baz",micro_ccc="d"}` | ||||||
| 	name := im.buildName("micro_foo", "bar", "baz", "aaa", "b", "ccc", "d") | 	name := im.buildName("foo", "bar", "baz", "aaa", "b", "ccc", "d") | ||||||
| 	if name != check { | 	if name != check { | ||||||
| 		t.Fatalf("metric name error: %s != %s", name, check) | 		t.Fatalf("metric name error: %s != %s", name, check) | ||||||
| 	} | 	} | ||||||
| @@ -37,13 +25,18 @@ func TestBuildName(t *testing.T) { | |||||||
| } | } | ||||||
|  |  | ||||||
| func TestWrapper(t *testing.T) { | func TestWrapper(t *testing.T) { | ||||||
| 	m := NewMeter() | 	m := NewMeter() // meter.Labels("test_key", "test_val")) | ||||||
| 	if err := m.Init(); err != nil { |  | ||||||
| 		t.Fatal(err) | 	w := wrapper.NewClientWrapper( | ||||||
| 	} | 		wrapper.ServiceName("svc1"), | ||||||
|  | 		wrapper.ServiceVersion("0.0.1"), | ||||||
|  | 		wrapper.ServiceID("12345"), | ||||||
|  | 		wrapper.Meter(m), | ||||||
|  | 	) | ||||||
|  |  | ||||||
| 	ctx := context.Background() | 	ctx := context.Background() | ||||||
|  |  | ||||||
| 	c := client.NewClient(client.Meter(m)) | 	c := client.NewClient(client.Wrap(w)) | ||||||
| 	if err := c.Init(); err != nil { | 	if err := c.Init(); err != nil { | ||||||
| 		t.Fatal(err) | 		t.Fatal(err) | ||||||
| 	} | 	} | ||||||
| @@ -53,7 +46,7 @@ func TestWrapper(t *testing.T) { | |||||||
| 	_, _ = rsp, err | 	_, _ = rsp, err | ||||||
| 	buf := bytes.NewBuffer(nil) | 	buf := bytes.NewBuffer(nil) | ||||||
| 	_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false)) | 	_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false)) | ||||||
| 	if !bytes.Contains(buf.Bytes(), []byte(`micro_client_request_total{endpoint="Service.Method",status="failure",code="500"} 1`)) { | 	if !bytes.Contains(buf.Bytes(), []byte(`micro_client_request_inflight{micro_endpoint="svc2.Service.Method"} 0`)) { | ||||||
| 		t.Fatalf("invalid metrics output: %s", buf.Bytes()) | 		t.Fatalf("invalid metrics output: %s", buf.Bytes()) | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user