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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Publish visibility.proto #148

Merged
merged 2 commits into from May 12, 2021
Merged

feat: Publish visibility.proto #148

merged 2 commits into from May 12, 2021

Conversation

yoshi-automation
Copy link
Contributor

@yoshi-automation yoshi-automation commented Apr 27, 2021

This PR was generated using Autosynth. 馃寛

Synth log will be available here:
https://source.cloud.google.com/results/invocations/3f44e15c-6839-4cf6-9691-aca53d9c1d6c/targets

  • To automatically regenerate this PR, check this box. (May take up to 24 hours.)

PiperOrigin-RevId: 370757345
Source-Link: googleapis/googleapis@7cde5d0

@yoshi-automation yoshi-automation requested a review from as a code owner Apr 27, 2021
@google-cla google-cla bot added the cla: yes label Apr 27, 2021
@Neenu1995 Neenu1995 added the kokoro:force-run label Apr 30, 2021
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run label Apr 30, 2021
@Neenu1995 Neenu1995 added the kokoro:force-run label Apr 30, 2021
        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.
Committer: @lukesneeringer
PiperOrigin-RevId: 370757345

Source-Author: Google APIs <noreply@google.com>
Source-Date: Tue Apr 27 13:59:23 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 7cde5d0df08801e00fc45df1546942aa2692d5c3
Source-Link: googleapis/googleapis@7cde5d0
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run label Apr 30, 2021
@suztomo
Copy link
Member

@suztomo suztomo commented May 5, 2021

Hmm. This seems a valid error. It's just appengine-api-1.0-sdk having shaded classes in return value.

The Linkage Monitor says:

May 05, 2021 4:03:30 PM com.google.cloud.tools.dependencies.linkagemonitor.LinkageMonitor run
INFO: BOM Coordinates: com.google.cloud:libraries-bom:20.2.0
May 05, 2021 4:06:57 PM com.google.cloud.tools.dependencies.linkagemonitor.LinkageMonitor run
INFO: The following problems in the baseline no longer appear in the snapshot:
  Class com.google.api.VisibilityProto is not found
  Class com.google.api.VisibilityProto is not found
  Class com.google.api.VisibilityProto is not found
  Class com.google.api.VisibilityProto is not found
  Class com.google.api.VisibilityProto is not found
  Class com.google.api.VisibilityProto is not found

May 05, 2021 4:06:57 PM com.google.cloud.tools.dependencies.linkagemonitor.LinkageMonitor run
SEVERE: Newly introduced problem:
(com.google.api.grpc:proto-google-common-protos:2.1.1-SNAPSHOT) com.google.api.VisibilityProto's method getDescriptor() is expected to return com.google.appengine.repackaged.com.google.protobuf.Descriptors$FileDescriptor but instead returns com.google.protobuf.Descriptors$FileDescriptor
  referenced from com.google.appengine.repackaged.com.google.api.HttpProto (com.google.appengine:appengine-api-1.0-sdk:1.9.71)
  referenced from com.google.appengine.repackaged.com.google.rpc.context.AbuseContextProto (com.google.appengine:appengine-api-1.0-sdk:1.9.71)
  referenced from com.google.appengine.repackaged.com.google.rpc.context.ConditionContextProto (com.google.appengine:appengine-api-1.0-sdk:1.9.71)
  referenced from com.google.appengine.repackaged.com.google.rpc.context.ContextExtensionsProto (com.google.appengine:appengine-api-1.0-sdk:1.9.71)
  referenced from com.google.appengine.repackaged.com.google.rpc.context.QosContextProto (com.google.appengine:appengine-api-1.0-sdk:1.9.71)
  referenced from com.google.appengine.repackaged.com.google.rpc.context.VisibilityContextProto (com.google.appengine:appengine-api-1.0-sdk:1.9.71)

com.google.api.grpc:proto-google-common-protos:2.1.1-SNAPSHOT is at:
  com.google.api.grpc:proto-google-common-protos:2.1.1-SNAPSHOT (compile)
  and 1 dependency path.
com.google.appengine:appengine-api-1.0-sdk:1.9.71 is at:
  com.google.http-client:google-http-client-appengine:1.39.2 (compile) / com.google.appengine:appengine-api-1.0-sdk:1.9.71 (provided)
  and 2 other dependency paths.

Let me think how best to resolve this.

appengine-api-1.0-sdk-1.9.71.jar

$  javap -verbose -cp ~/.m2/repository/com/google/appengine/appengine-api-1.0-sdk/1.9.71/appengine-api-1.0-sdk-1.9.71.jar com/google/appengine/repackaged/com/google/api/HttpProto |less
...
  #149 = Methodref          #130.#54      // com/google/api/VisibilityProto.getDescriptor:()Lcom/google/appengine/repackaged/com/google/protobuf/Descriptors$FileDescriptor;

VisibilityProto.java in this PR

The method in this PR returns non-repackaged version of FileDescriptors.FileDescriptor

  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
    return descriptor;
  }

@elharo
Copy link
Contributor

@elharo elharo commented May 7, 2021

Why is that linkage error firing on this PR in particular? I notice this cl uses the VisibilityProto but does not seem to change the appengine-api-sdk so I wonder if this is somehow picking up the wrong Visibility class?

Copy link
Contributor

@elharo elharo left a comment

Everything in this cl uses the normal, non-repackaged protos. That's good. However, I don't understand how that suddenly exposes the linkage error with the repackaged protos?

@suztomo
Copy link
Member

@suztomo suztomo commented May 10, 2021

@Neenu1995 I updated and released Linkage Monitor to skip the specific error. Now Linkage Monitor is green:

Screen Shot 2021-05-10 at 17 52 48

(The answer to Elliotte's comment is in GoogleCloudPlatform/cloud-opensource-java#2045)

@Neenu1995 Neenu1995 changed the title [CHANGE ME] Re-generated to pick up changes from googleapis. feat: Publish visibility.proto May 11, 2021
@Neenu1995 Neenu1995 added the automerge label May 11, 2021
@gcf-merge-on-green
Copy link

@gcf-merge-on-green gcf-merge-on-green bot commented May 12, 2021

Merge-on-green attempted to merge your PR for 6 hours, but it was not mergeable because either one of your required status checks failed, one of your required reviews was not approved, or there is a do not merge label. Learn more about your required status checks here: https://help.github.com/en/github/administering-a-repository/enabling-required-status-checks. You can remove and reapply the label to re-run the bot.

@gcf-merge-on-green gcf-merge-on-green bot removed the automerge label May 12, 2021
@chingor13 chingor13 merged commit 70a872e into master May 12, 2021
25 of 26 checks passed
@chingor13 chingor13 deleted the autosynth-googleapis branch May 12, 2021
gcf-merge-on-green bot pushed a commit that referenced this issue May 12, 2021
馃 I have created a release \*beep\* \*boop\*
---
## [2.2.0](https://www.github.com/googleapis/java-common-protos/compare/v2.1.0...v2.2.0) (2021-05-12)


### Features

* **generator:** update protoc to v3.15.3 ([#123](https://www.github.com/googleapis/java-common-protos/issues/123)) ([6e4c513](https://www.github.com/googleapis/java-common-protos/commit/6e4c513c736d03deddd4d61d98969a866e2a2600))
* introduce google.type.Decimal ([#133](https://www.github.com/googleapis/java-common-protos/issues/133)) ([2602033](https://www.github.com/googleapis/java-common-protos/commit/2602033ac638869765c331a6431940302c0a9147))
* Publish visibility.proto ([#148](https://www.github.com/googleapis/java-common-protos/issues/148)) ([70a872e](https://www.github.com/googleapis/java-common-protos/commit/70a872e3cdf3141d745028f4774574019c2eb7df))


### Bug Fixes

* correct maven artifact metadata ([#145](https://www.github.com/googleapis/java-common-protos/issues/145)) ([15f5c4a](https://www.github.com/googleapis/java-common-protos/commit/15f5c4a51124ce2d193f3947c1ef63710e25e7af)), closes [#72](https://www.github.com/googleapis/java-common-protos/issues/72)
* release scripts from issuing overlapping phases ([#142](https://www.github.com/googleapis/java-common-protos/issues/142)) ([36fedec](https://www.github.com/googleapis/java-common-protos/commit/36fedec9122adf95dfc4171311d4161867f8c8a6))
* typo ([#140](https://www.github.com/googleapis/java-common-protos/issues/140)) ([e05c3f9](https://www.github.com/googleapis/java-common-protos/commit/e05c3f9ada5fe444dd782dd7297b210e6c617b10))


### Documentation

* correct label format for monitored_resource and log_entry labels for managed monitored_resource should not have forward slash labels for log_entry should not have forward slash ([#128](https://www.github.com/googleapis/java-common-protos/issues/128)) ([05cfd8c](https://www.github.com/googleapis/java-common-protos/commit/05cfd8ca8f574502aa66b5be491eaaf7c1a01539))


### Dependencies

* update dependency com.google.protobuf:protobuf-bom to v3.15.6 ([#122](https://www.github.com/googleapis/java-common-protos/issues/122)) ([3fe8289](https://www.github.com/googleapis/java-common-protos/commit/3fe8289816924b9d4fdcefa49f225fc456c44064))
* update dependency com.google.protobuf:protobuf-bom to v3.15.8 ([#137](https://www.github.com/googleapis/java-common-protos/issues/137)) ([e3315de](https://www.github.com/googleapis/java-common-protos/commit/e3315debecbfd08db73b9c7303e0760024ff7504))
* update dependency com.google.protobuf:protobuf-bom to v3.16.0 ([#152](https://www.github.com/googleapis/java-common-protos/issues/152)) ([fe2b858](https://www.github.com/googleapis/java-common-protos/commit/fe2b8584a72cd8ca2adeb311f2a4b5cd2b642983))
* update dependency io.grpc:grpc-bom to v1.37.0 ([#131](https://www.github.com/googleapis/java-common-protos/issues/131)) ([5f6476a](https://www.github.com/googleapis/java-common-protos/commit/5f6476a8d3c88f97aa033b95b65d65b9a2de1421))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes context: partial
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants