-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code changes look good to me. Only thing remaining is the changelog.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the contribution!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay, will apply this advice
Could you fix the conflicts? |
return server, lis.Addr() | ||
} | ||
|
||
func TestBridgeTracer_ExtractAndInject_gRPC(t *testing.T) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test has been removed, but I'm not seeing it being added into bridge_test.go
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes it seems this has caused some confusion in my editor and I accidentally removed that file, I will fix it now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The go.mod
and go.sum
then also need to be brought back, so does the package in versions.yaml
.
@@ -1,25 +1,34 @@ | |||
module go.opentelemetry.io/otel/bridge/opentracing | |||
|
|||
go 1.23.0 | |||
go 1.23.8 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
go 1.23.8 | |
go 1.23.0 |
CHANGELOG.md
Outdated
@@ -20,8 +20,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm | |||
|
|||
- Drop support for [Go 1.22]. (#6381, #6418) | |||
- Remove `Resource` field from `EnabledParameters` in `go.opentelemetry.io/otel/sdk/log`. (#6494) | |||
- Remove `RecordFactory` type from `go.opentelemetry.io/otel/log/logtest`. (#6492) | |||
- Remove `RecordFactory` type from `go.opentelemetry.io/otel/log/logtest`. (#6492) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove all these unrelated changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fine!
Fixes: #6563
Now mock_test.go file is in the bridge/opentracing level. The functions and variables inside are now unexportable.
in bridge_grpc_test.go i needed to rewrite the same behavior of mock_test.go (didn't find a better way, because now mock_test.go file is unexportable.
componentKey and serviceKey variables was removed by uselessness