Skip to content

Flatten the bridge/opentracing/internal package into bridge/opentracing package #6574

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Flatten the bridge/opentracing/internal package into bridge/opentracing package #6574

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e9f4032
refactor: move mock tracer out of internal package/wipe internal package
Leoff00 Mar 28, 2025
fa9121a
chore: remove unused vars (componentKey and serviceKey
Leoff00 Mar 28, 2025
b6d340a
add changelog entries
Leoff00 Mar 28, 2025
69798e0
bump changelog
Leoff00 Mar 28, 2025
48fff7d
revert changelog
Leoff00 Mar 30, 2025
5693ab6
chore: flatting test dir into bridge/opentracing
Leoff00 Apr 10, 2025
65fdbf4
solve conflict
Leoff00 Apr 14, 2025
dc3b7f3
chore: rm go.mod and go.sum and update versions.yaml
Leoff00 Apr 15, 2025
b843ef6
Merge branch 'main' into flatpackages
Leoff00 Apr 22, 2025
a652d6e
chore: update CHANGELOG.md
Leoff00 Apr 23, 2025
483c2d7
qMerge branch 'flatpackages' of github.com:Leoff00/opentelemetry-go i…
Leoff00 Apr 23, 2025
7f4189d
Merge branch 'main' into flatpackages
Leoff00 Apr 23, 2025
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
231 changes: 116 additions & 115 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions bridge/opentracing/bridge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/bridge/opentracing/internal"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/trace"
)
Expand Down Expand Up @@ -467,7 +466,7 @@ func Test_otTagToOTelAttr(t *testing.T) {
}

func TestBridgeSpan_SetTag(t *testing.T) {
tracer := internal.NewMockTracer()
tracer := newMockTracer()
b, _ := NewTracerPair(tracer)

testCases := []struct {
Expand Down Expand Up @@ -513,7 +512,7 @@ func TestBridgeSpan_SetTag(t *testing.T) {
span := b.StartSpan("test")

span.SetTag(tc.tagKey, tc.tagValue)
mockSpan := span.(*bridgeSpan).otelSpan.(*internal.MockSpan)
mockSpan := span.(*bridgeSpan).otelSpan.(*mockSpan)
if tc.expected != nil {
assert.Contains(t, mockSpan.Attributes, tc.expected)
} else {
Expand All @@ -524,7 +523,7 @@ func TestBridgeSpan_SetTag(t *testing.T) {
}

func Test_otTagsToOTelAttributesKindAndError(t *testing.T) {
tracer := internal.NewMockTracer()
tracer := newMockTracer()
sc := &bridgeSpanContext{}

testCases := []struct {
Expand Down Expand Up @@ -559,7 +558,7 @@ func Test_otTagsToOTelAttributesKindAndError(t *testing.T) {
b, _ := NewTracerPair(tracer)

s := b.StartSpan(tc.name, tc.opt...)
assert.Equal(t, tc.expected, s.(*bridgeSpan).otelSpan.(*internal.MockSpan).SpanKind)
assert.Equal(t, tc.expected, s.(*bridgeSpan).otelSpan.(*mockSpan).SpanKind)
})
}
}
Expand All @@ -584,7 +583,7 @@ func TestBridge_SpanContext_IsSampled(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
tracer := internal.NewMockTracer()
tracer := newMockTracer()
tracer.TraceFlags = tc.flags

b, _ := NewTracerPair(tracer)
Expand Down Expand Up @@ -688,7 +687,7 @@ func TestBridgeCarrierBaggagePropagation(t *testing.T) {
for _, c := range carriers {
for _, tc := range testCases {
t.Run(fmt.Sprintf("%s %s", c.name, tc.name), func(t *testing.T) {
mockOtelTracer := internal.NewMockTracer()
mockOtelTracer := newMockTracer()
b, _ := NewTracerPair(mockOtelTracer)
b.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(
propagation.TraceContext{},
Expand Down Expand Up @@ -881,12 +880,12 @@ func TestBridgeSpan_LogFields(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
tracer := internal.NewMockTracer()
tracer := newMockTracer()
b, _ := NewTracerPair(tracer)
span := b.StartSpan("test")

span.LogFields(tc.field)
mockSpan := span.(*bridgeSpan).otelSpan.(*internal.MockSpan)
mockSpan := span.(*bridgeSpan).otelSpan.(*mockSpan)
event := mockSpan.Events[0]
assert.Contains(t, event.Attributes, tc.expected)
})
Expand Down Expand Up @@ -983,11 +982,11 @@ func TestBridgeSpan_LogKV(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
tracer := internal.NewMockTracer()
tracer := newMockTracer()
b, _ := NewTracerPair(tracer)
span := b.StartSpan("test")
span.LogKV(tc.kv[0], tc.kv[1])
mockSpan := span.(*bridgeSpan).otelSpan.(*internal.MockSpan)
mockSpan := span.(*bridgeSpan).otelSpan.(*mockSpan)
event := mockSpan.Events[0]
assert.Contains(t, event.Attributes, tc.expected)
})
Expand Down
11 changes: 10 additions & 1 deletion bridge/opentracing/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
module go.opentelemetry.io/otel/bridge/opentracing

go 1.23.0
go 1.23.8
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
go 1.23.8
go 1.23.0


replace go.opentelemetry.io/otel => ../..

replace go.opentelemetry.io/otel/trace => ../../trace

require (
github.com/opentracing-contrib/go-grpc v0.1.2
github.com/opentracing-contrib/go-grpc/test v0.0.0-20250401233452-0261db7d7b89
github.com/opentracing/opentracing-go v1.2.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/otel v1.35.0
go.opentelemetry.io/otel/trace v1.35.0
google.golang.org/grpc v1.71.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
golang.org/x/net v0.38.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/text v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/protobuf v1.36.4 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
24 changes: 24 additions & 0 deletions bridge/opentracing/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,20 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/opentracing-contrib/go-grpc v0.1.2 h1:MP16Ozc59kqqwn1v18aQxpeGZhsBanJ2iurZYaQSZ+g=
github.com/opentracing-contrib/go-grpc v0.1.2/go.mod h1:glU6rl1Fhfp9aXUHkE36K2mR4ht8vih0ekOVlWKEUHM=
github.com/opentracing-contrib/go-grpc/test v0.0.0-20250401233452-0261db7d7b89 h1:4/+7r7wH/JIL0ztHs+3JzbcrlljUeubFOKvo6Ge7yK4=
github.com/opentracing-contrib/go-grpc/test v0.0.0-20250401233452-0261db7d7b89/go.mod h1:abKxTV7GJXe40ktFi66KCtlW9N955wWCkwNfwW4+XWQ=
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand All @@ -24,6 +32,22 @@ 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/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Expand Down
5 changes: 0 additions & 5 deletions bridge/opentracing/internal/doc.go
View file
Open in desktop

This file was deleted.

38 changes: 16 additions & 22 deletions bridge/opentracing/mix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/baggage"
"go.opentelemetry.io/otel/bridge/opentracing/internal"
"go.opentelemetry.io/otel/trace"
)

type mixedAPIsTestCase struct {
desc string

setup func(*testing.T, *internal.MockTracer)
setup func(*testing.T, *mockTracer)
run func(*testing.T, context.Context)
check func(*testing.T, *internal.MockTracer)
check func(*testing.T, *mockTracer)
}

func getMixedAPIsTestCases() []mixedAPIsTestCase {
Expand Down Expand Up @@ -99,7 +98,7 @@ func getMixedAPIsTestCases() []mixedAPIsTestCase {
func TestMixedAPIs(t *testing.T) {
for idx, tc := range getMixedAPIsTestCases() {
t.Logf("Running test case %d: %s", idx, tc.desc)
mockOtelTracer := internal.NewMockTracer()
mockOtelTracer := newMockTracer()
ctx, otTracer, otelProvider := NewTracerPairWithContext(context.Background(), mockOtelTracer)
otTracer.SetWarningHandler(func(msg string) {
t.Log(msg)
Expand Down Expand Up @@ -128,12 +127,12 @@ func newSimpleTest() *simpleTest {
}
}

func (st *simpleTest) setup(t *testing.T, tracer *internal.MockTracer) {
func (st *simpleTest) setup(t *testing.T, tracer *mockTracer) {
tracer.SpareTraceIDs = append(tracer.SpareTraceIDs, st.traceID)
tracer.SpareSpanIDs = append(tracer.SpareSpanIDs, st.spanIDs...)
}

func (st *simpleTest) check(t *testing.T, tracer *internal.MockTracer) {
func (st *simpleTest) check(t *testing.T, tracer *mockTracer) {
checkTraceAndSpans(t, tracer, st.traceID, st.spanIDs)
}

Expand Down Expand Up @@ -166,15 +165,15 @@ func newCurrentActiveSpanTest() *currentActiveSpanTest {
}
}

func (cast *currentActiveSpanTest) setup(t *testing.T, tracer *internal.MockTracer) {
func (cast *currentActiveSpanTest) setup(t *testing.T, tracer *mockTracer) {
tracer.SpareTraceIDs = append(tracer.SpareTraceIDs, cast.traceID)
tracer.SpareSpanIDs = append(tracer.SpareSpanIDs, cast.spanIDs...)

cast.recordedCurrentOtelSpanIDs = nil
cast.recordedActiveOTSpanIDs = nil
}

func (cast *currentActiveSpanTest) check(t *testing.T, tracer *internal.MockTracer) {
func (cast *currentActiveSpanTest) check(t *testing.T, tracer *mockTracer) {
checkTraceAndSpans(t, tracer, cast.traceID, cast.spanIDs)
if len(cast.recordedCurrentOtelSpanIDs) != len(cast.spanIDs) {
t.Errorf(
Expand Down Expand Up @@ -236,7 +235,7 @@ func (cast *currentActiveSpanTest) recordSpans(t *testing.T, ctx context.Context
// context intact test

type contextIntactTest struct {
contextKeyValues []internal.MockContextKeyValue
contextKeyValues []mockContextKeyValue

recordedContextValues []interface{}
recordIdx int
Expand All @@ -256,7 +255,7 @@ type coin3Value struct{}

func newContextIntactTest() *contextIntactTest {
return &contextIntactTest{
contextKeyValues: []internal.MockContextKeyValue{
contextKeyValues: []mockContextKeyValue{
{
Key: coin1Key{},
Value: coin1Value{},
Expand All @@ -273,14 +272,14 @@ func newContextIntactTest() *contextIntactTest {
}
}

func (coin *contextIntactTest) setup(t *testing.T, tracer *internal.MockTracer) {
func (coin *contextIntactTest) setup(t *testing.T, tracer *mockTracer) {
tracer.SpareContextKeyValues = append(tracer.SpareContextKeyValues, coin.contextKeyValues...)

coin.recordedContextValues = nil
coin.recordIdx = 0
}

func (coin *contextIntactTest) check(t *testing.T, tracer *internal.MockTracer) {
func (coin *contextIntactTest) check(t *testing.T, tracer *mockTracer) {
if len(coin.recordedContextValues) != len(coin.contextKeyValues) {
t.Errorf(
"Expected to have %d recorded context values, got %d",
Expand Down Expand Up @@ -352,12 +351,12 @@ func newBaggageItemsPreservationTest() *baggageItemsPreservationTest {
}
}

func (bip *baggageItemsPreservationTest) setup(t *testing.T, tracer *internal.MockTracer) {
func (bip *baggageItemsPreservationTest) setup(t *testing.T, tracer *mockTracer) {
bip.step = 0
bip.recordedBaggage = nil
}

func (bip *baggageItemsPreservationTest) check(t *testing.T, tracer *internal.MockTracer) {
func (bip *baggageItemsPreservationTest) check(t *testing.T, tracer *mockTracer) {
if len(bip.recordedBaggage) != len(bip.baggageItems) {
t.Errorf("Expected %d recordings, got %d", len(bip.baggageItems), len(bip.recordedBaggage))
}
Expand Down Expand Up @@ -450,13 +449,13 @@ func newBaggageInteroperationTest() *baggageInteroperationTest {
}
}

func (bio *baggageInteroperationTest) setup(t *testing.T, tracer *internal.MockTracer) {
func (bio *baggageInteroperationTest) setup(t *testing.T, tracer *mockTracer) {
bio.step = 0
bio.recordedOTBaggage = nil
bio.recordedOtelBaggage = nil
}

func (bio *baggageInteroperationTest) check(t *testing.T, tracer *internal.MockTracer) {
func (bio *baggageInteroperationTest) check(t *testing.T, tracer *mockTracer) {
checkBIORecording(t, "OT", bio.baggageItems, bio.recordedOTBaggage)
checkBIORecording(t, "Otel", bio.baggageItems, bio.recordedOtelBaggage)
}
Expand Down Expand Up @@ -577,12 +576,7 @@ func generateBaggageKeys(key string) (otKey, otelKey string) {

// helpers

func checkTraceAndSpans(
t *testing.T,
tracer *internal.MockTracer,
expectedTraceID trace.TraceID,
expectedSpanIDs []trace.SpanID,
) {
func checkTraceAndSpans(t *testing.T, tracer *mockTracer, expectedTraceID trace.TraceID, expectedSpanIDs []trace.SpanID) {
expectedSpanCount := len(expectedSpanIDs)

// reverse spanIDs, since first span ID belongs to root, that
Expand Down
Loading