This is an automated email from the ASF dual-hosted git repository.
apupier 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 3342e3058241 Revert "CAMEL-23225: Propagate OpenTelemetry context
across thread boundaries…"
3342e3058241 is described below
commit 3342e30582410b822259c0e7454f7b344cf2198a
Author: Aurélien Pupier <[email protected]>
AuthorDate: Wed Mar 25 10:10:14 2026 +0100
Revert "CAMEL-23225: Propagate OpenTelemetry context across thread
boundaries…"
This reverts commit 5810a742bc70d559c77bf37a5e532b8d3aa2f3f9.
---
.../org/apache/camel/thread-factory-listener | 2 -
.../services/org/apache/camel/thread-pool-factory | 2 -
...TelemetryInstrumentedThreadFactoryListener.java | 32 ----------
...OpenTelemetryInstrumentedThreadPoolFactory.java | 69 ----------------------
...mel-factoryfinder-known-dependencies.properties | 1 -
5 files changed, 106 deletions(-)
diff --git
a/components/camel-opentelemetry2/src/generated/resources/META-INF/services/org/apache/camel/thread-factory-listener
b/components/camel-opentelemetry2/src/generated/resources/META-INF/services/org/apache/camel/thread-factory-listener
deleted file mode 100644
index 8cb98164902d..000000000000
---
a/components/camel-opentelemetry2/src/generated/resources/META-INF/services/org/apache/camel/thread-factory-listener
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.opentelemetry2.OpenTelemetryInstrumentedThreadFactoryListener
diff --git
a/components/camel-opentelemetry2/src/generated/resources/META-INF/services/org/apache/camel/thread-pool-factory
b/components/camel-opentelemetry2/src/generated/resources/META-INF/services/org/apache/camel/thread-pool-factory
deleted file mode 100644
index 31eb3a73f0bc..000000000000
---
a/components/camel-opentelemetry2/src/generated/resources/META-INF/services/org/apache/camel/thread-pool-factory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.opentelemetry2.OpenTelemetryInstrumentedThreadPoolFactory
diff --git
a/components/camel-opentelemetry2/src/main/java/org/apache/camel/opentelemetry2/OpenTelemetryInstrumentedThreadFactoryListener.java
b/components/camel-opentelemetry2/src/main/java/org/apache/camel/opentelemetry2/OpenTelemetryInstrumentedThreadFactoryListener.java
deleted file mode 100644
index f2eaae4bcd06..000000000000
---
a/components/camel-opentelemetry2/src/main/java/org/apache/camel/opentelemetry2/OpenTelemetryInstrumentedThreadFactoryListener.java
+++ /dev/null
@@ -1,32 +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.opentelemetry2;
-
-import java.util.concurrent.ThreadFactory;
-
-import io.opentelemetry.context.Context;
-import org.apache.camel.spi.ExecutorServiceManager;
-import org.apache.camel.spi.annotations.JdkService;
-
-@JdkService(ExecutorServiceManager.ThreadFactoryListener.FACTORY)
-public class OpenTelemetryInstrumentedThreadFactoryListener implements
ExecutorServiceManager.ThreadFactoryListener {
-
- @Override
- public ThreadFactory onNewThreadFactory(Object source, ThreadFactory
factory) {
- return runnable -> factory.newThread(Context.current().wrap(runnable));
- }
-}
diff --git
a/components/camel-opentelemetry2/src/main/java/org/apache/camel/opentelemetry2/OpenTelemetryInstrumentedThreadPoolFactory.java
b/components/camel-opentelemetry2/src/main/java/org/apache/camel/opentelemetry2/OpenTelemetryInstrumentedThreadPoolFactory.java
deleted file mode 100644
index 9c70dbaf1b19..000000000000
---
a/components/camel-opentelemetry2/src/main/java/org/apache/camel/opentelemetry2/OpenTelemetryInstrumentedThreadPoolFactory.java
+++ /dev/null
@@ -1,69 +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.opentelemetry2;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import io.opentelemetry.context.Context;
-import org.apache.camel.spi.ThreadPoolFactory;
-import org.apache.camel.spi.ThreadPoolProfile;
-import org.apache.camel.spi.annotations.JdkService;
-import org.apache.camel.support.DefaultThreadPoolFactory;
-
-@JdkService(ThreadPoolFactory.FACTORY)
-public class OpenTelemetryInstrumentedThreadPoolFactory extends
DefaultThreadPoolFactory {
-
- @Override
- public ExecutorService newCachedThreadPool(ThreadFactory threadFactory) {
- return Context.taskWrapping(super.newCachedThreadPool(threadFactory));
- }
-
- @Override
- public ExecutorService newThreadPool(
- int corePoolSize,
- int maxPoolSize,
- long keepAliveTime,
- TimeUnit timeUnit,
- int maxQueueSize,
- boolean allowCoreThreadTimeOut,
- RejectedExecutionHandler rejectedExecutionHandler,
- ThreadFactory threadFactory)
- throws IllegalArgumentException {
-
- ExecutorService executorService = super.newThreadPool(
- corePoolSize,
- maxPoolSize,
- keepAliveTime,
- timeUnit,
- maxQueueSize,
- allowCoreThreadTimeOut,
- rejectedExecutionHandler,
- threadFactory);
-
- return Context.taskWrapping(executorService);
- }
-
- @Override
- public ScheduledExecutorService newScheduledThreadPool(ThreadPoolProfile
profile, ThreadFactory threadFactory) {
- return Context.taskWrapping(super.newScheduledThreadPool(profile,
threadFactory));
- }
-
-}
diff --git
a/dsl/camel-kamelet-main/src/generated/resources/camel-factoryfinder-known-dependencies.properties
b/dsl/camel-kamelet-main/src/generated/resources/camel-factoryfinder-known-dependencies.properties
index 54f759b01dc4..fa64e4d779c0 100644
---
a/dsl/camel-kamelet-main/src/generated/resources/camel-factoryfinder-known-dependencies.properties
+++
b/dsl/camel-kamelet-main/src/generated/resources/camel-factoryfinder-known-dependencies.properties
@@ -54,5 +54,4 @@
META-INF/services/org/apache/camel/rest-registry-factory=camel:rest
META-INF/services/org/apache/camel/startup-step-recorder=camel:jfr
META-INF/services/org/apache/camel/telemetry-dev-tracer=camel:telemetry-dev
META-INF/services/org/apache/camel/thread-factory-listener=camel:opentelemetry
-META-INF/services/org/apache/camel/thread-factory-listener=camel:opentelemetry2
META-INF/services/org/apache/camel/write-ahead-resume-strategy=camel:wal
