This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 991258e4c7ccf80b338ca5d546319418dd8d2c19 Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Thu Apr 14 17:31:20 2022 +0200 TOMEE-3895 Smallrye OpenTracing integration and wiring --- ...croProfileOpenTracingTCKDeploymentPackager.java | 5 ---- .../opentracing/MPOpenTracingCDIExtension.java | 35 ++++++++++++++++++++++ ...eOpenTracingClientTracingRegistrarProvider.java | 3 +- ...ProfileOpenTracingFinishingFilterInstaller.java | 2 +- .../MicroProfileOpenTracingTracingFeature.java | 2 +- .../jakarta.enterprise.inject.spi.Extension | 2 ++ ...file.opentracing.ClientTracingRegistrarProvider | 1 + 7 files changed, 41 insertions(+), 9 deletions(-) diff --git a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java index 446d425dd1..64a83abe41 100644 --- a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java +++ b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java @@ -51,13 +51,8 @@ public class MicroProfileOpenTracingTCKDeploymentPackager extends ServletProtoco webArchive.addAsLibrary(jarLocation(ThreadLocalScopeManager.class)); webArchive.addAsWebInfResource("META-INF/beans.xml"); webArchive.addClass(MicroProfileOpenTracingTCKTracer.class); - webArchive.addClass(MicroProfileOpenTracingExceptionMapper.class); - webArchive.addClass(MicroProfileOpenTracingFinishingFilterInstaller.class); - webArchive.addClass(MicroProfileOpenTracingClientTracingRegistrarProvider.class); - webArchive.addClass(MicroProfileOpenTracingTracingFeature.class); webArchive.addClass(MicroProfileOpenTrackingContextResolver.class); webArchive.addAsServiceProvider(Providers.class, MicroProfileOpenTrackingContextResolver.class); - // webArchive.addAsServiceProvider(ClientTracingRegistrarProvider.class, MicroProfileOpenTracingClientTracingRegistrarProvider.class); System.out.println(webArchive.toString(true)); diff --git a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MPOpenTracingCDIExtension.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MPOpenTracingCDIExtension.java new file mode 100644 index 0000000000..7142c50cd6 --- /dev/null +++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MPOpenTracingCDIExtension.java @@ -0,0 +1,35 @@ +/* + * 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.tomee.microprofile.opentracing; + +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; +import jakarta.enterprise.inject.spi.Extension; + +public class MPOpenTracingCDIExtension implements Extension { + + /** + * Get some beans registered + * @param bbd + * @param beanManager + */ + public void observeBeforeBeanDiscovery(@Observes final BeforeBeanDiscovery bbd, final BeanManager beanManager) { + bbd.addAnnotatedType(beanManager.createAnnotatedType(TracerProducer.class)); + } + +} \ No newline at end of file diff --git a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingClientTracingRegistrarProvider.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingClientTracingRegistrarProvider.java similarity index 93% rename from tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingClientTracingRegistrarProvider.java rename to tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingClientTracingRegistrarProvider.java index 26a35fa28f..8bed84f7a6 100644 --- a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingClientTracingRegistrarProvider.java +++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingClientTracingRegistrarProvider.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tomee.microprofile.tck.opentracing; +package org.apache.tomee.microprofile.opentracing; import io.opentracing.Tracer; import io.opentracing.contrib.concurrent.TracedExecutorService; -import io.smallrye.opentracing.SmallRyeClientTracingFeature; import jakarta.enterprise.inject.spi.CDI; import jakarta.ws.rs.client.ClientBuilder; import org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider; diff --git a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingFinishingFilterInstaller.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingFinishingFilterInstaller.java similarity index 97% rename from tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingFinishingFilterInstaller.java rename to tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingFinishingFilterInstaller.java index bc7893c86c..a5ddc0fa66 100644 --- a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingFinishingFilterInstaller.java +++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingFinishingFilterInstaller.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tomee.microprofile.tck.opentracing; +package org.apache.tomee.microprofile.opentracing; import io.smallrye.opentracing.contrib.jaxrs2.server.SpanFinishingFilter; import jakarta.servlet.DispatcherType; diff --git a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTracingFeature.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingTracingFeature.java similarity index 97% rename from tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTracingFeature.java rename to tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingTracingFeature.java index e61fff406f..a95dd3c817 100644 --- a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTracingFeature.java +++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MicroProfileOpenTracingTracingFeature.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tomee.microprofile.tck.opentracing; +package org.apache.tomee.microprofile.opentracing; import io.opentracing.Span; import io.opentracing.Tracer; diff --git a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension index 6517c671c2..aa442ca8da 100644 --- a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension +++ b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension @@ -1,2 +1,4 @@ org.apache.tomee.microprofile.health.MPHealthCDIExtension org.apache.tomee.microprofile.metrics.MPMetricsCDIExtension +org.apache.tomee.microprofile.opentracing.MPOpenTracingCDIExtension + diff --git a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider new file mode 100644 index 0000000000..485cef5544 --- /dev/null +++ b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider @@ -0,0 +1 @@ +org.apache.tomee.microprofile.opentracing.MicroProfileOpenTracingClientTracingRegistrarProvider \ No newline at end of file
