diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 02da5de55..3a6e0dbe4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,23 +4,23 @@ # 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/cloud-sdk-java-team @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/api-pubsub -grpc-*/ @googleapis/cloud-sdk-java-team @googleapis/api-pubsub +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/api-pubsub -**/*Settings.java @googleapis/cloud-sdk-java-team @googleapis/api-pubsub -**/*ClientHttpJsonTest.java @googleapis/cloud-sdk-java-team @googleapis/api-pubsub -**/*ClientTest.java @googleapis/cloud-sdk-java-team @googleapis/api-pubsub -google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/** @googleapis/cloud-sdk-java-team @googleapis/api-pubsub -google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java @googleapis/cloud-sdk-java-team @googleapis/api-pubsub -google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/Mock* @googleapis/cloud-sdk-java-team @googleapis/api-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 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ce658ac8d..1f09ebd60 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -239,5 +239,5 @@ permissionRules: permission: admin - team: yoshi-java-admins permission: admin - - team: yoshi-java + - team: cloud-sdk-java-team permission: push diff --git a/.repo-metadata.json b/.repo-metadata.json index 0c8364b05..31cf00630 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -14,7 +14,7 @@ "library_type": "GAPIC_COMBO", "requires_billing": true, "api_reference": "https://cloud.google.com/pubsub/", - "codeowner_team": "@googleapis/api-pubsub", + "codeowner_team": "@googleapis/pubsub-team", "issue_tracker": "https://issuetracker.google.com/savedsearches/559741", "recommended_package": "com.google.cloud.pubsub.v1" } \ No newline at end of file diff --git a/generation_config.yaml b/generation_config.yaml index 31ade0ccf..cba64deff 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -14,7 +14,7 @@ libraries: repo: googleapis/java-pubsub repo_short: java-pubsub distribution_name: com.google.cloud:google-cloud-pubsub - codeowner_team: '@googleapis/api-pubsub' + codeowner_team: '@googleapis/pubsub-team' api_id: pubsub.googleapis.com library_type: GAPIC_COMBO requires_billing: true diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/LoggingUtil.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/LoggingUtil.java deleted file mode 100644 index dbc3a5d86..000000000 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/LoggingUtil.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright 2026 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -package com.google.cloud.pubsub.v1; - -import com.google.pubsub.v1.PubsubMessage; -import java.util.logging.Level; -import java.util.logging.Logger; - -public final class LoggingUtil { - // Instantiate all loggers as static final fields to maintain strong references - - private static final Logger slowAckLogger = Logger.getLogger("slow-ack"); - private static final Logger callbackDeliveryLogger = Logger.getLogger("callback-delivery"); - private static final Logger expiryLogger = Logger.getLogger("expiry"); - private static final Logger callbackExceptionsLogger = Logger.getLogger("callback-exceptions"); - private static final Logger ackBatchLogger = Logger.getLogger("ack-batch"); - private static final Logger subscriberFlowControlLogger = - Logger.getLogger("subscriber-flow-control"); - private static final Logger ackNackLogger = Logger.getLogger("ack-nack"); - private static final Logger publishBatchLogger = Logger.getLogger("publish-batch"); - private static final Logger subscriberStreamsLogger = Logger.getLogger("subscriber-streams"); - - public enum SubSystem { - SLOW_ACK(slowAckLogger), - CALLBACK_DELIVERY(callbackDeliveryLogger), - EXPIRY(expiryLogger), - CALLBACK_EXCEPTIONS(callbackExceptionsLogger), - ACK_BATCH(ackBatchLogger), - SUBSCRIBER_FLOW_CONTROL(subscriberFlowControlLogger), - ACK_NACK(ackNackLogger), - PUBLISH_BATCH(publishBatchLogger), - SUBSCRIBER_STREAMS(subscriberStreamsLogger); - - private final Logger logger; - - SubSystem(Logger logger) { - this.logger = logger; - } - - public Logger getLogger() { - return logger; - } - } - - public LoggingUtil() {} - - private String getSubscriptionLogPrefix( - PubsubMessageWrapper messageWrapper, String ackId, boolean exactlyOnceDeliveryEnabled) { - if (messageWrapper == null || messageWrapper.getPubsubMessage() == null) { - return " Ack ID: " - + ackId - + ", Exactly Once Delivery: " - + exactlyOnceDeliveryEnabled - + " (Message details not available)"; - } - - PubsubMessage message = messageWrapper.getPubsubMessage(); - String messageId = message.getMessageId(); - String orderingKey = message.getOrderingKey(); - - StringBuilder sb = new StringBuilder(); - sb.append("Message ID: ").append(messageId); - sb.append(", Ack ID: ").append(ackId); - if (orderingKey != null && !orderingKey.isEmpty()) { - sb.append(", Ordering Key: ").append(orderingKey); - } - sb.append(", Exactly Once Delivery: ").append(exactlyOnceDeliveryEnabled); - return sb.toString(); - } - - private String getPublisherLogPrefix(PubsubMessageWrapper messageWrapper) { - if (messageWrapper == null || messageWrapper.getPubsubMessage() == null) { - return " (Message details not available)"; - } - - PubsubMessage message = messageWrapper.getPubsubMessage(); - String messageId = message.getMessageId(); - String orderingKey = message.getOrderingKey(); - - StringBuilder sb = new StringBuilder(); - sb.append("Message ID: ").append(messageId); - if (orderingKey != null && !orderingKey.isEmpty()) { - sb.append(", Ordering Key: ").append(orderingKey); - } - return sb.toString(); - } - - public void logSubscriber( - SubSystem subSystem, - Level level, - String msg, - PubsubMessageWrapper messageWrapper, - String ackId, - boolean exactlyOnceDeliveryEnabled) { - Logger logger = subSystem.getLogger(); - if (logger.isLoggable(level)) { - String prefix = getSubscriptionLogPrefix(messageWrapper, ackId, exactlyOnceDeliveryEnabled); - logger.log(level, prefix + " - " + msg); - } - } - - public void logSubscriberWithThrowable( - SubSystem subSystem, - Level level, - String msg, - PubsubMessageWrapper messageWrapper, - String ackId, - boolean exactlyOnceDeliveryEnabled, - Throwable throwable) { - Logger logger = subSystem.getLogger(); - if (logger.isLoggable(level)) { - String prefix = getSubscriptionLogPrefix(messageWrapper, ackId, exactlyOnceDeliveryEnabled); - logger.log(level, prefix + " - " + msg, throwable); - } - } - - public void logPublisher( - SubSystem subSystem, Level level, String msg, PubsubMessageWrapper messageWrapper) { - Logger logger = subSystem.getLogger(); - if (logger.isLoggable(level)) { - String prefix = getPublisherLogPrefix(messageWrapper); - logger.log(level, prefix + " - " + msg); - } - } - - public void logEvent(SubSystem subSystem, Level level, String msg, Object... params) { - Logger logger = subSystem.getLogger(); - if (logger.isLoggable(level)) { - logger.log(level, msg, params); - } - } -}