Compare commits

..

21 Commits
v3 ... v4.0.10

Author SHA1 Message Date
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
16 changed files with 38 additions and 91 deletions

View File

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

View File

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

View File

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

View File

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

1
.gitignore vendored
View File

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

View File

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

View File

@@ -1,2 +1 @@
# micro-tracer-opentracing # micro-tracer-opentracing
![Coverage](https://img.shields.io/badge/Coverage-36.4%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 go 1.22.0
@@ -7,7 +7,7 @@ toolchain go1.23.4
require ( require (
github.com/opentracing/opentracing-go v1.2.0 github.com/opentracing/opentracing-go v1.2.0
go.opentelemetry.io/otel v1.35.0 go.opentelemetry.io/otel v1.35.0
go.unistack.org/micro/v3 v3.11.44 go.unistack.org/micro/v4 v4.1.6
) )
require ( require (

4
go.sum
View File

@@ -22,7 +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= 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 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= 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/v4 v4.1.6 h1:sYLpe1Vd8/lDwddtV0BLTvJ+i+fllXAS4fZngT1wKZ4=
go.unistack.org/micro/v3 v3.11.44/go.mod h1:13EFW2ps3BN9mpYbp9K0oQu/VDjEN6LJ4wwdom7hcXQ= go.unistack.org/micro/v4 v4.1.6/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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" ot "github.com/opentracing/opentracing-go"
otlog "github.com/opentracing/opentracing-go/log" otlog "github.com/opentracing/opentracing-go/log"
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"
"go.unistack.org/micro/v3/metadata" "go.unistack.org/micro/v4/metadata"
"go.unistack.org/micro/v3/tracer" "go.unistack.org/micro/v4/tracer"
) )
var _ tracer.Tracer = &otTracer{} var _ tracer.Tracer = &otTracer{}
@@ -261,10 +261,6 @@ func (t *otTracer) startSpanFromAny(ctx context.Context, name string, opts ...ot
return t.startSpanFromContext(ctx, name, opts...) return t.startSpanFromContext(ctx, name, opts...)
} }
func (t *otTracer) Enabled() bool {
return t.opts.Enabled
}
func (t *otTracer) startSpanFromContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) { func (t *otTracer) startSpanFromContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
var parentSpan ot.Span var parentSpan ot.Span
if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil { if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {

View File

@@ -7,9 +7,9 @@ import (
"github.com/opentracing/opentracing-go/mocktracer" "github.com/opentracing/opentracing-go/mocktracer"
// jconfig "github.com/uber/jaeger-client-go/config" // jconfig "github.com/uber/jaeger-client-go/config"
"go.unistack.org/micro/v3/logger/slog" "go.unistack.org/micro/v4/logger/slog"
"go.unistack.org/micro/v3/metadata" "go.unistack.org/micro/v4/metadata"
"go.unistack.org/micro/v3/tracer" "go.unistack.org/micro/v4/tracer"
) )
func TestNoopTraceID(t *testing.T) { func TestNoopTraceID(t *testing.T) {
@@ -25,7 +25,7 @@ func TestNoopTraceID(t *testing.T) {
var sp tracer.Span var sp tracer.Span
_, sp = tr.Start(ctx, "test") ctx, sp = tr.Start(ctx, "test")
if v := sp.TraceID(); v != "43" { if v := sp.TraceID(); v != "43" {
t.Fatalf("invalid span trace id %#+v", v) t.Fatalf("invalid span trace id %#+v", v)
} }

View File

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