You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/08/29 10:22:14 UTC

[camel] branch main updated: Camel-Tracing: Removing NsqSpanDecorator since component is no more available (#11228)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 3214273bb2c Camel-Tracing: Removing NsqSpanDecorator since component is no more available (#11228)
3214273bb2c is described below

commit 3214273bb2cdf155306f74a22eab4dd09a2c561b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 29 12:22:05 2023 +0200

    Camel-Tracing: Removing NsqSpanDecorator since component is no more available (#11228)
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../org.apache.camel.tracing.SpanDecorator         |  1 -
 .../org.apache.camel.tracing.SpanDecorator         |  1 -
 .../camel/tracing/decorators/NsqSpanDecorator.java | 54 ----------------------
 3 files changed, 56 deletions(-)

diff --git a/components/camel-observation/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator b/components/camel-observation/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
index 0887c54b427..36bdfa6d8f1 100644
--- a/components/camel-observation/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
+++ b/components/camel-observation/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
@@ -36,7 +36,6 @@ org.apache.camel.tracing.decorators.LogSpanDecorator
 org.apache.camel.tracing.decorators.MongoDBSpanDecorator
 org.apache.camel.tracing.decorators.NettyHttpSpanDecorator
 org.apache.camel.tracing.decorators.NatsSpanDecorator
-org.apache.camel.tracing.decorators.NsqSpanDecorator
 org.apache.camel.tracing.decorators.PahoSpanDecorator
 org.apache.camel.tracing.decorators.PlatformHttpSpanDecorator
 org.apache.camel.tracing.decorators.RestSpanDecorator
diff --git a/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator b/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
index 0887c54b427..36bdfa6d8f1 100644
--- a/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
+++ b/components/camel-opentelemetry/src/main/resources/META-INF/services/org.apache.camel.tracing.SpanDecorator
@@ -36,7 +36,6 @@ org.apache.camel.tracing.decorators.LogSpanDecorator
 org.apache.camel.tracing.decorators.MongoDBSpanDecorator
 org.apache.camel.tracing.decorators.NettyHttpSpanDecorator
 org.apache.camel.tracing.decorators.NatsSpanDecorator
-org.apache.camel.tracing.decorators.NsqSpanDecorator
 org.apache.camel.tracing.decorators.PahoSpanDecorator
 org.apache.camel.tracing.decorators.PlatformHttpSpanDecorator
 org.apache.camel.tracing.decorators.RestSpanDecorator
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
deleted file mode 100644
index ba1a68b2f65..00000000000
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.tracing.decorators;
-
-import java.util.Map;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-
-public class NsqSpanDecorator extends AbstractMessagingSpanDecorator {
-
-    public static final String NSQ_MESSAGE_ID = "CamelNsqMessageId";
-    public static final String NSQ_TOPIC = "CamelNsqMessageTopic";
-
-    @Override
-    public String getComponent() {
-        return "nsq";
-    }
-
-    @Override
-    public String getComponentClassName() {
-        return "org.apache.camel.component.nsq.NsqComponent";
-    }
-
-    @Override
-    public String getDestination(Exchange exchange, Endpoint endpoint) {
-        String topic = exchange.getIn().getHeader(NSQ_TOPIC, String.class);
-        if (topic == null) {
-            Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri());
-            topic = queryParameters.get("topic");
-        }
-        return topic != null ? topic : super.getDestination(exchange, endpoint);
-    }
-
-    @Override
-    protected String getMessageId(Exchange exchange) {
-        return exchange.getIn().getHeader(NSQ_MESSAGE_ID, String.class);
-    }
-
-}