From fd697056432b608105a737ced6c16be5a026a363 Mon Sep 17 00:00:00 2001 From: scottf Date: Thu, 23 Mar 2023 15:16:53 -0400 Subject: [PATCH 1/2] expose the consumer name since I already track it --- src/main/java/io/nats/client/JetStreamSubscription.java | 6 ++++++ .../java/io/nats/client/impl/NatsJetStreamSubscription.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/nats/client/JetStreamSubscription.java b/src/main/java/io/nats/client/JetStreamSubscription.java index c1ea1a866..f4aae8c02 100644 --- a/src/main/java/io/nats/client/JetStreamSubscription.java +++ b/src/main/java/io/nats/client/JetStreamSubscription.java @@ -26,6 +26,12 @@ */ public interface JetStreamSubscription extends Subscription { + /** + * Gets the consumer name that was used to create the subscription. + * @return the consumer name + */ + String getConsumerName(); + /** * Initiate pull with the specified batch size. * ! Pull subscriptions only. Push subscription will throw IllegalStateException diff --git a/src/main/java/io/nats/client/impl/NatsJetStreamSubscription.java b/src/main/java/io/nats/client/impl/NatsJetStreamSubscription.java index b1b45835f..edaefcaa2 100644 --- a/src/main/java/io/nats/client/impl/NatsJetStreamSubscription.java +++ b/src/main/java/io/nats/client/impl/NatsJetStreamSubscription.java @@ -57,7 +57,8 @@ void setConsumerName(String consumerName) { this.consumerName = consumerName; } - String getConsumerName() { + @Override + public String getConsumerName() { return consumerName; } From 1246e47da95b94b6ccb9225f8739518a62ea9c38 Mon Sep 17 00:00:00 2001 From: scottf Date: Thu, 23 Mar 2023 16:04:15 -0400 Subject: [PATCH 2/2] improve the default error listener --- .../java/io/nats/client/impl/ErrorListenerLoggerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/io/nats/client/impl/ErrorListenerLoggerImpl.java b/src/main/java/io/nats/client/impl/ErrorListenerLoggerImpl.java index 66558a1a9..3e5a9a46d 100644 --- a/src/main/java/io/nats/client/impl/ErrorListenerLoggerImpl.java +++ b/src/main/java/io/nats/client/impl/ErrorListenerLoggerImpl.java @@ -36,6 +36,10 @@ private String supplyMessage(String label, Connection conn, Consumer consumer, S } if (sub != null) { sb.append(", Subscription: ").append(sub.hashCode()); + if (sub instanceof JetStreamSubscription) { + JetStreamSubscription jssub = (JetStreamSubscription)sub; + sb.append(", Consumer Name: ").append(jssub.getConsumerName()); + } } for (int x = 0; x < pairs.length; x++) { sb.append(", ").append(pairs[x]).append(pairs[++x]);