Compare commits

..

38 Commits

Author SHA1 Message Date
e058f049a7 Merge pull request 'move from v4 enabled tracer' (#50) from devstigneev/micro-tracer-opentracing:v3 into v3
Some checks failed
coverage / build (push) Successful in 3m52s
test / test (push) Failing after 16m40s
Reviewed-on: #50
2025-05-21 08:36:20 +03:00
3718494ba6 move from v4 enabled tracer
Some checks failed
coverage / build (pull_request) Has been cancelled
lint / lint (pull_request) Has been cancelled
test / test (pull_request) Has been cancelled
2025-05-20 14:04:20 +03:00
vtolstov
1dad9b13e8 Apply Code Coverage Badge 2025-05-05 16:29:06 +00:00
4bc5facf9f [v3] update ci (#59)
All checks were successful
coverage / build (push) Successful in 1m59s
test / test (push) Successful in 20m53s
* update ci

* update ci

* fix linters
2025-05-05 19:26:01 +03:00
26908c1d44 fixup panic on otel attribute.KeyValue label
All checks were successful
test / test (push) Successful in 1m45s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-04-16 06:54:50 +03:00
18197c63f1 update micro
All checks were successful
test / test (push) Successful in 3m1s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-04-14 00:14:05 +03:00
38d57f8829 Merge pull request 'Update workflows' (#49) from atolstikhin/micro-tracer-opentracing:v3 into v3
All checks were successful
test / test (push) Successful in 12m42s
Reviewed-on: #49
2024-12-14 18:05:32 +03:00
aa61010405 Merge branch 'v3' into v3
Some checks failed
automerge / automerge (pull_request) Failing after 18s
autoapprove / autoapprove (pull_request) Failing after 2m13s
lint / lint (pull_request) Successful in 11m26s
dependabot-automerge / automerge (pull_request) Failing after 14m59s
test / test (pull_request) Successful in 24m7s
2024-12-14 17:40:19 +03:00
b729620976 fixup lint
Some checks failed
build / lint (push) Successful in 23s
build / test (push) Failing after 25s
codeql / analyze (go) (push) Failing after 11m31s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-12-14 17:39:10 +03:00
16b180bfaa update go.mod
Some checks failed
build / lint (push) Successful in 1m6s
build / test (push) Has been cancelled
codeql / analyze (go) (push) Has been cancelled
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-12-14 17:37:13 +03:00
Aleksandr Tolstikhin
efe77803ff Update workflows
Some checks failed
automerge / automerge (pull_request) Has been skipped
dependabot-automerge / automerge (pull_request) Has been skipped
autoapprove / autoapprove (pull_request) Successful in 8s
lint / lint (pull_request) Failing after 1m28s
test / test (pull_request) Has been cancelled
2024-12-14 01:32:34 +07:00
31350e8c21 Merge pull request '#347 add Sort Labels' (#47) from kgorbunov/micro-tracer-opentracing:#347-v3 into v3
Some checks failed
build / test (push) Failing after 1s
build / lint (push) Failing after 1s
codeql / analyze (go) (push) Failing after 1s
Reviewed-on: #47
2024-09-16 15:01:07 +03:00
Gorbunov Kirill Andreevich
d3d5925747 #347 add Sort Labels
Some checks failed
autoapprove / autoapprove (pull_request) Failing after 1s
automerge / automerge (pull_request) Has been skipped
dependabot-automerge / automerge (pull_request) Has been skipped
codeql / analyze (go) (pull_request) Has been cancelled
prbuild / test (pull_request) Has been cancelled
prbuild / lint (pull_request) Has been cancelled
2024-09-16 14:55:01 +03:00
89f75e0431 improve tracing
Some checks failed
build / test (push) Failing after 26s
build / lint (push) Successful in 25s
codeql / analyze (go) (push) Failing after 49s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-07-22 23:39:22 +03:00
9f6620676a get trace info from context
Some checks failed
build / test (push) Failing after 23s
build / lint (push) Successful in 22s
codeql / analyze (go) (push) Failing after 1m0s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-07-17 17:51:51 +03:00
e1f85545d9 get trace info from context
Some checks failed
build / test (push) Waiting to run
build / lint (push) Successful in 41s
codeql / analyze (go) (push) Failing after 2m5s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-07-17 17:38:14 +03:00
e887edb475 get trace info from context
Some checks failed
build / test (push) Has been cancelled
build / lint (push) Has been cancelled
codeql / analyze (go) (push) Has been cancelled
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-07-17 17:37:06 +03:00
2149a713d5 support never micro context attrs funcs
Some checks failed
build / lint (push) Successful in 24s
build / test (push) Failing after 1m30s
codeql / analyze (go) (push) Failing after 1m55s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-07-06 00:19:38 +03:00
9b553cfa62 add ability to pass span options on finish
Some checks failed
build / test (push) Failing after 1m38s
codeql / analyze (go) (push) Failing after 1m54s
build / lint (push) Successful in 9m17s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-05-09 19:30:32 +03:00
65ac3aff56 fixup add labels
Some checks failed
build / test (push) Failing after 1m43s
codeql / analyze (go) (push) Failing after 1m43s
build / lint (push) Successful in 9m13s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-05-06 01:09:41 +03:00
e9933df477 add abilit to skip span recording
Some checks failed
build / test (push) Failing after 1m32s
codeql / analyze (go) (push) Failing after 1m42s
build / lint (push) Successful in 9m16s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-05-04 19:24:10 +03:00
905910e8ce avoid duplicate tags
Some checks failed
build / test (push) Failing after 1m17s
codeql / analyze (go) (push) Failing after 2m45s
build / lint (push) Successful in 9m30s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-17 23:07:06 +03:00
7948652293 fixup labels
Some checks failed
build / test (push) Failing after 1m13s
codeql / analyze (go) (push) Failing after 1m46s
build / lint (push) Successful in 9m14s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-17 00:51:29 +03:00
54d9857bb9 fixup labels
Some checks failed
build / test (push) Failing after 1m11s
codeql / analyze (go) (push) Failing after 1m48s
build / lint (push) Successful in 9m20s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-17 00:35:37 +03:00
1e9abb9905 fixup tracing
Some checks failed
build / test (push) Failing after 1m11s
codeql / analyze (go) (push) Failing after 1m47s
build / lint (push) Successful in 9m19s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-16 23:59:36 +03:00
6b9edf3593 fixup finish
Some checks failed
build / test (push) Failing after 1m21s
codeql / analyze (go) (push) Failing after 1m51s
build / lint (push) Successful in 9m15s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-15 11:34:31 +03:00
742b86f128 support semconv
Some checks failed
build / test (push) Failing after 1m9s
codeql / analyze (go) (push) Failing after 1m48s
build / lint (push) Successful in 9m16s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-14 23:35:38 +03:00
474fc506dd fixup logs
Some checks failed
build / test (push) Failing after 1m7s
codeql / analyze (go) (push) Failing after 3m10s
build / lint (push) Successful in 9m15s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-12 23:33:59 +03:00
c94af432a0 fixup span tags and logs
Some checks failed
build / test (push) Failing after 1m49s
build / lint (push) Successful in 9m49s
codeql / analyze (go) (push) Failing after 12m46s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-12 12:38:40 +03:00
3f9704aef8 add new micro tracer methods
Some checks failed
build / test (push) Failing after 1m13s
codeql / analyze (go) (push) Failing after 2m31s
build / lint (push) Successful in 9m26s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-03-06 12:36:29 +03:00
5224363bfc update micro
Some checks failed
build / test (push) Failing after 58s
build / lint (push) Successful in 15s
codeql / analyze (go) (push) Failing after 1m52s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-10-12 01:27:42 +03:00
52ec3cf264 add missing tag case messaging.operation
Some checks failed
build / test (push) Failing after 1m28s
build / lint (push) Failing after 2m35s
codeql / analyze (go) (push) Failing after 3m7s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-09-01 16:10:08 +03:00
d2b9201423 Merge pull request 'tracer improve' (#44) from improve into v3
Some checks failed
build / test (push) Failing after 1m28s
build / lint (push) Failing after 2m40s
codeql / analyze (go) (push) Failing after 3m10s
Reviewed-on: #44
2023-09-01 15:41:22 +03:00
6543196faf tracer improve
Some checks failed
prbuild / test (pull_request) Failing after 1m29s
prbuild / lint (pull_request) Failing after 2m42s
autoapprove / autoapprove (pull_request) Failing after 1m26s
automerge / automerge (pull_request) Failing after 4s
codeql / analyze (go) (pull_request) Failing after 3m20s
dependabot-automerge / automerge (pull_request) Has been skipped
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-09-01 15:39:30 +03:00
f9dad57eb2 Merge pull request 'fixup span and tags' (#43) from fixup into v3
Some checks failed
codeql / analyze (go) (push) Failing after 3m3s
build / test (push) Failing after 1m28s
build / lint (push) Failing after 2m33s
Reviewed-on: #43
2023-09-01 08:09:14 +03:00
59283b64c9 fixup span and tags
Some checks failed
codeql / analyze (go) (pull_request) Failing after 3m7s
dependabot-automerge / automerge (pull_request) Has been skipped
prbuild / test (pull_request) Failing after 1m29s
prbuild / lint (pull_request) Failing after 2m33s
autoapprove / autoapprove (pull_request) Failing after 1m24s
automerge / automerge (pull_request) Failing after 3s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-09-01 08:08:34 +03:00
4805482921 Merge pull request 'update for latest micro' (#42) from micro into v3
Some checks failed
build / test (push) Failing after 1m28s
build / lint (push) Failing after 2m27s
codeql / analyze (go) (push) Failing after 3m9s
Reviewed-on: #42
2023-08-02 09:55:13 +03:00
c2225cb92a update for latest micro
Some checks failed
autoapprove / autoapprove (pull_request) Failing after 1m25s
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 1m29s
prbuild / lint (pull_request) Failing after 2m39s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-08-02 09:50:36 +03:00
12 changed files with 29 additions and 140 deletions

View File

@@ -1,6 +1,6 @@
---
name: Bug report
about: For reporting bugs in micro
about: For reporting bugs in go-micro
title: "[BUG]"
labels: ''
assignees: ''
@@ -16,3 +16,9 @@ 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 micro
about: If you have a need not served by go-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,8 +1,14 @@
---
name: Question
about: Ask a question about micro
about: Ask a question about go-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

View File

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

View File

@@ -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

1
.gitignore vendored
View File

@@ -13,3 +13,4 @@
# 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-36.4%25-yellow)
![Coverage](https://img.shields.io/badge/Coverage-37.0%25-yellow)

4
go.mod
View File

@@ -1,4 +1,4 @@
module go.unistack.org/micro-tracer-opentracing/v4
module go.unistack.org/micro-tracer-opentracing/v3
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/v4 v4.1.14
go.unistack.org/micro/v3 v3.11.44
)
require (

6
go.sum
View File

@@ -22,9 +22,7 @@ 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/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=
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=
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/v4/metadata"
"go.unistack.org/micro/v4/tracer"
"go.unistack.org/micro/v3/metadata"
"go.unistack.org/micro/v3/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/v4/logger/slog"
"go.unistack.org/micro/v4/metadata"
"go.unistack.org/micro/v4/tracer"
"go.unistack.org/micro/v3/logger/slog"
"go.unistack.org/micro/v3/metadata"
"go.unistack.org/micro/v3/tracer"
)
func TestNoopTraceID(t *testing.T) {

View File

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