git commit: PHOENIX-1187 Enable tracing on server

2014-08-20 Thread jyates
Repository: phoenix
Updated Branches:
  refs/heads/master 4fcd01d6a - f99e5d8d6


PHOENIX-1187 Enable tracing on server


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f99e5d8d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f99e5d8d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f99e5d8d

Branch: refs/heads/master
Commit: f99e5d8d609d326fb3571255cd8f47961b1c6860
Parents: 4fcd01d
Author: Jesse Yates jya...@apache.org
Authored: Tue Aug 19 15:25:57 2014 -0700
Committer: Jesse Yates jya...@apache.org
Committed: Wed Aug 20 13:43:38 2014 -0700

--
 phoenix-assembly/pom.xml|   2 +-
 phoenix-assembly/src/build/all.xml  | 184 --
 .../components/all-common-dependencies.xml  |  62 ++
 .../src/build/components/all-common-files.xml   |  71 +++
 .../src/build/components/all-common-jars.xml|  74 +++
 phoenix-assembly/src/build/hadoop-one-all.xml   |  53 +
 phoenix-assembly/src/build/hadoop-two-all.xml   |  64 +++
 .../coprocessor/MetaDataEndpointImpl.java   |  11 ++
 .../apache/phoenix/jdbc/PhoenixConnection.java  |   9 +-
 .../trace/PhoenixTableMetricsWriter.java|  45 +++--
 .../org/apache/phoenix/trace/util/Tracing.java  |  22 +++
 .../java/org/apache/phoenix/util/QueryUtil.java |  33 +++-
 .../org/apache/phoenix/metrics/Metrics.java |  41 
 .../org/apache/phoenix/trace/TracingCompat.java |   3 +
 .../bin/hadoop-metrics2-hbase.properties|  20 ++
 .../bin/hadoop-metrics2-phoenix.properties  |  53 +
 .../phoenix/trace/PhoenixMetricsSink.java   | 191 +++
 .../phoenix/trace/PhoenixMetricsWriter.java | 176 -
 .../apache/phoenix/trace/TraceMetricSource.java |  13 +-
 .../phoenix/trace/PhoenixMetricsWriterTest.java |   2 +-
 pom.xml |   6 +-
 21 files changed, 740 insertions(+), 395 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f99e5d8d/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index d8bd2d2..4921731 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -72,7 +72,7 @@
   tarLongFileModegnu/tarLongFileMode
   appendAssemblyIdfalse/appendAssemblyId
   descriptors
-descriptorsrc/build/all.xml/descriptor
+descriptorsrc/build/${assembly.descriptor}/descriptor
   /descriptors
 /configuration
   /execution

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f99e5d8d/phoenix-assembly/src/build/all.xml
--
diff --git a/phoenix-assembly/src/build/all.xml 
b/phoenix-assembly/src/build/all.xml
deleted file mode 100644
index 8fa5884..000
--- a/phoenix-assembly/src/build/all.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-?xml version='1.0'?
-!--
-
- 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.
-
---
-
-assembly 
xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0;
-  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-  
xsi:schemaLocation=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd;
-  !--This 'all' id is not appended to the produced bundle because we do this: 
http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
 --
-  idall/id
-  formats
-formattar.gz/format
-  /formats
-  includeBaseDirectorytrue/includeBaseDirectory
-  
-  fileSets
-!-- Top level directories --
-fileSet
-  !--Get misc project files --
-  directory${project.basedir}/../directory
-  outputDirectory//outputDirectory
-  includes
-include*.txt/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../bin/directory
-  outputDirectorybin/outputDirectory
-  fileMode0755/fileMode
-  

git commit: PHOENIX-1187 Enable tracing on server

2014-08-20 Thread jyates
Repository: phoenix
Updated Branches:
  refs/heads/4.0 d1a8f49a8 - 572724ef8


PHOENIX-1187 Enable tracing on server


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/572724ef
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/572724ef
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/572724ef

Branch: refs/heads/4.0
Commit: 572724ef8bcab8e48eefec910a8654114e2bfebb
Parents: d1a8f49
Author: Jesse Yates jya...@apache.org
Authored: Tue Aug 19 15:25:57 2014 -0700
Committer: Jesse Yates jya...@apache.org
Committed: Wed Aug 20 13:42:43 2014 -0700

--
 phoenix-assembly/pom.xml|   2 +-
 phoenix-assembly/src/build/all.xml  | 184 --
 .../components/all-common-dependencies.xml  |  62 ++
 .../src/build/components/all-common-files.xml   |  71 +++
 .../src/build/components/all-common-jars.xml|  74 +++
 phoenix-assembly/src/build/hadoop-one-all.xml   |  53 +
 phoenix-assembly/src/build/hadoop-two-all.xml   |  64 +++
 .../coprocessor/MetaDataEndpointImpl.java   |  11 ++
 .../apache/phoenix/jdbc/PhoenixConnection.java  |   9 +-
 .../trace/PhoenixTableMetricsWriter.java|  45 +++--
 .../org/apache/phoenix/trace/util/Tracing.java  |  22 +++
 .../java/org/apache/phoenix/util/QueryUtil.java |  33 +++-
 .../org/apache/phoenix/metrics/Metrics.java |  41 
 .../org/apache/phoenix/trace/TracingCompat.java |   3 +
 .../bin/hadoop-metrics2-hbase.properties|  20 ++
 .../bin/hadoop-metrics2-phoenix.properties  |  53 +
 .../phoenix/trace/PhoenixMetricsSink.java   | 191 +++
 .../phoenix/trace/PhoenixMetricsWriter.java | 176 -
 .../apache/phoenix/trace/TraceMetricSource.java |  13 +-
 .../phoenix/trace/PhoenixMetricsWriterTest.java |   2 +-
 pom.xml |   6 +-
 21 files changed, 740 insertions(+), 395 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/572724ef/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index b3c24d2..a34b09c 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -72,7 +72,7 @@
   tarLongFileModegnu/tarLongFileMode
   appendAssemblyIdfalse/appendAssemblyId
   descriptors
-descriptorsrc/build/all.xml/descriptor
+descriptorsrc/build/${assembly.descriptor}/descriptor
   /descriptors
 /configuration
   /execution

http://git-wip-us.apache.org/repos/asf/phoenix/blob/572724ef/phoenix-assembly/src/build/all.xml
--
diff --git a/phoenix-assembly/src/build/all.xml 
b/phoenix-assembly/src/build/all.xml
deleted file mode 100644
index 8fa5884..000
--- a/phoenix-assembly/src/build/all.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-?xml version='1.0'?
-!--
-
- 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.
-
---
-
-assembly 
xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0;
-  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-  
xsi:schemaLocation=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd;
-  !--This 'all' id is not appended to the produced bundle because we do this: 
http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
 --
-  idall/id
-  formats
-formattar.gz/format
-  /formats
-  includeBaseDirectorytrue/includeBaseDirectory
-  
-  fileSets
-!-- Top level directories --
-fileSet
-  !--Get misc project files --
-  directory${project.basedir}/../directory
-  outputDirectory//outputDirectory
-  includes
-include*.txt/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../bin/directory
-  outputDirectorybin/outputDirectory
-  fileMode0755/fileMode
-  directoryMode0755/directoryMode
-