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); 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 6e69118..a8e7eda 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) { 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(); diff --git a/htrace-flume/src/test/java/org/apache/htrace/impl/TestFlumeSpanReceiver.java b/htrace-flume/src/test/java/org/apache/htrace/impl/TestFlumeSpanReceiver.java index f7d3840..119a8cc 100644 --- a/htrace-flume/src/test/java/org/apache/htrace/impl/TestFlumeSpanReceiver.java +++ b/htrace-flume/src/test/java/org/apache/htrace/impl/TestFlumeSpanReceiver.java @@ -85,7 +85,7 @@ public class TestFlumeSpanReceiver { spans.add(innerTwo); innerOne.stop(); spans.add(innerOne); - rootSpan.addKVAnnotation("foo".getBytes(), "bar".getBytes()); + rootSpan.addKVAnnotation("foo", "bar"); rootSpan.addTimelineAnnotation("timeline"); rootSpan.stop(); spans.add(rootSpan); 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 bf93220..96fc486 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 diff --git a/htrace-zipkin/src/test/java/org/apache/htrace/TestHTraceSpanToZipkinSpan.java b/htrace-zipkin/src/test/java/org/apache/htrace/TestHTraceSpanToZipkinSpan.java index de4a8cd..d4de233 100644 --- a/htrace-zipkin/src/test/java/org/apache/htrace/TestHTraceSpanToZipkinSpan.java +++ b/htrace-zipkin/src/test/java/org/apache/htrace/TestHTraceSpanToZipkinSpan.java @@ -57,7 +57,7 @@ public class TestHTraceSpanToZipkinSpan { Span innerTwo = innerOne.child("Some more good work"); innerTwo.stop(); innerOne.stop(); - rootSpan.addKVAnnotation("foo".getBytes(), "bar".getBytes()); + rootSpan.addKVAnnotation("foo", "bar"); rootSpan.addTimelineAnnotation("timeline"); rootSpan.stop();