Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 25F9E102A6 for ; Tue, 15 Sep 2015 00:54:40 +0000 (UTC) Received: (qmail 56933 invoked by uid 500); 15 Sep 2015 00:54:40 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 56879 invoked by uid 500); 15 Sep 2015 00:54:40 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 56852 invoked by uid 99); 15 Sep 2015 00:54:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2015 00:54:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D894AE0414; Tue, 15 Sep 2015 00:54:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: CXF-6360: Integration with Apache HTrace. Simplifying TraceContext interface/implementation. Date: Tue, 15 Sep 2015 00:54:39 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 289ee01f0 -> c9ec28df4 CXF-6360: Integration with Apache HTrace. Simplifying TraceContext interface/implementation. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c9ec28df Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c9ec28df Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c9ec28df Branch: refs/heads/master Commit: c9ec28df42e815b0771964fdae96b7ecb2e2281b Parents: 289ee01 Author: reta Authored: Mon Sep 14 20:54:29 2015 -0400 Committer: reta Committed: Mon Sep 14 20:54:29 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cxf/tracing/htrace/HTraceTracerContext.java | 7 +------ .../src/main/java/org/apache/cxf/tracing/TracerContext.java | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c9ec28df/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java ---------------------------------------------------------------------- diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java index 9b97741..3194154 100644 --- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java +++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java @@ -82,15 +82,10 @@ public class HTraceTracerContext implements TracerContext { return callable; } } - - @Override - public void annotate(byte[] key, byte[] value) { - Trace.addKVAnnotation(key, value); - } @Override public void annotate(String key, String value) { - annotate(key.getBytes(StandardCharsets.UTF_8), + Trace.addKVAnnotation(key.getBytes(StandardCharsets.UTF_8), value.getBytes(StandardCharsets.UTF_8)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/c9ec28df/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java ---------------------------------------------------------------------- diff --git a/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java b/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java index 36d027d..a13923e 100644 --- a/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java +++ b/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java @@ -46,12 +46,6 @@ public interface TracerContext { */ Callable wrap(final String desription, final Traceable traceable); - /** - * Adds a key/value pair to the currently active span. - * @param key key to add - * @param value value to add - */ - void annotate(byte[] key, byte[] value); /** * Adds a key/value pair to the currently active span.