Skip to content

Conversation

@masahitojp
Copy link
Contributor

@masahitojp masahitojp commented Feb 16, 2021

bump google-cloud-pubsub to 1.110.3, because we follwed dependencies in google_cloud_platform_libraries_bom sets version.

The current master branch depends on 16.3.0 (#13990)

https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/16.3.0/artifact_details.html

^ It depends on com.google.cloud:google-cloud-pubsub:1.110.3
Since this is newer than the current master(1.108.6 ) , I think it's better to update

results of sh sdks/java/build-tools/beam-linkage-check.sh origin/master beam-11770

Success

https://gist.github.com/masahitojp/6a292e3d8ff5506383fca3a44805bafb


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.

@codecov
Copy link

codecov bot commented Feb 16, 2021

Codecov Report

Merging #13994 (df3fd10) into master (aaad864) will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13994      +/-   ##
==========================================
- Coverage   82.98%   82.97%   -0.01%     
==========================================
  Files         469      469              
  Lines       58298    58300       +2     
==========================================
- Hits        48379    48375       -4     
- Misses       9919     9925       +6     
Impacted Files Coverage Δ
...e_beam/portability/api/beam_runner_api_pb2_urns.py
...hon/apache_beam/examples/complete/game/__init__.py
.../apache_beam/portability/api/endpoints_pb2_grpc.py
...apache_beam/typehints/native_type_compatibility.py
...am/runners/interactive/options/capture_limiters.py
..._beam/runners/interactive/user_pipeline_tracker.py
sdks/python/apache_beam/coders/row_coder.py
...ks/python/apache_beam/runners/worker/operations.py
.../examples/snippets/transforms/elementwise/regex.py
...python/apache_beam/typehints/typehints_test_py3.py
... and 928 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 aaad864...df3fd10. Read the comment docs.

@masahitojp
Copy link
Contributor Author

Run Java_Examples_Dataflow PreCommit

@masahitojp
Copy link
Contributor Author

Run Website PreCommit

@masahitojp
Copy link
Contributor Author

R: @iemejia
Could you review this PR?

@iemejia
Copy link
Member

iemejia commented Feb 16, 2021

I am not familiar with the consequences of dependency upgrades for Google related dependencies, so in the future for google related dependencies please choose as a reviewer like @kennknowles @chamikaramj or @suztomo

Can someone of you please help review this one or forward this to someone who can. Thanks!
Oh and thanks for your this and all the other recent contributions @masahitojp !

@suztomo
Copy link
Contributor

suztomo commented Feb 16, 2021

Run Java Postcommit

@suztomo
Copy link
Contributor

suztomo commented Feb 16, 2021

@masahitojp Would you try running the command below?

sh sdks/java/build-tools/beam-linkage-check.sh origin/master beam-11770

https://cwiki.apache.org/confluence/display/BEAM/Dependency+Upgrades#app-switcher (this has outdated command line parameter. It now takes 2 git branches.)

If there's no new conflict, it looks good to me (I'm not a committer though).

Note that there's back-and-forth (#13765 and #13972) of GCP dependencies in the last couple of weeks. They might interfere this PR; thank you for your patience.

@masahitojp
Copy link
Contributor Author

masahitojp commented Feb 17, 2021

Hi @suztomo

I tried the command.

sh sdks/java/build-tools/beam-linkage-check.sh origin/master beam-11770

but I got a below errors 😢

Failed to generate the baseline file. Check the build error above.
Checking linkage for origin/beam-11770
Previous HEAD position was 3930d12d47 Merge pull request #13981: [BEAM-11124] bump joda-time to 2.10.10
HEAD is now at 45ba4c5888 [BEAM-11770] bump google-cloud-pubsub to 1.111.0
Running linkage check (validate) for beam-sdks-java-core
using baseline build/linkagecheck/baseline-beam-sdks-java-core.xml
Error: Baseline file not found
Running linkage check (validate) for beam-sdks-java-io-google-cloud-platform
using baseline build/linkagecheck/baseline-beam-sdks-java-io-google-cloud-platform.xml
Error: Baseline file not found
Running linkage check (validate) for beam-runners-google-cloud-dataflow-java
 using baseline build/linkagecheck/baseline-beam-runners-google-cloud-dataflow-java.xml
Error: Baseline file not found
Running linkage check (validate) for beam-sdks-java-io-hadoop-format
 using baseline build/linkagecheck/baseline-beam-sdks-java-io-hadoop-format.xml
Error: Baseline file not found

In the previous jobs, it is displayed as "BUILD SUCCESSFUL ".
Do you know what is causing it? (Manjaro Linux + openjdk version "1.8.0_282")

@suztomo
Copy link
Contributor

suztomo commented Feb 17, 2021 via email

@suztomo
Copy link
Contributor

suztomo commented Feb 17, 2021

I tried and got the same error. Digging further. https://gist.github.com/suztomo/b5a33361ad83c5e5c9054b393ac496c1

Created an issue: BEAM-11827.

@suztomo
Copy link
Contributor

suztomo commented Feb 17, 2021

@masahitojp It seems that beam-linkage-check.sh has not been migrated properly when this repository moved build script from Gradle to Kotlin. (Your observation helped me to identify the problem. Thank you!)

I raised a pull request to fix the problem #14006. Give me and Beam committers some moment.

@suztomo
Copy link
Contributor

suztomo commented Feb 17, 2021

@masahitojp I rebased your branch and ran the tool

https://gist.github.com/suztomo/0ba02d93aa0b2f5d9701c50f7d7fd81f It seems that proto-google-cloud-pubsub-v1 needs to have a newer version. Would you check it?

@masahitojp
Copy link
Contributor Author

masahitojp commented Feb 18, 2021

@suztomo Thank you for your great contribution!!

It seems that proto-google-cloud-pubsub-v1 needs to have a newer version. Would you check it?
I checked it. I can't say anything, but I think it's preferable to update it

proto_google_cloud_pubsub_v1 : "com.google.api.grpc:proto-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version

// google_cloud_platform_libraries_bom sets version

maybe , In other words, I think it will affect this.....

Note that there's back-and-forth (#13765 and #13972) of GCP dependencies in the last couple of weeks.

I think it would be good to put it on hold until this work is finished. 😢

@masahitojp
Copy link
Contributor Author

Run Java PreCommit

@masahitojp masahitojp changed the title [BEAM-11770] bump google-cloud-pubsub to 1.111.0 [BEAM-11770] bump google-cloud-pubsub to 1.110.3(google_cloud_platform_libraries_bom ) Feb 23, 2021
@masahitojp
Copy link
Contributor Author

The current master branch depends on 16.3.0 (#13990)
In other words, there was no longer any affect on us.

Note that there's back-and-forth (#13765 and #13972) of GCP dependencies in the last couple of weeks.

#13990 is merged, and this PR is restarted, especially since it does not seem to be causing any problems in testing.


Now I've changed the purpose of this PR.

what

bump google-cloud-pubsub to 1.110.3, because we follwed dependencies in google_cloud_platform_libraries_bom sets version.

The current master branch depends on 16.3.0 (#13990)

https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/16.3.0/artifact_details.html

^ It depends on com.google.cloud:google-cloud-pubsub:1.110.3
Since this is newer than the current master(1.108.6 ) , I think it's better to update

why(background)

The apache beam specifies the versions of the following packages

  • com.google.cloud:google-cloud-pubsub

But this package has dependencies with the following packages but this one is specified by google_cloud_platform_libraries_bom

  • com.google.api.grpc:proto-google-cloud-pubsub-v1
  • com.google.api.grpc:grpc-google-cloud-pubsub-v1

The dependencies of this package are difficult to understand for people who don't know about it, so there is a possibility that the dependencies will be broken unintentionally in the future. For this reason, I thought it would be better for me to unify them into google_cloud_platform_libraries_bom

^ It depends on com.google.cloud:google-cloud-pubsub:1.110.3
Since this is newer than the current master(1.108.6 ) , I think it's better to update

results of sh sdks/java/build-tools/beam-linkage-check.sh origin/master beam-11770

Success

https://gist.github.com/masahitojp/6a292e3d8ff5506383fca3a44805bafb
(Thanks to your support @suztomo )


Could you re-review this PR?
R: @TheNeuralBit @iemejia

google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:1.6.3",
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub:$google_cloud_pubsub_version",
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a nice enhancement. No need to maintain google-cloud-pubsub separately. Thank you.

Copy link
Member

Choose a reason for hiding this comment

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

+1, thank you

@TheNeuralBit TheNeuralBit merged commit 7b2c4dc into apache:master Feb 23, 2021
@masahitojp masahitojp deleted the beam-11770 branch February 23, 2021 16:00
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.

4 participants