Skip to content
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

Jump to bottom

Upgrade thrift to 0.13 #2311

Merged
merged 2 commits into from
Jun 26, 2020
Merged

Upgrade thrift to 0.13 #2311

merged 2 commits into from
Jun 26, 2020

Conversation

pavolloffay
Copy link
Member

Signed-off-by: Pavol Loffay ploffay@redhat.com

Resolves #1972

@pavolloffay
Upgrade thrift to 0.13
c4c4be9 
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
@pavolloffay pavolloffay requested a review from yurishkuro June 26, 2020 11:12
@pavolloffay pavolloffay requested a review from a team as a code owner June 26, 2020 11:12
pavolloffay
pavolloffay commented Jun 26, 2020
View reviewed changes
cmd/opentelemetry/go.mod
@@ -4,12 +4,13 @@ go 1.13

replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab

replace github.com/jaegertracing/jaeger => ./../../
// TODO uncomment once OTEL upgrades Jaeger with thrift 0.13
//replace github.com/jaegertracing/jaeger => ./../../
Copy link
Member Author

Choose a reason for hiding this comment

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

I had to do this otherwise Jeger OTEL would not compile - OTEL depends on older Jaeger version using older thrift.

Copy link
Member

Choose a reason for hiding this comment

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

please book a ticket

@codecov
Copy link

codecov bot commented Jun 26, 2020 •
edited
Loading

Codecov Report

Merging #2311 into master will decrease coverage by 0.00%.
The diff coverage is 97.67%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2311      +/-   ##
==========================================
- Coverage   96.21%   96.20%   -0.01%     
==========================================
  Files         203      203              
  Lines       10291    10289       -2     
==========================================
- Hits         9901     9899       -2     
  Misses        335      335              
  Partials       55       55
Impacted Files Coverage Δ
cmd/collector/app/server/test.go 33.33% <0.00%> (ø)
cmd/agent/app/builder.go 100.00% <100.00%> (ø)
cmd/agent/app/configmanager/grpc/manager.go 100.00% <100.00%> (ø)
cmd/agent/app/configmanager/metrics.go 100.00% <100.00%> (ø)
...ent/app/customtransport/buffered_read_transport.go 100.00% <100.00%> (ø)
cmd/agent/app/processors/thrift_processor.go 100.00% <100.00%> (ø)
cmd/agent/app/reporter/client_metrics.go 100.00% <100.00%> (ø)
cmd/agent/app/reporter/grpc/reporter.go 100.00% <100.00%> (ø)
cmd/agent/app/reporter/metrics.go 100.00% <100.00%> (ø)
cmd/agent/app/reporter/reporter.go 100.00% <100.00%> (ø)
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c13c47d...776fe4e. Read the comment docs.

@pavolloffay
Add context to sampling managers
776fe4e 
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
@pavolloffay pavolloffay requested a review from objectiser June 26, 2020 13:11
objectiser
objectiser approved these changes Jun 26, 2020
View reviewed changes
Copy link
Contributor

@objectiser objectiser left a comment

Choose a reason for hiding this comment

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

LGTM - just a couple of clarifications in the dependencies.

cmd/opentelemetry/go.sum
@@ -759,6 +759,9 @@ github.com/jackc/pgx/v4 v4.4.1/go.mod h1:6iSW+JznC0YT+SgBn7rNxoEBsBgSmnC5FwyCekO
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jaegertracing/jaeger v1.17.0/go.mod h1:LUWPSnzNPGRubM8pk0inANGitpiMOOxihXx0+53llXI=
Copy link
Contributor

Choose a reason for hiding this comment

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

This isn't required.

Copy link
Member Author

Choose a reason for hiding this comment

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

Weird go mod tidy keeps it there. Anyway this is just temporary we will use the override directive once we upgrade Jaeger in OTEL.

cmd/opentelemetry/go.sum
@@ -1234,6 +1238,8 @@ github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
github.com/uber/tchannel-go v1.10.0 h1:YOihLHuvkwT3nzvpgqFtexFW+pb5vD1Tz7h/bIWApgE=
github.com/uber/tchannel-go v1.10.0/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo=
github.com/uber/tchannel-go v1.16.0 h1:B7dirDs15/vJJYDeoHpv3xaEUjuRZ38Rvt1qq9g7pSo=
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this still be pulled in?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes because we pin the Jaeger to 1.18.1 which uses t-channel. This is just temporary until OTEL is upgraded with the latest Jaeger.

@pavolloffay pavolloffay merged commit be17169 into jaegertracing:master Jun 26, 2020
yurishkuro
yurishkuro reviewed Jun 26, 2020
View reviewed changes
thrift-gen/agent/ttypes.go
@@ -1,21 +0,0 @@
// Autogenerated by Thrift Compiler (0.9.3)
Copy link
Member

Choose a reason for hiding this comment

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

why are there so many files removed? Is the content migrated elsewhere?

Copy link
Member Author

Choose a reason for hiding this comment

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

I have removed entire thrift-gen directory and run the generator. Maybe the new generator uses a different file structure?

@nilebox nilebox mentioned this pull request Jun 30, 2020
Closed
@pavolloffay pavolloffay mentioned this pull request Sep 4, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yurishkuro yurishkuro yurishkuro left review comments

@objectiser objectiser objectiser approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update thrift to 0.13
3 participants
@pavolloffay @objectiser @yurishkuro