You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by cm...@apache.org on 2016/09/03 00:02:36 UTC
incubator-htrace git commit: HTRACE-369. htrace-zipkin: fix jdk8
javadoc build error (Mike Drob via Colin P. McCabe)
Repository: incubator-htrace
Updated Branches:
refs/heads/master 1d8ed273d -> f675aad3a
HTRACE-369. htrace-zipkin: fix jdk8 javadoc build error (Mike Drob via Colin P. McCabe)
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/f675aad3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/f675aad3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/f675aad3
Branch: refs/heads/master
Commit: f675aad3a95110a26820c28886f23f70827ab203
Parents: 1d8ed27
Author: Colin P. McCabe <cm...@apache.org>
Authored: Fri Aug 26 11:49:20 2016 -0700
Committer: Colin P. McCabe <cm...@apache.org>
Committed: Fri Sep 2 17:02:01 2016 -0700
----------------------------------------------------------------------
htrace-zipkin/pom.xml | 2 +-
.../java/org/apache/htrace/impl/ScribeTransport.java | 4 ++--
.../org/apache/htrace/impl/ZipkinSpanReceiver.java | 6 +++---
.../apache/htrace/zipkin/HTraceToZipkinConverter.java | 13 ++++++-------
4 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/f675aad3/htrace-zipkin/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml
index b7ce61e..925988e 100644
--- a/htrace-zipkin/pom.xml
+++ b/htrace-zipkin/pom.xml
@@ -219,7 +219,7 @@ language governing permissions and limitations under the License. -->
<id>doclint-disable</id>
<activation><jdk>[1.8,)</jdk></activation>
<properties>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalparam>-Xdoclint:all,-Xdoclint:-missing</additionalparam>
</properties>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/f675aad3/htrace-zipkin/src/main/java/org/apache/htrace/impl/ScribeTransport.java
----------------------------------------------------------------------
diff --git a/htrace-zipkin/src/main/java/org/apache/htrace/impl/ScribeTransport.java b/htrace-zipkin/src/main/java/org/apache/htrace/impl/ScribeTransport.java
index 0fc7920..17886c5 100644
--- a/htrace-zipkin/src/main/java/org/apache/htrace/impl/ScribeTransport.java
+++ b/htrace-zipkin/src/main/java/org/apache/htrace/impl/ScribeTransport.java
@@ -103,11 +103,11 @@ public class ScribeTransport implements Transport {
* Here is a little ascii art which shows the above transformation:
* <pre>
* +------------+ +------------+ +------------+ +-----------------+
- * | HTrace Span|-->|Zipkin Span |-->| (LogEntry) | ===========> | Zipkin Collector|
+ * | HTrace Span|-->|Zipkin Span |-->| (LogEntry) | ===========> | Zipkin Collector|
* +------------+ +------------+ +------------+ (Scribe RPC) +-----------------+
* </pre>
* @param spans to be sent. The raw bytes are being sent.
- * @throws IOException
+ * @throws IOException if there is a problem sending the span entries
*/
@Override
public void send(List<byte[]> spans) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/f675aad3/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java
----------------------------------------------------------------------
diff --git a/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java b/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java
index 2dfe5a6..da7027f 100644
--- a/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java
+++ b/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicLong;
/**
* Zipkin is an open source tracing library. This span receiver acts as a bridge between HTrace and
* Zipkin, that converts HTrace Span objects into Zipkin Span objects.
- * <p/>
+ * <p>
* HTrace spans are queued into a blocking queue. From there background worker threads will
* batch the spans together and then send them through to a Zipkin collector.
*
@@ -338,10 +338,10 @@ public class ZipkinSpanReceiver extends SpanReceiver {
/**
* Close the receiver.
- * <p/>
+ * <p>
* This tries to shut
*
- * @throws IOException
+ * @throws IOException This implementation will not throw an {@link IOException}.
*/
@Override
public void close() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/f675aad3/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java
----------------------------------------------------------------------
diff --git a/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java b/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java
index dc4e9bc..44baea0 100644
--- a/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java
+++ b/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java
@@ -36,15 +36,15 @@ import java.util.Map;
* This class is responsible for converting a HTrace.Span to a Zipkin.Span object. To use the Zipkin
* infrastructure (collector, front end), we need to store the Span information in a zipkin specific
* format. This class transforms a HTrace:Span object to a Zipkin:Span object.
- * <p/>
+ * <p>
* This is how both Span objects are related:
- * <table>
- * <col width="50%"/> <col width="50%"/> <thead>
+ * <table summary="Mapping between HTrace and Zipkin Span opbjects.">
+ * <thead>
* <tr>
- * <th>HTrace:Span</th>
- * <th>Zipkin:Span</th>
+ * <th style="width: 50%">HTrace:Span</th>
+ * <th style="width: 50%">Zipkin:Span</th>
* </tr>
- * <thead> <tbody>
+ * </thead> <tbody>
* <tr>
* <td>TraceId</td>
* <td>TraceId</td>
@@ -71,7 +71,6 @@ import java.util.Map;
* </tr>
* </tbody>
* </table>
- * <p/>
*/
public class HTraceToZipkinConverter {
private static final Log LOG = LogFactory.getLog(HTraceToZipkinConverter.class);