svn commit: r26293 - /release/incubator/htrace/
Author: lewismc Date: Wed Apr 11 20:21:17 2018 New Revision: 26293 Log: Remove HTrace dist directory prepare for retirement to Attic Removed: release/incubator/htrace/
[05/12] incubator-htrace git commit: adding colin review changes to span receiver
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a6ca3ccf/htrace-kudu/src/test/java/org/apache/htrace/impl/TestKuduSpanReceiver.java -- diff --git a/htrace-kudu/src/test/java/org/apache/htrace/impl/TestKuduSpanReceiver.java b/htrace-kudu/src/test/java/org/apache/htrace/impl/TestKuduSpanReceiver.java index e045eba..8b446e2 100644 --- a/htrace-kudu/src/test/java/org/apache/htrace/impl/TestKuduSpanReceiver.java +++ b/htrace-kudu/src/test/java/org/apache/htrace/impl/TestKuduSpanReceiver.java @@ -18,16 +18,18 @@ package org.apache.htrace.impl; import org.apache.htrace.core.Tracer; -import org.apache.htrace.core.Span; import org.apache.htrace.core.TracerPool; +import org.apache.htrace.core.Span; +import org.apache.htrace.core.SpanId; +import org.apache.htrace.core.MilliSpan; import org.apache.htrace.core.TraceScope; import org.apache.htrace.core.HTraceConfiguration; -import org.apache.htrace.protobuf.generated.SpanProtos; -import org.junit.Assert; +import org.apache.htrace.core.TimelineAnnotation; import org.junit.BeforeClass; -import org.junit.AfterClass; import org.junit.Ignore; import org.junit.Test; +import org.junit.Assert; +import org.junit.AfterClass; import org.kududb.Schema; import org.kududb.Type; import org.kududb.ColumnSchema; @@ -37,50 +39,88 @@ import org.kududb.client.CreateTableOptions; import org.kududb.client.KuduScanner; import org.kududb.client.RowResultIterator; import org.kududb.client.RowResult; +import org.kududb.client.KuduPredicate; - -import java.io.ByteArrayInputStream; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; public class TestKuduSpanReceiver extends BaseKuduTest { private static final String BIN_DIR_PROP = "binDir"; - private static final String BIN_DIR_PROP_DEFAULT = "../build/release/bin"; + private static final String BIN_DIR_PROP_DEFAULT = "./build/release/bin"; + //set kudu binary location and enable test execution from here + private static final boolean TEST_ENABLE = false; @BeforeClass public static void setUpBeforeClass() throws Exception { -System.setProperty(BIN_DIR_PROP, BIN_DIR_PROP_DEFAULT); -BaseKuduTest.setUpBeforeClass(); +if (TEST_ENABLE) { + System.setProperty(BIN_DIR_PROP, BIN_DIR_PROP_DEFAULT); + BaseKuduTest.setUpBeforeClass(); +} } @AfterClass public static void tearDownAfterClass() throws Exception { -BaseKuduTest.tearDownAfterClass(); +if(TEST_ENABLE) { + BaseKuduTest.tearDownAfterClass(); +} } private void createTable() throws Exception { KuduClient client = BaseKuduTest.syncClient; -List columns = new ArrayList(4); -columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_ID, -Type.BINARY) +List span_columns = new ArrayList(); +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_TRACE_ID, +Type.INT64) .key(true) .build()); -columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN, -Type.BINARY) +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_START_TIME, +Type.INT64) .build()); -columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_ROOT_SPAN_START_TIME, -Type.BINARY) +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_STOP_TIME, +Type.INT64) .build()); -columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_ROOT_SPAN, -Type.BINARY) +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_SPAN_ID, +Type.INT64) +.build()); +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_PROCESS_ID, +Type.STRING) +.build()); +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_PARENT_ID, +Type.INT64) +.build()); +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_PARENT, +Type.BOOL) +.build()); +span_columns.add(new ColumnSchema.ColumnSchemaBuilder(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_DESCRIPTION, +Type.STRING) .build()); -List rangeKeys = new ArrayList<>(); -rangeKeys.add(KuduReceiverConstants.DEFAULT_KUDU_COLUMN_SPAN_ID); -Schema schema = new Schema(columns); -client.createTable(KuduReceiverConstants.DEFAULT_KUDU_TABLE, schema, +List rangeKeys = new ArrayList<>(); +
[12/12] incubator-htrace git commit: Merge branch 'GSOC_HTRACE' of https://github.com/nisalanirmana/incubator-htrace
Merge branch 'GSOC_HTRACE' of https://github.com/nisalanirmana/incubator-htrace Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/a3b503d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/a3b503d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/a3b503d7 Branch: refs/heads/master Commit: a3b503d7da4bd151bba2978ce7720ba38aa4d332 Parents: 4508cd5 641d05b Author: Lewis John McGibbneyAuthored: Wed Apr 11 13:25:45 2018 -0700 Committer: Lewis John McGibbney Committed: Wed Apr 11 13:25:45 2018 -0700 -- htrace-kudu/pom.xml | 196 .../htrace/impl/KuduClientConfiguration.java| 77 + .../htrace/impl/KuduReceiverConstants.java | 55 .../apache/htrace/impl/KuduSpanReceiver.java| 218 ++ .../htrace/viewer/KuduClientConstants.java | 45 +++ .../apache/htrace/viewer/KuduSpanViewer.java| 300 +++ .../htrace/viewer/KuduSpanViewerRunner.java | 38 +++ .../htrace/viewer/KuduSpanViewerServer.java | 63 .../viewer/KuduSpanViewerSpansServlet.java | 96 ++ .../viewer/KuduSpanViewerTracesServlet.java | 88 ++ .../htrace/impl/TestKuduSpanReceiver.java | 247 +++ .../apache/htrace/impl/TestKuduSpanViewer.java | 231 ++ htrace-kudu/src/test/resources/log4j.properties | 25 ++ pom.xml | 1 + 14 files changed, 1680 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a3b503d7/pom.xml -- diff --cc pom.xml index 44e850a,879c8f1..86eab9a --- a/pom.xml +++ b/pom.xml @@@ -35,8 -35,17 +35,9 @@@ language governing permissions and limi htrace-hbase htrace-flume htrace-htraced + htrace-kudu - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - scm:git:http://git-wip-us.apache.org/repos/asf/incubator-htrace.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-htrace.git
[10/12] incubator-htrace git commit: adding rest endpoints for span viewer web app
adding rest endpoints for span viewer web app Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/4b2e213e Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/4b2e213e Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/4b2e213e Branch: refs/heads/master Commit: 4b2e213ea007d3cadc4475ae5833c57ed3843665 Parents: 0cd394f Author: Nisala NirmanaAuthored: Sat Aug 20 00:08:58 2016 +0530 Committer: Nisala Nirmana Committed: Sat Aug 20 00:08:58 2016 +0530 -- htrace-kudu/pom.xml | 12 + .../htrace/viewer/KuduClientConstants.java | 45 +++ .../apache/htrace/viewer/KuduSpanViewer.java| 300 +++ .../htrace/viewer/KuduSpanViewerRunner.java | 38 +++ .../htrace/viewer/KuduSpanViewerServer.java | 63 .../viewer/KuduSpanViewerSpansServlet.java | 96 ++ .../viewer/KuduSpanViewerTracesServlet.java | 88 ++ 7 files changed, 642 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4b2e213e/htrace-kudu/pom.xml -- diff --git a/htrace-kudu/pom.xml b/htrace-kudu/pom.xml index e977bd9..19195e5 100644 --- a/htrace-kudu/pom.xml +++ b/htrace-kudu/pom.xml @@ -33,6 +33,7 @@ language governing permissions and limitations under the License. --> UTF-8 0.9.1 1.3.2 +9.2.13.v20150730 true @@ -156,6 +157,17 @@ language governing permissions and limitations under the License. --> commons-io ${commons.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4b2e213e/htrace-kudu/src/main/java/org/apache/htrace/viewer/KuduClientConstants.java -- diff --git a/htrace-kudu/src/main/java/org/apache/htrace/viewer/KuduClientConstants.java b/htrace-kudu/src/main/java/org/apache/htrace/viewer/KuduClientConstants.java new file mode 100644 index 000..5945ad6 --- /dev/null +++ b/htrace-kudu/src/main/java/org/apache/htrace/viewer/KuduClientConstants.java @@ -0,0 +1,45 @@ +/* + * 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. + */ + +package org.apache.htrace.viewer; + + +public class KuduClientConstants { + static final String KUDU_MASTER_HOST_KEY = "kudu.master.host"; + static final String DEFAULT_KUDU_MASTER_HOST = "127.0.0.1"; + static final String KUDU_MASTER_PORT_KEY = "kudu.master.port"; + static final String DEFAULT_KUDU_MASTER_PORT = "7051"; + static final String DEFAULT_KUDU_SPAN_TABLE = "span"; + static final String DEFAULT_KUDU_SPAN_TIMELINE_ANNOTATION_TABLE = "span.timeline"; + static final String DEFAULT_KUDU_COLUMN_SPAN_TRACE_ID = "trace_id"; + static final String DEFAULT_KUDU_COLUMN_SPAN_START_TIME = "start_time"; + static final String DEFAULT_KUDU_COLUMN_SPAN_STOP_TIME = "stop_time"; + static final String DEFAULT_KUDU_COLUMN_SPAN_PARENT_ID_LOW = "parent_id_low"; + static final String DEFAULT_KUDU_COLUMN_SPAN_PARENT_ID_HIGH = "parent_id_high"; + static final String DEFAULT_KUDU_COLUMN_SPAN_SPAN_ID = "span_id"; + static final String DEFAULT_KUDU_COLUMN_SPAN_DESCRIPTION = "description"; + static final String DEFAULT_KUDU_COLUMN_SPAN_PARENT = "parent"; + static final String DEFAULT_KUDU_COLUMN_TIMELINE_TIME = "time";; + static final String DEFAULT_KUDU_COLUMN_TIMELINE_MESSAGE = "message"; + static final String DEFAULT_KUDU_COLUMN_TIMELINE_SPANID = "spanid"; + static final String KUDU_CLIENT_WORKER_COUNT_KEY = "kudu.client.worker.count"; + static final String KUDU_CLIENT_BOSS_COUNT_KEY = "kudu.client.boss.count"; + static final String KUDU_CLIENT_STATISTICS_ENABLED_KEY = "kudu.client.statistics.enabled"; + static final String KUDU_CLIENT_TIMEOUT_ADMIN_OPERATION_KEY =
[02/12] incubator-htrace git commit: initial span receiver for kudu poc commit
initial span receiver for kudu poc commit Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/6752709e Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/6752709e Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/6752709e Branch: refs/heads/master Commit: 6752709e6d078465f55f88233ec3357328aa6d1e Parents: 1a11d6c Author: nisalanirmanaAuthored: Mon Jun 13 16:45:01 2016 +0530 Committer: nisalanirmana Committed: Mon Jun 13 16:45:01 2016 +0530 -- htrace-kudu/pom.xml | 229 ++ .../apache/htrace/KuduHTraceConfiguration.java | 52 + .../htrace/impl/KuduClientConfiguration.java| 87 + .../org/apache/htrace/impl/KuduConstants.java | 49 + .../apache/htrace/impl/KuduSpanReceiver.java| 261 ++ .../htrace/protobuf/generated/SpanProtos.java | 2241 ++ htrace-kudu/src/main/protobuf/Span.proto| 38 + htrace-kudu/src/test/resources/log4j.properties | 25 + pom.xml |1 + 9 files changed, 2983 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/6752709e/htrace-kudu/pom.xml -- diff --git a/htrace-kudu/pom.xml b/htrace-kudu/pom.xml new file mode 100644 index 000..60db72d --- /dev/null +++ b/htrace-kudu/pom.xml @@ -0,0 +1,229 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + 4.0.0 + + htrace-kudu + jar + + +htrace +org.apache.htrace +4.1.0-incubating-SNAPSHOT +.. + + + htrace-kudu + +htrace-kudu is the tools to send tracing information +to an kudu database for analysis later. + + http://incubator.apache.org/projects/htrace.html + + +UTF-8 +1.0.0-SNAPSHOT +2.6.0-cdh5.4.7 +true + + + + + cdh.repo + Cloudera Repositories + https://repository.cloudera.com/artifactory/cloudera-repos + +false + + + + + + + +${basedir}/src/main + + webapps/** + + + + + +maven-assembly-plugin + + +jar-with-dependencies + + + + +org.apache.rat +apache-rat-plugin + + +org.apache.maven.plugins +maven-source-plugin + + +maven-compiler-plugin + + +org.apache.maven.plugins +maven-shade-plugin + + ${createDependencyReducedPom} + + + +package + + + + org.apache.commons.logging + org.apache.htrace.shaded.commons.logging + + + com.google.protobuf + org.apache.htrace.shaded.com.google.protobuf + + + + + shade + + + + + +maven-javadoc-plugin + + +org.apache.maven.plugins +maven-gpg-plugin + + + +maven-deploy-plugin + + + + + + + + org.apache.htrace + htrace-core4 + ${project.version} + provided + + + org.apache.htrace + htrace-core4 + ${project.version} + tests + test + + + com.google.protobuf + protobuf-java + 2.5.0 + + + + commons-logging + commons-logging + + + junit + junit + test + + + + + org.kududb + kudu-client + ${kudu.version} + + + org.apache.hadoop + hadoop-client + ${hadoop.version} + + + + + + compile-protobuf + + + compile-protobuf + + + + + +org.apache.hadoop +hadoop-maven-plugins +2.7.1 + + ${protobuf.version} + ${protoc.path} + + + +compile-protoc +generate-sources + + protoc + + + +${basedir}/src/main/protobuf + + +${basedir}/src/main/protobuf + + Span.proto + + + ${basedir}/src/main/java/ + + +
[1/2] incubator-htrace git commit: HTRACE-346 NOTICE.txt Zipkin Paragraph removed
Repository: incubator-htrace Updated Branches: refs/heads/master a3b503d7d -> 282ab405c HTRACE-346 NOTICE.txt Zipkin Paragraph removed Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/0d3e2454 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/0d3e2454 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/0d3e2454 Branch: refs/heads/master Commit: 0d3e2454aa44da249a656221983d0f310cabb826 Parents: 5737e65 Author: Nisala NirmanaAuthored: Sun May 8 10:05:07 2016 +0530 Committer: Nisala Nirmana Committed: Sun May 8 10:05:07 2016 +0530 -- NOTICE.txt | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0d3e2454/NOTICE.txt -- diff --git a/NOTICE.txt b/NOTICE.txt index 4c07950..a23ccfc 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -8,6 +8,3 @@ In addition, this product includes software dependencies. See the accompanying LICENSE.txt for a listing of dependencies that are NOT Apache licensed (with pointers to their licensing) -Apache HTrace includes an Apache Thrift connector to Zipkin. Zipkin -is a distributed tracing system that is Apache 2.0 Licensed. -Copyright 2012 Twitter, Inc.
incubator-htrace git commit: Add retirement notice
Repository: incubator-htrace Updated Branches: refs/heads/master 282ab405c -> 04ee0d686 Add retirement notice Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/04ee0d68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/04ee0d68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/04ee0d68 Branch: refs/heads/master Commit: 04ee0d686ccec0c780e922bd7531efdc77061bb1 Parents: 282ab40 Author: Lewis John McGibbneyAuthored: Wed Apr 11 13:33:24 2018 -0700 Committer: Lewis John McGibbney Committed: Wed Apr 11 13:33:24 2018 -0700 -- RETIRED.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/04ee0d68/RETIRED.txt -- diff --git a/RETIRED.txt b/RETIRED.txt new file mode 100644 index 000..70323ce --- /dev/null +++ b/RETIRED.txt @@ -0,0 +1 @@ +This podling has been retired, please see: http://incubator.apache.org/projects/htrace.html
incubator-htrace git commit: Fix broken kudu module
Repository: incubator-htrace Updated Branches: refs/heads/master 04ee0d686 -> 2ce9d3b25 Fix broken kudu module Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/2ce9d3b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/2ce9d3b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/2ce9d3b2 Branch: refs/heads/master Commit: 2ce9d3b25a49d371a7b48e389b56d50a0164c8a0 Parents: 04ee0d6 Author: Lewis John McGibbneyAuthored: Wed Apr 11 13:37:33 2018 -0700 Committer: Lewis John McGibbney Committed: Wed Apr 11 13:37:33 2018 -0700 -- htrace-kudu/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/2ce9d3b2/htrace-kudu/pom.xml -- diff --git a/htrace-kudu/pom.xml b/htrace-kudu/pom.xml index 19195e5..0b7a15b 100644 --- a/htrace-kudu/pom.xml +++ b/htrace-kudu/pom.xml @@ -18,7 +18,7 @@ language governing permissions and limitations under the License. --> htrace org.apache.htrace -4.2.0-incubating-SNAPSHOT +4.3.0-incubating-SNAPSHOT ..