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/05/18 09:27:17 UTC
[incubator-zipkin-dependencies] 01/01: Corrects fuzz in build in
preparation for ASF release
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch fuzz
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-dependencies.git
commit 979f268eee8187486a911b354caaf99f32626471
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Sat May 18 11:26:44 2019 +0200
Corrects fuzz in build in preparation for ASF release
cc @zeagord
---
.travis.yml | 11 +----
LICENSE | 1 -
README.md | 18 +++----
.../cassandra3/CassandraDependenciesJob.java | 3 +-
pom.xml | 57 +++++++++++++---------
5 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9629ee6..157322f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ before_install:
# install mysql schema
- mysql -uroot -e 'SET GLOBAL innodb_file_format=Barracuda'
- mysql -uroot -e 'create database if not exists zipkin'
- - curl -SL https://raw.githubusercontent.com/openzipkin/zipkin/master/zipkin-storage/mysql-v1/src/main/resources/mysql.sql | mysql -uroot -Dzipkin
+ - curl -SL https://raw.githubusercontent.com/apache/incubator-zipkin/master/zipkin-storage/mysql-v1/src/main/resources/mysql.sql | mysql -uroot -Dzipkin
# Required for Elasticsearch 5 (See https://github.com/docker-library/docs/tree/master/elasticsearch#host-setup)
- sudo sysctl -w vm.max_map_count=262144
@@ -37,16 +37,9 @@ before_install:
install: ./mvnw -q install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
script: ./mvnw clean verify -B
-# Don't build release tags. This avoids publish conflicts because the version commit exists both on master and the release tag.
-# See https://github.com/travis-ci/travis-ci/issues/1532
-branches:
- except:
- - /^[0-9]/
-
notifications:
webhooks:
- urls: # skip license on travis due to zipkin #1512
-
+ urls:
- https://webhooks.gitter.im/e/637e968b45032d16ee26
on_success: change
on_failure: always
diff --git a/LICENSE b/LICENSE
index ca34c97..590fd93 100644
--- a/LICENSE
+++ b/LICENSE
@@ -204,4 +204,3 @@ This product contains a modified part of Guava, distributed by Google:
* License: Apache License v2.0
* Homepage: https://github.com/google/guava
-
diff --git a/README.md b/README.md
index a534a1e..d53b184 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
[](https://gitter.im/openzipkin/zipkin)
[](https://builds.apache.org/view/Z/view/Zipkin/job/GH-incubator-zipkin/job/incubator-zipkin-dependencies/job/master/)
-[](https://search.maven.org/search?q=g:org.apache.zipkin.dependencies%20AND%20a:zipkin-dependencies)
+[](https://search.maven.org/search?q=g:org.apache.zipkin.dependencies%20AND%20a:zipkin-dependencies)
# zipkin-dependencies
This is a Spark job that will collect spans from your datastore, analyze links between services,
-and store them for later presentation in the [web UI](https://github.com/openzipkin/zipkin/tree/master/zipkin-ui) (ex. http://localhost:8080/dependency).
+and store them for later presentation in the [web UI](https://github.com/apache/incubator-zipkin/tree/master/zipkin-lens) (ex. http://localhost:8080/dependency).
This job parses all traces in the current day in UTC time. This means you should schedule it to run
just prior to midnight UTC.
-All Zipkin [Storage Components](https://github.com/openzipkin/zipkin/blob/master/zipkin-storage/)
+All Zipkin [Storage Components](https://github.com/apache/incubator-zipkin/blob/master/zipkin-storage/)
are supported, including Cassandra, MySQL and Elasticsearch.
## Quick-start
@@ -51,8 +51,8 @@ The following variables are common to all storage layers:
### Cassandra
Cassandra is used when `STORAGE_TYPE=cassandra` or `STORAGE_TYPE=cassandra3`.
-* `cassandra` is compatible with Zipkin's [Legacy Cassandra storage component](https://github.com/openzipkin/zipkin/tree/master/zipkin-storage/cassandra).
-* `cassandra3` is compatible with Zipkin's [Cassandra v3 storage component](https://github.com/openzipkin/zipkin/tree/master/zipkin-storage/zipkin2_cassandra).
+* `cassandra` is compatible with Zipkin's [Legacy Cassandra storage component](https://github.com/apache/incubator-zipkin/tree/master/zipkin-storage/cassandra).
+* `cassandra3` is compatible with Zipkin's [Cassandra v3 storage component](https://github.com/apache/incubator-zipkin/tree/master/zipkin-storage/zipkin2_cassandra).
Here are the variables that apply
@@ -70,7 +70,7 @@ $ STORAGE_TYPE=cassandra3 CASSANDRA_USERNAME=user CASSANDRA_PASSWORD=pass java -
```
### MySQL Storage
-MySQL is used when `STORAGE_TYPE=mysql`. The schema is compatible with Zipkin's [MySQL storage component](https://github.com/openzipkin/zipkin/tree/master/zipkin-storage/mysql).
+MySQL is used when `STORAGE_TYPE=mysql`. The schema is compatible with Zipkin's [MySQL storage component](https://github.com/apache/incubator-zipkin/tree/master/zipkin-storage/mysql-v1).
* `MYSQL_DB`: The database to use. Defaults to "zipkin".
* `MYSQL_USER` and `MYSQL_PASS`: MySQL authentication, which defaults to empty string.
@@ -85,7 +85,7 @@ $ STORAGE_TYPE=mysql MYSQL_USER=root java -jar zipkin-dependencies.jar
```
### Elasticsearch Storage
-Elasticsearch is used when `STORAGE_TYPE=elasticsearch`. The schema is compatible with Zipkin's [Elasticsearch storage component](https://github.com/openzipkin/zipkin/tree/master/zipkin-storage/elasticsearch-http).
+Elasticsearch is used when `STORAGE_TYPE=elasticsearch`. The schema is compatible with Zipkin's [Elasticsearch storage component](https://github.com/apache/incubator-zipkin/tree/master/zipkin-storage/elasticsearch).
* `ES_INDEX`: The index prefix to use when generating daily index names. Defaults to zipkin.
* `ES_DATE_SEPARATOR`: The separator used when generating dates in index.
@@ -126,7 +126,7 @@ To build the job from source and run against a local cassandra, in Spark's stand
```bash
# Build the spark jobs
-$ ./mvnw -DskipTests clean install
+$ mvn -DskipTests clean install
$ STORAGE_TYPE=cassandra java -jar ./main/target/zipkin-dependencies*.jar
```
@@ -137,7 +137,7 @@ else, make sure you are running the same version of spark as used here.
You can use the following command to display what this project is built against:
```bash
-$ SPARK_VERSION=$(./mvnw help:evaluate -Dexpression=spark.version -q -DforceStdout)
+$ SPARK_VERSION=$(mvn help:evaluate -Dexpression=spark.version -q -DforceStdout)
$ echo $SPARK_VERSION
2.4.0
```
diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java
index f290062..5150a49 100644
--- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java
+++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java
@@ -125,8 +125,7 @@ public final class CassandraDependenciesJob {
return this;
}
- /** @see {@code StorageComponent.Builder#strictTraceId(boolean)} */
- public Builder strictTraceId(boolean strictTraceId) {
+ Builder strictTraceId(boolean strictTraceId) {
this.strictTraceId = strictTraceId;
return this;
}
diff --git a/pom.xml b/pom.xml
index 17386d6..e4ec4d7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,6 @@
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<license-maven-plugin.version>3.0</license-maven-plugin.version>
<maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
- <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
</properties>
@@ -292,6 +291,17 @@
</plugin>
<plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ <excludePackageNames>zipkin2.internal,zipkin2.internal.*</excludePackageNames>
+ <!-- hush pedantic warnings: we don't put param and return on everything! -->
+ <doclint>none</doclint>
+ </configuration>
+ </plugin>
+
+ <plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
</plugin>
@@ -378,26 +388,6 @@
</plugin>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>${maven-release-plugin.version}</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-dependencies</packageName>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<executions>
@@ -530,6 +520,29 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <configuration>
+ <!-- make the source release zip includes the word incubating -->
+ <finalName>apache-zipkin-dependencies-incubating-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assemblies/source-release.xml</descriptor>
+ </descriptors>
+ <!-- don't inherit the source-release as we are overriding it -->
+ <descriptorRefs combine.self="override" />
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>