This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
The following commit(s) were added to refs/heads/master by this push:
new c3fdf48 Remove MessageBuilder#setTraceContext and
MessageView#getTraceContext
c3fdf48 is described below
commit c3fdf4827cc2eb5fea3cdf1f02edd0c37a40c52b
Author: Aaron Ai <[email protected]>
AuthorDate: Wed Nov 9 10:49:31 2022 +0800
Remove MessageBuilder#setTraceContext and MessageView#getTraceContext
---
.../apache/rocketmq/client/apis/message/Message.java | 8 --------
.../rocketmq/client/apis/message/MessageBuilder.java | 8 --------
.../rocketmq/client/apis/message/MessageView.java | 8 --------
.../rocketmq/client/java/message/GeneralMessage.java | 16 ----------------
.../client/java/message/GeneralMessageImpl.java | 19 -------------------
.../client/java/message/MessageBuilderImpl.java | 13 +------------
.../rocketmq/client/java/message/MessageImpl.java | 15 +--------------
.../rocketmq/client/java/message/MessageViewImpl.java | 12 ++----------
.../client/java/message/PublishingMessageImpl.java | 13 -------------
.../client/java/message/GeneralMessageImplTest.java | 14 +++-----------
.../rocketmq/client/java/message/MessageImplTest.java | 1 -
.../apache/rocketmq/client/java/tool/TestBase.java | 2 +-
12 files changed, 8 insertions(+), 121 deletions(-)
diff --git
a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/Message.java
b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/Message.java
index 2fea2b4..d08b9c7 100644
---
a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/Message.java
+++
b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/Message.java
@@ -72,14 +72,6 @@ public interface Message {
*/
Optional<String> getMessageGroup();
- /**
- * Get the parent trace context, see
- * <a
href="https://opentelemetry.io/docs/concepts/signals/traces/#trace-context";>OpenTelemetry
Trace context</a>.
- *
- * @return parent trace context, which is optional, {@link
Optional#empty()} means trace context is not specified.
- */
- Optional<String> getParentTraceContext();
-
/**
* Get the expected delivery timestamp, which make sense only when topic
type is delay.
*
diff --git
a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageBuilder.java
b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageBuilder.java
index 62fc9c7..8275e88 100644
---
a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageBuilder.java
+++
b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageBuilder.java
@@ -87,14 +87,6 @@ public interface MessageBuilder {
*/
MessageBuilder setMessageGroup(String messageGroup);
- /**
- * Set the trace context for each message, which should follow
openTelemetry specs.
- *
- * @param traceContext trace context for the messages.
- * @return the message builder instance.
- */
- MessageBuilder setTraceContext(String traceContext);
-
/**
* Set the delivery timestamp for the message, which is optional.
*
diff --git
a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageView.java
b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageView.java
index 761c21c..dded0d4 100644
---
a/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageView.java
+++
b/java/client-apis/src/main/java/org/apache/rocketmq/client/apis/message/MessageView.java
@@ -94,14 +94,6 @@ public interface MessageView {
*/
String getBornHost();
- /**
- * Message trace context, see
- * <a
href="https://opentelemetry.io/docs/concepts/signals/traces/#trace-context";>OpenTelemetry
Trace context</a>.
- *
- * @return message trace context.
- */
- Optional<String> getTraceContext();
-
/**
* Get the born timestamp of the message.
*
diff --git
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessage.java
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessage.java
index 575235d..2e614fd 100644
---
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessage.java
+++
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessage.java
@@ -81,22 +81,6 @@ public interface GeneralMessage {
*/
Optional<String> getMessageGroup();
- /**
- * Get the parent trace context, see
- * <a
href="https://opentelemetry.io/docs/concepts/signals/traces/#trace-context";>OpenTelemetry
Trace context</a>.
- *
- * @return parent trace context, which is optional, {@link
Optional#empty()} means trace context is not specified.
- */
- Optional<String> getParentTraceContext();
-
- /**
- * Message trace context, see
- * <a
href="https://opentelemetry.io/docs/concepts/signals/traces/#trace-context";>OpenTelemetry
Trace context</a>.
- *
- * @return message trace context.
- */
- Optional<String> getTraceContext();
-
/**
* Get the expected delivery timestamp, which makes sense only when topic
type is delay.
*
diff --git
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessageImpl.java
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessageImpl.java
index 4d5da19..ed46be4 100644
---
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessageImpl.java
+++
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/GeneralMessageImpl.java
@@ -37,8 +37,6 @@ public class GeneralMessageImpl implements GeneralMessage {
private final String messageGroup;
private final Long deliveryTimestamp;
private final String bornHost;
- private final String parentTraceContext;
- private final String traceContext;
private final Long bornTimestamp;
private final Integer deliveryAttempt;
private final Long decodeTimestamp;
@@ -62,8 +60,6 @@ public class GeneralMessageImpl implements GeneralMessage {
this.messageGroup = message.getMessageGroup().orElse(null);
this.deliveryTimestamp = message.getDeliveryTimestamp().orElse(null);
this.bornHost = null;
- this.parentTraceContext = message.getParentTraceContext().orElse(null);
- this.traceContext = null;
this.bornTimestamp = null;
this.deliveryAttempt = null;
this.decodeTimestamp = null;
@@ -74,13 +70,11 @@ public class GeneralMessageImpl implements GeneralMessage {
this.topic = message.getTopic();
this.messageId = message.getMessageId();
byte[] messageBody;
- String messageTraceContext;
Long messageDecodeTimestamp;
Long messageTransportDeliveryTimestamp;
if (message instanceof MessageViewImpl) {
MessageViewImpl impl = (MessageViewImpl) message;
messageBody = impl.body;
- messageTraceContext = impl.getTraceContext().orElse(null);
messageDecodeTimestamp = impl.getDecodeTimestamp();
messageTransportDeliveryTimestamp =
impl.getTransportDeliveryTimestamp().orElse(null);
} else {
@@ -88,7 +82,6 @@ public class GeneralMessageImpl implements GeneralMessage {
final ByteBuffer byteBuffer = message.getBody();
messageBody = new byte[byteBuffer.remaining()];
byteBuffer.get(messageBody);
- messageTraceContext = null;
// Could not get accurate decode timestamp.
messageDecodeTimestamp = null;
// Could not get accurate transport delivery timestamp.
@@ -101,8 +94,6 @@ public class GeneralMessageImpl implements GeneralMessage {
this.messageGroup = message.getMessageGroup().orElse(null);
this.deliveryTimestamp = message.getDeliveryTimestamp().orElse(null);
this.bornHost = message.getBornHost();
- this.parentTraceContext = null;
- this.traceContext = messageTraceContext;
this.bornTimestamp = message.getBornTimestamp();
this.deliveryAttempt = message.getDeliveryAttempt();
this.decodeTimestamp = messageDecodeTimestamp;
@@ -145,16 +136,6 @@ public class GeneralMessageImpl implements GeneralMessage {
return Optional.ofNullable(messageGroup);
}
- @Override
- public Optional<String> getParentTraceContext() {
- return Optional.ofNullable(parentTraceContext);
- }
-
- @Override
- public Optional<String> getTraceContext() {
- return Optional.ofNullable(traceContext);
- }
-
@Override
public Optional<Long> getDeliveryTimestamp() {
return Optional.ofNullable(deliveryTimestamp);
diff --git
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageBuilderImpl.java
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageBuilderImpl.java
index d83d8c8..83cbb30 100644
---
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageBuilderImpl.java
+++
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageBuilderImpl.java
@@ -38,7 +38,6 @@ public class MessageBuilderImpl implements MessageBuilder {
private byte[] body = null;
private String tag = null;
private String messageGroup = null;
- private String traceContext = null;
private Long deliveryTimestamp = null;
private Collection<String> keys = new HashSet<>();
private final Map<String, String> properties = new HashMap<>();
@@ -103,16 +102,6 @@ public class MessageBuilderImpl implements MessageBuilder {
return this;
}
- /**
- * See {@link MessageBuilder#setTraceContext(String)}
- */
- @Override
- public MessageBuilder setTraceContext(String traceContext) {
- checkArgument(StringUtils.isNotBlank(traceContext), "traceContext
should not be blank");
- this.traceContext = traceContext;
- return this;
- }
-
/**
* See {@link MessageBuilder#setDeliveryTimestamp(long)}
*/
@@ -141,6 +130,6 @@ public class MessageBuilderImpl implements MessageBuilder {
public Message build() {
checkNotNull(topic, "topic has not been set yet");
checkNotNull(body, "body has not been set yet");
- return new MessageImpl(topic, body, tag, keys, messageGroup,
traceContext, deliveryTimestamp, properties);
+ return new MessageImpl(topic, body, tag, keys, messageGroup,
deliveryTimestamp, properties);
}
}
diff --git
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageImpl.java
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageImpl.java
index c4f0db5..2d6ece7 100644
---
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageImpl.java
+++
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageImpl.java
@@ -44,8 +44,6 @@ public class MessageImpl implements Message {
private final String messageGroup;
@Nullable
private final Long deliveryTimestamp;
- @Nullable
- private final String parentTraceContext;
private final Map<String, String> properties;
@@ -54,7 +52,7 @@ public class MessageImpl implements Message {
* logging warnings already, so we avoid repeating args check here.
*/
MessageImpl(String topic, byte[] body, @Nullable String tag,
Collection<String> keys,
- @Nullable String messageGroup, @Nullable String parentTraceContext,
@Nullable Long deliveryTimestamp,
+ @Nullable String messageGroup, @Nullable Long deliveryTimestamp,
Map<String, String> properties) {
this.topic = topic;
this.body = body;
@@ -62,7 +60,6 @@ public class MessageImpl implements Message {
this.messageGroup = messageGroup;
this.deliveryTimestamp = deliveryTimestamp;
this.keys = keys;
- this.parentTraceContext = parentTraceContext;
this.properties = properties;
}
@@ -81,7 +78,6 @@ public class MessageImpl implements Message {
this.tag = message.getTag().orElse(null);
this.messageGroup = message.getMessageGroup().orElse(null);
this.deliveryTimestamp = message.getDeliveryTimestamp().orElse(null);
- this.parentTraceContext = message.getParentTraceContext().orElse(null);
this.keys = message.getKeys();
this.properties = message.getProperties();
}
@@ -142,14 +138,6 @@ public class MessageImpl implements Message {
return Optional.ofNullable(messageGroup);
}
- /**
- * @see Message#getParentTraceContext()
- */
- @Override
- public Optional<String> getParentTraceContext() {
- return Optional.ofNullable(parentTraceContext);
- }
-
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
@@ -157,7 +145,6 @@ public class MessageImpl implements Message {
.add("tag", tag)
.add("messageGroup", messageGroup)
.add("deliveryTimestamp", deliveryTimestamp)
- .add("parentTraceContext", parentTraceContext)
.add("keys", keys)
.add("properties", properties)
.toString();
diff --git
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageViewImpl.java
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageViewImpl.java
index 6ac264a..027ca5b 100644
---
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageViewImpl.java
+++
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/MessageViewImpl.java
@@ -63,7 +63,6 @@ public class MessageViewImpl implements
LinkedElement<MessageViewImpl>, MessageV
private final MessageQueueImpl messageQueue;
private final Endpoints endpoints;
private volatile String receiptHandle;
- private final String traceContext;
private final long offset;
private final boolean corrupted;
private final long decodeTimestamp;
@@ -73,7 +72,7 @@ public class MessageViewImpl implements
LinkedElement<MessageViewImpl>, MessageV
public MessageViewImpl(MessageId messageId, String topic, byte[] body,
String tag, String messageGroup,
Long deliveryTimestamp, Collection<String> keys, Map<String, String>
properties,
String bornHost, long bornTimestamp, int deliveryAttempt,
MessageQueueImpl messageQueue,
- String receiptHandle, String traceContext, long offset, boolean
corrupted,
+ String receiptHandle, long offset, boolean corrupted,
Long transportDeliveryTimestamp) {
this.messageId = checkNotNull(messageId, "messageId should not be
null");
this.topic = checkNotNull(topic, "topic should not be null");
@@ -89,7 +88,6 @@ public class MessageViewImpl implements
LinkedElement<MessageViewImpl>, MessageV
this.messageQueue = messageQueue;
this.endpoints = null == messageQueue ? null :
messageQueue.getBroker().getEndpoints();
this.receiptHandle = checkNotNull(receiptHandle, "receiptHandle should
not be null");
- this.traceContext = traceContext;
this.offset = offset;
this.corrupted = corrupted;
this.decodeTimestamp = System.currentTimeMillis();
@@ -185,10 +183,6 @@ public class MessageViewImpl implements
LinkedElement<MessageViewImpl>, MessageV
return deliveryAttempt;
}
- public Optional<String> getTraceContext() {
- return Optional.ofNullable(traceContext);
- }
-
public int incrementAndGetDeliveryAttempt() {
return ++deliveryAttempt;
}
@@ -323,10 +317,8 @@ public class MessageViewImpl implements
LinkedElement<MessageViewImpl>, MessageV
final long offset = systemProperties.getQueueOffset();
final Map<String, String> properties = message.getUserPropertiesMap();
final String receiptHandle = systemProperties.getReceiptHandle();
- String traceContext = systemProperties.hasTraceContext() ?
systemProperties.getTraceContext() : null;
return new MessageViewImpl(messageId, topic, body, tag, messageGroup,
deliveryTimestamp, keys, properties,
- bornHost, bornTimestamp, deliveryAttempt, mq, receiptHandle,
traceContext, offset, corrupted,
- transportDeliveryTimestamp);
+ bornHost, bornTimestamp, deliveryAttempt, mq, receiptHandle,
offset, corrupted, transportDeliveryTimestamp);
}
@Override
diff --git
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/PublishingMessageImpl.java
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/PublishingMessageImpl.java
index c1e2a85..0795c82 100644
---
a/java/client/src/main/java/org/apache/rocketmq/client/java/message/PublishingMessageImpl.java
+++
b/java/client/src/main/java/org/apache/rocketmq/client/java/message/PublishingMessageImpl.java
@@ -22,7 +22,6 @@ import apache.rocketmq.v2.SystemProperties;
import com.google.protobuf.ByteString;
import com.google.protobuf.util.Timestamps;
import java.io.IOException;
-import java.util.Optional;
import org.apache.rocketmq.client.apis.message.Message;
import org.apache.rocketmq.client.apis.message.MessageId;
import org.apache.rocketmq.client.java.impl.producer.PublishingSettings;
@@ -37,12 +36,10 @@ import
org.apache.rocketmq.client.java.route.MessageQueueImpl;
public class PublishingMessageImpl extends MessageImpl {
private final MessageId messageId;
private final MessageType messageType;
- private volatile String traceContext;
public PublishingMessageImpl(Message message, PublishingSettings
publishingSettings, boolean txEnabled)
throws IOException {
super(message);
- this.traceContext = null;
final int length = message.getBody().remaining();
final int maxBodySizeBytes = publishingSettings.getMaxBodySizeBytes();
if (length > maxBodySizeBytes) {
@@ -84,14 +81,6 @@ public class PublishingMessageImpl extends MessageImpl {
return messageType;
}
- public void setTraceContext(String traceContext) {
- this.traceContext = traceContext;
- }
-
- public Optional<String> getTraceContext() {
- return Optional.ofNullable(traceContext);
- }
-
/**
* Convert {@link PublishingMessageImpl} to protocol buffer.
*
@@ -117,8 +106,6 @@ public class PublishingMessageImpl extends MessageImpl {
.setMessageType(MessageType.toProtobuf(messageType));
// Message tag
this.getTag().ifPresent(systemPropertiesBuilder::setTag);
- // Trace context
-
this.getTraceContext().ifPresent(systemPropertiesBuilder::setTraceContext);
// Delivery timestamp
this.getDeliveryTimestamp()
.ifPresent(millis ->
systemPropertiesBuilder.setDeliveryTimestamp(Timestamps.fromMillis(millis)));
diff --git
a/java/client/src/test/java/org/apache/rocketmq/client/java/message/GeneralMessageImplTest.java
b/java/client/src/test/java/org/apache/rocketmq/client/java/message/GeneralMessageImplTest.java
index 8b1bf89..2f1de06 100644
---
a/java/client/src/test/java/org/apache/rocketmq/client/java/message/GeneralMessageImplTest.java
+++
b/java/client/src/test/java/org/apache/rocketmq/client/java/message/GeneralMessageImplTest.java
@@ -41,13 +41,12 @@ public class GeneralMessageImplTest extends TestBase {
List<String> keys = new ArrayList<>();
keys.add("keyA");
String messageGroup = "messageGroup0";
- String parentTraceContext = "parentTraceContext0";
long deliveryTimestamp = System.currentTimeMillis();
Map<String, String> properties = new HashMap<>();
properties.put("propertyA", "valueA");
- final MessageImpl message = new MessageImpl(topic, body, tag, keys,
messageGroup, parentTraceContext,
- deliveryTimestamp, properties);
+ final MessageImpl message = new MessageImpl(topic, body, tag, keys,
messageGroup, deliveryTimestamp,
+ properties);
final GeneralMessageImpl generalMessage = new
GeneralMessageImpl(message);
assertFalse(generalMessage.getMessageId().isPresent());
assertEquals(topic, generalMessage.getTopic());
@@ -58,9 +57,6 @@ public class GeneralMessageImplTest extends TestBase {
assertEquals(keys, generalMessage.getKeys());
assertTrue(generalMessage.getMessageGroup().isPresent());
assertEquals(messageGroup, generalMessage.getMessageGroup().get());
- assertTrue(generalMessage.getParentTraceContext().isPresent());
- assertEquals(parentTraceContext,
generalMessage.getParentTraceContext().get());
- assertFalse(generalMessage.getTraceContext().isPresent());
assertTrue(generalMessage.getDeliveryTimestamp().isPresent());
assertEquals(deliveryTimestamp, (long)
generalMessage.getDeliveryTimestamp().get());
assertFalse(generalMessage.getBornHost().isPresent());
@@ -87,14 +83,13 @@ public class GeneralMessageImplTest extends TestBase {
int deliveryAttempt = 1;
final MessageQueueImpl mq = fakeMessageQueueImpl(topic);
String receiptHandle = "receiptHandle0";
- String traceContext = "traceContext0";
long offset = 8;
boolean corrupted = false;
long transportDeliveryTimestamp = System.currentTimeMillis();
final MessageViewImpl messageView = new MessageViewImpl(messageId,
topic, body, tag, messageGroup,
deliveryTimestamp, keys, properties, bornHost, bornTimestamp,
deliveryAttempt, mq, receiptHandle,
- traceContext, offset, corrupted, transportDeliveryTimestamp);
+ offset, corrupted, transportDeliveryTimestamp);
final GeneralMessageImpl generalMessage = new
GeneralMessageImpl(messageView);
assertTrue(generalMessage.getMessageId().isPresent());
assertEquals(messageId, generalMessage.getMessageId().get());
@@ -106,9 +101,6 @@ public class GeneralMessageImplTest extends TestBase {
assertEquals(keys, generalMessage.getKeys());
assertTrue(generalMessage.getMessageGroup().isPresent());
assertEquals(messageGroup, generalMessage.getMessageGroup().get());
- assertFalse(generalMessage.getParentTraceContext().isPresent());
- assertTrue(generalMessage.getTraceContext().isPresent());
- assertEquals(traceContext, generalMessage.getTraceContext().get());
assertTrue(generalMessage.getDeliveryTimestamp().isPresent());
assertEquals(deliveryTimestamp, (long)
generalMessage.getDeliveryTimestamp().get());
assertTrue(generalMessage.getBornHost().isPresent());
diff --git
a/java/client/src/test/java/org/apache/rocketmq/client/java/message/MessageImplTest.java
b/java/client/src/test/java/org/apache/rocketmq/client/java/message/MessageImplTest.java
index ea31921..a9a918f 100644
---
a/java/client/src/test/java/org/apache/rocketmq/client/java/message/MessageImplTest.java
+++
b/java/client/src/test/java/org/apache/rocketmq/client/java/message/MessageImplTest.java
@@ -130,6 +130,5 @@ public class MessageImplTest extends TestBase {
assertArrayEquals(FAKE_MESSAGE_BODY, bytes);
assertFalse(message.getDeliveryTimestamp().isPresent());
assertFalse(message.getMessageGroup().isPresent());
- assertFalse(message.getParentTraceContext().isPresent());
}
}
\ No newline at end of file
diff --git
a/java/client/src/test/java/org/apache/rocketmq/client/java/tool/TestBase.java
b/java/client/src/test/java/org/apache/rocketmq/client/java/tool/TestBase.java
index 9de739a..ef6723c 100644
---
a/java/client/src/test/java/org/apache/rocketmq/client/java/tool/TestBase.java
+++
b/java/client/src/test/java/org/apache/rocketmq/client/java/tool/TestBase.java
@@ -183,7 +183,7 @@ public class TestBase {
Map<String, String> properties = new HashMap<>();
List<String> keys = new ArrayList<>();
return new MessageViewImpl(messageId, FAKE_TOPIC_0, body, null, null,
null,
- keys, properties, FAKE_HOST_0, 1, 1, mq, FAKE_RECEIPT_HANDLE_0,
null, 1, corrupted,
+ keys, properties, FAKE_HOST_0, 1, 1, mq, FAKE_RECEIPT_HANDLE_0, 1,
corrupted,
System.currentTimeMillis());
}
