You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by st...@apache.org on 2014/12/31 21:40:31 UTC
incubator-htrace git commit: HTRACE-38. Add apache license header to
src/main/site/markdown/index.md (cmccabe) ADDEDNUM that adds license to more
markdown files and ups our rat version.
Repository: incubator-htrace
Updated Branches:
refs/heads/master d5a6cf7ea -> 796e2438f
HTRACE-38. Add apache license header to src/main/site/markdown/index.md (cmccabe)
ADDEDNUM that adds license to more markdown files and ups our rat
version.
Signed-off-by: stack <st...@duboce.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/796e2438
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/796e2438
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/796e2438
Branch: refs/heads/master
Commit: 796e2438fafac3510938c1f987fadd27eef6c063
Parents: d5a6cf7
Author: Colin P. Mccabe <cm...@apache.org>
Authored: Wed Dec 31 12:10:54 2014 -0800
Committer: stack <st...@duboce.net>
Committed: Wed Dec 31 12:39:51 2014 -0800
----------------------------------------------------------------------
README.md | 17 +++++++++++++++++
.../java/org/apache/htrace/impl/MilliSpan.java | 8 ++++----
htrace-flume/README.md | 17 +++++++++++++++++
htrace-hbase/README.md | 17 +++++++++++++++++
pom.xml | 2 +-
5 files changed, 56 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/796e2438/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8d5bb3c..b3b486e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
HTrace
======
HTrace is a tracing framework for use with distributed systems written in java.
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/796e2438/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java
----------------------------------------------------------------------
diff --git a/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java b/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java
index 7f3e81a..597b566 100644
--- a/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java
+++ b/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java
@@ -283,7 +283,7 @@ public class MilliSpan implements Span {
return writer.toString();
}
- private static long parseUnsignedLong(String s) {
+ private static long parseUnsignedHexLong(String s) {
return new BigInteger(s, 16).longValue();
}
@@ -297,15 +297,15 @@ public class MilliSpan implements Span {
builder.begin(root.get("b").asLong()).
end(root.get("e").asLong()).
description(root.get("d").asText()).
- traceId(parseUnsignedLong(root.get("i").asText())).
- spanId(parseUnsignedLong(root.get("s").asText())).
+ traceId(parseUnsignedHexLong(root.get("i").asText())).
+ spanId(parseUnsignedHexLong(root.get("s").asText())).
processId(root.get("r").asText());
JsonNode parentsNode = root.get("p");
LinkedList<Long> parents = new LinkedList<Long>();
for (Iterator<JsonNode> iter = parentsNode.elements();
iter.hasNext(); ) {
JsonNode parentIdNode = iter.next();
- parents.add(parseUnsignedLong(parentIdNode.asText()));
+ parents.add(parseUnsignedHexLong(parentIdNode.asText()));
}
builder.parents(parents);
JsonNode traceInfoNode = root.get("n");
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/796e2438/htrace-flume/README.md
----------------------------------------------------------------------
diff --git a/htrace-flume/README.md b/htrace-flume/README.md
index 32bbb88..9181fc8 100644
--- a/htrace-flume/README.md
+++ b/htrace-flume/README.md
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
htrace-flume
============
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/796e2438/htrace-hbase/README.md
----------------------------------------------------------------------
diff --git a/htrace-hbase/README.md b/htrace-hbase/README.md
index b976d70..d0c41f5 100644
--- a/htrace-hbase/README.md
+++ b/htrace-hbase/README.md
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
htrace-hbase
============
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/796e2438/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d531fef..2d42b5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@ language governing permissions and limitations under the License. -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
+ <version>0.11</version>
<executions>
<execution>
<phase>package</phase>