This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 64a534d641f55b5cf05500a3ff092f73cf041f8d Author: Andriy Redko <[email protected]> AuthorDate: Thu Dec 15 20:30:51 2022 -0500 Removed tracing_opentracing_camel from samples: Apache Camel does not support Spring Boot 3 / Jetty 11 / JakartaEE 9.0+ yet (work in progress) --- .../jax_rs/tracing_opentracing_camel/README.txt | 40 ---- .../jax_rs/tracing_opentracing_camel/pom.xml | 232 --------------------- .../java/demo/jaxrs/tracing/client/Client.java | 67 ------ .../jaxrs/tracing/server/camel/CatalogRoute.java | 38 ---- .../demo/jaxrs/tracing/server/camel/Server.java | 68 ------ .../java/demo/jaxrs/tracing/server/cxf/Book.java | 48 ----- .../demo/jaxrs/tracing/server/cxf/Catalog.java | 53 ----- .../java/demo/jaxrs/tracing/server/cxf/Server.java | 72 ------- .../services/io.jaegertracing.spi.SenderFactory | 1 - .../src/main/resources/application.yml | 2 - .../src/main/resources/logback.xml | 12 -- distribution/src/main/release/samples/pom.xml | 2 - 12 files changed, 635 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/README.txt b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/README.txt deleted file mode 100644 index b57fe4788c..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/README.txt +++ /dev/null @@ -1,40 +0,0 @@ -JAX-RS OpenTracing/Jaeger/Apache Camel Tracing Demo -================= - -The demo shows a basic usage of OpenTracing API + Jaeger distributed tracer -across multiple distributed REST-based components. It consists of HTTP route -defined using Apache Camel, which forwards the request to JAX-RS 2.0 (JSR-339) -service, backed by Apache CXF. The demo also contains a JAX-RS 2.0 (JSR-339) -client which initiates the connection to the Apache Camel HTTP route. The -following REST(ful) endpoints are available: - - - GET to http://0.0.0.0:8084/catalog - - GET to http://localhost:8080/services/books - -To collect the traces, please run Jaeger distributed tracer components, the -simplest way would be using Docker: - - docker run --rm -it --network=host -p 16686:16686 -p 14268:14268 jaegertracing/all-in-one - -The following sample traces should be available in Jaeger UI (available -be default at http://localhost:16686/search): - - +- cxf-client GET http://localhost:8084/catalog - +- camel-server GET - +- camel-server GET - +- cxf-service GET /services/books - -Building and running the demo using Maven ---------------------------------------- - -From the base directory of this sample (i.e., where this README file is -located), the Maven pom.xml file can be used to build and run the demo. - -Using either UNIX or Windows: - - mvn install - mvn -Pcamel-server (from one command line window) - mvn -Pcxf-server (from one command line window) - mvn -Pclient (from a third command line window) - -To remove the target dir, run mvn clean". diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml deleted file mode 100644 index 649b9fca91..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml +++ /dev/null @@ -1,232 +0,0 @@ -<?xml version="1.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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <artifactId>jax_rs_tracing_opentracing_camel</artifactId> - <name>JAX-RS Demo Using Distributed Tracing with OpenTracing API, Apache Camel and Jaeger</name> - <description>JAX-RS Demo Using Distributed Tracing with OpenTracing API, Apache Camel and Jaeger</description> - <parent> - <groupId>org.apache.cxf.samples</groupId> - <artifactId>cxf-samples</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../..</relativePath> - </parent> - - <properties> - <cxf.version>${project.version}</cxf.version> - </properties> - - <profiles> - <profile> - <id>cxf-server</id> - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>java</goal> - </goals> - <configuration> - <mainClass>demo.jaxrs.tracing.server.cxf.Server</mainClass> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>camel-server</id> - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>java</goal> - </goals> - <configuration> - <mainClass>demo.jaxrs.tracing.server.camel.Server</mainClass> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>client</id> - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>java</goal> - </goals> - <configuration> - <mainClass>demo.jaxrs.tracing.client.Client</mainClass> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-dependencies</artifactId> - <version>${cxf.camel.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - </dependency> - <!-- This dependency is needed if you're using the Jetty container --> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-integration-tracing-opentracing</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-extension-providers</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-spring-boot-starter-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>jakarta.ws.rs</groupId> - <artifactId>jakarta.ws.rs-api</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - </dependency> - <dependency> - <groupId>io.jaegertracing</groupId> - <artifactId>jaeger-core</artifactId> - </dependency> - <dependency> - <groupId>io.jaegertracing</groupId> - <artifactId>jaeger-thrift</artifactId> - </dependency> - - <!-- spring-boot --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - <version>${spring.boot.version}</version> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <version>${spring.boot.version}</version> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-opentracing-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jetty-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-http-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-starter</artifactId> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.jakarta.rs</groupId> - <artifactId>jackson-jakarta-rs-json-provider</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <configuration> - <rules> - <requireJavaVersion> - <version>17</version> - </requireJavaVersion> - </rules> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/client/Client.java deleted file mode 100644 index 1bca3cb1e2..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/client/Client.java +++ /dev/null @@ -1,67 +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 demo.jaxrs.tracing.client; - -import jakarta.ws.rs.client.ClientBuilder; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - -import io.jaegertracing.Configuration; -import io.jaegertracing.Configuration.ReporterConfiguration; -import io.jaegertracing.Configuration.SamplerConfiguration; -import io.jaegertracing.Configuration.SenderConfiguration; -import io.jaegertracing.internal.samplers.ConstSampler; -import io.opentracing.Tracer; - -import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingClientProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public final class Client { - private static final Logger LOG = LoggerFactory.getLogger(Client.class); - - private Client() { - } - - public static void main(final String[] args) throws Exception { - final Tracer tracer = new Configuration("cxf-client") - .withSampler(new SamplerConfiguration().withType(ConstSampler.TYPE).withParam(1)) - .withReporter(new ReporterConfiguration().withSender( - new SenderConfiguration() - .withEndpoint("http://localhost:14268/api/traces";) - )) - .getTracer(); - - final OpenTracingClientProvider provider = new OpenTracingClientProvider(tracer); - final jakarta.ws.rs.client.Client client = ClientBuilder.newClient().register(provider); - - final Response response = client - .target("http://localhost:8084/catalog";) - .request() - .accept(MediaType.APPLICATION_JSON) - .get(); - - LOG.info("Response: {}", response.readEntity(String.class)); - response.close(); - - // Allow Tracer to flush - Thread.sleep(1000); - } -} diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/camel/CatalogRoute.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/camel/CatalogRoute.java deleted file mode 100644 index 913f6d03df..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/camel/CatalogRoute.java +++ /dev/null @@ -1,38 +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 demo.jaxrs.tracing.server.camel; - -import org.apache.camel.builder.RouteBuilder; -import org.springframework.stereotype.Component; - -@Component -public class CatalogRoute extends RouteBuilder { - @Override - public void configure() throws Exception { - from("jetty:http://0.0.0.0:8084/catalog";) - .routeId("catalog") - .streamCaching() - .log("Catalog request: ${body}") - .delay(simple("${random(1000,2000)}")) - .transform(simple("catalog-${body}")) - .to("http://localhost:8080/services/books?bridgeEndpoint=true";) - .log("Books response: ${body}"); - } -} diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/camel/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/camel/Server.java deleted file mode 100644 index 5b8d2d593a..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/camel/Server.java +++ /dev/null @@ -1,68 +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 demo.jaxrs.tracing.server.camel; - -import org.apache.camel.opentracing.starter.CamelOpenTracing; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.WebApplicationType; -import org.springframework.context.annotation.Bean; - -import io.jaegertracing.Configuration; -import io.jaegertracing.Configuration.CodecConfiguration; -import io.jaegertracing.Configuration.ReporterConfiguration; -import io.jaegertracing.Configuration.SamplerConfiguration; -import io.jaegertracing.Configuration.SenderConfiguration; -import io.jaegertracing.internal.propagation.TextMapCodec; -import io.jaegertracing.internal.samplers.ConstSampler; -import io.opentracing.Tracer; -import io.opentracing.propagation.Format.Builtin; - -@EnableAutoConfiguration -@SpringBootApplication -@CamelOpenTracing -public class Server { - public static void main(String[] args) { - new SpringApplicationBuilder(Server.class) - .web(WebApplicationType.NONE) - .build() - .run(args); - } - - @Bean - Tracer tracer() { - return new Configuration("camel-server") - .withSampler( - new SamplerConfiguration() - .withType(ConstSampler.TYPE) - .withParam(1)) - .withReporter(new ReporterConfiguration().withSender( - new SenderConfiguration() - .withEndpoint("http://localhost:14268/api/traces";) - )) - .withCodec( - new CodecConfiguration() - .withCodec(Builtin.TEXT_MAP, new TextMapCodec(true)) - ) - .getTracer(); - } -} - diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Book.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Book.java deleted file mode 100644 index 1d322d3a69..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Book.java +++ /dev/null @@ -1,48 +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 demo.jaxrs.tracing.server.cxf; - -public class Book { - private String id; - private String title; - - public Book() { - } - - public Book(String id, String title) { - this.id = id; - this.title = title; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } -} diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Catalog.java deleted file mode 100644 index 7bea6b727e..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Catalog.java +++ /dev/null @@ -1,53 +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 demo.jaxrs.tracing.server.cxf; - -import java.util.Arrays; -import java.util.Collection; - -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.MediaType; - -import org.apache.cxf.tracing.TracerContext; - -@Path("/books") -public class Catalog { - public Catalog() { - } - - - @GET - @Produces(MediaType.APPLICATION_JSON) - public Collection<Book> getBooks(@Context final TracerContext tracing) { - - final Collection<Book> books = - Arrays.asList( - new Book("Apache CXF Web Service Development", "Naveen Balani, Rajeev Hathi") - ); - - tracing.annotate("# of books", Integer.toString(books.size())); - return books; - } -} - - diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Server.java deleted file mode 100644 index 9aa355abbe..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Server.java +++ /dev/null @@ -1,72 +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 demo.jaxrs.tracing.server.cxf; - -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - -import org.apache.cxf.Bus; -import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; -import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingFeature; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; - -import io.jaegertracing.Configuration; -import io.jaegertracing.Configuration.ReporterConfiguration; -import io.jaegertracing.Configuration.SamplerConfiguration; -import io.jaegertracing.Configuration.SenderConfiguration; -import io.jaegertracing.internal.samplers.ConstSampler; -import io.opentracing.Tracer; - -@EnableAutoConfiguration -@SpringBootApplication -public class Server { - @Autowired private Bus bus; - - public static void main(String[] args) { - SpringApplication.run(Server.class, args); - } - - @Bean - org.apache.cxf.endpoint.Server cxfServer(@Qualifier("cxf") final Tracer tracer) { - final JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean(); - endpoint.setBus(bus); - endpoint.setAddress("/"); - endpoint.setServiceBean(new Catalog()); - endpoint.setProvider(new OpenTracingFeature(tracer)); - endpoint.setProvider(new JacksonJsonProvider()); - return endpoint.create(); - } - - @Bean @Qualifier("cxf") - Tracer cxfTracer() { - return new Configuration("cxf-service") - .withSampler(new SamplerConfiguration().withType(ConstSampler.TYPE).withParam(1)) - .withReporter(new ReporterConfiguration().withSender( - new SenderConfiguration() - .withEndpoint("http://localhost:14268/api/traces";) - )) - .getTracer(); - } -} - diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/META-INF/services/io.jaegertracing.spi.SenderFactory b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/META-INF/services/io.jaegertracing.spi.SenderFactory deleted file mode 100644 index d726e4d842..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/META-INF/services/io.jaegertracing.spi.SenderFactory +++ /dev/null @@ -1 +0,0 @@ -io.jaegertracing.thrift.internal.senders.ThriftSenderFactory \ No newline at end of file diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/application.yml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/application.yml deleted file mode 100644 index 47fbb02d12..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/application.yml +++ /dev/null @@ -1,2 +0,0 @@ -server: - port: 8080 \ No newline at end of file diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/logback.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/logback.xml deleted file mode 100644 index 9b9f901e0f..0000000000 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration scan="true" scanPeriod="5 seconds"> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>[%level] %d{yyyy-MM-dd HH:mm:ss.SSS} %logger{36} - [%X] %msg%n</pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - </root> -</configuration> \ No newline at end of file diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 58e577efb5..669ba46d84 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -45,7 +45,6 @@ <cxf.olingo.server.version>4.9.0</cxf.olingo.server.version> <cxf.aspectj.version>1.9.1</cxf.aspectj.version> <cxf.brave.version>5.14.1</cxf.brave.version> - <cxf.camel.version>2.24.0</cxf.camel.version> <cxf.zest.version>2.1</cxf.zest.version> <cxf.activemq.artemis.version>2.26.0</cxf.activemq.artemis.version> <cxf.h2.version>2.1.214</cxf.h2.version> @@ -102,7 +101,6 @@ <module>jax_rs/sse_tomcat</module> <module>jax_rs/tracing_brave</module> <module>jax_rs/tracing_opentracing</module> - <module>jax_rs/tracing_opentracing_camel</module> <module>jax_rs/websocket</module> <module>jax_rs/websocket_web</module> <module>jax_server_aegis_client</module>
