You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/14 15:32:04 UTC
[tomee] branch master updated (1e2e6ef385 -> 54d7b119ef)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 1e2e6ef385 TOMEE-3896 Smallrye Metrics integration and wiring
new 991258e4c7 TOMEE-3895 Smallrye OpenTracing integration and wiring
new 54d7b119ef Fix REST CLient issues with OpenTracing Tracer not being available
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...croProfileOpenTracingTCKDeploymentPackager.java | 5 -----
.../MicroProfileRestClientTCKArchiveProcessor.java | 4 ++++
.../rest-client/src/test/resources/arquillian.xml | 1 +
.../tck-suite.xml => rest-client/tck-dev.xml} | 14 ++++++-------
.../opentracing/MPOpenTracingCDIExtension.java | 23 +++++++++++-----------
...eOpenTracingClientTracingRegistrarProvider.java | 3 +--
...ProfileOpenTracingFinishingFilterInstaller.java | 2 +-
.../MicroProfileOpenTracingTracingFeature.java | 2 +-
.../jakarta.enterprise.inject.spi.Extension | 2 ++
...file.opentracing.ClientTracingRegistrarProvider | 1 +
10 files changed, 30 insertions(+), 27 deletions(-)
copy tck/microprofile-tck/{opentracing/tck-suite.xml => rest-client/tck-dev.xml} (78%)
copy arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/classloader/HashCdiExtension.java => tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/MPOpenTracingCDIExtension.java (60%)
rename {tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing => tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing}/MicroProfileOpenTracingClientTracingRegistrarProvider.java (93%)
rename {tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing => tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing}/MicroProfileOpenTracingFinishingFilterInstaller.java (97%)
rename {tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing => tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing}/MicroProfileOpenTracingTracingFeature.java (97%)
create mode 100644 tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider
[tomee] 01/02: TOMEE-3895 Smallrye OpenTracing integration and wiring
Posted by jl...@apache.org.
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 <jl...@tomitribe.com>
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
[tomee] 02/02: Fix REST CLient issues with OpenTracing Tracer not being available
Posted by jl...@apache.org.
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 54d7b119eff3ebe447daa06718edf78402d8812b
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Apr 14 17:31:56 2022 +0200
Fix REST CLient issues with OpenTracing Tracer not being available
---
.../MicroProfileRestClientTCKArchiveProcessor.java | 4 ++++
.../rest-client/src/test/resources/arquillian.xml | 1 +
tck/microprofile-tck/rest-client/tck-dev.xml | 27 ++++++++++++++++++++++
3 files changed, 32 insertions(+)
diff --git a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
index 049bcb99e2..8deb9e34e2 100644
--- a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
+++ b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java
@@ -18,11 +18,13 @@
package org.apache.tomee.microprofile.tck.restclient;
+import org.apache.openejb.loader.JarLocation;
import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
import org.jboss.arquillian.test.spi.TestClass;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -34,6 +36,8 @@ public class MicroProfileRestClientTCKArchiveProcessor implements ApplicationArc
if (archive instanceof WebArchive) {
WebArchive webArchive = (WebArchive) archive;
+ webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.server.Handler.class));
+ webArchive.addAsWebInfResource(new StringAsset(""), "beans.xml");
final Map<ArchivePath, Node> content = webArchive.getContent();
final Node node = content.get(new BasicPath("META-INF/certificates-dir.txt"));
diff --git a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
index 7a0077f872..af2fe9b868 100644
--- a/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml
@@ -27,6 +27,7 @@
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">microprofile</property>
+ <property name="debug">false</property>
<property name="conf">src/test/conf</property>
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
diff --git a/tck/microprofile-tck/rest-client/tck-dev.xml b/tck/microprofile-tck/rest-client/tck-dev.xml
new file mode 100644
index 0000000000..8c702dfd90
--- /dev/null
+++ b/tck/microprofile-tck/rest-client/tck-dev.xml
@@ -0,0 +1,27 @@
+<!--
+ 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.
+ -->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="microprofile-rest-client-TCK" verbose="2" configfailurepolicy="continue" >
+
+ <test name="microprofile-rest-client TCK">
+ <classes>
+ <class name="org.eclipse.microprofile.rest.client.tck.ClientHeaderParamTest"></class>
+ </classes>
+ </test>
+
+</suite>
\ No newline at end of file