Merge branch 'main' into test-fix

Author: michaelpri10

.github/.OwlBot-hermetic.yaml

@@ -11,16 +11,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-docker:
-  image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
-
 deep-remove-regex:
 - "/grpc-google-.*/src"
 - "/proto-google-.*/src"
 - "/google-.*/src"
 
+#Args=--initialize-at-build-time=org.junit.runners.model.FrameworkField
 deep-preserve-regex:
+- "/.*google-.*/src/main/java/.*/stub/Version.java"
+- "/google-cloud-pubsub/src/test/resources/META-INF/native-image/.*"
+- "/google-cloud-pubsub/src/main/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
 - "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
 - "/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeletedTopic.java"
 - "/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSnapshotName.java"
@@ -37,10 +37,12 @@ deep-preserve-regex:
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDataMatcher.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java"
+- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java"
+- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java"
 - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java"
@@ -55,15 +57,19 @@ deep-preserve-regex:
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiverWithAckResponse.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/ModackRequestData.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenCensusUtil.java"
+- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherInterface.java"
+- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberInterface.java"
+- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettings.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java"
 - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Waiter.java"
+- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/LoggingUtil.java"
 
 deep-copy-regex:
 - source: "/google/pubsub/(v.*)/.*-java/proto-google-.*/src"

.github/.OwlBot.lock.yaml

@@ -4,15 +4,26 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-pubsub is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/api-pubsub
+# The @googleapis/pubsub-team is the default owner for changes in this repo
+*                       @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/api-pubsub
+**/*.java               @googleapis/pubsub-team
 
+# For generated Java code
+proto-*/                    @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+grpc-*/                     @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+# Generated code pattern in google-cloud-pubsub
+**/*Client.java             @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+**/*Settings.java           @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+**/*ClientHttpJsonTest.java @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+**/*ClientTest.java         @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/** @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/Mock* @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
 
 # Generated snippets should not be owned by samples reviewers
-samples/snippets/generated/       @googleapis/yoshi-java
+samples/snippets/generated/       @googleapis/cloud-sdk-java-team

.github/CODEOWNERS

@@ -6,6 +6,7 @@ externalManifests:
   file: '.github/readme/synth.metadata/synth.metadata'
   jsonpath: '$.generatedFiles[*]'
 ignoreAuthors:
+- 'cloud-java-bot'
 - 'renovate-bot'
 - 'yoshi-automation'
 - 'release-please[bot]'

.github/generated-files-bot.yml

@@ -2,39 +2,32 @@ bumpMinorPreMajor: true
 handleGHRelease: true
 releaseType: java-yoshi
 branches:
-  - releaseType: java-lts
-    bumpMinorPreMajor: true
-    handleGHRelease: true
-    branch: 1.111.0-sp
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-yoshi
-    branch: java7
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
+  - branch: 1.111.0-sp
+    releaseType: java-lts
+  - branch: java7
+  - branch: 1.114.x
     releaseType: java-backport
-    branch: 1.114.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
+  - branch: 1.116.x
     releaseType: java-backport
-    branch: 1.116.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
+  - branch: 1.117.x
     releaseType: java-backport
-    branch: 1.117.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
+  - branch: 1.120.x
     releaseType: java-backport
-    branch: 1.120.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
+  - branch: 1.121.x
     releaseType: java-backport
-    branch: 1.121.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
+  - branch: 1.123.x
+    releaseType: java-backport
+  - branch: 1.125.x
+    releaseType: java-backport
+  - branch: 1.129.x
+    releaseType: java-backport
+  - branch: 1.137.x
+    releaseType: java-backport
+  - branch: 1.140.x
     releaseType: java-backport
-    branch: 1.123.x
+  - branch: protobuf-4.x-rc
+    manifest: true
   - bumpMinorPreMajor: true
     handleGHRelease: true
     releaseType: java-backport
-    branch: 1.125.x
+    branch: 1.147.x