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 2015/07/17 22:47:38 UTC
incubator-htrace git commit: HTRACE-208. Remove deprecated
addKVAnnotation(byte[], byte[]) method (cmccabe)
Repository: incubator-htrace
Updated Branches:
refs/heads/master a5b7ef771 -> 0fd8d21a8
HTRACE-208. Remove deprecated addKVAnnotation(byte[], byte[]) method (cmccabe)
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/0fd8d21a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/0fd8d21a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/0fd8d21a
Branch: refs/heads/master
Commit: 0fd8d21a8fe7303cd4b36290b8fa505124ae0bc7
Parents: a5b7ef7
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Fri Jul 17 13:29:41 2015 -0700
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Fri Jul 17 13:47:31 2015 -0700
----------------------------------------------------------------------
htrace-core/src/main/java/org/apache/htrace/Span.java | 6 ------
htrace-core/src/main/java/org/apache/htrace/Trace.java | 11 -----------
.../src/main/java/org/apache/htrace/impl/MilliSpan.java | 10 ----------
.../org/apache/htrace/impl/TestHBaseSpanReceiver.java | 3 ---
4 files changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0fd8d21a/htrace-core/src/main/java/org/apache/htrace/Span.java
----------------------------------------------------------------------
diff --git a/htrace-core/src/main/java/org/apache/htrace/Span.java b/htrace-core/src/main/java/org/apache/htrace/Span.java
index 71164d4..b28ff8c 100644
--- a/htrace-core/src/main/java/org/apache/htrace/Span.java
+++ b/htrace-core/src/main/java/org/apache/htrace/Span.java
@@ -111,12 +111,6 @@ public interface Span {
void addKVAnnotation(String key, String value);
/**
- * Add a data annotation associated with this span
- */
- @Deprecated
- void addKVAnnotation(byte[] key, byte[] value);
-
- /**
* Add a timeline annotation associated with this span
*/
void addTimelineAnnotation(String msg);
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0fd8d21a/htrace-core/src/main/java/org/apache/htrace/Trace.java
----------------------------------------------------------------------
diff --git a/htrace-core/src/main/java/org/apache/htrace/Trace.java b/htrace-core/src/main/java/org/apache/htrace/Trace.java
index ef07687..2d8bff5 100644
--- a/htrace-core/src/main/java/org/apache/htrace/Trace.java
+++ b/htrace-core/src/main/java/org/apache/htrace/Trace.java
@@ -158,17 +158,6 @@ public class Trace {
}
/**
- * Adds a data annotation to the current span if tracing is currently on.
- */
- @Deprecated
- public static void addKVAnnotation(byte[] key, byte[] value) {
- Span s = currentSpan();
- if (s != null) {
- s.addKVAnnotation(key, value);
- }
- }
-
- /**
* Annotate the current span with the given message.
*/
public static void addTimelineAnnotation(String msg) {
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0fd8d21a/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 8544867..ffec117 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
@@ -257,16 +257,6 @@ public class MilliSpan implements Span {
}
@Override
- public void addKVAnnotation(byte[] key, byte[] value) {
- // TODO: remove this method
- try {
- addKVAnnotation(new String(key, "UTF-8"), new String(value, "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
public void addKVAnnotation(String key, String value) {
if (traceInfo == null)
traceInfo = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0fd8d21a/htrace-hbase/src/test/java/org/apache/htrace/impl/TestHBaseSpanReceiver.java
----------------------------------------------------------------------
diff --git a/htrace-hbase/src/test/java/org/apache/htrace/impl/TestHBaseSpanReceiver.java b/htrace-hbase/src/test/java/org/apache/htrace/impl/TestHBaseSpanReceiver.java
index 549fddb..0f8eaf5 100644
--- a/htrace-hbase/src/test/java/org/apache/htrace/impl/TestHBaseSpanReceiver.java
+++ b/htrace-hbase/src/test/java/org/apache/htrace/impl/TestHBaseSpanReceiver.java
@@ -208,9 +208,6 @@ public class TestHBaseSpanReceiver {
}
@Override
- public void addKVAnnotation(byte[] key, byte[] value) {}
-
- @Override
public void addKVAnnotation(String key, String value) {}
@Override