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.

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

Conversation

Leoff00
Copy link

@Leoff00 Leoff00 commented Mar 28, 2025

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

Copy link

linux-foundation-easycla bot commented Mar 28, 2025

CLA Signed

The committers listed above are authorized under a signed CLA.

Copy link
Contributor

@MrAlias MrAlias left a 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.

Copy link
Contributor

@MrAlias MrAlias left a 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!

Copy link
Member

@pellared pellared Apr 3, 2025

Choose a reason for hiding this comment

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

This contains duplicated definitions of mockContextKeyValue. I think we should flatten test directory into bridge/opentracing as well in order to avoid this.

image

Copy link
Author

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

@dmathieu
Copy link
Member

Could you fix the conflicts?

@MrAlias MrAlias added this to the v1.36.0 milestone Apr 11, 2025
@dmathieu dmathieu added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Apr 15, 2025
return server, lis.Addr()
}

func TestBridgeTracer_ExtractAndInject_gRPC(t *testing.T) {
Copy link
Member

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?

Copy link
Author

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

Copy link
Member

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
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

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)
Copy link
Member

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.

Copy link
Author

Choose a reason for hiding this comment

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

fine!

@MrAlias MrAlias modified the milestones: v1.36.0, Subsequent v1.36.0 May 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flatten the bridge/opentracing/internal package into bridge/opentracing
4 participants