Compare commits

..

25 Commits

Author SHA1 Message Date
9294657af5 add tracer enabled status
All checks were successful
coverage / build (push) Successful in 1m39s
test / test (push) Successful in 4m22s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-05-19 09:42:51 +03:00
979dde6c24 [v4] update ci (#58)
All checks were successful
coverage / build (push) Successful in 1m12s
test / test (push) Successful in 3m25s
sync / sync (push) Successful in 7s
* update ci

* fix linters

* added commit hash check to avoid unnecessary repository cloning
2025-05-05 19:18:54 +03:00
vtolstov
6cd278a495 Apply Code Coverage Badge 2025-04-27 18:52:33 +00:00
e51f37d856 improve sync
All checks were successful
coverage / build (push) Successful in 3m30s
test / test (push) Successful in 9m18s
sync / sync (push) Successful in 4m2s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-04-27 21:39:42 +03:00
c7b11e6691 fixup for latest micro v4
All checks were successful
test / test (push) Successful in 1m45s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-04-24 12:50:38 +03:00
d44110c2a9 update from v3
All checks were successful
test / test (push) Successful in 3m2s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-04-24 12:22:56 +03:00
9faa3fa56f Merge pull request 'Update workflows' (#48) from atolstikhin/micro-tracer-opentracing:master into master
Some checks failed
test / test (push) Has been cancelled
Reviewed-on: #48
2024-12-14 18:05:42 +03:00
50dd9bbd63 Merge branch 'master' into master
Some checks failed
dependabot-automerge / automerge (pull_request) Has been skipped
autoapprove / autoapprove (pull_request) Failing after 2m36s
automerge / automerge (pull_request) Failing after 10m31s
lint / lint (pull_request) Successful in 11m53s
test / test (pull_request) Successful in 24m34s
2024-12-14 17:39:59 +03:00
f6cf0dd8d3 fixup lint
Some checks failed
build / lint (push) Successful in 6m35s
build / test (push) Successful in 10m30s
codeql / analyze (go) (push) Failing after 15m48s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-12-14 17:39:31 +03:00
Aleksandr Tolstikhin
ba1384e5b4 Update workflows
Some checks failed
automerge / automerge (pull_request) Has been skipped
autoapprove / autoapprove (pull_request) Successful in 6s
dependabot-automerge / automerge (pull_request) Has been skipped
lint / lint (pull_request) Failing after 1m16s
test / test (pull_request) Has been cancelled
2024-12-14 01:31:46 +07:00
3f75c0e276 Обновить .github/workflows/pr.yml
Some checks failed
build / test (push) Successful in 1m27s
build / lint (push) Successful in 9m20s
codeql / analyze (go) (push) Failing after 14m41s
2024-03-13 08:45:01 +03:00
855709a753 Обновить .github/workflows/build.yml
Some checks failed
build / test (push) Has been cancelled
build / lint (push) Has been cancelled
codeql / analyze (go) (push) Has been cancelled
2024-03-13 08:44:39 +03:00
b9fdec821e fixup span tags and logs
Some checks failed
codeql / analyze (go) (push) Failing after 2m58s
build / test (push) Failing after 1m9s
build / lint (push) Successful in 9m19s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-12 12:38:05 +03:00
afd47c8edb add new micro tracer methods
Some checks failed
build / test (push) Failing after 1m10s
codeql / analyze (go) (push) Failing after 1m48s
build / lint (push) Successful in 9m15s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-06 12:48:00 +03:00
eeef4515ab Merge pull request 'update to latest micro' (#46) from updates into master
Some checks failed
build / test (push) Failing after 50s
build / lint (push) Successful in 19s
codeql / analyze (go) (push) Failing after 1m4s
Reviewed-on: #46
2023-10-17 00:04:28 +03:00
a53b3b08bf update to latest micro
Some checks failed
codeql / analyze (go) (pull_request) Failing after 1m19s
prbuild / test (pull_request) Failing after 54s
prbuild / lint (pull_request) Successful in 33s
autoapprove / autoapprove (pull_request) Failing after 6s
automerge / automerge (pull_request) Failing after 5s
dependabot-automerge / automerge (pull_request) Has been skipped
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-10-17 00:03:46 +03:00
123023be06 add missing tag case messaging.operation
Some checks failed
codeql / analyze (go) (push) Failing after 3m13s
build / test (push) Failing after 1m28s
build / lint (push) Failing after 2m42s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-09-01 16:09:18 +03:00
c2f6dfd267 Merge pull request 'uniq labels' (#45) from imp into master
Some checks failed
build / test (push) Failing after 1m28s
build / lint (push) Failing after 2m44s
codeql / analyze (go) (push) Failing after 3m12s
Reviewed-on: #45
2023-09-01 15:52:53 +03:00
acd0034624 uniq labels
Some checks failed
automerge / automerge (pull_request) Failing after 4s
codeql / analyze (go) (pull_request) Failing after 3m4s
dependabot-automerge / automerge (pull_request) Has been skipped
prbuild / test (pull_request) Failing after 1m28s
prbuild / lint (pull_request) Failing after 2m46s
autoapprove / autoapprove (pull_request) Failing after 1m25s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-09-01 15:52:29 +03:00
b32b60d136 fixup span and tags
Some checks failed
build / test (push) Failing after 1m29s
build / lint (push) Failing after 2m42s
codeql / analyze (go) (push) Failing after 3m14s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-09-01 08:27:53 +03:00
66d1c9d811 Merge pull request 'update for latest micro' (#41) from micro into master
Some checks failed
build / test (push) Failing after 1m29s
build / lint (push) Failing after 2m36s
codeql / analyze (go) (push) Failing after 3m13s
Reviewed-on: #41
2023-08-02 09:41:49 +03:00
a1838a8070 update for latest micro
Some checks failed
autoapprove / autoapprove (pull_request) Failing after 1m24s
automerge / automerge (pull_request) Failing after 3s
codeql / analyze (go) (pull_request) Failing after 3m11s
dependabot-automerge / automerge (pull_request) Has been skipped
prbuild / test (pull_request) Failing after 1m28s
prbuild / lint (pull_request) Failing after 2m41s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-08-02 09:41:32 +03:00
9084c3134c Merge pull request 'move to micro v4' (#40) from v4 into master
Reviewed-on: #40
2023-05-07 19:39:06 +03:00
2fb5693d97 move to micro v4
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-05-07 19:38:45 +03:00
57e07c302c Merge branch 'v3' 2023-05-07 19:37:40 +03:00
12 changed files with 140 additions and 29 deletions

View File

@@ -1,6 +1,6 @@
---
name: Bug report
about: For reporting bugs in go-micro
about: For reporting bugs in micro
title: "[BUG]"
labels: ''
assignees: ''
@@ -16,9 +16,3 @@ assignees: ''
**How to reproduce the bug:**
If possible, please include a minimal code snippet here.
**Environment:**
Go Version: please paste `go version` output here
```
please paste `go env` output here
```

View File

@@ -1,6 +1,6 @@
---
name: Feature request / Enhancement
about: If you have a need not served by go-micro
about: If you have a need not served by micro
title: "[FEATURE]"
labels: ''
assignees: ''
@@ -14,4 +14,4 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
A clear and concise description of what you want to happen.
**Additional context**
Add any other context or screenshots about the feature request here.
Add any other context or screenshots about the feature request here.

View File

@@ -1,14 +1,8 @@
---
name: Question
about: Ask a question about go-micro
about: Ask a question about micro
title: ''
labels: ''
assignees: ''
---
Before asking, please check if your question has already been answered:
1. Check the documentation - https://micro.mu/docs/
2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
3. Search existing issues
---

28
.github/autoapprove.yml vendored Normal file
View File

@@ -0,0 +1,28 @@
name: "autoapprove"
on:
pull_request_target:
types: [assigned, opened, synchronize, reopened]
workflow_run:
workflows: ["prbuild"]
types:
- completed
permissions:
pull-requests: write
contents: write
jobs:
autoapprove:
runs-on: ubuntu-latest
steps:
- name: approve
run: [ "curl -o tea https://dl.gitea.com/tea/main/tea-main-linux-amd64",
"chmod +x ./tea",
"./tea login add --name unistack --token ${{ secrets.GITHUB_TOKEN }} --url https://git.unistack.org",
"./tea pr --repo ${{ github.event.repository.name }}"
]
if: github.actor == 'vtolstov'
id: approve
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

94
.github/workflows/job_sync.yml vendored Normal file
View File

@@ -0,0 +1,94 @@
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

1
.gitignore vendored
View File

@@ -13,4 +13,3 @@
# Dependency directories (remove the comment below to include it)
# vendor/
.idea

View File

@@ -1,2 +1,2 @@
# micro-tracer-opentracing
![Coverage](https://img.shields.io/badge/Coverage-37.0%25-yellow)
![Coverage](https://img.shields.io/badge/Coverage-36.6%25-yellow)

4
go.mod
View File

@@ -1,4 +1,4 @@
module go.unistack.org/micro-tracer-opentracing/v3
module go.unistack.org/micro-tracer-opentracing/v4
go 1.22.0
@@ -7,7 +7,7 @@ toolchain go1.23.4
require (
github.com/opentracing/opentracing-go v1.2.0
go.opentelemetry.io/otel v1.35.0
go.unistack.org/micro/v3 v3.11.44
go.unistack.org/micro/v4 v4.1.14
)
require (

6
go.sum
View File

@@ -22,7 +22,9 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
go.unistack.org/micro/v3 v3.11.44 h1:A+T8zVcL2vlL66kn/Y4rqhtBybLO829wFEYZJYorDOU=
go.unistack.org/micro/v3 v3.11.44/go.mod h1:13EFW2ps3BN9mpYbp9K0oQu/VDjEN6LJ4wwdom7hcXQ=
go.unistack.org/micro/v4 v4.1.6 h1:sYLpe1Vd8/lDwddtV0BLTvJ+i+fllXAS4fZngT1wKZ4=
go.unistack.org/micro/v4 v4.1.6/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
go.unistack.org/micro/v4 v4.1.14 h1:6EotPq9kz/gaFb5YulHdKuuUwmj/7Hk44DpOlzh/A6k=
go.unistack.org/micro/v4 v4.1.14/go.mod h1:xleO2M5Yxh4s6I+RUcLrEpUjobefh+71ctrdIfn7TUs=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View File

@@ -8,8 +8,8 @@ import (
ot "github.com/opentracing/opentracing-go"
otlog "github.com/opentracing/opentracing-go/log"
"go.opentelemetry.io/otel/attribute"
"go.unistack.org/micro/v3/metadata"
"go.unistack.org/micro/v3/tracer"
"go.unistack.org/micro/v4/metadata"
"go.unistack.org/micro/v4/tracer"
)
var _ tracer.Tracer = &otTracer{}

View File

@@ -7,9 +7,9 @@ import (
"github.com/opentracing/opentracing-go/mocktracer"
// jconfig "github.com/uber/jaeger-client-go/config"
"go.unistack.org/micro/v3/logger/slog"
"go.unistack.org/micro/v3/metadata"
"go.unistack.org/micro/v3/tracer"
"go.unistack.org/micro/v4/logger/slog"
"go.unistack.org/micro/v4/metadata"
"go.unistack.org/micro/v4/tracer"
)
func TestNoopTraceID(t *testing.T) {

View File

@@ -2,7 +2,7 @@ package opentracing
import (
"github.com/opentracing/opentracing-go"
"go.unistack.org/micro/v3/tracer"
"go.unistack.org/micro/v4/tracer"
)
type tracerKey struct{}