You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/04 07:06:50 UTC
[camel] branch master updated (46a4be8 -> 4284d03)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 46a4be8 Add nsq span decorator for opentracing
new 15bacd5 CAMEL-14251: camel-nats - Store message payload in body/headers
new 4284d03 Add nats to opentracing
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/nats/NatsConstants.java | 4 ++++
.../org/apache/camel/component/nats/NatsConsumer.java | 6 +++++-
.../apache/camel/component/nats/NatsConsumerTest.java | 10 +++++-----
.../nats/NatsConsumerWithRedeliveryTest.java | 4 +---
.../{NsqSpanDecorator.java => NatsSpanDecorator.java} | 19 +++++++------------
.../org.apache.camel.opentracing.SpanDecorator | 1 +
6 files changed, 23 insertions(+), 21 deletions(-)
copy components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/{NsqSpanDecorator.java => NatsSpanDecorator.java} (68%)
[camel] 02/02: Add nats to opentracing
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4284d03c529bbeb4fdf65fc58f154451e7361933
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 4 08:06:34 2019 +0100
Add nats to opentracing
---
.../opentracing/decorators/NatsSpanDecorator.java | 50 ++++++++++++++++++++++
.../org.apache.camel.opentracing.SpanDecorator | 1 +
2 files changed, 51 insertions(+)
diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/NatsSpanDecorator.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/NatsSpanDecorator.java
new file mode 100644
index 0000000..dfa3262
--- /dev/null
+++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/NatsSpanDecorator.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.camel.opentracing.decorators;
+
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+
+public class NatsSpanDecorator extends AbstractMessagingSpanDecorator {
+
+ public static final String NATS_SID = "CamelNatsSID";
+
+ @Override
+ public String getComponent() {
+ return "nats";
+ }
+
+ @Override
+ public String getComponentClassName() {
+ return "org.apache.camel.component.nats.NatsComponent";
+ }
+
+ @Override
+ public String getDestination(Exchange exchange, Endpoint endpoint) {
+ Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri());
+ String topic = queryParameters.get("topic");
+ return topic != null ? topic : super.getDestination(exchange, endpoint);
+ }
+
+ @Override
+ protected String getMessageId(Exchange exchange) {
+ return exchange.getIn().getHeader(NATS_SID, String.class);
+ }
+
+}
diff --git a/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator b/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator
index 614d15d..978172f 100644
--- a/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator
+++ b/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator
@@ -37,6 +37,7 @@ org.apache.camel.opentracing.decorators.KafkaSpanDecorator
org.apache.camel.opentracing.decorators.LogSpanDecorator
org.apache.camel.opentracing.decorators.MongoDBSpanDecorator
org.apache.camel.opentracing.decorators.NettyHttpSpanDecorator
+org.apache.camel.opentracing.decorators.NatsSpanDecorator
org.apache.camel.opentracing.decorators.NsqSpanDecorator
org.apache.camel.opentracing.decorators.PahoSpanDecorator
org.apache.camel.opentracing.decorators.RabbitmqSpanDecorator
[camel] 01/02: CAMEL-14251: camel-nats - Store message payload in
body/headers
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 15bacd5fa5c2c327f5166ef2c48e8d7a0c4c6615
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 4 07:59:08 2019 +0100
CAMEL-14251: camel-nats - Store message payload in body/headers
---
.../java/org/apache/camel/component/nats/NatsConstants.java | 4 ++++
.../java/org/apache/camel/component/nats/NatsConsumer.java | 6 +++++-
.../java/org/apache/camel/component/nats/NatsConsumerTest.java | 10 +++++-----
.../camel/component/nats/NatsConsumerWithRedeliveryTest.java | 4 +---
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
index a927360..9b2b422 100644
--- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
+++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java
@@ -19,4 +19,8 @@ package org.apache.camel.component.nats;
public interface NatsConstants {
String NATS_MESSAGE_TIMESTAMP = "CamelNatsMessageTimestamp";
+ String NATS_SID = "CamelNatsSID";
+ String NATS_REPLY_TO = "CamelNatsReplyTo";
+ String NATS_SUBJECT = "CamelNatsSubject";
+ String NATS_QUEUE_NAME = "CamelNatsQueueName";
}
diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
index 1a0611a..bbcd715 100644
--- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
+++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java
@@ -144,7 +144,11 @@ public class NatsConsumer extends DefaultConsumer {
public void onMessage(Message msg) throws InterruptedException {
log.debug("Received Message: {}", msg);
Exchange exchange = getEndpoint().createExchange();
- exchange.getIn().setBody(msg);
+ exchange.getIn().setBody(msg.getData());
+ exchange.getIn().setHeader(NatsConstants.NATS_REPLY_TO, msg.getReplyTo());
+ exchange.getIn().setHeader(NatsConstants.NATS_SID, msg.getSID());
+ exchange.getIn().setHeader(NatsConstants.NATS_SUBJECT, msg.getSubject());
+ exchange.getIn().setHeader(NatsConstants.NATS_QUEUE_NAME, msg.getSubscription().getQueueName());
exchange.getIn().setHeader(NatsConstants.NATS_MESSAGE_TIMESTAMP, System.currentTimeMillis());
try {
processor.process(exchange);
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java
index bcbfeac..6267648 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.nats;
-import java.io.IOException;
-
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,9 +27,11 @@ public class NatsConsumerTest extends NatsTestSupport {
protected MockEndpoint mockResultEndpoint;
@Test
- public void testConsumer() throws InterruptedException, IOException {
- mockResultEndpoint.expectedMessageCount(1);
- template.requestBody("direct:send", "test");
+ public void testConsumer() throws Exception {
+ mockResultEndpoint.expectedBodiesReceived("Hello World");
+ mockResultEndpoint.expectedHeaderReceived(NatsConstants.NATS_SUBJECT, "test");
+
+ template.requestBody("direct:send", "Hello World");
mockResultEndpoint.assertIsSatisfied();
}
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
index 1f965cc..afea0dc 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.nats;
import java.io.IOException;
-import io.nats.client.Message;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
@@ -66,8 +65,7 @@ public class NatsConsumerWithRedeliveryTest extends NatsTestSupport {
@Override
public boolean matches(Exchange exchange) {
- Message g = exchange.getIn().getBody(Message.class);
- String s = new String(g.getData());
+ String s = exchange.getMessage().getBody(String.class);
if (s.contains("test")) {
return true;
}