Skip to content

Commit

Permalink
Move HttpSpanCollector to its own module
Browse files Browse the repository at this point in the history
similar to Kafka and Scribe, Http should be in its own module, allowing
users to pick whichever they want.

This basically moves 2a85cec to its own module
  • Loading branch information
CodingFabian committed Jan 21, 2016
1 parent 986f0f0 commit d207ce9
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 9 deletions.
8 changes: 1 addition & 7 deletions brave-core/pom.xml
Expand Up @@ -60,12 +60,6 @@
<version>3.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>3.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -88,7 +82,7 @@
<shadeTestJar>false</shadeTestJar>
<minimizeJar>true</minimizeJar>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- Use of zipkin-java are internal only; don't add dependencies -->
<!-- Use of zipkin-java is internal only; don't add dependency -->
<relocations>
<relocation>
<pattern>zipkin</pattern>
Expand Down
13 changes: 13 additions & 0 deletions brave-spancollector-http/LICENSE
@@ -0,0 +1,13 @@
Copyright 2015 <kristofa@github.com>

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.
4 changes: 4 additions & 0 deletions brave-spancollector-http/README.md
@@ -0,0 +1,4 @@
# brave-spancollector-http #

SpanCollector that is used to submit spans to Zipkins Http endpoint `/spans`.

68 changes: 68 additions & 0 deletions brave-spancollector-http/pom.xml
@@ -0,0 +1,68 @@
<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>com.github.kristofa</groupId>
<artifactId>brave</artifactId>
<version>3.4.1-SNAPSHOT</version>
</parent>

<artifactId>brave-spancollector-http</artifactId>
<packaging>jar</packaging>

<name>brave-spancollector-http</name>
<description>Brave SpanCollector that submits spans to zipkins http endpoint</description>
<url>https://github.com/kristofa/brave</url>
<licenses>
<license>
<name>Apache 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-core</artifactId>
<version>3.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
<!-- org.apache.thrift.ProcessFunction v0.9 uses SLF4J at runtime -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId>
<version>0.4.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>3.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
@@ -1,5 +1,6 @@
package com.github.kristofa.brave;
package com.github.kristofa.brave.http;

import com.github.kristofa.brave.*;
import com.github.kristofa.brave.internal.Nullable;
import com.google.auto.value.AutoValue;
import com.twitter.zipkin.gen.Span;
Expand Down
@@ -1,5 +1,6 @@
package com.github.kristofa.brave;
package com.github.kristofa.brave.http;

import com.github.kristofa.brave.SpanCollectorMetricsHandler;
import com.twitter.zipkin.gen.Span;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Expand Up @@ -52,6 +52,7 @@
<module>brave-core-spring</module>
<module>brave-resteasy-spring</module>
<module>brave-resteasy3-spring</module>
<module>brave-spancollector-http</module>
<module>brave-spancollector-scribe</module>
<module>brave-spancollector-kafka</module>
<module>brave-sampler-zookeeper</module>
Expand Down

0 comments on commit d207ce9

Please sign in to comment.