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.

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

Use official Apache Thrift instead of Jaeger's fork #2861

Merged
merged 1 commit into from
Mar 4, 2021
Merged

Use official Apache Thrift instead of Jaeger's fork #2861

merged 1 commit into from
Mar 4, 2021

Conversation

jpkrohling
Copy link
Contributor

Closes #2781

Signed-off-by: Juraci Paixão Kröhling juraci@kroehling.de

@jpkrohling
Copy link
Contributor Author

albertteoh
albertteoh previously approved these changes Mar 4, 2021
@albertteoh
Copy link
Contributor

Looks like more changes are required to resolve the lint checks?

@mergify mergify bot dismissed albertteoh’s stale review March 4, 2021 12:25

Pull request has been modified.

@@ -91,7 +90,7 @@ func testHTTPHandler(t *testing.T, basePath string) {
err = resp.Body.Close()
require.NoError(t, err)
if endpoint == "/" {
objResp := &tSampling092.SamplingStrategyResponse{}
objResp := &sampling.SamplingStrategyResponse{}
Copy link
Member

Choose a reason for hiding this comment

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

What is the motivation for this change? We use v092 for backwards compatibility with some old clients that used to expect numeric enums in the JSON.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That explains it. The 0.9.2 client code base is failing to compile because of the Thrift incompatibility issues, and I was wondering why this was using that old client.

Not sure how to move forward here: we can't use 0.9.2, as it won't compile with the Thrift we have now as dependency (0.14.1).

Copy link
Member

Choose a reason for hiding this comment

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

What exactly is the dependency? We have a fork of 0.9.2 embedded in the repo, it wasn't supposed to interact with the main version of Thrift.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The context changes, like here:

if _, err := iprot.ReadStructBegin(); err != nil {

In the latest Thrift, this function requires a context. Should I just manually change those methods then to comply with the new signature?

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I see, so this package is just our old generated types, not the full thrift/lib. Then I'd say we drop this support, it's been several years since the clients were upgraded. It was introduced back before agent was even oss, in #61.

Would be good to get confirmation from @vprithvi that it's not being used. There used to be a metric counting requests to this old endpoint https://github.com/jaegertracing/jaeger/pull/61/files#diff-2f12a4e2fcded1e774b911087f15091aead73a569c7d67caaa8be009d521dca2R63, but I am not seeing it in the recent code.

@jpkrohling jpkrohling marked this pull request as draft March 4, 2021 15:09
Closes #2781

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@jpkrohling jpkrohling marked this pull request as ready for review March 4, 2021 16:02
@codecov
Copy link

codecov bot commented Mar 4, 2021

Codecov Report

Merging #2861 (323994d) into master (e4cacd0) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2861      +/-   ##
==========================================
+ Coverage   95.91%   95.93%   +0.02%     
==========================================
  Files         223      223              
  Lines        9695     9697       +2     
==========================================
+ Hits         9299     9303       +4     
+ Misses        326      325       -1     
+ Partials       70       69       -1     
Impacted Files Coverage Δ
cmd/agent/app/builder.go 95.89% <ø> (ø)
cmd/agent/app/testutils/thriftudp_client.go 100.00% <100.00%> (ø)
cmd/collector/app/handler/http_handler.go 100.00% <100.00%> (ø)
model/converter/thrift/zipkin/deserialize.go 100.00% <100.00%> (ø)
pkg/config/tlscfg/cert_watcher.go 92.20% <0.00%> (-2.60%) ⬇️
...lugin/sampling/strategystore/adaptive/processor.go 100.00% <0.00%> (+0.92%) ⬆️
cmd/query/app/server.go 97.08% <0.00%> (+1.45%) ⬆️

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 e4cacd0...323994d. Read the comment docs.

@yurishkuro
Copy link
Member

yurishkuro commented Mar 4, 2021

Let's add a "breaking change" notice to CHANGELOG nvm, since you kept 0.9.2

@jpkrohling jpkrohling merged commit 2fff3ca into jaegertracing:master Mar 4, 2021
albertteoh pushed a commit to albertteoh/jaeger that referenced this pull request Mar 5, 2021
Closes jaegertracing#2781

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@jpkrohling jpkrohling added this to the Release 1.23.0 milestone Jun 4, 2021
@jpkrohling jpkrohling deleted the jpkrohling/issue2781 branch July 28, 2021 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove temporary usage of a Thrift fork
3 participants