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 2021/04/18 06:11:50 UTC
[camel] branch master updated: CAMEL-16028: Upgrade to MicroProfile
4 (#5390)
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
The following commit(s) were added to refs/heads/master by this push:
new 1991746 CAMEL-16028: Upgrade to MicroProfile 4 (#5390)
1991746 is described below
commit 199174646eefe66649423d08afcc68296620a207
Author: James Netherton <ja...@users.noreply.github.com>
AuthorDate: Sun Apr 18 07:11:20 2021 +0100
CAMEL-16028: Upgrade to MicroProfile 4 (#5390)
---
camel-dependencies/pom.xml | 18 +++----
.../faulttolerance/FaultToleranceProcessor.java | 10 ++--
...CamelMicroProfileHealthCheckRepositoryTest.java | 14 +++---
.../health/CamelMicroProfileHealthCheckTest.java | 56 +++++++++++-----------
.../health/CamelMicroProfileHealthTestSupport.java | 2 +-
.../MicroProfileMetricsExchangeEventNotifier.java | 4 +-
.../metrics/MicroProfileMetricsMetadataTest.java | 12 ++---
.../opentracing/OpenTracingTracingStrategy.java | 2 +-
.../ThirdPartyInstrumentationIntegrationTest.java | 2 +-
parent/pom.xml | 19 ++++----
10 files changed, 69 insertions(+), 70 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 91b4b97..326e130 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -417,10 +417,10 @@
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
<metrics-version>4.1.12.1</metrics-version>
<micrometer-version>1.6.1</micrometer-version>
- <microprofile-config-version>1.4</microprofile-config-version>
- <microprofile-fault-tolerance-version>2.1</microprofile-fault-tolerance-version>
- <microprofile-health-version>2.2</microprofile-health-version>
- <microprofile-metrics-version>2.3</microprofile-metrics-version>
+ <microprofile-config-version>2.0</microprofile-config-version>
+ <microprofile-fault-tolerance-version>3.0</microprofile-fault-tolerance-version>
+ <microprofile-health-version>3.0</microprofile-health-version>
+ <microprofile-metrics-version>3.0</microprofile-metrics-version>
<milo-guava-version>26.0-jre</milo-guava-version>
<milo-version>0.3.7</milo-version>
<mimepull-version>1.9.13</mimepull-version>
@@ -456,7 +456,7 @@
<openstack4j-version>3.8</openstack4j-version>
<opentelemetry-version>0.15.0</opentelemetry-version>
<opentracing-tracerresolver-version>0.1.8</opentracing-tracerresolver-version>
- <opentracing-version>0.31.0</opentracing-version>
+ <opentracing-version>0.33.0</opentracing-version>
<openwebbeans-version>1.7.3</openwebbeans-version>
<openwebbeans1-version>1.2.7</openwebbeans1-version>
<optaplanner-version>8.5.0.Final</optaplanner-version>
@@ -513,10 +513,10 @@
<slf4j-api-version>1.7.30</slf4j-api-version>
<slf4j-version>1.7.30</slf4j-version>
<smack-version>4.3.5</smack-version>
- <smallrye-config-version>1.10.2</smallrye-config-version>
- <smallrye-fault-tolerance-version>4.3.2</smallrye-fault-tolerance-version>
- <smallrye-health-version>2.2.5</smallrye-health-version>
- <smallrye-metrics-version>2.4.5</smallrye-metrics-version>
+ <smallrye-config-version>2.2.0</smallrye-config-version>
+ <smallrye-fault-tolerance-version>5.0.0</smallrye-fault-tolerance-version>
+ <smallrye-health-version>3.0.1</smallrye-health-version>
+ <smallrye-metrics-version>3.0.1</smallrye-metrics-version>
<snakeyaml-engine-version>2.2.1</snakeyaml-engine-version>
<snakeyaml-version>1.28</snakeyaml-version>
<snmp4j-version>2.6.3_1</snmp4j-version>
diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
index ad51366..61ac869 100644
--- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
+++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java
@@ -238,13 +238,13 @@ public class FaultToleranceProcessor extends AsyncProcessorSupport
// 1. bulkhead
if (config.isBulkheadEnabled()) {
target = new ThreadPoolBulkhead(
- target, "bulkhead", executorService, config.getBulkheadMaxConcurrentCalls(),
- config.getBulkheadWaitingTaskQueue(), null);
+ target, "bulkhead", config.getBulkheadMaxConcurrentCalls(),
+ config.getBulkheadWaitingTaskQueue());
}
// 2. timeout
if (config.isTimeoutEnabled()) {
TimeoutWatcher watcher = new ScheduledExecutorTimeoutWatcher(scheduledExecutorService);
- target = new Timeout(target, "timeout", config.getTimeoutDuration(), watcher, null);
+ target = new Timeout(target, "timeout", config.getTimeoutDuration(), watcher);
}
// 3. fallback
if (fallbackProcessor != null) {
@@ -253,7 +253,7 @@ public class FaultToleranceProcessor extends AsyncProcessorSupport
target = new Fallback(target, "fallback", fallbackContext -> {
exchange.setException(fallbackContext.failure);
return fFallbackTask.call();
- }, SetOfThrowables.ALL, SetOfThrowables.EMPTY, null);
+ }, SetOfThrowables.ALL, SetOfThrowables.EMPTY);
}
try {
@@ -332,7 +332,7 @@ public class FaultToleranceProcessor extends AsyncProcessorSupport
circuitBreaker = new CircuitBreaker(
invocation(), id, SetOfThrowables.ALL,
SetOfThrowables.EMPTY, config.getDelay(), config.getRequestVolumeThreshold(), config.getFailureRatio(),
- config.getSuccessThreshold(), new SystemStopwatch(), null);
+ config.getSuccessThreshold(), new SystemStopwatch());
}
ServiceHelper.initService(processorExchangeFactory, taskFactory, fallbackTaskFactory, processor);
diff --git a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRepositoryTest.java b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRepositoryTest.java
index 726c110..c81a2a3 100644
--- a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRepositoryTest.java
+++ b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRepositoryTest.java
@@ -23,7 +23,7 @@ import io.smallrye.health.SmallRyeHealth;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.health.HealthCheckRegistry;
-import org.eclipse.microprofile.health.HealthCheckResponse.State;
+import org.eclipse.microprofile.health.HealthCheckResponse.Status;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -44,13 +44,13 @@ public class CamelMicroProfileHealthCheckRepositoryTest extends CamelMicroProfil
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.UP.name(), healthObject.getString("status"));
+ assertEquals(Status.UP.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.UP, checks.getJsonObject(0), jsonObject -> {
- assertEquals(State.UP.name(), jsonObject.getString("route:healthyRoute"));
+ assertHealthCheckOutput("camel-readiness-checks", Status.UP, checks.getJsonObject(0), jsonObject -> {
+ assertEquals(Status.UP.name(), jsonObject.getString("route:healthyRoute"));
});
}
@@ -70,13 +70,13 @@ public class CamelMicroProfileHealthCheckRepositoryTest extends CamelMicroProfil
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.DOWN.name(), healthObject.getString("status"));
+ assertEquals(Status.DOWN.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.DOWN, checks.getJsonObject(0), jsonObject -> {
- assertEquals(State.DOWN.name(), jsonObject.getString("route:healthyRoute"));
+ assertHealthCheckOutput("camel-readiness-checks", Status.DOWN, checks.getJsonObject(0), jsonObject -> {
+ assertEquals(Status.DOWN.name(), jsonObject.getString("route:healthyRoute"));
});
}
diff --git a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckTest.java b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckTest.java
index cbbc2a7..c040e77 100644
--- a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckTest.java
+++ b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckTest.java
@@ -23,7 +23,7 @@ import io.smallrye.health.SmallRyeHealth;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy;
import org.apache.camel.impl.health.ContextHealthCheck;
-import org.eclipse.microprofile.health.HealthCheckResponse.State;
+import org.eclipse.microprofile.health.HealthCheckResponse.Status;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -44,13 +44,13 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.UP.name(), healthObject.getString("status"));
+ assertEquals(Status.UP.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.UP, checks.getJsonObject(0), checksJson -> {
- assertEquals(State.UP.name(), checksJson.getString("context"));
+ assertHealthCheckOutput("camel-readiness-checks", Status.UP, checks.getJsonObject(0), checksJson -> {
+ assertEquals(Status.UP.name(), checksJson.getString("context"));
});
}
@@ -68,13 +68,13 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.DOWN.name(), healthObject.getString("status"));
+ assertEquals(Status.DOWN.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.DOWN, checks.getJsonObject(0), checksJson -> {
- assertEquals(State.DOWN.name(), checksJson.getString("context"));
+ assertHealthCheckOutput("camel-readiness-checks", Status.DOWN, checks.getJsonObject(0), checksJson -> {
+ assertEquals(Status.DOWN.name(), checksJson.getString("context"));
});
}
@@ -93,15 +93,15 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.UP.name(), healthObject.getString("status"));
+ assertEquals(Status.UP.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
JsonObject checksObject = checks.getJsonObject(0);
- assertHealthCheckOutput("camel-liveness-checks", State.UP, checksObject, checksJson -> {
- assertEquals(State.UP.name(), checksJson.getString("liveness-1"));
- assertEquals(State.UP.name(), checksJson.getString("liveness-2"));
+ assertHealthCheckOutput("camel-liveness-checks", Status.UP, checksObject, checksJson -> {
+ assertEquals(Status.UP.name(), checksJson.getString("liveness-1"));
+ assertEquals(Status.UP.name(), checksJson.getString("liveness-2"));
});
}
@@ -120,15 +120,15 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.DOWN.name(), healthObject.getString("status"));
+ assertEquals(Status.DOWN.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
JsonObject checksObject = checks.getJsonObject(0);
- assertHealthCheckOutput("camel-liveness-checks", State.DOWN, checksObject, checksJson -> {
- assertEquals(State.UP.name(), checksJson.getString("liveness-1"));
- assertEquals(State.DOWN.name(), checksJson.getString("liveness-2"));
+ assertHealthCheckOutput("camel-liveness-checks", Status.DOWN, checksObject, checksJson -> {
+ assertEquals(Status.UP.name(), checksJson.getString("liveness-1"));
+ assertEquals(Status.DOWN.name(), checksJson.getString("liveness-2"));
});
}
@@ -147,14 +147,14 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.UP.name(), healthObject.getString("status"));
+ assertEquals(Status.UP.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.UP, checks.getJsonObject(0), jsonObject -> {
- assertEquals(State.UP.name(), jsonObject.getString("readiness-1"));
- assertEquals(State.UP.name(), jsonObject.getString("readiness-2"));
+ assertHealthCheckOutput("camel-readiness-checks", Status.UP, checks.getJsonObject(0), jsonObject -> {
+ assertEquals(Status.UP.name(), jsonObject.getString("readiness-1"));
+ assertEquals(Status.UP.name(), jsonObject.getString("readiness-2"));
});
}
@@ -173,14 +173,14 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.DOWN.name(), healthObject.getString("status"));
+ assertEquals(Status.DOWN.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.DOWN, checks.getJsonObject(0), jsonObject -> {
- assertEquals(State.UP.name(), jsonObject.getString("readiness-1"));
- assertEquals(State.DOWN.name(), jsonObject.getString("readiness-2"));
+ assertHealthCheckOutput("camel-readiness-checks", Status.DOWN, checks.getJsonObject(0), jsonObject -> {
+ assertEquals(Status.UP.name(), jsonObject.getString("readiness-1"));
+ assertEquals(Status.DOWN.name(), jsonObject.getString("readiness-2"));
});
}
@@ -197,12 +197,12 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.UP.name(), healthObject.getString("status"));
+ assertEquals(Status.UP.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(1, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.UP, checks.getJsonObject(0), jsonObject -> {
+ assertHealthCheckOutput("camel-readiness-checks", Status.UP, checks.getJsonObject(0), jsonObject -> {
assertNull(jsonObject);
});
}
@@ -220,16 +220,16 @@ public class CamelMicroProfileHealthCheckTest extends CamelMicroProfileHealthTes
SmallRyeHealth health = reporter.getHealth();
JsonObject healthObject = getHealthJson(health);
- assertEquals(State.UP.name(), healthObject.getString("status"));
+ assertEquals(Status.UP.name(), healthObject.getString("status"));
JsonArray checks = healthObject.getJsonArray("checks");
assertEquals(2, checks.size());
- assertHealthCheckOutput("camel-readiness-checks", State.UP, checks.getJsonObject(0), jsonObject -> {
+ assertHealthCheckOutput("camel-readiness-checks", Status.UP, checks.getJsonObject(0), jsonObject -> {
assertNull(jsonObject);
});
- assertHealthCheckOutput("camel-liveness-checks", State.UP, checks.getJsonObject(1), jsonObject -> {
+ assertHealthCheckOutput("camel-liveness-checks", Status.UP, checks.getJsonObject(1), jsonObject -> {
assertNull(jsonObject);
});
}
diff --git a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java
index 3c301a1..9543e04 100644
--- a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java
+++ b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java
@@ -62,7 +62,7 @@ public class CamelMicroProfileHealthTestSupport extends CamelTestSupport {
}
protected void assertHealthCheckOutput(
- String expectedName, HealthCheckResponse.State expectedState, JsonObject healthObject,
+ String expectedName, HealthCheckResponse.Status expectedState, JsonObject healthObject,
Consumer<JsonObject> dataObjectAssertions) {
assertEquals(expectedName, healthObject.getString("name"));
assertEquals(expectedState.name(), healthObject.getString("status"));
diff --git a/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifier.java b/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifier.java
index 90e5c91..89c5f83 100644
--- a/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifier.java
+++ b/components/camel-microprofile/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifier.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.microprofile.metrics.event.notifier.exchange;
+import java.time.Duration;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import org.apache.camel.CamelContext;
@@ -123,7 +123,7 @@ public class MicroProfileMetricsExchangeEventNotifier extends AbstractMicroProfi
timer = getMetricRegistry().timer(name + PROCESSING_METRICS_SUFFIX, tags);
sentEvent.getExchange().setProperty("eventTimer:" + name, timer);
}
- timer.update(sentEvent.getTimeTaken(), TimeUnit.MILLISECONDS);
+ timer.update(Duration.ofMillis(sentEvent.getTimeTaken()));
}
protected void handleDoneEvent(ExchangeEvent doneEvent) {
diff --git a/components/camel-microprofile/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java b/components/camel-microprofile/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java
index 943850d..89bfac7 100644
--- a/components/camel-microprofile/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java
+++ b/components/camel-microprofile/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java
@@ -42,18 +42,18 @@ public class MicroProfileMetricsMetadataTest extends MicroProfileMetricsTestSupp
public void testMetricMetadata() {
template.sendBody("direct:metadata", null);
Metadata metadata = getMetricMetadata("test-counter");
- assertEquals(METRIC_DESCRIPTION, metadata.getDescription().get());
+ assertEquals(METRIC_DESCRIPTION, metadata.getDescription());
assertEquals(METRIC_DISPLAY_NAME, metadata.getDisplayName());
- assertEquals(KILOBYTES, metadata.getUnit().get());
+ assertEquals(KILOBYTES, metadata.getUnit());
}
@Test
public void testMetricMetadataFromHeader() {
template.sendBody("direct:metadataHeader", null);
Metadata metadata = getMetricMetadata("test-counter-header");
- assertEquals(METRIC_DESCRIPTION, metadata.getDescription().get());
+ assertEquals(METRIC_DESCRIPTION, metadata.getDescription());
assertEquals(METRIC_DISPLAY_NAME, metadata.getDisplayName());
- assertEquals(KILOBYTES, metadata.getUnit().get());
+ assertEquals(KILOBYTES, metadata.getUnit());
}
@Test
@@ -65,9 +65,9 @@ public class MicroProfileMetricsMetadataTest extends MicroProfileMetricsTestSupp
template.sendBodyAndHeaders("direct:metadata", null, headers);
Metadata metadata = getMetricMetadata("test-counter");
- assertEquals(METRIC_DISPLAY_NAME_MODIFIED, metadata.getDescription().get());
+ assertEquals(METRIC_DISPLAY_NAME_MODIFIED, metadata.getDescription());
assertEquals(METRIC_DESCRIPTION_MODIFIED, metadata.getDisplayName());
- assertEquals(MEGABITS, metadata.getUnit().get());
+ assertEquals(MEGABITS, metadata.getUnit());
}
@Override
diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracingStrategy.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracingStrategy.java
index 919dcb2..2d24018 100644
--- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracingStrategy.java
+++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracingStrategy.java
@@ -76,7 +76,7 @@ public class OpenTracingTracingStrategy implements InterceptStrategy {
ActiveSpanManager.activate(exchange, new OpenTracingSpanAdapter(processorSpan));
}
- try (Scope scope = tracer.getTracer().scopeManager().activate(processorSpan, false)) {
+ try (Scope scope = tracer.getTracer().scopeManager().activate(processorSpan)) {
target.process(exchange);
} catch (Exception ex) {
processorSpan.log(errorLogs(ex));
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ThirdPartyInstrumentationIntegrationTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ThirdPartyInstrumentationIntegrationTest.java
index 1abb5f0..dddcb66 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ThirdPartyInstrumentationIntegrationTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ThirdPartyInstrumentationIntegrationTest.java
@@ -115,7 +115,7 @@ public class ThirdPartyInstrumentationIntegrationTest extends CamelTestSupport {
Tracer.SpanBuilder spanBuilder = tracer.buildSpan("third-party-span")
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_SERVER);
Span span = spanBuilder.start();
- try (Scope ignored = tracer.scopeManager().activate(span, false)) {
+ try (Scope ignored = tracer.scopeManager().activate(span)) {
closure.run();
} catch (Exception e) {
Tags.ERROR.set(span, Boolean.TRUE);
diff --git a/parent/pom.xml b/parent/pom.xml
index 6895650..74abf8c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -403,10 +403,10 @@
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
<metrics-version>4.1.12.1</metrics-version>
<micrometer-version>1.6.1</micrometer-version>
- <microprofile-config-version>1.4</microprofile-config-version>
- <microprofile-metrics-version>2.3</microprofile-metrics-version>
- <microprofile-health-version>2.2</microprofile-health-version>
- <microprofile-fault-tolerance-version>2.1</microprofile-fault-tolerance-version>
+ <microprofile-config-version>2.0</microprofile-config-version>
+ <microprofile-metrics-version>3.0</microprofile-metrics-version>
+ <microprofile-health-version>3.0</microprofile-health-version>
+ <microprofile-fault-tolerance-version>3.0</microprofile-fault-tolerance-version>
<milo-version>0.3.7</milo-version>
<milo-guava-version>26.0-jre</milo-guava-version>
<mimepull-version>1.9.13</mimepull-version>
@@ -444,8 +444,7 @@
<openjpa-version>3.1.2</openjpa-version>
<openstack4j-version>3.8</openstack4j-version>
<opentelemetry-version>0.15.0</opentelemetry-version>
- <!-- cannot upgrade opentracing until https://github.com/eclipse/microprofile-opentracing v2 is released -->
- <opentracing-version>0.31.0</opentracing-version>
+ <opentracing-version>0.33.0</opentracing-version>
<opentracing-tracerresolver-version>0.1.8</opentracing-tracerresolver-version>
<optaplanner-version>8.5.0.Final</optaplanner-version>
<os-maven-plugin-version>1.7.0</os-maven-plugin-version>
@@ -501,10 +500,10 @@
<slf4j-api-version>1.7.30</slf4j-api-version>
<slf4j-version>1.7.30</slf4j-version>
<smack-version>4.3.5</smack-version>
- <smallrye-config-version>1.10.2</smallrye-config-version>
- <smallrye-metrics-version>2.4.5</smallrye-metrics-version>
- <smallrye-health-version>2.2.5</smallrye-health-version>
- <smallrye-fault-tolerance-version>4.3.2</smallrye-fault-tolerance-version>
+ <smallrye-config-version>2.2.0</smallrye-config-version>
+ <smallrye-metrics-version>3.0.1</smallrye-metrics-version>
+ <smallrye-health-version>3.0.1</smallrye-health-version>
+ <smallrye-fault-tolerance-version>5.0.0</smallrye-fault-tolerance-version>
<snakeyaml-version>1.28</snakeyaml-version>
<snakeyaml-engine-version>2.2.1</snakeyaml-engine-version>
<snmp4j-version>2.6.3_1</snmp4j-version>