You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/01/30 14:19:09 UTC
[incubator-zipkin-brave-karaf] 24/37: Revamps project to recent
version of Brave and refactors senders
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch rat
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git
commit a9f4e8578ff14a9edc0b02a1a559b5a45d0f7c9c
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Sat Feb 24 15:59:32 2018 +0800
Revamps project to recent version of Brave and refactors senders
Before, I think we accidentally conflated zipkin reporter's senders with
instrumentation. When we go to instrument okhttp, for example, that will
different than the sender (what sends spans to zipkin).
This doesn't pass tests, so could use a hand.
---
.gitignore | 13 +-
.mvn/wrapper/MavenWrapperDownloader.java | 110 +++
.mvn/wrapper/maven-wrapper.jar | Bin 49519 -> 48337 bytes
.mvn/wrapper/maven-wrapper.properties | 2 +-
.settings.xml | 2 +-
brave-exporter-kafka08/pom.xml | 90 ---
.../osgi/exporter/kafka/KafkaReporterExporter.java | 90 ---
brave-exporter-okhttp3/pom.xml | 103 ---
.../okhttp3/internal/OkHttp3ReporterExporter.java | 140 ----
brave-exporter/pom.xml | 85 ---
.../zipkin/brave/osgi/exporter/BraveExporter.java | 66 --
.../urlconnect/SenderUrlConnectExporter.java | 71 --
brave-features/.classpath | 36 -
brave-features/pom.xml | 80 ---
brave-features/src/main/resources/features.xml | 60 --
brave-itests/pom.xml | 175 -----
.../java/io/zipkin/brave/itests/BraveTest.java | 126 ----
exporter-sender-kafka/pom.xml | 78 +++
.../exporter/sender/kafka/KafkaSenderExporter.java | 80 +++
.../sender/kafka/KafkaSenderExporterTest.java | 45 +-
exporter-sender-okhttp/pom.xml | 73 ++
.../sender/okhttp/SenderOkHttpExporter.java | 63 ++
exporter/pom.xml | 77 +++
.../brave/exporter/AsyncReporterExporter.java | 60 ++
.../zipkin/brave/exporter/HttpTracingExporter.java | 55 ++
.../io/zipkin/brave/exporter/TracingExporter.java | 68 ++
.../urlconnection/URLConnectionSenderExporter.java | 66 ++
features/pom.xml | 81 +++
features/src/main/resources/features.xml | 44 ++
{brave-itests => itests}/.gitignore | 0
itests/pom.xml | 156 +++++
.../java/io/zipkin/brave/itests/BraveTest.java | 97 +++
.../src/test/resources/exam.properties | 0
.../src/test/resources/logback.xml | 0
mvnw | 158 +++--
mvnw.cmd | 26 +-
pom.xml | 754 ++++++++++++---------
37 files changed, 1696 insertions(+), 1534 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3e4494c..e1f45e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,12 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
-.classpath
-.project
-.settings
-target
+# Maven
+target/
+
+# IntelliJ
+.idea/
+*.iml
+
+# macOS
+.DS_Store
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100755
index 0000000..fa4f7b4
--- /dev/null
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,110 @@
+/*
+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.
+*/
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL =
+ "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if(mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if(mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: : " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if(!outputFile.getParentFile().exists()) {
+ if(!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
old mode 100644
new mode 100755
index c6feb8b..01e6799
Binary files a/.mvn/wrapper/maven-wrapper.jar and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
old mode 100644
new mode 100755
index c9023ed..00d32aa
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
\ No newline at end of file
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
\ No newline at end of file
diff --git a/.settings.xml b/.settings.xml
index 74dd284..15f5f03 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2015-2016 The OpenZipkin Authors
+ Copyright 2016-2018 The OpenZipkin Authors
Licensed 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
diff --git a/brave-exporter-kafka08/pom.xml b/brave-exporter-kafka08/pom.xml
deleted file mode 100644
index 1ad63a1..0000000
--- a/brave-exporter-kafka08/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2016 The OpenZipkin Authors
-
- Licensed 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>io.zipkin.brave.karaf</groupId>
- <artifactId>brave-karaf-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>brave-exporter-kafka08</artifactId>
-
- <properties>
- <main.basedir>${project.basedir}/..</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>io.zipkin.brave</groupId>
- <artifactId>brave-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-reporter</artifactId>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-sender-kafka08</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>3.3.0</version>
- <executions>
- <execution>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/brave-exporter-kafka08/src/main/java/io/zipkin/brave/osgi/exporter/kafka/KafkaReporterExporter.java b/brave-exporter-kafka08/src/main/java/io/zipkin/brave/osgi/exporter/kafka/KafkaReporterExporter.java
deleted file mode 100644
index 4c48df2..0000000
--- a/brave-exporter-kafka08/src/main/java/io/zipkin/brave/osgi/exporter/kafka/KafkaReporterExporter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright 2016 The OpenZipkin Authors
- *
- * Licensed 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 io.zipkin.brave.osgi.exporter.kafka;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.ConfigurationPolicy;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.metatype.annotations.Designate;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import zipkin.Span;
-import zipkin.reporter.AsyncReporter;
-import zipkin.reporter.Encoding;
-import zipkin.reporter.Reporter;
-import zipkin.reporter.kafka08.KafkaSender;
-
-@Component //
-( //
- immediate = true, //
- name = "io.zipkin.reporter.kafka08", //
- configurationPolicy = ConfigurationPolicy.REQUIRE
-)
-@Designate(ocd = KafkaReporterExporter.Config.class)
-public class KafkaReporterExporter {
-
- private static final String OVERRIDE_PREFIX = "kafka.";
- @SuppressWarnings("rawtypes")
- private ServiceRegistration<Reporter> reg;
- private AsyncReporter<Span> reporter;
-
- @ObjectClassDefinition(name = "Zipkin Reporter Kafka08")
- @interface Config {
- String bootstrapServers() default "localhost:9092";
- Encoding encoding() default Encoding.THRIFT;
- int messageMaxBytes() default 1000000;
- String topic() default "zipkin";
- }
-
- @Activate
- public void activate(Config config, BundleContext context, Map<String,String> properties) {
- KafkaSender sender = createSender(config, properties);
- reporter = AsyncReporter.builder(sender).build();
- reg = context.registerService(Reporter.class, reporter, new Hashtable<String, String>(properties));
- }
-
- KafkaSender createSender(Config config, Map<String, String> properties) {
- KafkaSender sender = KafkaSender.builder() //
- .bootstrapServers(config.bootstrapServers()) //
- .encoding(config.encoding()) //
- .messageMaxBytes(config.messageMaxBytes()) //
- .overrides(getOverrides(properties)) //
- .topic(config.topic()) //
- .build();
- return sender;
- }
-
- private HashMap<String, String> getOverrides(Map<String, String> properties) {
- HashMap<String, String> overrides = new HashMap<String, String>();
- for (String key : properties.keySet()) {
- if (key.startsWith(OVERRIDE_PREFIX)) {
- overrides.put(key.substring(OVERRIDE_PREFIX.length() - 1), properties.get(key));
- }
- }
- return overrides;
- }
-
- @Deactivate
- public void deactive() {
- reg.unregister();
- reporter.close();
- }
-
-}
diff --git a/brave-exporter-okhttp3/pom.xml b/brave-exporter-okhttp3/pom.xml
deleted file mode 100644
index 17827bb..0000000
--- a/brave-exporter-okhttp3/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2017 The OpenZipkin Authors
-
- Licensed 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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>brave-karaf-parent</artifactId>
- <groupId>io.zipkin.brave.karaf</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>brave-exporter-okhttp3</artifactId>
-
- <properties>
- <main.basedir>${project.basedir}/..</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>io.zipkin.java</groupId>
- <artifactId>zipkin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.zipkin.brave</groupId>
- <artifactId>brave-context-slf4j</artifactId>
- <version>${brave.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-reporter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-sender-okhttp3</artifactId>
- <version>${zipkin.reporter.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>3.3.0</version>
- <executions>
- <execution>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/brave-exporter-okhttp3/src/main/java/io/zipkin/brave/osgi/exporter/okhttp3/internal/OkHttp3ReporterExporter.java b/brave-exporter-okhttp3/src/main/java/io/zipkin/brave/osgi/exporter/okhttp3/internal/OkHttp3ReporterExporter.java
deleted file mode 100644
index 55aecac..0000000
--- a/brave-exporter-okhttp3/src/main/java/io/zipkin/brave/osgi/exporter/okhttp3/internal/OkHttp3ReporterExporter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright 2016-2017 The OpenZipkin Authors
- *
- * Licensed 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 io.zipkin.brave.osgi.exporter.okhttp3.internal;
-
-import brave.Tracing;
-import brave.context.slf4j.MDCCurrentTraceContext;
-import brave.sampler.Sampler;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.ConfigurationPolicy;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.metatype.annotations.Designate;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import zipkin.Span;
-import zipkin.reporter.AsyncReporter;
-import zipkin.reporter.Encoding;
-import zipkin.reporter.Reporter;
-import zipkin.reporter.okhttp3.OkHttpSender;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-@Component(
- immediate = true,
- name = "io.zipkin.reporter.okhttp3",
- property = {"sender=okhttp3"},
- configurationPolicy = ConfigurationPolicy.REQUIRE
-)
-@Designate(ocd = OkHttp3ReporterExporter.Config.class)
-public class OkHttp3ReporterExporter {
-
- private static final String OVERRIDE_PREFIX = "okhttp3.";
-
- @SuppressWarnings("rawtypes")
- private ServiceRegistration<Reporter> reporterServiceRegistration;
- @SuppressWarnings("rawtypes")
- private ServiceRegistration<Tracing> tracingServiceRegistration;
-
- private AsyncReporter<Span> reporter;
- private Tracing tracing;
-
- private BundleContext context;
-
- @ObjectClassDefinition(name = "Zipkin Reporter OkHttp3")
- @interface Config {
- String zipkinUrl() default "localhost:9411";
-
- boolean compressionEnabled() default true;
-
- Encoding encoding() default Encoding.THRIFT;
-
- int messageMaxBytes() default 1000000;
-
- String localServiceName() default "zipkin-okhttp3";
-
- String samplerFilter() default "(type=always)";
- }
-
- @Activate
- public void activate(Config config, BundleContext context, Map<String, String> properties) {
- this.context = context;
- OkHttpSender sender = createSender(config, properties);
- reporter = AsyncReporter.create(sender);
-
- reporterServiceRegistration = context.registerService(Reporter.class, reporter,
- new Hashtable<String, String>(properties));
-
- tracing = httpTracer(config, properties, reporter);
- tracingServiceRegistration = context.registerService(Tracing.class, tracing,
- new Hashtable<String, String>(properties));
- }
-
- @SuppressWarnings("unchecked")
- public Tracing httpTracer(Config config, Map<String, String> properties, Reporter reporter) {
-
- Sampler sampler = Sampler.ALWAYS_SAMPLE;
-
- try {
- ServiceReference<Sampler>[] samplers =
- (ServiceReference<Sampler>[]) context.getAllServiceReferences(
- Sampler.class.getName(), config.samplerFilter());
- if (samplers != null && samplers.length > 0) {
- sampler = context.getService(samplers[0]);
- }
-
- } catch (InvalidSyntaxException e) {
-
- }
-
- Tracing.Builder tracingBuilder = Tracing.newBuilder();
- tracingBuilder.localServiceName(config.localServiceName());
- tracingBuilder.sampler(sampler);
- tracingBuilder.reporter(reporter);
- tracingBuilder.currentTraceContext(MDCCurrentTraceContext.create());
-
- return tracingBuilder.build();
- }
-
-
- OkHttpSender createSender(Config config, Map<String, String> properties) {
- return OkHttpSender.builder()
- .endpoint(config.zipkinUrl())
- .compressionEnabled(config.compressionEnabled())
- .messageMaxBytes(config.messageMaxBytes())
- .build();
- }
-
- private HashMap<String, String> getOverrides(Map<String, String> properties) {
- HashMap<String, String> overrides = new HashMap<String, String>();
- for (String key : properties.keySet()) {
- if (key.startsWith(OVERRIDE_PREFIX)) {
- overrides.put(key.substring(OVERRIDE_PREFIX.length() - 1), properties.get(key));
- }
- }
- return overrides;
- }
-
- @Deactivate
- public void deactive() {
- tracingServiceRegistration.unregister();
- reporterServiceRegistration.unregister();
- reporter.close();
- }
-}
diff --git a/brave-exporter/pom.xml b/brave-exporter/pom.xml
deleted file mode 100644
index dbc38ac..0000000
--- a/brave-exporter/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2016 The OpenZipkin Authors
-
- Licensed 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>io.zipkin.brave.karaf</groupId>
- <artifactId>brave-karaf-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>brave-exporter</artifactId>
-
- <properties>
- <main.basedir>${project.basedir}/..</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>io.zipkin.brave</groupId>
- <artifactId>brave-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-reporter</artifactId>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-sender-urlconnection</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>3.3.0</version>
- <executions>
- <execution>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/brave-exporter/src/main/java/io/zipkin/brave/osgi/exporter/BraveExporter.java b/brave-exporter/src/main/java/io/zipkin/brave/osgi/exporter/BraveExporter.java
deleted file mode 100644
index 04b9536..0000000
--- a/brave-exporter/src/main/java/io/zipkin/brave/osgi/exporter/BraveExporter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright 2016 The OpenZipkin Authors
- *
- * Licensed 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 io.zipkin.brave.osgi.exporter;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import com.github.kristofa.brave.Brave;
-import com.github.kristofa.brave.Sampler;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.metatype.annotations.Designate;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import zipkin.Span;
-import zipkin.reporter.Reporter;
-
-@Component //
-( //
- immediate = true, //
- name = "io.zipkin.brave" //
-)
-@Designate(ocd = BraveExporter.Config.class)
-public class BraveExporter {
- @Reference
- Reporter<Span> reporter;
-
- private ServiceRegistration<Brave> reg;
-
- @ObjectClassDefinition(name = "Brave")
- @interface Config {
- String name() default "default";
- boolean traceId128Bit() default false;
- float rate() default 1;
- }
-
- @Activate
- public void activate(Config config, BundleContext context, Map<String, String> properties) {
- Brave brave = new Brave.Builder(config.name())
- .reporter(reporter) //
- .traceId128Bit(config.traceId128Bit()) //
- .traceSampler(Sampler.create(config.rate()))
- .build();
- reg = context.registerService(Brave.class, brave, new Hashtable<String, String>(properties));
- }
-
- @Deactivate
- public void deactive() {
- reg.unregister();
- }
-
-}
diff --git a/brave-exporter/src/main/java/io/zipkin/brave/osgi/exporter/urlconnect/SenderUrlConnectExporter.java b/brave-exporter/src/main/java/io/zipkin/brave/osgi/exporter/urlconnect/SenderUrlConnectExporter.java
deleted file mode 100644
index 94f85b9..0000000
--- a/brave-exporter/src/main/java/io/zipkin/brave/osgi/exporter/urlconnect/SenderUrlConnectExporter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright 2016 The OpenZipkin Authors
- *
- * Licensed 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 io.zipkin.brave.osgi.exporter.urlconnect;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.ConfigurationPolicy;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.metatype.annotations.Designate;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import zipkin.Span;
-import zipkin.reporter.AsyncReporter;
-import zipkin.reporter.Reporter;
-import zipkin.reporter.urlconnection.URLConnectionSender;
-
-@Component //
-( //
- immediate = true, //
- name = "io.zipkin.reporter.urlconnect", //
- configurationPolicy = ConfigurationPolicy.REQUIRE
-)
-@Designate(ocd = SenderUrlConnectExporter.Config.class)
-public class SenderUrlConnectExporter {
-
- @SuppressWarnings("rawtypes")
- private ServiceRegistration<Reporter> reg;
- private AsyncReporter<Span> reporter;
-
- @ObjectClassDefinition(name = "Zipkin Reporter URLConnect")
- @interface Config {
- String endpoint() default "http://localhost:9411/api/v1/spans";
- boolean compressionEnabled() default true;
- int connectTimeout() default 10 * 1000;
- int messageMaxBytes() default 5 * 1024 * 1024;
- }
-
- @Activate
- public void activate(Config config, BundleContext context, Map<String,String> properties) {
- URLConnectionSender sender = URLConnectionSender.builder()
- .endpoint(config.endpoint()) //
- .compressionEnabled(config.compressionEnabled()) //
- .connectTimeout(config.connectTimeout())
- .messageMaxBytes(config.messageMaxBytes())
- .build();
- reporter = AsyncReporter.builder(sender).build();
- reg = context.registerService(Reporter.class, reporter, new Hashtable<String, String>(properties));
- }
-
- @Deactivate
- public void deactive() {
- reg.unregister();
- reporter.close();
- }
-
-}
diff --git a/brave-features/.classpath b/brave-features/.classpath
deleted file mode 100644
index fae1a2b..0000000
--- a/brave-features/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/brave-features/pom.xml b/brave-features/pom.xml
deleted file mode 100644
index 2a1bb0f..0000000
--- a/brave-features/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2016 The OpenZipkin Authors
-
- Licensed 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>io.zipkin.brave.karaf</groupId>
- <artifactId>brave-karaf-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>brave-features</artifactId>
- <packaging>pom</packaging>
-
- <properties>
- <main.basedir>${project.basedir}/..</main.basedir>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/classes/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/brave-features/src/main/resources/features.xml b/brave-features/src/main/resources/features.xml
deleted file mode 100644
index 9cb5b49..0000000
--- a/brave-features/src/main/resources/features.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2016 The OpenZipkin Authors
-
- Licensed 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.
-
--->
-<features name="brave" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
- <feature name="brave-core">
- <feature>scr</feature>
- <bundle dependency="true">mvn:io.zipkin.java/zipkin/${zipkin.version}</bundle>
- <bundle dependency="true">mvn:io.zipkin.reporter/zipkin-reporter/${zipkin.reporter.version}</bundle>
- <bundle>mvn:io.zipkin.reporter/zipkin-sender-urlconnection/${zipkin.reporter.version}</bundle>
- <bundle>mvn:io.zipkin.brave/brave-core/${brave.version}</bundle>
- <bundle>mvn:io.zipkin.brave.karaf/brave-exporter/${project.version}</bundle>
- </feature>
-
- <feature name="brave-kafka08">
- <feature>brave-core</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.8.2.2_1</bundle>
- <bundle>mvn:io.zipkin.reporter/zipkin-sender-kafka08/${zipkin.reporter.version}</bundle>
- <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-kafka08/${project.version}</bundle>
- </feature>
-
- <feature name="brave-okhttp3`">
- <feature>brave-core</feature>
- <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.4.5</bundle>
- <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.5.3</bundle>
- <bundle>mvn:io.zipkin.brave/brave/${brave.version}</bundle>
- <bundle>mvn:io.zipkin.brave/brave/${brave.version}</bundle>
- <bundle>mvn:io.zipkin.brave/brave-instrumentation-http/${brave.version}</bundle>
- <bundle>mvn:io.zipkin.brave/brave-instrumentation-httpclient/${brave.version}</bundle>
- <bundle>mvn:io.zipkin.brave/brave-context-slf4j/${brave.version}</bundle>
- <bundle>mvn:io.zipkin.reporter/zipkin-sender-okhttp3/${zipkin.reporter.version}</bundle>
- <bundle>wrap:mvn:com.squareup.okhttp3/okhttp/3.8.0</bundle>
- <bundle>wrap:mvn:com.squareup.okio/okio/1.13.0</bundle>
- <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-okhttp3/${project.version}</bundle>
- </feature>
-
- <feature name="brave-jaxrs2">
- <feature>brave-core</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
- <bundle dependency="true">mvn:io.zipkin.brave/brave-http/${brave.version}</bundle>
- <bundle>mvn:io.zipkin.brave/brave-jaxrs2/${brave.version}</bundle>
- </feature>
-
-</features>
\ No newline at end of file
diff --git a/brave-itests/pom.xml b/brave-itests/pom.xml
deleted file mode 100644
index ce934df..0000000
--- a/brave-itests/pom.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2016 The OpenZipkin Authors
-
- Licensed 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>io.zipkin.brave.karaf</groupId>
- <artifactId>brave-karaf-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>brave-itests</artifactId>
-
- <properties>
- <pax.exam.version>4.5.0</pax.exam.version>
- <pax.url.version>2.1.0</pax.url.version>
- <logback.version>1.0.4</logback.version>
- <slf4j.version>1.7.4</slf4j.version>
- <karaf.version>4.0.7</karaf.version>
- <junit.version>4.12</junit.version>
- <main.basedir>${project.basedir}/..</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>io.zipkin.brave</groupId>
- <artifactId>brave-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.zipkin.brave.karaf</groupId>
- <artifactId>brave-exporter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.zipkin.brave.karaf</groupId>
- <artifactId>brave-exporter-kafka08</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-sender-urlconnection</artifactId>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-sender-kafka08</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Pax Exam Dependencies -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-cm</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-invoker-junit</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Karaf Container -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-karaf</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-inject</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-extender-service</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Preferred link because it does not require an mvn url handler implicitely. -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-assembly</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- framework to test with -->
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>standard</artifactId>
- <version>${karaf.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java b/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
deleted file mode 100644
index 1e32ba8..0000000
--- a/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright 2016 The OpenZipkin Authors
- *
- * Licensed 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 io.zipkin.brave.itests;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import com.github.kristofa.brave.Brave;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import zipkin.Span;
-import zipkin.reporter.Reporter;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class BraveTest {
- private static final String FILTER_KAFKA08 = "(component.name=io.zipkin.reporter.kafka08)";
-
- private static final String FILTER_URLCONNECT = "(component.name=io.zipkin.reporter.urlconnect)";
-
- List<Span> spans = new ArrayList<Span>();
-
- @Inject
- @Filter(FILTER_URLCONNECT)
- Reporter<Span> reporter;
-
- @Inject
- @Filter(FILTER_KAFKA08)
- Reporter<Span> reporterKafka;
-
- @Inject
- BundleContext context;
-
- @Configuration
- public static Option[] configuration() throws Exception {
- MavenArtifactUrlReference karaf = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
- .type("zip").version("4.0.7");
- MavenUrlReference brave = maven().groupId("io.zipkin.brave.karaf").artifactId("brave-features").type("xml")
- .classifier("features").version("1.0.0-SNAPSHOT");
- return new Option[] //
- {
- karafDistributionConfiguration().frameworkUrl(karaf).useDeployFolder(false),
- configureConsole().ignoreLocalConsole(), //
- logLevel(LogLevel.INFO), //
- keepRuntimeFolder(), //
- features(brave, "brave-core", "brave-kafka08"),
- // Create an empty config to trigger creation of component
- newConfiguration("io.zipkin.reporter.urlconnect").asOption(),
- newConfiguration("io.zipkin.reporter.kafka08").asOption()
- };
- }
-
- @Test
- public void inlineBraveSetup() {
- Reporter<Span> local = new Reporter<Span>() {
-
- @Override
- public void report(Span span) {
- spans.add(span);
- }
- };
- Brave brave = new Brave.Builder().reporter(local).build();
- brave.localTracer().startNewSpan("test", "testop");
- brave.localTracer().finishSpan();
- Assert.assertThat(1, equalTo(spans.size()));
- }
-
- @SuppressWarnings("rawtypes")
- @Test
- public void checkReporterUrlConnect() throws InvalidSyntaxException {
- ServiceReference<Reporter> ref = getSingleService(FILTER_URLCONNECT);
- Assert.assertEquals(10000, ref.getProperty("connectTimeout"));
- }
-
- @SuppressWarnings("rawtypes")
- @Test
- public void checkReporterKafka() throws InvalidSyntaxException {
- ServiceReference<Reporter> ref = getSingleService(FILTER_KAFKA08);
- Assert.assertEquals("zipkin", ref.getProperty("topic"));
- }
-
- @SuppressWarnings("rawtypes")
- private ServiceReference<Reporter> getSingleService(String filter) throws InvalidSyntaxException {
- Collection<ServiceReference<Reporter>> refs = context.getServiceReferences(Reporter.class, filter);
- Assert.assertEquals(1, refs.size());
- return refs.iterator().next();
- }
-
-}
diff --git a/exporter-sender-kafka/pom.xml b/exporter-sender-kafka/pom.xml
new file mode 100644
index 0000000..d294f02
--- /dev/null
+++ b/exporter-sender-kafka/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+
+ Copyright 2016-2018 The OpenZipkin Authors
+
+ Licensed 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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-karaf-parent</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>brave-exporter-sender-kafka</artifactId>
+ <name>Brave OSGi Exporter: Kafka Sender</name>
+
+ <properties>
+ <main.basedir>${project.basedir}/..</main.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-reporter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-kafka11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/exporter-sender-kafka/src/main/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporter.java b/exporter-sender-kafka/src/main/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporter.java
new file mode 100644
index 0000000..48d2b38
--- /dev/null
+++ b/exporter-sender-kafka/src/main/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporter.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
+ *
+ * Licensed 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 io.zipkin.brave.exporter.sender.kafka;
+
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import zipkin2.codec.Encoding;
+import zipkin2.reporter.Sender;
+import zipkin2.reporter.kafka11.KafkaSender;
+
+@Component(
+ immediate = true,
+ name = "io.zipkin.sender.kafka",
+ configurationPolicy = ConfigurationPolicy.REQUIRE
+)
+@Designate(ocd = KafkaSenderExporter.Config.class)
+public class KafkaSenderExporter {
+
+ private static final String OVERRIDE_PREFIX = "kafka.";
+ private ServiceRegistration<Sender> reg;
+ private KafkaSender sender;
+
+ @Activate
+ public void activate(Config config, BundleContext context, Map<String, String> properties) {
+ sender = KafkaSender.newBuilder()
+ .bootstrapServers(config.bootstrapServers())
+ .encoding(config.encoding())
+ .messageMaxBytes(config.messageMaxBytes())
+ .overrides(getOverrides(properties))
+ .topic(config.topic())
+ .build();
+ reg = context.registerService(Sender.class, sender, new Hashtable<String, String>(properties));
+ }
+
+ private HashMap<String, String> getOverrides(Map<String, String> properties) {
+ HashMap<String, String> overrides = new HashMap<String, String>();
+ for (String key : properties.keySet()) {
+ if (key.startsWith(OVERRIDE_PREFIX)) {
+ overrides.put(key.substring(OVERRIDE_PREFIX.length() - 1), properties.get(key));
+ }
+ }
+ return overrides;
+ }
+
+ @Deactivate
+ public void deactive() {
+ reg.unregister();
+ sender.close();
+ }
+
+ @ObjectClassDefinition(name = "Zipkin Sender Kafka") @interface Config {
+ String bootstrapServers() default "localhost:9092";
+
+ Encoding encoding() default Encoding.JSON;
+
+ int messageMaxBytes() default 1000000;
+
+ String topic() default "zipkin";
+ }
+}
diff --git a/brave-exporter-kafka08/src/test/java/io/zipkin/brave/osgi/exporter/kafka/KafkaReporterExporterTest.java b/exporter-sender-kafka/src/test/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporterTest.java
similarity index 50%
rename from brave-exporter-kafka08/src/test/java/io/zipkin/brave/osgi/exporter/kafka/KafkaReporterExporterTest.java
rename to exporter-sender-kafka/src/test/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporterTest.java
index 8b6b10e..3c685c3 100644
--- a/brave-exporter-kafka08/src/test/java/io/zipkin/brave/osgi/exporter/kafka/KafkaReporterExporterTest.java
+++ b/exporter-sender-kafka/src/test/java/io/zipkin/brave/exporter/sender/kafka/KafkaSenderExporterTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 The OpenZipkin Authors
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
*
* Licensed 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
@@ -11,34 +11,31 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package io.zipkin.brave.osgi.exporter.kafka;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+package io.zipkin.brave.exporter.sender.kafka;
+import io.zipkin.brave.exporter.sender.kafka.KafkaSenderExporter.Config;
import java.util.HashMap;
import java.util.Map;
-
-import io.zipkin.brave.osgi.exporter.kafka.KafkaReporterExporter.Config;
import org.junit.Test;
import org.osgi.framework.BundleContext;
-import zipkin.reporter.Encoding;
+import zipkin2.codec.Encoding;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-@Config(bootstrapServers = "server1", messageMaxBytes = 10, topic="mytopic")
-public class KafkaReporterExporterTest {
-
- @Test
- public void testConfig() {
- KafkaReporterExporter exporter = new KafkaReporterExporter();
- Map<String, String> properties = new HashMap<String, String>();
- properties.put("kafka.myprop", "myvalue");
- BundleContext context = mock(BundleContext.class);
- Config config = mock(Config.class);
- when(config.bootstrapServers()).thenReturn("server1");
- when(config.encoding()).thenReturn(Encoding.THRIFT);
- when(config.topic()).thenReturn("mytopic");
- exporter.activate(config, context, properties);
- }
+@Config(bootstrapServers = "server1", messageMaxBytes = 10, topic = "mytopic")
+public class KafkaSenderExporterTest {
+ @Test
+ public void testConfig() {
+ KafkaSenderExporter exporter = new KafkaSenderExporter();
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put("kafka.myprop", "myvalue");
+ BundleContext context = mock(BundleContext.class);
+ Config config = mock(Config.class);
+ when(config.bootstrapServers()).thenReturn("server1");
+ when(config.encoding()).thenReturn(Encoding.JSON);
+ when(config.topic()).thenReturn("mytopic");
+ exporter.activate(config, context, properties);
+ }
}
diff --git a/exporter-sender-okhttp/pom.xml b/exporter-sender-okhttp/pom.xml
new file mode 100644
index 0000000..9d919ba
--- /dev/null
+++ b/exporter-sender-okhttp/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+
+ Copyright 2016-2018 The OpenZipkin Authors
+
+ Licensed 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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-karaf-parent</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>brave-exporter-sender-okhttp</artifactId>
+ <name>Brave OSGi Exporter: OkHttp Sender</name>
+
+ <properties>
+ <main.basedir>${project.basedir}/..</main.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-reporter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-okhttp3</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/exporter-sender-okhttp/src/main/java/io/zipkin/brave/exporter/sender/okhttp/SenderOkHttpExporter.java b/exporter-sender-okhttp/src/main/java/io/zipkin/brave/exporter/sender/okhttp/SenderOkHttpExporter.java
new file mode 100644
index 0000000..4899f1b
--- /dev/null
+++ b/exporter-sender-okhttp/src/main/java/io/zipkin/brave/exporter/sender/okhttp/SenderOkHttpExporter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
+ *
+ * Licensed 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 io.zipkin.brave.exporter.sender.okhttp;
+
+import java.util.Hashtable;
+import java.util.Map;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import zipkin2.reporter.Sender;
+import zipkin2.reporter.okhttp3.OkHttpSender;
+
+@Component(
+ immediate = true,
+ name = "io.zipkin.sender.okhttp",
+ configurationPolicy = ConfigurationPolicy.REQUIRE
+)
+@Designate(ocd = SenderOkHttpExporter.Config.class)
+public class SenderOkHttpExporter {
+
+ private ServiceRegistration<Sender> reg;
+ private OkHttpSender sender;
+
+ @ObjectClassDefinition(name = "Zipkin Sender OkHttp") @interface Config {
+ String endpoint() default "http://localhost:9411/api/v2/spans";
+
+ boolean compressionEnabled() default true;
+
+ int messageMaxBytes() default 5 * 1024 * 1024;
+ }
+
+ @Activate
+ public void activate(Config config, BundleContext context, Map<String, String> properties) {
+ sender = OkHttpSender.newBuilder()
+ .endpoint(config.endpoint())
+ .compressionEnabled(config.compressionEnabled())
+ .messageMaxBytes(config.messageMaxBytes())
+ .build();
+ reg = context.registerService(Sender.class, sender, new Hashtable<>(properties));
+ }
+
+ @Deactivate
+ public void deactive() {
+ reg.unregister();
+ if (sender != null) sender.close();
+ }
+}
\ No newline at end of file
diff --git a/exporter/pom.xml b/exporter/pom.xml
new file mode 100644
index 0000000..dfb4c0f
--- /dev/null
+++ b/exporter/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+
+ Copyright 2016-2018 The OpenZipkin Authors
+
+ Licensed 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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-karaf-parent</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>brave-exporter</artifactId>
+ <name>Brave OSGi Exporter</name>
+
+ <properties>
+ <main.basedir>${project.basedir}/..</main.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>io.zipkin.brave</groupId>
+ <artifactId>brave</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.brave</groupId>
+ <artifactId>brave-instrumentation-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-urlconnection</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/AsyncReporterExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/AsyncReporterExporter.java
new file mode 100644
index 0000000..6d32a38
--- /dev/null
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/AsyncReporterExporter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
+ *
+ * Licensed 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 io.zipkin.brave.exporter;
+
+import java.util.Hashtable;
+import java.util.Map;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import zipkin2.Span;
+import zipkin2.reporter.AsyncReporter;
+import zipkin2.reporter.Reporter;
+import zipkin2.reporter.Sender;
+
+@Component(
+ immediate = true,
+ name = "io.zipkin.asyncreporter"
+)
+@Designate(ocd = AsyncReporterExporter.Config.class)
+public class AsyncReporterExporter {
+ @Reference
+ Sender sender;
+
+ private AsyncReporter<Span> reporter;
+ @SuppressWarnings("rawtypes")
+ private ServiceRegistration<Reporter> reg;
+
+ @Activate
+ public void activate(Config config, BundleContext context, Map<String, String> properties) {
+ reporter = AsyncReporter.builder(sender)
+ .build();
+ reg = context.registerService(Reporter.class, reporter,
+ new Hashtable<String, String>(properties));
+ }
+
+ @Deactivate
+ public void deactive() {
+ reg.unregister();
+ if (reporter != null) reporter.close();
+ }
+
+ @ObjectClassDefinition(name = "AsyncReporter") @interface Config {
+ }
+}
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/HttpTracingExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/HttpTracingExporter.java
new file mode 100644
index 0000000..be6dcd7
--- /dev/null
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/HttpTracingExporter.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
+ *
+ * Licensed 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 io.zipkin.brave.exporter;
+
+import brave.Tracing;
+import brave.http.HttpTracing;
+import java.util.Hashtable;
+import java.util.Map;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@Component(
+ immediate = true,
+ name = "io.zipkin.brave.http"
+)
+@Designate(ocd = HttpTracingExporter.Config.class)
+public class HttpTracingExporter {
+ @Reference
+ Tracing tracing;
+
+ private ServiceRegistration<HttpTracing> reg;
+
+ @Activate
+ public void activate(Config config, BundleContext context, Map<String, String> properties) {
+ HttpTracing httpTracing = HttpTracing.newBuilder(tracing)
+ .build();
+ reg = context.registerService(HttpTracing.class, httpTracing,
+ new Hashtable<String, String>(properties));
+ }
+
+ @Deactivate
+ public void deactive() {
+ reg.unregister();
+ }
+
+ @ObjectClassDefinition(name = "HttpTracing") @interface Config {
+ }
+}
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/TracingExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/TracingExporter.java
new file mode 100644
index 0000000..eae174d
--- /dev/null
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/TracingExporter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
+ *
+ * Licensed 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 io.zipkin.brave.exporter;
+
+import brave.Tracing;
+import brave.sampler.Sampler;
+import java.util.Hashtable;
+import java.util.Map;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import zipkin2.Span;
+import zipkin2.reporter.Reporter;
+
+@Component(
+ immediate = true,
+ name = "io.zipkin.brave"
+)
+@Designate(ocd = TracingExporter.Config.class)
+public class TracingExporter {
+ @Reference
+ Reporter<Span> reporter;
+
+ private Tracing tracing;
+ private ServiceRegistration<Tracing> reg;
+
+ @Activate
+ public void activate(Config config, BundleContext context, Map<String, String> properties) {
+ tracing = Tracing.newBuilder()
+ .localServiceName(config.name())
+ .spanReporter(reporter)
+ .traceId128Bit(config.traceId128Bit())
+ .sampler(Sampler.create(config.rate()))
+ .build();
+ reg =
+ context.registerService(Tracing.class, tracing, new Hashtable<String, String>(properties));
+ }
+
+ @Deactivate
+ public void deactive() {
+ reg.unregister();
+ if (tracing != null) tracing.close();
+ }
+
+ @ObjectClassDefinition(name = "Tracing") @interface Config {
+ String name() default "unknown";
+
+ boolean traceId128Bit() default false;
+
+ float rate() default 1;
+ }
+}
diff --git a/exporter/src/main/java/io/zipkin/brave/exporter/sender/urlconnection/URLConnectionSenderExporter.java b/exporter/src/main/java/io/zipkin/brave/exporter/sender/urlconnection/URLConnectionSenderExporter.java
new file mode 100644
index 0000000..78c8b11
--- /dev/null
+++ b/exporter/src/main/java/io/zipkin/brave/exporter/sender/urlconnection/URLConnectionSenderExporter.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
+ *
+ * Licensed 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 io.zipkin.brave.exporter.sender.urlconnection;
+
+import java.util.Hashtable;
+import java.util.Map;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import zipkin2.reporter.Sender;
+import zipkin2.reporter.urlconnection.URLConnectionSender;
+
+@Component(
+ immediate = true,
+ name = "io.zipkin.sender.urlconnection",
+ configurationPolicy = ConfigurationPolicy.REQUIRE
+)
+@Designate(ocd = URLConnectionSenderExporter.Config.class)
+public class URLConnectionSenderExporter {
+
+ private ServiceRegistration<Sender> reg;
+ private URLConnectionSender sender;
+
+ @Activate
+ public void activate(Config config, BundleContext context, Map<String, String> properties) {
+ sender = URLConnectionSender.newBuilder()
+ .endpoint(config.endpoint())
+ .compressionEnabled(config.compressionEnabled())
+ .connectTimeout(config.connectTimeout())
+ .messageMaxBytes(config.messageMaxBytes())
+ .build();
+ reg = context.registerService(Sender.class, sender, new Hashtable<String, String>(properties));
+ }
+
+ @Deactivate
+ public void deactive() {
+ reg.unregister();
+ if (sender != null) sender.close();
+ }
+
+ @ObjectClassDefinition(name = "Zipkin Sender URLConnection") @interface Config {
+ String endpoint() default "http://localhost:9411/api/v2/spans";
+
+ boolean compressionEnabled() default true;
+
+ int connectTimeout() default 10 * 1000;
+
+ int messageMaxBytes() default 5 * 1024 * 1024;
+ }
+}
\ No newline at end of file
diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644
index 0000000..5f6256d
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2016-2018 The OpenZipkin Authors
+
+ Licensed 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-karaf-parent</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>brave-features</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <main.basedir>${project.basedir}/..</main.basedir>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
new file mode 100644
index 0000000..72377d7
--- /dev/null
+++ b/features/src/main/resources/features.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2016 The OpenZipkin Authors
+
+ Licensed 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.
+
+-->
+<features name="brave" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+
+ <feature name="brave">
+ <feature>scr</feature>
+ <bundle dependency="true">mvn:io.zipkin.zipkin2/zipkin/${zipkin.version}</bundle>
+ <bundle dependency="true">mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin.reporter.version}</bundle>
+ <bundle>mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin.reporter.version}</bundle>
+ <bundle>mvn:io.zipkin.brave/brave/${brave.version}</bundle>
+ <bundle>mvn:io.zipkin.brave/brave-instrumentation-http/${brave.version}</bundle>
+ <bundle>mvn:io.zipkin.brave.karaf/brave-exporter/${project.version}</bundle>
+ </feature>
+
+ <feature name="brave-sender-kafka">
+ <feature>brave</feature>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/1.1.0_1</bundle>
+ <bundle>mvn:io.zipkin.reporter2/zipkin-sender-kafka11/${zipkin.reporter.version}</bundle>
+ <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-sender-kafka/${project.version}</bundle>
+ </feature>
+
+ <feature name="brave-sender-okhttp`">
+ <feature>brave</feature>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.10.0_2</bundle>
+ <bundle>mvn:io.zipkin.reporter2/zipkin-sender-okhttp3/${zipkin.reporter.version}</bundle>
+ <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version}</bundle>
+ </feature>
+</features>
\ No newline at end of file
diff --git a/brave-itests/.gitignore b/itests/.gitignore
similarity index 100%
rename from brave-itests/.gitignore
rename to itests/.gitignore
diff --git a/itests/pom.xml b/itests/pom.xml
new file mode 100644
index 0000000..7bed232
--- /dev/null
+++ b/itests/pom.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2016-2018 The OpenZipkin Authors
+
+ Licensed 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-karaf-parent</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>brave-itests</artifactId>
+
+ <properties>
+ <pax-exam.version>4.12.0</pax-exam.version>
+ <karaf.version>4.2.0</karaf.version>
+ <main.basedir>${project.basedir}/..</main.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-exporter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-urlconnection</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.brave</groupId>
+ <artifactId>brave</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-exporter-sender-kafka</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-kafka11</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-exporter-sender-okhttp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-okhttp3</artifactId>
+ </dependency>
+
+ <!-- Pax Exam Dependencies -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-cm</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-invoker-junit</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Karaf Container -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-inject</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-extender-service</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Preferred link because it does not require an mvn url handler implicitly. -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-assembly</artifactId>
+ <version>${pax-exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- framework to test with -->
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <version>${karaf.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ <version>${karaf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java b/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
new file mode 100644
index 0000000..6698d4e
--- /dev/null
+++ b/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2016-2018 The OpenZipkin Authors
+ *
+ * Licensed 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 io.zipkin.brave.itests;
+
+import java.util.Collection;
+import javax.inject.Inject;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+import org.ops4j.pax.exam.options.MavenUrlReference;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import zipkin2.reporter.Sender;
+
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class BraveTest {
+ private static final String FILTER_KAFKA = "(component.name=io.zipkin.sender.kafka)";
+ private static final String FILTER_OKHTTP = "(component.name=io.zipkin.sender.okhttp)";
+ private static final String FILTER_URLCONNECTION =
+ "(component.name=io.zipkin.sender.urlconnection)";
+
+ @Inject
+ BundleContext context;
+
+ @Configuration
+ public static Option[] configuration() {
+ MavenArtifactUrlReference karaf = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
+ .type("zip").version("4.0.7");
+ MavenUrlReference brave =
+ maven().groupId("io.zipkin.brave.karaf").artifactId("brave-features").type("xml")
+ .classifier("features").version("0.1.0-SNAPSHOT");
+ return new Option[] {
+ karafDistributionConfiguration().frameworkUrl(karaf).useDeployFolder(false),
+ configureConsole().ignoreLocalConsole(),
+ logLevel(LogLevel.INFO),
+ keepRuntimeFolder(),
+ features(brave, "brave", "brave-kafka", "brave-okhttp"),
+ // Create an empty config to trigger creation of component
+ newConfiguration("io.zipkin.sender.urlconnection").asOption(),
+ newConfiguration("io.zipkin.sender.okhttp").asOption(),
+ newConfiguration("io.zipkin.sender.kafka").asOption()
+ };
+ }
+
+ @Test
+ public void checkSenderUrlConnection() throws InvalidSyntaxException {
+ ServiceReference<Sender> ref = getSingleSender(FILTER_URLCONNECTION);
+ Assert.assertEquals(10000, ref.getProperty("connectTimeout"));
+ }
+
+ @Test
+ public void checkSenderKafka() throws InvalidSyntaxException {
+ ServiceReference<Sender> ref = getSingleSender(FILTER_KAFKA);
+ Assert.assertEquals("zipkin", ref.getProperty("topic"));
+ }
+
+ @Test
+ public void checkSenderOkHttp() throws InvalidSyntaxException {
+ ServiceReference<Sender> ref = getSingleSender(FILTER_OKHTTP);
+ Assert.assertEquals("zipkin", ref.getProperty("topic"));
+ }
+
+ @SuppressWarnings("rawtypes")
+ private ServiceReference<Sender> getSingleSender(String filter) throws InvalidSyntaxException {
+ Collection<ServiceReference<Sender>> refs = context.getServiceReferences(Sender.class, filter);
+ Assert.assertEquals(1, refs.size());
+ return refs.iterator().next();
+ }
+}
diff --git a/brave-itests/src/test/resources/exam.properties b/itests/src/test/resources/exam.properties
similarity index 100%
rename from brave-itests/src/test/resources/exam.properties
rename to itests/src/test/resources/exam.properties
diff --git a/brave-itests/src/test/resources/logback.xml b/itests/src/test/resources/logback.xml
similarity index 100%
rename from brave-itests/src/test/resources/logback.xml
rename to itests/src/test/resources/logback.xml
diff --git a/mvnw b/mvnw
index fc7efd1..5551fde 100755
--- a/mvnw
+++ b/mvnw
@@ -54,38 +54,16 @@ case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
Darwin*) darwin=true
- #
- # Look for the Apple JDKs first to preserve the existing behaviour, and then look
- # for the new JDKs provided by Oracle.
- #
- if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
- #
- # Apple JDKs
- #
- export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
- fi
-
- if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
- #
- # Apple JDKs
- #
- export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
- fi
-
- if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
- #
- # Oracle JDKs
- #
- export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
- fi
-
- if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
- #
- # Apple JDKs
- #
- export JAVA_HOME=`/usr/libexec/java_home`
- fi
- ;;
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
esac
if [ -z "$JAVA_HOME" ] ; then
@@ -130,7 +108,7 @@ if $cygwin ; then
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
-# For Migwn, ensure paths are in UNIX format before anything is touched
+# For Mingw, ensure paths are in UNIX format before anything is touched
if $mingw ; then
[ -n "$M2_HOME" ] &&
M2_HOME="`(cd "$M2_HOME"; pwd)`"
@@ -184,27 +162,28 @@ fi
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --path --windows "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-fi
-
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
- local basedir=$(pwd)
- local wdir=$(pwd)
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
- wdir=$(cd "$wdir/.."; pwd)
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
done
echo "${basedir}"
}
@@ -216,13 +195,87 @@ concat_lines() {
fi
}
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
@@ -230,5 +283,4 @@ exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
- ${WRAPPER_LAUNCHER} $MAVEN_CMD_LINE_ARGS
-
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
old mode 100644
new mode 100755
index 0d49a2d..48363fa
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -35,6 +35,8 @@
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
+@REM set title of command window
+title %0
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@@ -80,8 +82,6 @@ goto error
:init
-set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %*
-
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
@@ -117,11 +117,27 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
:endReadAdditionalConfig
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
if ERRORLEVEL 1 goto error
goto end
diff --git a/pom.xml b/pom.xml
index 1d271c1..5008b36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,338 +1,444 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2016, 2017 The OpenZipkin Authors
-Licensed 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
+ Copyright 2016-2018 The OpenZipkin Authors
-http://www.apache.org/licenses/LICENSE-2.0
+ Licensed 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.
-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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>io.zipkin.brave.karaf</groupId>
- <artifactId>brave-karaf-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>brave-features</module>
- <module>brave-itests</module>
- <module>brave-exporter</module>
- <module>brave-exporter-kafka08</module>
- <module>brave-exporter-okhttp3</module>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>io.zipkin.brave.karaf</groupId>
+ <artifactId>brave-karaf-parent</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>features</module>
+ <module>itests</module>
+ <module>exporter</module>
+ <module>exporter-sender-kafka</module>
+ <module>exporter-sender-okhttp</module>
</modules>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<!-- default bytecode version for src/main -->
<main.java.version>1.6</main.java.version>
<main.signature.artifact>java16</main.signature.artifact>
- <main.basedir>${project.basedir}</main.basedir>
-
- <license-maven-plugin.version>2.11</license-maven-plugin.version>
-
- <brave.version>4.5.0</brave.version>
- <zipkin.version>1.24.0</zipkin.version>
- <zipkin.reporter.version>0.10.0</zipkin.reporter.version>
-
- <slf4j.version>1.7.21</slf4j.version>
- </properties>
-
- <name>Brave Karaf Parent</name>
- <description>Brave Karaf Parent</description>
- <url>https://github.com/openzipkin/brave-karaf</url>
- <inceptionYear>2016</inceptionYear>
-
- <organization>
- <name>OpenZipkin</name>
- <url>http://zipkin.io/</url>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <scm>
- <url>https://github.com/openzipkin/brave-karaf</url>
- <connection>scm:git:https://github.com/openzipkin/brave-karaf</connection>
- <developerConnection>scm:git:https://github.com/openzipkin/brave-karaf</developerConnection>
- <tag>0.0.1</tag>
- </scm>
-
- <developers>
- </developers>
-
- <distributionManagement>
- <repository>
- <id>bintray</id>
- <url>https://api.bintray.com/maven/openzipkin/maven/brave-karaf/;publish=1</url>
- </repository>
- <snapshotRepository>
- <id>jfrog-snapshots</id>
- <url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url>
- </snapshotRepository>
- </distributionManagement>
-
- <issueManagement>
- <system>Github</system>
- <url>https://github.com/openzipkin/brave-karaf/issues</url>
- </issueManagement>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.zipkin.java</groupId>
- <artifactId>zipkin</artifactId>
- <version>${zipkin.version}</version>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-reporter</artifactId>
- <version>${zipkin.reporter.version}</version>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-sender-urlconnection</artifactId>
- <version>${zipkin.reporter.version}</version>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter</groupId>
- <artifactId>zipkin-sender-kafka08</artifactId>
- <version>${zipkin.reporter.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.zipkin.brave</groupId>
- <artifactId>brave-core</artifactId>
- <version>${brave.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.3.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>io.zipkin.java</groupId>
- <artifactId>zipkin</artifactId>
- </dependency>
-
- <!-- don't worry. auto-* are source retention, not runtime -->
- <dependency>
- <groupId>com.google.auto.value</groupId>
- <artifactId>auto-value</artifactId>
- <version>1.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.zipkin.java</groupId>
- <artifactId>zipkin</artifactId>
- <version>${zipkin.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-
- <build>
- <pluginManagement>
- <plugins>
- <!-- mvn -N io.takari:maven:wrapper -Dmaven=3.3.9 -->
- <plugin>
- <groupId>io.takari</groupId>
- <artifactId>maven</artifactId>
- <version>0.3.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>${main.signature.artifact}</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- Ensures checksums are added to published jars -->
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <createChecksum>true</createChecksum>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>${license-maven-plugin.version}</version>
- <configuration>
- <header>${main.basedir}/src/etc/header.txt</header>
- <excludes>
- <exclude>pom.xml</exclude>
- <exclude>.travis.yml</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.mvn/**</exclude>
- <exclude>.settings.xml</exclude>
- <exclude>mvnw*</exclude>
- <exclude>build-support/**</exclude>
- <exclude>etc/header.txt</exclude>
- <exclude>**/.idea/**</exclude>
- <exclude>LICENSE</exclude>
- <exclude>**/*.md</exclude>
- <exclude>src/test/resources/**</exclude>
- <exclude>src/main/resources/**</exclude>
- </excludes>
- <strictCheck>true</strictCheck>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin-git</artifactId>
- <version>${license-maven-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>compile</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <releaseProfiles>release</releaseProfiles>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <tagNameFormat>@{project.version}</tagNameFormat>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>io.zipkin.centralsync-maven-plugin</groupId>
- <artifactId>centralsync-maven-plugin</artifactId>
- <version>0.1.0</version>
- <configuration>
- <packageName>zipkin-aws</packageName>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <!-- Creates source jar -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <failOnError>false</failOnError>
- <excludePackageNames>zipkin.aws.internal,zipkin.aws.internal.*
- </excludePackageNames>
- <!-- hush pedantic warnings: we don't put param and return on everything! -->
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <main.basedir>${project.basedir}</main.basedir>
+
+ <!-- Make sure these versions match brave-bom -->
+ <brave.version>5.1.5</brave.version>
+ <zipkin.version>2.10.4</zipkin.version>
+ <zipkin-reporter.version>2.7.7</zipkin-reporter.version>
+
+ <license-maven-plugin.version>2.11</license-maven-plugin.version>
+ <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+ </properties>
+
+ <name>Brave Karaf (Parent)</name>
+ <description>Brave Karaf (Parent)</description>
+ <url>https://github.com/openzipkin/brave-karaf</url>
+ <inceptionYear>2016</inceptionYear>
+
+ <organization>
+ <name>OpenZipkin</name>
+ <url>http://zipkin.io/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <url>https://github.com/openzipkin/brave-karaf</url>
+ <connection>scm:git:https://github.com/openzipkin/brave-karaf.git</connection>
+ <developerConnection>scm:git:https://github.com/openzipkin/brave-karaf.git</developerConnection>
+ <tag>HEAD</tag>
+ </scm>
+
+ <!-- Developer section is needed for Maven Central, but doesn't need to include each person -->
+ <developers>
+ <developer>
+ <id>openzipkin</id>
+ <name>OpenZipkin Gitter</name>
+ <url>https://gitter.im/openzipkin/zipkin</url>
+ </developer>
+ </developers>
+
+ <distributionManagement>
+ <repository>
+ <id>bintray</id>
+ <url>https://api.bintray.com/maven/openzipkin/maven/brave-karaf/;publish=1</url>
+ </repository>
+ <snapshotRepository>
+ <id>jfrog-snapshots</id>
+ <url>http://oss.jfrog.org/artifactory/oss-snapshot-local</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <issueManagement>
+ <system>Github</system>
+ <url>https://github.com/openzipkin/brave-karaf/issues</url>
+ </issueManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>brave-exporter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>brave-exporter-sender-kafka</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>brave-exporter-sender-okhttp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.zipkin.zipkin2</groupId>
+ <artifactId>zipkin</artifactId>
+ <version>${zipkin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-reporter</artifactId>
+ <version>${zipkin-reporter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-urlconnection</artifactId>
+ <version>${zipkin-reporter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-kafka11</artifactId>
+ <version>${zipkin-reporter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-okhttp3</artifactId>
+ <version>${zipkin-reporter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.brave</groupId>
+ <artifactId>brave</artifactId>
+ <version>${brave.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.brave</groupId>
+ <artifactId>brave-instrumentation-http</artifactId>
+ <version>${brave.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>3.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.21.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.10.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- mvn -N io.takari:maven:wrapper -Dmaven=3.5.4 -->
+ <plugin>
+ <groupId>io.takari</groupId>
+ <artifactId>maven</artifactId>
+ <version>0.6.1</version>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>4.0.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <!-- Retrolambda will rewrite lambdas as Java 6 bytecode -->
+ <source>1.8</source>
+ <target>1.8</target>
+ <compilerId>javac-with-errorprone</compilerId>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac-errorprone</artifactId>
+ <version>2.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>net.orfjackal.retrolambda</groupId>
+ <artifactId>retrolambda-maven-plugin</artifactId>
+ <version>2.5.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process-main</goal>
+ </goals>
+ <configuration>
+ <target>${main.java.version}</target>
+ <fork>true</fork>
+ <quiet>true</quiet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.17</version>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>${main.signature.artifact}</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Ensures checksums are added to published jars -->
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>${license-maven-plugin.version}</version>
+ <configuration>
+ <header>${main.basedir}/src/etc/header.txt</header>
+ <mapping>
+ <!-- Don't use javadoc style as this makes code formatters break it by adding tags! -->
+ <java>SLASHSTAR_STYLE</java>
+ </mapping>
+ <excludes>
+ <exclude>.travis.yml</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.mvn/**</exclude>
+ <exclude>mvnw*</exclude>
+ <exclude>etc/header.txt</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>**/*.md</exclude>
+ <exclude>src/test/resources/**</exclude>
+ <exclude>src/main/resources/**</exclude>
+ <exclude>build-support/**</exclude>
+ </excludes>
+ <strictCheck>true</strictCheck>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin-git</artifactId>
+ <version>${license-maven-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>compile</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.8,9)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <releaseProfiles>release</releaseProfiles>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>io.zipkin.centralsync-maven-plugin</groupId>
+ <artifactId>centralsync-maven-plugin</artifactId>
+ <version>0.1.0</version>
+ <configuration>
+ <packageName>brave-karaf</packageName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <!-- Creates source jar -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ <!-- hush pedantic warnings: we don't put param and return on everything! -->
+ <doclint>none</doclint>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>