This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9d6b6b909c71c414739dceddb98e3b3df03303e7 Merge: a277631854f 466a745c19a Author: Croway <[email protected]> AuthorDate: Thu Mar 9 11:18:24 2023 +0100 Merge branch 'camel-3.x' of github.com:apache/camel into camel-3.x bom/camel-bom/pom.xml | 5 + camel-dependencies/pom.xml | 5 +- catalog/camel-allcomponents/pom.xml | 5 + .../org/apache/camel/catalog/others.properties | 2 +- .../apache/camel/catalog/others/observation.json | 15 + .../org/apache/camel/catalog/others/zeebe.json | 14 - .../jms/tx/JMSTransactionErrorHandlerTest.java | 2 +- .../JMSTransactionIsTransactedRedeliveredTest.java | 2 +- .../jms/tx/JMSTransactionRollbackTest.java | 2 +- .../jms/tx/JMSTransactionalClientTest.java | 2 +- .../tx/JMSTransactionalClientWithRollbackTest.java | 2 +- ...sactionErrorHandlerBuilderAsSpringBeanTest.java | 2 +- ...actionErrorHandlerCustomerSpringParserTest.java | 2 +- .../jms/tx/JMSTransactionErrorHandlerTest.xml | 2 +- .../JMSTransactionIsTransactedRedeliveredTest.xml | 2 +- .../jms/tx/JMSTransactionRollbackTest.xml | 2 +- .../jms/tx/JMSTransactionalClientTest.xml | 2 +- .../tx/JMSTransactionalClientWithRollbackTest.xml | 2 +- ...nsactionErrorHandlerBuilderAsSpringBeanTest.xml | 2 +- ...sactionErrorHandlerCustomerSpringParserTest.xml | 2 +- .../camel/component/jms/tx/artemis-security.xml | 6 +- .../health/CamelMicroProfileHealthCheckTest.java | 33 +- ...MicroProfileHealthSupervisedRoutesMainTest.java | 2 +- .../health/CamelMicroProfileHealthTestSupport.java | 10 + components/camel-observation/pom.xml | 88 +++++ .../services/org/apache/camel/other.properties | 7 + .../src/generated/resources/observation.json | 15 + .../src/main/docs/observation.adoc | 88 +++++ .../camel/observation/AttributeProcessor.java | 116 +++++++ .../GetCorrelationContextProcessor.java | 109 +++++++ .../MicrometerObservationSpanAdapter.java | 170 ++++++++++ .../observation/MicrometerObservationTracer.java | 175 ++++++++++ .../SetCorrelationContextProcessor.java | 115 +++++++ .../org.apache.camel.tracing.SpanDecorator | 54 ++++ .../org/apache/camel/observation/ABCRouteTest.java | 70 ++++ .../CamelMicrometerObservationTestSupport.java | 264 +++++++++++++++ .../observation/ClientRecipientListRouteTest.java | 68 ++++ .../apache/camel/observation/CurrentSpanTest.java | 355 +++++++++++++++++++++ .../observation/CustomComponentNameRouteTest.java | 74 +++++ .../observation/MulticastParallelRouteTest.java | 71 +++++ .../camel/observation/MulticastRouteTest.java | 73 +++++ .../camel/observation/RouteConcurrentTest.java | 82 +++++ .../camel/observation/SpanProcessorsTest.java | 86 +++++ .../org/apache/camel/observation/SpanTestData.java | 107 +++++++ .../camel/observation/TestSEDASpanDecorator.java} | 28 +- .../apache/camel/observation/TwoServiceTest.java | 60 ++++ .../observation/TwoServiceWithExcludeTest.java | 66 ++++ .../CamelDefaultTracingObservationHandler.java | 54 ++++ ...opagatingReceiverTracingObservationHandler.java | 56 ++++ ...PropagatingSenderTracingObservationHandler.java | 46 +++ .../src/test/resources/log4j2.properties | 29 ++ .../camel/opentelemetry/OpenTelemetryTracer.java | 3 +- .../camel/opentracing/OpenTracingTracer.java | 3 +- .../org/apache/camel/component/sql/SqlHelper.java | 30 +- .../apache/camel/component/sql/SqlProducer.java | 7 +- .../apache/camel/component/sql/SqlRouteTest.java | 15 + .../java/org/apache/camel/tracing/SpanAdapter.java | 20 ++ .../main/java/org/apache/camel/tracing/Tracer.java | 8 +- .../decorators/AbstractHttpSpanDecorator.java | 4 +- .../camel/tracing/decorators/CqlSpanDecorator.java | 2 +- .../decorators/ElasticsearchSpanDecorator.java | 2 +- .../tracing/decorators/JdbcSpanDecorator.java | 2 +- .../tracing/decorators/MongoDBSpanDecorator.java | 2 +- .../camel/tracing/decorators/SqlSpanDecorator.java | 2 +- .../services/org/apache/camel/other.properties | 24 -- .../camel-zeebe/src/generated/resources/zeebe.json | 14 - .../camel-zeebe/src/main/resources/component/zeebe | 1 - components/pom.xml | 1 + .../modules/others/examples/json/observation.json | 1 + .../modules/others/examples/json/zeebe.json | 1 - docs/components/modules/others/nav.adoc | 1 + .../modules/others/pages/observation.adoc | 1 + .../modules/ROOT/pages/camel-jbang.adoc | 73 +++++ dsl/camel-jbang/camel-jbang-core/pom.xml | 14 + .../apache/camel/dsl/jbang/core/commands/Bind.java | 2 +- .../dsl/jbang/core/commands/CamelJBangMain.java | 14 +- .../camel/dsl/jbang/core/commands/Complete.java | 2 +- .../camel/dsl/jbang/core/commands/Export.java | 2 +- .../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +- .../apache/camel/dsl/jbang/core/commands/Init.java | 4 +- .../apache/camel/dsl/jbang/core/commands/Pipe.java | 2 +- .../apache/camel/dsl/jbang/core/commands/Run.java | 4 +- .../jbang/core/commands/catalog/CatalogDoc.java | 2 +- .../core/commands/catalog/CatalogKamelet.java | 2 +- .../{Complete.java => config/ConfigCommand.java} | 27 +- .../{Complete.java => config/ConfigGet.java} | 35 +- .../{Complete.java => config/ConfigList.java} | 32 +- .../dsl/jbang/core/commands/config/ConfigSet.java | 54 ++++ .../{Complete.java => config/ConfigUnset.java} | 32 +- .../dsl/jbang/core/common/CommandLineHelper.java | 107 +++++++ .../templates/run-custom-camel-version.tmpl | 2 +- .../apache/camel/dsl/jbang/BackgroundTest.java} | 56 ++-- .../camel-jbang-main/dist/CamelJBang.java | 2 +- .../src/main/jbang/main/CamelJBang.java | 2 +- parent/pom.xml | 10 +- 95 files changed, 3028 insertions(+), 249 deletions(-)
