Skip to content

opentracing: Make schemaURL and scope attributes as identifying for Tracer #5931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pellared merged 3 commits into from
Oct 31, 2024
Merged

opentracing: Make schemaURL and scope attributes as identifying for Tracer #5931

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6387a60
opentracing: Make schemaURL and scope attributes as identifying for T…
pellared Oct 30, 2024
ea0dd99
Update changelog
pellared Oct 30, 2024
c9e4d4a
refactor test
pellared Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
opentracing: Make schemaURL and scope attributes as identifying for T… 
…racer
  • Loading branch information
@pellared
pellared committed Oct 30, 2024
commit 6387a6063a1d476d711895429dbacebdcd6048a0
5 changes: 5 additions & 0 deletions bridge/opentracing/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package opentracing // import "go.opentelemetry.io/otel/bridge/opentracing"
import (
"sync"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/embedded"
)
Expand Down Expand Up @@ -38,6 +39,8 @@ func NewTracerProvider(bridge *BridgeTracer, provider trace.TracerProvider) *Tra
type wrappedTracerKey struct {
name string
version string
schema string
attrs attribute.Set
}

// Tracer creates a WrappedTracer that wraps the OpenTelemetry tracer for each call to
Expand All @@ -51,6 +54,8 @@ func (p *TracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.T
key := wrappedTracerKey{
name: name,
version: c.InstrumentationVersion(),
schema: c.SchemaURL(),
attrs: c.InstrumentationAttributes(),
}

if t, ok := p.tracers[key]; ok {
Expand Down
7 changes: 6 additions & 1 deletion bridge/opentracing/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package opentracing
import (
"testing"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/bridge/opentracing/internal"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/embedded"
Expand Down Expand Up @@ -64,11 +65,15 @@ func TestTracerProvider(t *testing.T) {
assertMockTracerName(t, tracer2, foobar)
tracer3 := provider.Tracer(bazbar)
assertMockTracerName(t, tracer3, bazbar)
tracer4 := provider.Tracer(bazbar, trace.WithInstrumentationAttributes(attribute.String("foo", "bar")))
assertMockTracerName(t, tracer4, bazbar)
tracer5 := provider.Tracer(bazbar, trace.WithSchemaURL("https://opentelemetry.io/schemas/1.2.0"))
assertMockTracerName(t, tracer5, bazbar)

if tracer1 != tracer2 {
t.Errorf("expected the same tracer, got different tracers")
}
if tracer1 == tracer3 || tracer2 == tracer3 {
if tracer1 == tracer3 || tracer2 == tracer3 || tracer3 == tracer4 || tracer3 == tracer5 || tracer4 == tracer5 {
t.Errorf("expected different tracers, got the same tracer")
}
})
Expand Down