This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 2f7998508f4 CAMEL-16364: camel-tracing - Add more decorators
2f7998508f4 is described below
commit 2f7998508f46703e78039205e55c7a43397bc743
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jun 17 20:35:48 2024 +0200
CAMEL-16364: camel-tracing - Add more decorators
---
...panDecorator.java => ActiveMQ6SpanDecorator.java} | 6 +++---
...SpanDecorator.java => ActiveMQSpanDecorator.java} | 6 +++---
...ettySpanDecorator.java => FileSpanDecorator.java} | 19 ++++++++++++++++---
...JettySpanDecorator.java => FtpSpanDecorator.java} | 6 +++---
...ettySpanDecorator.java => FtpsSpanDecorator.java} | 6 +++---
.../camel/tracing/decorators/JettySpanDecorator.java | 2 +-
...tySpanDecorator.java => QuartzSpanDecorator.java} | 20 +++++++++++++++++---
...panDecorator.java => SchedulerSpanDecorator.java} | 6 +++---
...ettySpanDecorator.java => SftpSpanDecorator.java} | 6 +++---
9 files changed, 52 insertions(+), 25 deletions(-)
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ActiveMQ6SpanDecorator.java
similarity index 85%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ActiveMQ6SpanDecorator.java
index 94a418a60a3..153dbccfc4d 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ActiveMQ6SpanDecorator.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+public class ActiveMQ6SpanDecorator extends JmsSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "activemq6";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.activemq6.ActiveMQComponent";
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ActiveMQSpanDecorator.java
similarity index 85%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ActiveMQSpanDecorator.java
index 94a418a60a3..b1fa920749e 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/ActiveMQSpanDecorator.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+public class ActiveMQSpanDecorator extends JmsSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "activemq";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.activemq.ActiveMQComponent";
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FileSpanDecorator.java
similarity index 64%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FileSpanDecorator.java
index 94a418a60a3..44031121b5f 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FileSpanDecorator.java
@@ -16,16 +16,29 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+
+public class FileSpanDecorator extends AbstractSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "file";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.file.FileComponent";
+ }
+
+ @Override
+ public String getOperationName(Exchange exchange, Endpoint endpoint) {
+ Object name = exchange.getMessage().getHeader(Exchange.FILE_NAME);
+ if (name instanceof String) {
+ return (String) name;
+ }
+
+ return super.getOperationName(exchange, endpoint);
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FtpSpanDecorator.java
similarity index 85%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FtpSpanDecorator.java
index 94a418a60a3..e9ecc7dd26e 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FtpSpanDecorator.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+public class FtpSpanDecorator extends FileSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "ftp";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.file.remote.FtpComponent";
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FtpsSpanDecorator.java
similarity index 85%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FtpsSpanDecorator.java
index 94a418a60a3..c33c8a51e65 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/FtpsSpanDecorator.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+public class FtpsSpanDecorator extends FileSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "ftps";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.file.remote.FtpsComponent";
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
index 94a418a60a3..7bc53f964c2 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
@@ -25,7 +25,7 @@ public class JettySpanDecorator extends
AbstractHttpSpanDecorator {
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.jetty12.JettyHttpComponent12";
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/QuartzSpanDecorator.java
similarity index 60%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/QuartzSpanDecorator.java
index 94a418a60a3..a231a0c4d7f 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/QuartzSpanDecorator.java
@@ -16,16 +16,30 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+
+public class QuartzSpanDecorator extends AbstractSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "quartz";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.quartz.QuartzComponent";
+ }
+
+ @Override
+ public String getOperationName(Exchange exchange, Endpoint endpoint) {
+ String group = exchange.getMessage().getHeader("triggerGroup",
String.class);
+ String name = exchange.getMessage().getHeader("triggerName",
String.class);
+ if (group != null && name != null) {
+ return group + "/" + name;
+ }
+
+ return super.getOperationName(exchange, endpoint);
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SchedulerSpanDecorator.java
similarity index 85%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SchedulerSpanDecorator.java
index 94a418a60a3..fce6d349427 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SchedulerSpanDecorator.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+public class SchedulerSpanDecorator extends TimerSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "scheduler";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.scheduler.SchedulerComponent";
}
}
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SftpSpanDecorator.java
similarity index 85%
copy from
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
copy to
components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SftpSpanDecorator.java
index 94a418a60a3..2dc33db1d21 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SftpSpanDecorator.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.tracing.decorators;
-public class JettySpanDecorator extends AbstractHttpSpanDecorator {
+public class SftpSpanDecorator extends FileSpanDecorator {
@Override
public String getComponent() {
- return "jetty";
+ return "sftp";
}
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.file.remote.SftpComponent";
}
}
