diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 7023350ad..f61e4eb85 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
- - uses: googleapis/sdk-platform-java/.github/scripts@v2.63.0
+ - uses: googleapis/sdk-platform-java/.github/scripts@v2.64.1
if: env.SHOULD_RUN == 'true'
with:
base_ref: ${{ github.base_ref }}
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index 118c3b50f..ba9ae7cf5 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -17,6 +17,6 @@ jobs:
# repository
.kokoro/build.sh
- name: Unmanaged dependency check
- uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.53.0
+ uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.1
with:
bom-path: google-cloud-pubsub-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
index 55c5543e2..b772eac66 100644
--- a/.kokoro/presubmit/graalvm-native-a.cfg
+++ b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
index 5c981b984..baf136cf8 100644
--- a/.kokoro/presubmit/graalvm-native-b.cfg
+++ b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
index f2032499d..2fb2fc87c 100644
--- a/.kokoro/presubmit/graalvm-native-c.cfg
+++ b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
}
env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2df2a6eb3..d16543734 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# Changelog
+## [1.143.1](https://github.com/googleapis/java-pubsub/compare/v1.143.0...v1.143.1) (2025-11-13)
+
+
+### Bug Fixes
+
+* Deflake WaiterTest ([#2600](https://github.com/googleapis/java-pubsub/issues/2600)) ([298c8db](https://github.com/googleapis/java-pubsub/commit/298c8db04616341da040935636b1a04ce5f022a0))
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.64.1 ([b210251](https://github.com/googleapis/java-pubsub/commit/b2102516bf833c2704c85cb348b67bb7cbfdb3a6))
+
+
+### Dependencies
+
+* Remove OpenTelemetry semconv dependency ([#2611](https://github.com/googleapis/java-pubsub/issues/2611)) ([240fc37](https://github.com/googleapis/java-pubsub/commit/240fc3784db3860eb2668946fbf861beed2647d7))
+* Update actions/checkout action to v5 ([#2592](https://github.com/googleapis/java-pubsub/issues/2592)) ([6ca466d](https://github.com/googleapis/java-pubsub/commit/6ca466d382ddde9780ae1c8627092d731e314f90))
+* Update dependency com.google.cloud:google-cloud-bigquery to v2.55.3 ([#2602](https://github.com/googleapis/java-pubsub/issues/2602)) ([d14106c](https://github.com/googleapis/java-pubsub/commit/d14106cc278c98d3f954f959e2dd3764ebd20fc2))
+* Update dependency com.google.cloud:google-cloud-core to v2.61.0 ([#2588](https://github.com/googleapis/java-pubsub/issues/2588)) ([244cf75](https://github.com/googleapis/java-pubsub/commit/244cf758bf46f8431a17b1d8e76d1d90c494fc76))
+* Update dependency com.google.cloud:google-cloud-storage to v2.59.0 ([#2603](https://github.com/googleapis/java-pubsub/issues/2603)) ([d9d05bf](https://github.com/googleapis/java-pubsub/commit/d9d05bfa18580cdacdfa9378d30b56ce0ae0d4d2))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.54.1 ([#2609](https://github.com/googleapis/java-pubsub/issues/2609)) ([c99373f](https://github.com/googleapis/java-pubsub/commit/c99373f2d25c6b9f1bcb6aace3c6625375310a16))
+* Update dependency com.google.protobuf:protobuf-java-util to v4.33.0 ([#2587](https://github.com/googleapis/java-pubsub/issues/2587)) ([33724ce](https://github.com/googleapis/java-pubsub/commit/33724cef79e3f7e798c5ef222ee7dff3565555f8))
+
## [1.143.0](https://github.com/googleapis/java-pubsub/compare/v1.142.0...v1.143.0) (2025-10-20)
diff --git a/README.md b/README.md
index 615b42ea6..b0672bc00 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
com.google.cloud
libraries-bom
- 26.70.0
+ 26.71.0
pom
import
@@ -43,7 +43,7 @@ If you are using Maven without the BOM, add this to your dependencies:
com.google.cloud
google-cloud-pubsub
- 1.142.0
+ 1.143.0
```
@@ -51,20 +51,20 @@ If you are using Maven without the BOM, add this to your dependencies:
If you are using Gradle 5.x or later, add this to your dependencies:
```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.70.0')
+implementation platform('com.google.cloud:libraries-bom:26.71.0')
implementation 'com.google.cloud:google-cloud-pubsub'
```
If you are using Gradle without BOM, add this to your dependencies:
```Groovy
-implementation 'com.google.cloud:google-cloud-pubsub:1.143.0'
+implementation 'com.google.cloud:google-cloud-pubsub:1.143.1'
```
If you are using SBT, add this to your dependencies:
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.143.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.143.1"
```
## Authentication
@@ -420,7 +420,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.143.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.143.1
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/generation_config.yaml b/generation_config.yaml
index 0a9e75959..744688ac1 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.63.0
-googleapis_commitish: c288189b43c016dd3cf1ec73ce3cadee8b732f07
-libraries_bom_version: 26.70.0
+gapic_generator_version: 2.64.1
+googleapis_commitish: 5342712986262b93211b136eb4bd6fb79b3764af
+libraries_bom_version: 26.71.0
libraries:
- api_shortname: pubsub
name_pretty: Cloud Pub/Sub
diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml
index 39ad7f874..5281720c5 100644
--- a/google-cloud-pubsub-bom/pom.xml
+++ b/google-cloud-pubsub-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-pubsub-bom
- 1.143.0
+ 1.143.1
pom
com.google.cloud
sdk-platform-java-config
- 3.53.0
+ 3.54.1
Google Cloud pubsub BOM
@@ -52,17 +52,17 @@
com.google.cloud
google-cloud-pubsub
- 1.143.0
+ 1.143.1
com.google.api.grpc
grpc-google-cloud-pubsub-v1
- 1.125.0
+ 1.125.1
com.google.api.grpc
proto-google-cloud-pubsub-v1
- 1.125.0
+ 1.125.1
diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml
index 35f337209..8d31ef029 100644
--- a/google-cloud-pubsub/pom.xml
+++ b/google-cloud-pubsub/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-pubsub
- 1.143.0
+ 1.143.1
jar
Google Cloud Pub/Sub
https://github.com/googleapis/java-pubsub
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-pubsub-parent
- 1.143.0
+ 1.143.1
google-cloud-pubsub
@@ -108,10 +108,6 @@
io.opentelemetry
opentelemetry-context
-
- io.opentelemetry
- opentelemetry-semconv
-
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java
index 9ee751135..3de448458 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java
@@ -27,7 +27,6 @@
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.util.List;
public class OpenTelemetryPubsubTracer {
@@ -40,6 +39,13 @@ public class OpenTelemetryPubsubTracer {
"subscriber concurrency control";
private static final String SUBSCRIBE_SCHEDULER_SPAN_NAME = "subscriber scheduler";
+ private static final String MESSAGING_SYSTEM_ATTR_KEY = "messaging.system";
+ private static final String MESSAGING_DESTINATION_NAME_ATTR_KEY = "messaging.destination.name";
+ private static final String CODE_FUNCTION_ATTR_KEY = "code.function";
+ private static final String MESSAGING_OPERATION_ATTR_KEY = "messaging.operation";
+ private static final String MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY =
+ "messaging.batch.message_count";
+ private static final String MESSAGING_MESSAGE_ID_ATTR_KEY = "messaging.message.id";
private static final String MESSAGE_SIZE_ATTR_KEY = "messaging.message.body.size";
private static final String ORDERING_KEY_ATTR_KEY = "messaging.gcp_pubsub.message.ordering_key";
private static final String MESSAGE_ACK_ID_ATTR_KEY = "messaging.gcp_pubsub.message.ack_id";
@@ -66,12 +72,12 @@ private static final AttributesBuilder createCommonSpanAttributesBuilder(
String destinationName, String projectName, String codeFunction, String operation) {
AttributesBuilder attributesBuilder =
Attributes.builder()
- .put(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
- .put(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName)
+ .put(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
+ .put(MESSAGING_DESTINATION_NAME_ATTR_KEY, destinationName)
.put(PROJECT_ATTR_KEY, projectName)
- .put(SemanticAttributes.CODE_FUNCTION, codeFunction);
+ .put(CODE_FUNCTION_ATTR_KEY, codeFunction);
if (operation != null) {
- attributesBuilder.put(SemanticAttributes.MESSAGING_OPERATION, operation);
+ attributesBuilder.put(MESSAGING_OPERATION_ATTR_KEY, operation);
}
return attributesBuilder;
@@ -179,7 +185,7 @@ Span startPublishRpcSpan(TopicName topicName, List message
Attributes attributes =
createCommonSpanAttributesBuilder(
topicName.getTopic(), topicName.getProject(), "publishCall", "publish")
- .put(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, messages.size())
+ .put(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, messages.size())
.build();
SpanBuilder publishRpcSpanBuilder =
tracer
@@ -187,7 +193,7 @@ Span startPublishRpcSpan(TopicName topicName, List message
.setSpanKind(SpanKind.CLIENT)
.setAllAttributes(attributes);
Attributes linkAttributes =
- Attributes.builder().put(SemanticAttributes.MESSAGING_OPERATION, "publish").build();
+ Attributes.builder().put(MESSAGING_OPERATION_ATTR_KEY, "publish").build();
for (PubsubMessageWrapper message : messages) {
if (message.getPublisherSpan().getSpanContext().isSampled())
publishRpcSpanBuilder.addLink(message.getPublisherSpan().getSpanContext(), linkAttributes);
@@ -237,7 +243,7 @@ void startSubscriberSpan(PubsubMessageWrapper message, boolean exactlyOnceDelive
message.getSubscriptionName(), message.getSubscriptionProject(), "onResponse", null);
attributesBuilder
- .put(SemanticAttributes.MESSAGING_MESSAGE_ID, message.getMessageId())
+ .put(MESSAGING_MESSAGE_ID_ATTR_KEY, message.getMessageId())
.put(MESSAGE_SIZE_ATTR_KEY, message.getDataSize())
.put(MESSAGE_ACK_ID_ATTR_KEY, message.getAckId())
.put(MESSAGE_EXACTLY_ONCE_ATTR_KEY, exactlyOnceDeliveryEnabled);
@@ -336,8 +342,7 @@ void startSubscribeProcessSpan(PubsubMessageWrapper message) {
if (subscriberSpan != null) {
Span subscribeProcessSpan =
startChildSpan(message.getSubscriptionName() + " process", subscriberSpan);
- subscribeProcessSpan.setAttribute(
- SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE);
+ subscribeProcessSpan.setAttribute(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE);
Span publisherSpan = message.getPublisherSpan();
if (publisherSpan != null) {
subscribeProcessSpan.addLink(publisherSpan.getSpanContext());
@@ -373,7 +378,7 @@ Span startSubscribeRpcSpan(
subscriptionName.getProject(),
codeFunction,
rpcOperation)
- .put(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, messages.size());
+ .put(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, messages.size());
// Ack deadline and receipt modack are specific to the modack operation
if (rpcOperation == "modack") {
@@ -388,7 +393,7 @@ Span startSubscribeRpcSpan(
.setSpanKind(SpanKind.CLIENT)
.setAllAttributes(attributesBuilder.build());
Attributes linkAttributes =
- Attributes.builder().put(SemanticAttributes.MESSAGING_OPERATION, rpcOperation).build();
+ Attributes.builder().put(MESSAGING_OPERATION_ATTR_KEY, rpcOperation).build();
for (PubsubMessageWrapper message : messages) {
if (message.getSubscriberSpan().getSpanContext().isSampled()) {
rpcSpanBuilder.addLink(message.getSubscriberSpan().getSpanContext(), linkAttributes);
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java
index 7067b0c1a..19864a26f 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java
@@ -26,7 +26,6 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.TextMapGetter;
import io.opentelemetry.context.propagation.TextMapSetter;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
/**
* A wrapper class for a {@link PubsubMessage} object that handles creation and tracking of
@@ -54,6 +53,7 @@ public class PubsubMessageWrapper {
private static final String GOOGCLIENT_PREFIX = "googclient_";
+ private static final String MESSAGING_MESSAGE_ID_ATTR_KEY = "messaging.message.id";
private static final String MESSAGE_RESULT_ATTR_KEY = "messaging.gcp_pubsub.result";
private Span publisherSpan;
@@ -194,7 +194,7 @@ void addPublishStartEvent() {
*/
void setPublisherMessageIdSpanAttribute(String messageId) {
if (publisherSpan != null) {
- publisherSpan.setAttribute(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId);
+ publisherSpan.setAttribute(MESSAGING_MESSAGE_ID_ATTR_KEY, messageId);
}
}
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java
index 2297f84bf..52351ddef 100644
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java
+++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java
@@ -35,7 +35,6 @@
import io.opentelemetry.sdk.trace.data.LinkData;
import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.sdk.trace.data.StatusData;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
@@ -82,6 +81,13 @@ public class OpenTelemetryTest {
private static final String ACK_START_EVENT = "ack start";
private static final String ACK_END_EVENT = "ack end";
+ private static final String MESSAGING_SYSTEM_ATTR_KEY = "messaging.system";
+ private static final String MESSAGING_DESTINATION_NAME_ATTR_KEY = "messaging.destination.name";
+ private static final String CODE_FUNCTION_ATTR_KEY = "code.function";
+ private static final String MESSAGING_OPERATION_ATTR_KEY = "messaging.operation";
+ private static final String MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY =
+ "messaging.batch.message_count";
+ private static final String MESSAGING_MESSAGE_ID_ATTR_KEY = "messaging.message.id";
private static final String MESSAGING_SYSTEM_VALUE = "gcp_pubsub";
private static final String PROJECT_ATTR_KEY = "gcp.project_id";
private static final String MESSAGE_SIZE_ATTR_KEY = "messaging.message.body.size";
@@ -159,12 +165,12 @@ public void testPublishSpansSuccess() {
AttributesAssert publishRpcSpanAttributesAssert =
OpenTelemetryAssertions.assertThat(publishRpcSpanData.getAttributes());
publishRpcSpanAttributesAssert
- .containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
- .containsEntry(SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_TOPIC_NAME.getTopic())
+ .containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
+ .containsEntry(MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_TOPIC_NAME.getTopic())
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
- .containsEntry(SemanticAttributes.CODE_FUNCTION, "publishCall")
- .containsEntry(SemanticAttributes.MESSAGING_OPERATION, "publish")
- .containsEntry(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, messageWrappers.size());
+ .containsEntry(CODE_FUNCTION_ATTR_KEY, "publishCall")
+ .containsEntry(MESSAGING_OPERATION_ATTR_KEY, "publish")
+ .containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, messageWrappers.size());
// Check span data, events, links, and attributes for the publisher create span
SpanDataAssert publisherSpanDataAssert = OpenTelemetryAssertions.assertThat(publisherSpanData);
@@ -190,14 +196,14 @@ public void testPublishSpansSuccess() {
AttributesAssert publisherSpanAttributesAssert =
OpenTelemetryAssertions.assertThat(publisherSpanData.getAttributes());
publisherSpanAttributesAssert
- .containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
- .containsEntry(SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_TOPIC_NAME.getTopic())
+ .containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
+ .containsEntry(MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_TOPIC_NAME.getTopic())
.containsEntry(PROJECT_ATTR_KEY, PROJECT_NAME)
- .containsEntry(SemanticAttributes.CODE_FUNCTION, "publish")
- .containsEntry(SemanticAttributes.MESSAGING_OPERATION, "create")
+ .containsEntry(CODE_FUNCTION_ATTR_KEY, "publish")
+ .containsEntry(MESSAGING_OPERATION_ATTR_KEY, "create")
.containsEntry(ORDERING_KEY_ATTR_KEY, ORDERING_KEY)
.containsEntry(MESSAGE_SIZE_ATTR_KEY, messageSize)
- .containsEntry(SemanticAttributes.MESSAGING_MESSAGE_ID, MESSAGE_ID);
+ .containsEntry(MESSAGING_MESSAGE_ID_ATTR_KEY, MESSAGE_ID);
// Check that the message has the attribute containing the trace context.
PubsubMessage message = messageWrapper.getPubsubMessage();
@@ -393,14 +399,13 @@ public void testSubscribeSpansSuccess() {
AttributesAssert modackRpcSpanAttributesAssert =
OpenTelemetryAssertions.assertThat(modackRpcSpanData.getAttributes());
modackRpcSpanAttributesAssert
- .containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
+ .containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
.containsEntry(
- SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
+ MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
- .containsEntry(SemanticAttributes.CODE_FUNCTION, "sendModAckOperations")
- .containsEntry(SemanticAttributes.MESSAGING_OPERATION, "modack")
- .containsEntry(
- SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, subscribeMessageWrappers.size())
+ .containsEntry(CODE_FUNCTION_ATTR_KEY, "sendModAckOperations")
+ .containsEntry(MESSAGING_OPERATION_ATTR_KEY, "modack")
+ .containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, subscribeMessageWrappers.size())
.containsEntry(ACK_DEADLINE_ATTR_KEY, 10)
.containsEntry(RECEIPT_MODACK_ATTR_KEY, true);
@@ -420,14 +425,13 @@ public void testSubscribeSpansSuccess() {
AttributesAssert ackRpcSpanAttributesAssert =
OpenTelemetryAssertions.assertThat(ackRpcSpanData.getAttributes());
ackRpcSpanAttributesAssert
- .containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
+ .containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
.containsEntry(
- SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
+ MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
- .containsEntry(SemanticAttributes.CODE_FUNCTION, "sendAckOperations")
- .containsEntry(SemanticAttributes.MESSAGING_OPERATION, "ack")
- .containsEntry(
- SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, subscribeMessageWrappers.size());
+ .containsEntry(CODE_FUNCTION_ATTR_KEY, "sendAckOperations")
+ .containsEntry(MESSAGING_OPERATION_ATTR_KEY, "ack")
+ .containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, subscribeMessageWrappers.size());
// Check span data, links, and attributes for the nack RPC span
SpanDataAssert nackRpcSpanDataAssert = OpenTelemetryAssertions.assertThat(nackRpcSpanData);
@@ -445,14 +449,13 @@ public void testSubscribeSpansSuccess() {
AttributesAssert nackRpcSpanAttributesAssert =
OpenTelemetryAssertions.assertThat(nackRpcSpanData.getAttributes());
nackRpcSpanAttributesAssert
- .containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
+ .containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
.containsEntry(
- SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
+ MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
- .containsEntry(SemanticAttributes.CODE_FUNCTION, "sendModAckOperations")
- .containsEntry(SemanticAttributes.MESSAGING_OPERATION, "nack")
- .containsEntry(
- SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, subscribeMessageWrappers.size());
+ .containsEntry(CODE_FUNCTION_ATTR_KEY, "sendModAckOperations")
+ .containsEntry(MESSAGING_OPERATION_ATTR_KEY, "nack")
+ .containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, subscribeMessageWrappers.size());
// Check span data, events, links, and attributes for the publisher create span
SpanDataAssert subscriberSpanDataAssert =
@@ -493,18 +496,18 @@ public void testSubscribeSpansSuccess() {
AttributesAssert subscriberSpanAttributesAssert =
OpenTelemetryAssertions.assertThat(subscriberSpanData.getAttributes());
subscriberSpanAttributesAssert
- .containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
+ .containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
.containsEntry(
- SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
+ MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
.containsEntry(PROJECT_ATTR_KEY, PROJECT_NAME)
- .containsEntry(SemanticAttributes.CODE_FUNCTION, "onResponse")
+ .containsEntry(CODE_FUNCTION_ATTR_KEY, "onResponse")
.containsEntry(MESSAGE_SIZE_ATTR_KEY, messageSize)
.containsEntry(ORDERING_KEY_ATTR_KEY, ORDERING_KEY)
.containsEntry(MESSAGE_ACK_ID_ATTR_KEY, ACK_ID)
.containsEntry(MESSAGE_DELIVERY_ATTEMPT_ATTR_KEY, DELIVERY_ATTEMPT)
.containsEntry(MESSAGE_EXACTLY_ONCE_ATTR_KEY, EXACTLY_ONCE_ENABLED)
.containsEntry(MESSAGE_RESULT_ATTR_KEY, PROCESS_ACTION)
- .containsEntry(SemanticAttributes.MESSAGING_MESSAGE_ID, MESSAGE_ID);
+ .containsEntry(MESSAGING_MESSAGE_ID_ATTR_KEY, MESSAGE_ID);
}
@Test
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java
index c9eed7e16..aaa396690 100644
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java
+++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java
@@ -55,39 +55,61 @@ public void run() {
}
@Test
- public void testTryWait_Completes() {
+ public void testTryWait_Completes() throws Exception {
final Waiter waiter = new Waiter();
waiter.incrementPendingCount(1);
final FakeClock clock = new FakeClock();
+ final Thread mainThread = Thread.currentThread();
Thread t =
new Thread(
- () -> {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
+ new Runnable() {
+ @Override
+ public void run() {
+ while (mainThread.getState() == Thread.State.NEW) {
+ Thread.yield();
+ }
+ waiter.incrementPendingCount(-1);
}
- waiter.incrementPendingCount(-1);
});
t.start();
assertTrue(waiter.tryWait(500, clock));
+ t.join();
+
+ assertEquals(0, waiter.pendingCount());
}
@Test
- public void testTryWait_TimesOut() {
+ public void testTryWait_TimesOut() throws Exception {
final Waiter waiter = new Waiter();
waiter.incrementPendingCount(1);
final FakeClock clock = new FakeClock();
+ final Thread mainThread = Thread.currentThread();
Thread t =
new Thread(
- () -> {
- clock.advance(100, TimeUnit.MILLISECONDS);
+ new Runnable() {
+ @Override
+ public void run() {
+ while (mainThread.getState() == Thread.State.NEW) {
+ Thread.yield();
+ }
+ try {
+ // Waits some additional time to ensure that the waiter is actually waiting.
+ Thread.sleep(100);
+ clock.advance(200, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ // Ignored.
+ }
+ }
});
t.start();
assertFalse(waiter.tryWait(100, clock));
+ t.join();
+
+ assertEquals(1, waiter.pendingCount());
}
@Test
diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml
index 7cb6e8fe2..fd03db4db 100644
--- a/grpc-google-cloud-pubsub-v1/pom.xml
+++ b/grpc-google-cloud-pubsub-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-pubsub-v1
- 1.125.0
+ 1.125.1
grpc-google-cloud-pubsub-v1
GRPC library for grpc-google-cloud-pubsub-v1
com.google.cloud
google-cloud-pubsub-parent
- 1.143.0
+ 1.143.1
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
index a1b0a2b1c..8ee09f14e 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
@@ -25,9 +25,6 @@
* messages to a topic.
*
*/
-@javax.annotation.Generated(
- value = "by gRPC proto compiler",
- comments = "Source: google/pubsub/v1/pubsub.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class PublisherGrpc {
@@ -832,8 +829,9 @@ protected PublisherBlockingV2Stub build(
* (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
*
*/
- public com.google.pubsub.v1.Topic createTopic(com.google.pubsub.v1.Topic request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.pubsub.v1.Topic createTopic(com.google.pubsub.v1.Topic request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getCreateTopicMethod(), getCallOptions(), request);
}
@@ -845,8 +843,9 @@ public com.google.pubsub.v1.Topic createTopic(com.google.pubsub.v1.Topic request
* mask. Note that certain properties of a topic are not modifiable.
*
*/
- public com.google.pubsub.v1.Topic updateTopic(com.google.pubsub.v1.UpdateTopicRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.pubsub.v1.Topic updateTopic(com.google.pubsub.v1.UpdateTopicRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getUpdateTopicMethod(), getCallOptions(), request);
}
@@ -858,9 +857,9 @@ public com.google.pubsub.v1.Topic updateTopic(com.google.pubsub.v1.UpdateTopicRe
* does not exist.
*
*/
- public com.google.pubsub.v1.PublishResponse publish(
- com.google.pubsub.v1.PublishRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.pubsub.v1.PublishResponse publish(com.google.pubsub.v1.PublishRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getPublishMethod(), getCallOptions(), request);
}
@@ -871,8 +870,9 @@ public com.google.pubsub.v1.PublishResponse publish(
* Gets the configuration of a topic.
*
*/
- public com.google.pubsub.v1.Topic getTopic(com.google.pubsub.v1.GetTopicRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.pubsub.v1.Topic getTopic(com.google.pubsub.v1.GetTopicRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getGetTopicMethod(), getCallOptions(), request);
}
@@ -884,8 +884,8 @@ public com.google.pubsub.v1.Topic getTopic(com.google.pubsub.v1.GetTopicRequest
*
*/
public com.google.pubsub.v1.ListTopicsResponse listTopics(
- com.google.pubsub.v1.ListTopicsRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ListTopicsRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getListTopicsMethod(), getCallOptions(), request);
}
@@ -897,8 +897,8 @@ public com.google.pubsub.v1.ListTopicsResponse listTopics(
*
*/
public com.google.pubsub.v1.ListTopicSubscriptionsResponse listTopicSubscriptions(
- com.google.pubsub.v1.ListTopicSubscriptionsRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ListTopicSubscriptionsRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getListTopicSubscriptionsMethod(), getCallOptions(), request);
}
@@ -914,8 +914,8 @@ public com.google.pubsub.v1.ListTopicSubscriptionsResponse listTopicSubscription
*
*/
public com.google.pubsub.v1.ListTopicSnapshotsResponse listTopicSnapshots(
- com.google.pubsub.v1.ListTopicSnapshotsRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ListTopicSnapshotsRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getListTopicSnapshotsMethod(), getCallOptions(), request);
}
@@ -930,8 +930,9 @@ public com.google.pubsub.v1.ListTopicSnapshotsResponse listTopicSnapshots(
* not deleted, but their `topic` field is set to `_deleted-topic_`.
*
*/
- public com.google.protobuf.Empty deleteTopic(com.google.pubsub.v1.DeleteTopicRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.protobuf.Empty deleteTopic(com.google.pubsub.v1.DeleteTopicRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getDeleteTopicMethod(), getCallOptions(), request);
}
@@ -946,8 +947,8 @@ public com.google.protobuf.Empty deleteTopic(com.google.pubsub.v1.DeleteTopicReq
*
*/
public com.google.pubsub.v1.DetachSubscriptionResponse detachSubscription(
- com.google.pubsub.v1.DetachSubscriptionRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.DetachSubscriptionRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getDetachSubscriptionMethod(), getCallOptions(), request);
}
}
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java
index 35c281c88..59fbec01b 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SchemaServiceGrpc.java
@@ -24,9 +24,6 @@
* Service for doing schema-related operations.
*
*/
-@javax.annotation.Generated(
- value = "by gRPC proto compiler",
- comments = "Source: google/pubsub/v1/schema.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class SchemaServiceGrpc {
@@ -881,8 +878,8 @@ protected SchemaServiceBlockingV2Stub build(
*
*/
public com.google.pubsub.v1.Schema createSchema(
- com.google.pubsub.v1.CreateSchemaRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.CreateSchemaRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getCreateSchemaMethod(), getCallOptions(), request);
}
@@ -893,8 +890,9 @@ public com.google.pubsub.v1.Schema createSchema(
* Gets a schema.
*
*/
- public com.google.pubsub.v1.Schema getSchema(com.google.pubsub.v1.GetSchemaRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.pubsub.v1.Schema getSchema(com.google.pubsub.v1.GetSchemaRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getGetSchemaMethod(), getCallOptions(), request);
}
@@ -906,8 +904,8 @@ public com.google.pubsub.v1.Schema getSchema(com.google.pubsub.v1.GetSchemaReque
*
*/
public com.google.pubsub.v1.ListSchemasResponse listSchemas(
- com.google.pubsub.v1.ListSchemasRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ListSchemasRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getListSchemasMethod(), getCallOptions(), request);
}
@@ -919,8 +917,8 @@ public com.google.pubsub.v1.ListSchemasResponse listSchemas(
*
*/
public com.google.pubsub.v1.ListSchemaRevisionsResponse listSchemaRevisions(
- com.google.pubsub.v1.ListSchemaRevisionsRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ListSchemaRevisionsRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getListSchemaRevisionsMethod(), getCallOptions(), request);
}
@@ -932,8 +930,8 @@ public com.google.pubsub.v1.ListSchemaRevisionsResponse listSchemaRevisions(
*
*/
public com.google.pubsub.v1.Schema commitSchema(
- com.google.pubsub.v1.CommitSchemaRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.CommitSchemaRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getCommitSchemaMethod(), getCallOptions(), request);
}
@@ -945,8 +943,8 @@ public com.google.pubsub.v1.Schema commitSchema(
*
*/
public com.google.pubsub.v1.Schema rollbackSchema(
- com.google.pubsub.v1.RollbackSchemaRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.RollbackSchemaRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getRollbackSchemaMethod(), getCallOptions(), request);
}
@@ -958,8 +956,8 @@ public com.google.pubsub.v1.Schema rollbackSchema(
*
*/
public com.google.pubsub.v1.Schema deleteSchemaRevision(
- com.google.pubsub.v1.DeleteSchemaRevisionRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.DeleteSchemaRevisionRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getDeleteSchemaRevisionMethod(), getCallOptions(), request);
}
@@ -970,9 +968,9 @@ public com.google.pubsub.v1.Schema deleteSchemaRevision(
* Deletes a schema.
*
*/
- public com.google.protobuf.Empty deleteSchema(
- com.google.pubsub.v1.DeleteSchemaRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.protobuf.Empty deleteSchema(com.google.pubsub.v1.DeleteSchemaRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getDeleteSchemaMethod(), getCallOptions(), request);
}
@@ -984,8 +982,8 @@ public com.google.protobuf.Empty deleteSchema(
*
*/
public com.google.pubsub.v1.ValidateSchemaResponse validateSchema(
- com.google.pubsub.v1.ValidateSchemaRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ValidateSchemaRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getValidateSchemaMethod(), getCallOptions(), request);
}
@@ -997,8 +995,8 @@ public com.google.pubsub.v1.ValidateSchemaResponse validateSchema(
*
*/
public com.google.pubsub.v1.ValidateMessageResponse validateMessage(
- com.google.pubsub.v1.ValidateMessageRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ValidateMessageRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getValidateMessageMethod(), getCallOptions(), request);
}
}
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
index 2a8fc9299..26003fb0e 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
@@ -26,9 +26,6 @@
* establishing a bi-directional stream using the `StreamingPull` method.
*
*/
-@javax.annotation.Generated(
- value = "by gRPC proto compiler",
- comments = "Source: google/pubsub/v1/pubsub.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class SubscriberGrpc {
@@ -1450,8 +1447,8 @@ protected SubscriberBlockingV2Stub build(
*
*/
public com.google.pubsub.v1.Subscription createSubscription(
- com.google.pubsub.v1.Subscription request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.Subscription request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getCreateSubscriptionMethod(), getCallOptions(), request);
}
@@ -1463,8 +1460,8 @@ public com.google.pubsub.v1.Subscription createSubscription(
*
*/
public com.google.pubsub.v1.Subscription getSubscription(
- com.google.pubsub.v1.GetSubscriptionRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.GetSubscriptionRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getGetSubscriptionMethod(), getCallOptions(), request);
}
@@ -1478,8 +1475,8 @@ public com.google.pubsub.v1.Subscription getSubscription(
*
*/
public com.google.pubsub.v1.Subscription updateSubscription(
- com.google.pubsub.v1.UpdateSubscriptionRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.UpdateSubscriptionRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getUpdateSubscriptionMethod(), getCallOptions(), request);
}
@@ -1491,8 +1488,8 @@ public com.google.pubsub.v1.Subscription updateSubscription(
*
*/
public com.google.pubsub.v1.ListSubscriptionsResponse listSubscriptions(
- com.google.pubsub.v1.ListSubscriptionsRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ListSubscriptionsRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getListSubscriptionsMethod(), getCallOptions(), request);
}
@@ -1508,8 +1505,8 @@ public com.google.pubsub.v1.ListSubscriptionsResponse listSubscriptions(
*
*/
public com.google.protobuf.Empty deleteSubscription(
- com.google.pubsub.v1.DeleteSubscriptionRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.DeleteSubscriptionRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getDeleteSubscriptionMethod(), getCallOptions(), request);
}
@@ -1525,8 +1522,8 @@ public com.google.protobuf.Empty deleteSubscription(
*
*/
public com.google.protobuf.Empty modifyAckDeadline(
- com.google.pubsub.v1.ModifyAckDeadlineRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ModifyAckDeadlineRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getModifyAckDeadlineMethod(), getCallOptions(), request);
}
@@ -1542,8 +1539,9 @@ public com.google.protobuf.Empty modifyAckDeadline(
* than once will not result in an error.
*
*/
- public com.google.protobuf.Empty acknowledge(com.google.pubsub.v1.AcknowledgeRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.protobuf.Empty acknowledge(com.google.pubsub.v1.AcknowledgeRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getAcknowledgeMethod(), getCallOptions(), request);
}
@@ -1554,8 +1552,9 @@ public com.google.protobuf.Empty acknowledge(com.google.pubsub.v1.AcknowledgeReq
* Pulls messages from the server.
*
*/
- public com.google.pubsub.v1.PullResponse pull(com.google.pubsub.v1.PullRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.pubsub.v1.PullResponse pull(com.google.pubsub.v1.PullRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getPullMethod(), getCallOptions(), request);
}
@@ -1592,8 +1591,8 @@ public com.google.pubsub.v1.PullResponse pull(com.google.pubsub.v1.PullRequest r
*
*/
public com.google.protobuf.Empty modifyPushConfig(
- com.google.pubsub.v1.ModifyPushConfigRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ModifyPushConfigRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getModifyPushConfigMethod(), getCallOptions(), request);
}
@@ -1609,8 +1608,8 @@ public com.google.protobuf.Empty modifyPushConfig(
*
*/
public com.google.pubsub.v1.Snapshot getSnapshot(
- com.google.pubsub.v1.GetSnapshotRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.GetSnapshotRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getGetSnapshotMethod(), getCallOptions(), request);
}
@@ -1626,8 +1625,8 @@ public com.google.pubsub.v1.Snapshot getSnapshot(
*
*/
public com.google.pubsub.v1.ListSnapshotsResponse listSnapshots(
- com.google.pubsub.v1.ListSnapshotsRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.ListSnapshotsRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getListSnapshotsMethod(), getCallOptions(), request);
}
@@ -1654,8 +1653,8 @@ public com.google.pubsub.v1.ListSnapshotsResponse listSnapshots(
*
*/
public com.google.pubsub.v1.Snapshot createSnapshot(
- com.google.pubsub.v1.CreateSnapshotRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.CreateSnapshotRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getCreateSnapshotMethod(), getCallOptions(), request);
}
@@ -1672,8 +1671,8 @@ public com.google.pubsub.v1.Snapshot createSnapshot(
*
*/
public com.google.pubsub.v1.Snapshot updateSnapshot(
- com.google.pubsub.v1.UpdateSnapshotRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.UpdateSnapshotRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getUpdateSnapshotMethod(), getCallOptions(), request);
}
@@ -1693,8 +1692,8 @@ public com.google.pubsub.v1.Snapshot updateSnapshot(
*
*/
public com.google.protobuf.Empty deleteSnapshot(
- com.google.pubsub.v1.DeleteSnapshotRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ com.google.pubsub.v1.DeleteSnapshotRequest request) throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getDeleteSnapshotMethod(), getCallOptions(), request);
}
@@ -1711,8 +1710,9 @@ public com.google.protobuf.Empty deleteSnapshot(
* snapshot must be on the same topic.
*
*/
- public com.google.pubsub.v1.SeekResponse seek(com.google.pubsub.v1.SeekRequest request) {
- return io.grpc.stub.ClientCalls.blockingUnaryCall(
+ public com.google.pubsub.v1.SeekResponse seek(com.google.pubsub.v1.SeekRequest request)
+ throws io.grpc.StatusException {
+ return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
getChannel(), getSeekMethod(), getCallOptions(), request);
}
}
diff --git a/pom.xml b/pom.xml
index 8c63f6dc9..f5fd9874d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-pubsub-parent
pom
- 1.143.0
+ 1.143.1
Google Cloud Pub/Sub Parent
https://github.com/googleapis/java-pubsub
@@ -14,7 +14,7 @@
com.google.cloud
sdk-platform-java-config
- 3.53.0
+ 3.54.1
@@ -69,17 +69,17 @@
com.google.api.grpc
proto-google-cloud-pubsub-v1
- 1.125.0
+ 1.125.1
com.google.api.grpc
grpc-google-cloud-pubsub-v1
- 1.125.0
+ 1.125.1
com.google.cloud
google-cloud-pubsub
- 1.143.0
+ 1.143.1
diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml
index ee3d27b32..012ad1784 100644
--- a/proto-google-cloud-pubsub-v1/pom.xml
+++ b/proto-google-cloud-pubsub-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-pubsub-v1
- 1.125.0
+ 1.125.1
proto-google-cloud-pubsub-v1
PROTO library for proto-google-cloud-pubsub-v1
com.google.cloud
google-cloud-pubsub-parent
- 1.143.0
+ 1.143.1
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 35331a6b0..e9b2ee2b8 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -44,7 +44,7 @@
com.google.cloud
google-cloud-pubsub
- 1.142.0
+ 1.143.0
@@ -75,23 +75,23 @@
com.google.protobuf
protobuf-java-util
- 4.32.1
+ 4.33.0
com.google.cloud
google-cloud-core
- 2.60.3
+ 2.61.0
tests
com.google.cloud
google-cloud-bigquery
- 2.55.2
+ 2.55.3
com.google.cloud
google-cloud-storage
- 2.58.1
+ 2.59.0
com.google.cloud.opentelemetry
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 99a343181..95a05609c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -43,7 +43,7 @@
com.google.cloud
google-cloud-pubsub
- 1.143.0
+ 1.143.1
@@ -61,7 +61,7 @@
com.google.protobuf
protobuf-java-util
- 4.32.1
+ 4.33.0
@@ -79,18 +79,18 @@
com.google.cloud
google-cloud-core
- 2.60.3
+ 2.61.0
tests
com.google.cloud
google-cloud-bigquery
- 2.55.2
+ 2.55.3
com.google.cloud
google-cloud-storage
- 2.58.1
+ 2.59.0
com.google.cloud.opentelemetry
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c0b404f69..40d7fb828 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -45,7 +45,7 @@
com.google.cloud
libraries-bom
- 26.70.0
+ 26.71.0
pom
import
@@ -85,7 +85,7 @@
com.google.protobuf
protobuf-java-util
- 4.32.1
+ 4.33.0
@@ -103,7 +103,7 @@
com.google.cloud
google-cloud-core
- 2.60.3
+ 2.61.0
tests
diff --git a/versions.txt b/versions.txt
index 7092d2e59..e51f1f34a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version
-google-cloud-pubsub:1.143.0:1.143.0
-grpc-google-cloud-pubsub-v1:1.125.0:1.125.0
-proto-google-cloud-pubsub-v1:1.125.0:1.125.0
+google-cloud-pubsub:1.143.1:1.143.1
+grpc-google-cloud-pubsub-v1:1.125.1:1.125.1
+proto-google-cloud-pubsub-v1:1.125.1:1.125.1