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

[BEAM-11805] Replace user-agent for spanner #13990

Merged

Conversation

allenpradeep
Copy link
Contributor

This patch contains the workaround to replace the user-agent for spanner.
R: @TheNeuralBit @nielm


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Format the pull request title like [BEAM-XXX] Fixes bug in ApproximateQuantiles, where you replace BEAM-XXX with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

Post-Commit Tests Status (on master branch)

Lang SDK Dataflow Flink Samza Spark Twister2
Go Build Status --- Build Status --- Build Status ---
Java Build Status Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status Build Status
Build Status
Build Status
Build Status
Python Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
--- Build Status ---
XLang Build Status Build Status Build Status --- Build Status ---

Pre-Commit Tests Status (on master branch)

--- Java Python Go Website Whitespace Typescript
Non-portable Build Status Build Status
Build Status
Build Status
Build Status
Build Status Build Status Build Status Build Status
Portable --- Build Status --- --- --- ---

See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests

See CI.md for more information about GitHub Actions CI.

@allenpradeep
Copy link
Contributor Author

@TheNeuralBit - This patch has the following checkstyle violation. Can you help with this?
[ant:checkstyle] [ERROR] /usr/local/google/home/alxavier/spannerio/apbeam/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java:35: You are using raw guava, please use vendored guava classes. [ForbidNonVendoredGuava]

@nielm
Copy link
Contributor

nielm commented Feb 13, 2021

@TheNeuralBit - This patch has the following checkstyle violation. Can you help with this?
[ant:checkstyle] [ERROR] /usr/local/google/home/alxavier/spannerio/apbeam/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java:35: You are using raw guava, please use vendored guava classes. [ForbidNonVendoredGuava]

Replace the import
com.google.common.util.concurrent.ThreadFactoryBuilder
With
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ThreadFactoryBuilder

@allenpradeep
Copy link
Contributor Author

Run Java PreCommit

@allenpradeep
Copy link
Contributor Author

@nielm @thiagotnunes - Thanks

Please take a look.
I have fixed the checkstyle issues and added the support for checking emulator connection.

Copy link
Member

@TheNeuralBit TheNeuralBit left a comment

Choose a reason for hiding this comment

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

@allenpradeep could you also cherry-pick the the version update commits from #13765? They were rolled back in #13792. I'd like to apply both changes at once to make sure they pass CI before merging.

@allenpradeep
Copy link
Contributor Author

Run Java PreCommit

@allenpradeep
Copy link
Contributor Author

@allenpradeep could you also cherry-pick the the version update commits from #13765? They were rolled back in #13792. I'd like to apply both changes at once to make sure they pass CI before merging.

There were some spanner test issues with the previous commit. I'll cherry pick #13765 after the integration tests passes and resend.

@allenpradeep allenpradeep force-pushed the BEAM-11805-Append-user-agent-header branch from 860ea1e to e8cb006 Compare February 17, 2021 02:34
@allenpradeep
Copy link
Contributor Author

@allenpradeep could you also cherry-pick the the version update commits from #13765? They were rolled back in #13792. I'd like to apply both changes at once to make sure they pass CI before merging.

@TheNeuralBit - cherry-picked the the 2 commits from #13765.
Waiting for the tests to complete.

@allenpradeep
Copy link
Contributor Author

Run Java PreCommit

@codecov
Copy link

codecov bot commented Feb 17, 2021

Codecov Report

Merging #13990 (a88a034) into master (8f87957) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #13990   +/-   ##
=======================================
  Coverage   82.94%   82.94%           
=======================================
  Files         469      469           
  Lines       58343    58343           
=======================================
+ Hits        48394    48395    +1     
+ Misses       9949     9948    -1     
Impacted Files Coverage Δ
.../python/apache_beam/transforms/periodicsequence.py 96.49% <0.00%> (-1.76%) ⬇️
...ks/python/apache_beam/runners/worker/sdk_worker.py 89.69% <0.00%> (+0.15%) ⬆️
sdks/python/apache_beam/io/iobase.py 84.81% <0.00%> (+0.26%) ⬆️

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 8f87957...a88a034. Read the comment docs.

@allenpradeep
Copy link
Contributor Author

Run Java PreCommit

@allenpradeep
Copy link
Contributor Author

Run Java PostCommit

@TheNeuralBit
Copy link
Member

@allenpradeep The merge conflict looks to be due to #13804, which upgraded guava. I don't think it's an actual conflict, it's just that 007c0ab is upgrading gRPC, which is on an adjacent line. The resolution should be to just make sure we upgrade both.

@allenpradeep allenpradeep force-pushed the BEAM-11805-Append-user-agent-header branch from e8cb006 to a88a034 Compare February 17, 2021 18:52
@allenpradeep
Copy link
Contributor Author

@allenpradeep The merge conflict looks to be due to #13804, which upgraded guava. I don't think it's an actual conflict, it's just that 007c0ab is upgrading gRPC, which is on an adjacent line. The resolution should be to just make sure we upgrade both.

@TheNeuralBit
Done. PTAL

@allenpradeep
Copy link
Contributor Author

Run Java PostCommit

Copy link
Member

@TheNeuralBit TheNeuralBit left a comment

Choose a reason for hiding this comment

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

Thank you @allenpradeep, I will merge when CI is green.

@TheNeuralBit
Copy link
Member

Failure is a flake in FhirIOReadIT. I'll go ahead and merge.

TheNeuralBit added a commit to TheNeuralBit/beam that referenced this pull request Sep 24, 2021
TheNeuralBit added a commit that referenced this pull request Oct 5, 2021
dmitriikuzinepam pushed a commit to dmitriikuzinepam/beam that referenced this pull request Nov 2, 2021
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.

None yet

6 participants