Skip to content

Commit

Permalink
Merge branch 'main' into inconsistent-body-close
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-pictor-csec authored Nov 8, 2024
2 parents 5d2de95 + 2be617e commit ca5268d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion bridge/opentracing/test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ replace go.opentelemetry.io/otel/bridge/opentracing => ../
replace go.opentelemetry.io/otel/trace => ../../../trace

require (
github.com/opentracing-contrib/go-grpc v0.0.0-20241107172107-e3cbcab5b6a5
github.com/opentracing-contrib/go-grpc v0.1.0
github.com/opentracing-contrib/go-grpc/test v0.0.0-20241108014533-51a56c348061
github.com/opentracing/opentracing-go v1.2.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/otel v1.31.0
Expand Down
6 changes: 4 additions & 2 deletions bridge/opentracing/test/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ 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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/opentracing-contrib/go-grpc v0.0.0-20241107172107-e3cbcab5b6a5 h1:GQPLM1ycxWm9P+JosdyDP/jMP5BuJuOj8XkUYyv09lQ=
github.com/opentracing-contrib/go-grpc v0.0.0-20241107172107-e3cbcab5b6a5/go.mod h1:qrKVX6K42O2HvkCHYCMw/1Ca1hndihEIFkwgAnKG6Nw=
github.com/opentracing-contrib/go-grpc v0.1.0 h1:9JHDtQXv6UL0tFF8KJB/4ApJgeOcaHp1h07d0PJjESc=
github.com/opentracing-contrib/go-grpc v0.1.0/go.mod h1:i3/jx/TvJZ/HKidtT4XGIi/NosUEpzS9xjVJctbKZzI=
github.com/opentracing-contrib/go-grpc/test v0.0.0-20241108014533-51a56c348061 h1:2P+/GsaUnTJdQyrSGQ/nycO4J1eAkA42b4tbHYc+T9Q=
github.com/opentracing-contrib/go-grpc/test v0.0.0-20241108014533-51a56c348061/go.mod h1:7Wi+xyYMLB5JovMVv8bwomFvc8BJw8iH8pkz/GNxHIY=
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 Down

0 comments on commit ca5268d

Please sign in to comment.