Repository: incubator-htrace Updated Branches: refs/heads/master 98aecf878 -> 959a6ef03
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-core/src/test/java/org/apache/htrace/impl/TestProcessId.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/test/java/org/apache/htrace/impl/TestProcessId.java b/htrace-core/src/test/java/org/apache/htrace/impl/TestProcessId.java deleted file mode 100644 index 9e5f6b9..0000000 --- a/htrace-core/src/test/java/org/apache/htrace/impl/TestProcessId.java +++ /dev/null @@ -1,47 +0,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. - */ -package org.apache.htrace.impl; - -import java.io.IOException; -import org.junit.Test; -import static org.junit.Assert.assertEquals; - -public class TestProcessId { - private void testProcessIdImpl(String expected, String fmt) { - assertEquals(expected, new ProcessId(fmt).get()); - } - - @Test - public void testSimpleProcessIds() { - testProcessIdImpl("abc", "abc"); - testProcessIdImpl("abc", "a\\bc"); - testProcessIdImpl("abc", "ab\\c"); - testProcessIdImpl("abc", "\\a\\b\\c"); - testProcessIdImpl("a\\bc", "a\\\\bc"); - } - - @Test - public void testSubstitutionVariables() throws IOException { - testProcessIdImpl(ProcessId.getProcessName(), "${pname}"); - testProcessIdImpl("my." + ProcessId.getProcessName(), "my.${pname}"); - testProcessIdImpl(ProcessId.getBestIpString() + ".str", "${ip}.str"); - testProcessIdImpl("${pname}", "\\${pname}"); - testProcessIdImpl("$cash$money{}", "$cash$money{}"); - testProcessIdImpl("Foo." + Long.valueOf(ProcessId.getOsPid()).toString(), - "Foo.${pid}"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-core/src/test/java/org/apache/htrace/impl/TestTracerId.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/test/java/org/apache/htrace/impl/TestTracerId.java b/htrace-core/src/test/java/org/apache/htrace/impl/TestTracerId.java new file mode 100644 index 0000000..271d082 --- /dev/null +++ b/htrace-core/src/test/java/org/apache/htrace/impl/TestTracerId.java @@ -0,0 +1,47 @@ +/* + * 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.impl; + +import java.io.IOException; +import org.junit.Test; +import static org.junit.Assert.assertEquals; + +public class TestTracerId { + private void testTracerIdImpl(String expected, String fmt) { + assertEquals(expected, new TracerId(fmt).get()); + } + + @Test + public void testSimpleTracerIds() { + testTracerIdImpl("abc", "abc"); + testTracerIdImpl("abc", "a\\bc"); + testTracerIdImpl("abc", "ab\\c"); + testTracerIdImpl("abc", "\\a\\b\\c"); + testTracerIdImpl("a\\bc", "a\\\\bc"); + } + + @Test + public void testSubstitutionVariables() throws IOException { + testTracerIdImpl(TracerId.getProcessName(), "${pname}"); + testTracerIdImpl("my." + TracerId.getProcessName(), "my.${pname}"); + testTracerIdImpl(TracerId.getBestIpString() + ".str", "${ip}.str"); + testTracerIdImpl("${pname}", "\\${pname}"); + testTracerIdImpl("$cash$money{}", "$cash$money{}"); + testTracerIdImpl("Foo." + Long.valueOf(TracerId.getOsPid()).toString(), + "Foo.${pid}"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java b/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java index baa4fa1..a1352ab 100644 --- a/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java +++ b/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java @@ -89,12 +89,12 @@ public class FlumeSpanReceiver implements SpanReceiver { private int maxSpanBatchSize; private String flumeHostName; private int flumePort; - private final ProcessId processId; + private final TracerId tracerId; public FlumeSpanReceiver(HTraceConfiguration conf) { this.queue = new ArrayBlockingQueue<Span>(1000); this.tf = new SimpleThreadFactory(); - this.processId = new ProcessId(conf); + this.tracerId = new TracerId(conf); configure(conf); } @@ -175,7 +175,7 @@ public class FlumeSpanReceiver implements SpanReceiver { Map<String, String> headers = new HashMap<String, String>(); headers.put("TraceId", Long.toString(span.getTraceId())); headers.put("SpanId", Long.toString(span.getSpanId())); - headers.put("ProcessId", span.getProcessId()); + headers.put("TracerId", span.getTracerId()); headers.put("Description", span.getDescription()); String body = span.toJson(); @@ -274,8 +274,8 @@ public class FlumeSpanReceiver implements SpanReceiver { public void receiveSpan(Span span) { if (running.get()) { try { - if (span.getProcessId().isEmpty()) { - span.setProcessId(processId.get()); + if (span.getTracerId().isEmpty()) { + span.setTracerId(tracerId.get()); } this.queue.add(span); } catch (IllegalStateException e) { http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-flume/src/test/java/org/apache/htrace/impl/TestFlumeSpanReceiver.java ---------------------------------------------------------------------- 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 b7f8863..6743c85 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 @@ -44,7 +44,7 @@ public class TestFlumeSpanReceiver { description("root"). traceId(1). spanId(100). - processId("test"). + tracerId("test"). begin(System.currentTimeMillis()). build(); Span innerOne = rootSpan.child("Some good work"); http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-hbase/src/main/java/org/apache/htrace/impl/HBaseSpanReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-hbase/src/main/java/org/apache/htrace/impl/HBaseSpanReceiver.java b/htrace-hbase/src/main/java/org/apache/htrace/impl/HBaseSpanReceiver.java index 2faf4bb..beb96b5 100644 --- a/htrace-hbase/src/main/java/org/apache/htrace/impl/HBaseSpanReceiver.java +++ b/htrace-hbase/src/main/java/org/apache/htrace/impl/HBaseSpanReceiver.java @@ -126,7 +126,7 @@ public class HBaseSpanReceiver implements SpanReceiver { private final byte[] cf; private final byte[] icf; private final int maxSpanBatchSize; - private final ProcessId processId; + private final TracerId tracerId; public HBaseSpanReceiver(HTraceConfiguration conf) { this.queue = new ArrayBlockingQueue<Span>(1000); @@ -154,7 +154,7 @@ public class HBaseSpanReceiver implements SpanReceiver { for (int i = 0; i < numThreads; i++) { this.service.submit(new WriteSpanRunnable()); } - this.processId = new ProcessId(conf); + this.tracerId = new TracerId(conf); } private class WriteSpanRunnable implements Runnable { @@ -212,7 +212,7 @@ public class HBaseSpanReceiver implements SpanReceiver { .setStart(span.getStartTimeMillis()) .setStop(span.getStopTimeMillis()) .setSpanId(span.getSpanId()) - .setProcessId(span.getProcessId()) + .setProcessId(span.getTracerId()) .setDescription(span.getDescription()); if (span.getParents().length == 0) { @@ -333,8 +333,8 @@ public class HBaseSpanReceiver implements SpanReceiver { public void receiveSpan(Span span) { if (running.get()) { try { - if (span.getProcessId().isEmpty()) { - span.setProcessId(processId.get()); + if (span.getTracerId().isEmpty()) { + span.setTracerId(tracerId.get()); } this.queue.add(span); } catch (IllegalStateException e) { http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/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 0f8eaf5..5027891 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 @@ -176,12 +176,12 @@ public class TestHBaseSpanReceiver { } @Override - public String getProcessId() { + public String getTracerId() { return span.getProcessId(); } @Override - public void setProcessId(String processId) { + public void setTracerId(String tracerId) { throw new UnsupportedOperationException(); } @@ -192,9 +192,9 @@ public class TestHBaseSpanReceiver { @Override public String toString() { - return String.format("Span{Id:0x%16x,parentId:0x%16x,pid:%s,desc:%s}", + return String.format("Span{Id:0x%16x,parentId:0x%16x,trid:%s,desc:%s}", getSpanId(), span.getParentId(), - getProcessId(), getDescription()); + getTracerId(), getDescription()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/client/client.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/client/client.go b/htrace-htraced/go/src/org/apache/htrace/client/client.go index 6a62e81..ef827e8 100644 --- a/htrace-htraced/go/src/org/apache/htrace/client/client.go +++ b/htrace-htraced/go/src/org/apache/htrace/client/client.go @@ -120,8 +120,8 @@ func (hcl *Client) writeSpansHttp(req *common.WriteSpansReq) error { } } customHeaders := make(map[string]string) - if req.DefaultPid != "" { - customHeaders["htrace-pid"] = req.DefaultPid + if req.DefaultTrid != "" { + customHeaders["htrace-trid"] = req.DefaultTrid } _, _, err = hcl.makeRestRequest("POST", "writeSpans", &w, customHeaders) http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/common/query.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/common/query.go b/htrace-htraced/go/src/org/apache/htrace/common/query.go index aae034c..7a9e523 100644 --- a/htrace-htraced/go/src/org/apache/htrace/common/query.go +++ b/htrace-htraced/go/src/org/apache/htrace/common/query.go @@ -81,7 +81,7 @@ const ( BEGIN_TIME Field = "begin" END_TIME Field = "end" DURATION Field = "duration" - PROCESS_ID Field = "processid" + TRACER_ID Field = "tracerid" ) func (field Field) IsValid() bool { @@ -96,7 +96,7 @@ func (field Field) IsValid() bool { func ValidFields() []Field { return []Field{SPAN_ID, DESCRIPTION, BEGIN_TIME, END_TIME, - DURATION, PROCESS_ID} + DURATION, TRACER_ID} } type Predicate struct { http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/common/rpc.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/common/rpc.go b/htrace-htraced/go/src/org/apache/htrace/common/rpc.go index fe50a44..28521a5 100644 --- a/htrace-htraced/go/src/org/apache/htrace/common/rpc.go +++ b/htrace-htraced/go/src/org/apache/htrace/common/rpc.go @@ -38,8 +38,8 @@ const MAX_HRPC_BODY_LENGTH = 64 * 1024 * 1024 // A request to write spans to htraced. type WriteSpansReq struct { - DefaultPid string - Spans []*Span + DefaultTrid string + Spans []*Span } // A response to a WriteSpansReq http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/common/span.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/common/span.go b/htrace-htraced/go/src/org/apache/htrace/common/span.go index b276844..720c4cd 100644 --- a/htrace-htraced/go/src/org/apache/htrace/common/span.go +++ b/htrace-htraced/go/src/org/apache/htrace/common/span.go @@ -113,7 +113,7 @@ type SpanData struct { TraceId SpanId `json:"i"` Parents []SpanId `json:"p"` Info TraceInfoMap `json:"n,omitempty"` - ProcessId string `json:"r"` + TracerId string `json:"r"` TimelineAnnotations []TimelineAnnotation `json:"t,omitempty"` } http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/common/span_test.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/common/span_test.go b/htrace-htraced/go/src/org/apache/htrace/common/span_test.go index f218b3a..e3b44fe 100644 --- a/htrace-htraced/go/src/org/apache/htrace/common/span_test.go +++ b/htrace-htraced/go/src/org/apache/htrace/common/span_test.go @@ -32,10 +32,10 @@ func TestSpanToJson(t *testing.T) { Description: "getFileDescriptors", TraceId: 999, Parents: []SpanId{}, - ProcessId: "testProcessId", + TracerId: "testTracerId", }} ExpectStrEqual(t, - `{"s":"2000000000000000","b":123,"e":456,"d":"getFileDescriptors","i":"00000000000003e7","p":[],"r":"testProcessId"}`, + `{"s":"2000000000000000","b":123,"e":456,"d":"getFileDescriptors","i":"00000000000003e7","p":[],"r":"testTracerId"}`, string(span.ToJson())) } @@ -48,7 +48,7 @@ func TestAnnotatedSpanToJson(t *testing.T) { Description: "getFileDescriptors2", TraceId: 999, Parents: []SpanId{}, - ProcessId: "testAnnotatedProcessId", + TracerId: "testAnnotatedTracerId", TimelineAnnotations: []TimelineAnnotation{ TimelineAnnotation{ Time: 7777, @@ -61,6 +61,6 @@ func TestAnnotatedSpanToJson(t *testing.T) { }, }} ExpectStrEqual(t, - `{"s":"121f2e036d442000","b":1234,"e":4567,"d":"getFileDescriptors2","i":"00000000000003e7","p":[],"r":"testAnnotatedProcessId","t":[{"t":7777,"m":"contactedServer"},{"t":8888,"m":"passedFd"}]}`, + `{"s":"121f2e036d442000","b":1234,"e":4567,"d":"getFileDescriptors2","i":"00000000000003e7","p":[],"r":"testAnnotatedTracerId","t":[{"t":7777,"m":"contactedServer"},{"t":8888,"m":"passedFd"}]}`, string(span.ToJson())) } http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/htrace/file_test.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/file_test.go b/htrace-htraced/go/src/org/apache/htrace/htrace/file_test.go index b6f9cac..6fd6789 100644 --- a/htrace-htraced/go/src/org/apache/htrace/htrace/file_test.go +++ b/htrace-htraced/go/src/org/apache/htrace/htrace/file_test.go @@ -135,7 +135,7 @@ func TestReadSpans(t *testing.T) { Begin: 1424736225037, End: 1424736225901, Description: "ClientNamenodeProtocol#getFileInfo", - ProcessId: "FsShell", + TracerId: "FsShell", Parents: []common.SpanId{test.SpanId("60538dfb4df91418")}, }, }, @@ -146,7 +146,7 @@ func TestReadSpans(t *testing.T) { Begin: 1424736224969, End: 1424736225960, Description: "getFileInfo", - ProcessId: "FsShell", + TracerId: "FsShell", Parents: []common.SpanId{}, Info: common.TraceInfoMap{ "path": "/", http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/htrace/graph_test.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/graph_test.go b/htrace-htraced/go/src/org/apache/htrace/htrace/graph_test.go index 8698a98..e614cec 100644 --- a/htrace-htraced/go/src/org/apache/htrace/htrace/graph_test.go +++ b/htrace-htraced/go/src/org/apache/htrace/htrace/graph_test.go @@ -35,7 +35,7 @@ func TestSpansToDot(t *testing.T) { Begin: 1424813349020, End: 1424813349134, Description: "newDFSInputStream", - ProcessId: "FsShell", + TracerId: "FsShell", Parents: []common.SpanId{}, Info: common.TraceInfoMap{ "path": "/", @@ -49,7 +49,7 @@ func TestSpansToDot(t *testing.T) { Begin: 1424813349025, End: 1424813349133, Description: "getBlockLocations", - ProcessId: "FsShell", + TracerId: "FsShell", Parents: []common.SpanId{test.SpanId("6af3cc058e5d829d")}, }, }, @@ -60,7 +60,7 @@ func TestSpansToDot(t *testing.T) { Begin: 1424813349027, End: 1424813349073, Description: "ClientNamenodeProtocol#getBlockLocations", - ProcessId: "FsShell", + TracerId: "FsShell", Parents: []common.SpanId{test.SpanId("75d16cc5b2c07d8a")}, }, }, http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/htraced/datastore.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/htraced/datastore.go b/htrace-htraced/go/src/org/apache/htrace/htraced/datastore.go index 35c7dad..48f02aa 100644 --- a/htrace-htraced/go/src/org/apache/htrace/htraced/datastore.go +++ b/htrace-htraced/go/src/org/apache/htrace/htraced/datastore.go @@ -573,8 +573,8 @@ func loadPredicateData(pred *common.Predicate) (*predicateData, error) { } p.uintKey = s2u64(v) break - case common.PROCESS_ID: - // Any string is valid for a process ID. + case common.TRACER_ID: + // Any string is valid for a tracer ID. p.strKey = pred.Val break default: @@ -638,8 +638,8 @@ func (pred *predicateData) extractRelevantSpanData(span *common.Span) (uint64, s return s2u64(span.End), "" case common.DURATION: return s2u64(span.Duration()), "" - case common.PROCESS_ID: - return 0, span.ProcessId + case common.TRACER_ID: + return 0, span.TracerId default: panic(fmt.Sprintf("Field type %s isn't a 64-bit integer.", pred.Field)) } http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/htraced/datastore_test.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/htraced/datastore_test.go b/htrace-htraced/go/src/org/apache/htrace/htraced/datastore_test.go index 4696547..0c122fd 100644 --- a/htrace-htraced/go/src/org/apache/htrace/htraced/datastore_test.go +++ b/htrace-htraced/go/src/org/apache/htrace/htraced/datastore_test.go @@ -52,7 +52,7 @@ var SIMPLE_TEST_SPANS []common.Span = []common.Span{ Description: "getFileDescriptors", TraceId: 999, Parents: []common.SpanId{}, - ProcessId: "firstd", + TracerId: "firstd", }}, common.Span{Id: 2, SpanData: common.SpanData{ @@ -61,7 +61,7 @@ var SIMPLE_TEST_SPANS []common.Span = []common.Span{ Description: "openFd", TraceId: 999, Parents: []common.SpanId{1}, - ProcessId: "secondd", + TracerId: "secondd", }}, common.Span{Id: 3, SpanData: common.SpanData{ @@ -70,7 +70,7 @@ var SIMPLE_TEST_SPANS []common.Span = []common.Span{ Description: "passFd", TraceId: 999, Parents: []common.SpanId{1}, - ProcessId: "thirdd", + TracerId: "thirdd", }}, } http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/htraced/hrpc.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/htraced/hrpc.go b/htrace-htraced/go/src/org/apache/htrace/htraced/hrpc.go index a53380e..71b9625 100644 --- a/htrace-htraced/go/src/org/apache/htrace/htraced/hrpc.go +++ b/htrace-htraced/go/src/org/apache/htrace/htraced/hrpc.go @@ -190,11 +190,11 @@ func (cdc *HrpcServerCodec) Close() error { func (hand *HrpcHandler) WriteSpans(req *common.WriteSpansReq, resp *common.WriteSpansResp) (err error) { hand.lg.Debugf("hrpc writeSpansHandler: received %d span(s). "+ - "defaultPid = %s\n", len(req.Spans), req.DefaultPid) + "defaultTrid = %s\n", len(req.Spans), req.DefaultTrid) for i := range req.Spans { span := req.Spans[i] - if span.ProcessId == "" { - span.ProcessId = req.DefaultPid + if span.TracerId == "" { + span.TracerId = req.DefaultTrid } if hand.lg.TraceEnabled() { hand.lg.Tracef("writing span %d: %s\n", i, span.ToJson()) http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go b/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go index ee62642..cd90038 100644 --- a/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go +++ b/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go @@ -162,7 +162,7 @@ func (hand *writeSpansHandler) ServeHTTP(w http.ResponseWriter, req *http.Reques setResponseHeaders(w.Header()) dec := json.NewDecoder(req.Body) spans := make([]*common.Span, 0, 32) - defaultPid := req.Header.Get("htrace-pid") + defaultTrid := req.Header.Get("htrace-trid") for { var span common.Span err := dec.Decode(&span) @@ -174,13 +174,13 @@ func (hand *writeSpansHandler) ServeHTTP(w http.ResponseWriter, req *http.Reques } break } - if span.ProcessId == "" { - span.ProcessId = defaultPid + if span.TracerId == "" { + span.TracerId = defaultTrid } spans = append(spans, &span) } - hand.lg.Debugf("writeSpansHandler: received %d span(s). defaultPid = %s\n", - len(spans), defaultPid) + hand.lg.Debugf("writeSpansHandler: received %d span(s). defaultTrid = %s\n", + len(spans), defaultTrid) for spanIdx := range spans { if hand.lg.DebugEnabled() { hand.lg.Debugf("writing span %s\n", spans[spanIdx].ToJson()) http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/go/src/org/apache/htrace/test/random.go ---------------------------------------------------------------------- diff --git a/htrace-htraced/go/src/org/apache/htrace/test/random.go b/htrace-htraced/go/src/org/apache/htrace/test/random.go index d10e2f9..96a3e8b 100644 --- a/htrace-htraced/go/src/org/apache/htrace/test/random.go +++ b/htrace-htraced/go/src/org/apache/htrace/test/random.go @@ -67,6 +67,6 @@ func NewRandomSpan(rnd *rand.Rand, potentialParents []*common.Span) *common.Span Description: "getFileDescriptors", TraceId: common.SpanId(NonZeroRand64(rnd)), Parents: parents, - ProcessId: fmt.Sprintf("process%d", NonZeroRand32(rnd)), + TracerId: fmt.Sprintf("tracer%d", NonZeroRand32(rnd)), }} } http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java b/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java index 5a4daaf..bd8764b 100644 --- a/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java +++ b/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java @@ -172,7 +172,7 @@ public class HTracedRESTReceiver implements SpanReceiver { /** * The process ID to use for all spans. */ - private final ProcessId processId; + private final TracerId tracerId; /** * Create an HttpClient instance. @@ -226,7 +226,7 @@ public class HTracedRESTReceiver implements SpanReceiver { capacity + ", url=" + url + ", periodInMs=" + periodInMs + ", maxToSendAtATime=" + maxToSendAtATime); } - processId = new ProcessId(conf); + tracerId = new TracerId(conf); } /** @@ -322,7 +322,7 @@ public class HTracedRESTReceiver implements SpanReceiver { try { Request request = httpClient.newRequest(url).method(HttpMethod.POST); request.header(HttpHeader.CONTENT_TYPE, "application/json"); - request.header("htrace-pid", processId.get()); + request.header("htrace-trid", tracerId.get()); StringBuilder bld = new StringBuilder(); for (Span span : spanBuf) { bld.append(span.toJson()); http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java index a6faa02..35d1f09 100644 --- a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java +++ b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java @@ -65,7 +65,7 @@ public class TestHTracedRESTReceiver { */ private final class TestHTraceConfiguration extends HTraceConfiguration { private final URL restServerUrl; - final static String PROCESS_ID = "TestHTracedRESTReceiver"; + final static String TRACER_ID = "TestHTracedRESTReceiver"; public TestHTraceConfiguration(final URL restServerUrl) { this.restServerUrl = restServerUrl; @@ -80,8 +80,8 @@ public class TestHTracedRESTReceiver { public String get(String key, String defaultValue) { if (key.equals(HTracedRESTReceiver.HTRACED_REST_URL_KEY)) { return this.restServerUrl.toString(); - } else if (key.equals(ProcessId.PROCESS_ID_KEY)) { - return PROCESS_ID; + } else if (key.equals(TracerId.TRACER_ID_KEY)) { + return TRACER_ID; } return defaultValue; } @@ -129,7 +129,7 @@ public class TestHTracedRESTReceiver { parents(new long[]{1L}). spanId(i); if (i == NUM_SPANS - 1) { - builder.processId("specialPid"); + builder.tracerId("specialTrid"); } spans[i] = builder.build(); } @@ -161,14 +161,14 @@ public class TestHTracedRESTReceiver { LOG.info("Got " + content + " for span " + i); MilliSpan dspan = MilliSpan.fromJson(content); assertEquals((long)i, dspan.getSpanId()); - // Every span should have the process ID we set in the + // Every span should have the tracer ID we set in the // configuration... except for the last span, which had // a custom value set. if (i == NUM_SPANS - 1) { - assertEquals("specialPid", dspan.getProcessId()); + assertEquals("specialTrid", dspan.getTracerId()); } else { - assertEquals(TestHTraceConfiguration.PROCESS_ID, - dspan.getProcessId()); + assertEquals(TestHTraceConfiguration.TRACER_ID, + dspan.getTracerId()); } } return true; http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-webapp/src/main/web/app/span.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/span.js b/htrace-webapp/src/main/web/app/span.js index d29f020..b56a2c9 100644 --- a/htrace-webapp/src/main/web/app/span.js +++ b/htrace-webapp/src/main/web/app/span.js @@ -83,7 +83,7 @@ htrace.Span = Backbone.Model.extend({ var span = {}; this.set("spanId", response.s ? response.s : htrace.INVALID_SPAN_ID); this.set("traceId", response.i ? response.i : htrace.INVALID_SPAN_ID); - this.set("processId", response.r ? response.r : ""); + this.set("tracerId", response.r ? response.r : ""); this.set("parents", response.p ? response.p : []); this.set("description", response.d ? response.d : ""); this.set("begin", response.b ? parseInt(response.b, 10) : 0); @@ -125,8 +125,8 @@ htrace.Span = Backbone.Model.extend({ if (!(this.get("traceId") === htrace.INVALID_SPAN_ID)) { obj.i = this.get("traceId"); } - if (!(this.get("processId") === "")) { - obj.r = this.get("processId"); + if (!(this.get("tracerId") === "")) { + obj.r = this.get("tracerId"); } if (this.get("parents").length > 0) { obj.p = this.get("parents"); http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-webapp/src/main/web/app/span_widget.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/span_widget.js b/htrace-webapp/src/main/web/app/span_widget.js index 1ef402c..50bea91 100644 --- a/htrace-webapp/src/main/web/app/span_widget.js +++ b/htrace-webapp/src/main/web/app/span_widget.js @@ -106,7 +106,7 @@ htrace.showSpanDetails = function(span) { htrace.SpanWidget = function(params) { this.draw = function() { this.drawBackground(); - this.drawProcessId(); + this.drawTracerId(); this.drawDescription(); }; @@ -123,14 +123,14 @@ htrace.SpanWidget = function(params) { } // Draw process ID text. - this.drawProcessId = function() { + this.drawTracerId = function() { this.ctx.save(); this.ctx.fillStyle="#000000"; this.ctx.font = (this.ySize - 2) + "px sans-serif"; this.ctx.beginPath(); this.ctx.rect(this.x0, this.y0, this.xB - this.x0, this.ySize); this.ctx.clip(); - this.ctx.fillText(this.span.get('processId'), this.x0, this.yF - 4); + this.ctx.fillText(this.span.get('tracerId'), this.x0, this.yF - 4); this.ctx.restore(); }; http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java b/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java index c0bacd7..8326100 100644 --- a/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java +++ b/htrace-zipkin/src/main/java/org/apache/htrace/impl/ZipkinSpanReceiver.java @@ -140,7 +140,7 @@ public class ZipkinSpanReceiver implements SpanReceiver { } }; - private final ProcessId processId; + private final TracerId tracerId; //////////////////// /// Variables that will change on each call to configure() @@ -154,7 +154,7 @@ public class ZipkinSpanReceiver implements SpanReceiver { public ZipkinSpanReceiver(HTraceConfiguration conf) { this.queue = new ArrayBlockingQueue<Span>(1000); this.protocolFactory = new TBinaryProtocol.Factory(); - this.processId = new ProcessId(conf); + this.tracerId = new TracerId(conf); configure(conf); } @@ -374,8 +374,8 @@ public class ZipkinSpanReceiver implements SpanReceiver { public void receiveSpan(Span span) { if (running.get()) { try { - if (span.getProcessId().isEmpty()) { - span.setProcessId(processId.get()); + if (span.getTracerId().isEmpty()) { + span.setTracerId(tracerId.get()); } this.queue.add(span); } catch (IllegalStateException e) { http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java ---------------------------------------------------------------------- diff --git a/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java b/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java index 4154d92..f41ec10 100644 --- a/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java +++ b/htrace-zipkin/src/main/java/org/apache/htrace/zipkin/HTraceToZipkinConverter.java @@ -106,7 +106,7 @@ public class HTraceToZipkinConverter { */ public Span convert(org.apache.htrace.Span hTraceSpan) { Span zipkinSpan = new Span(); - String serviceName = hTraceSpan.getProcessId().toLowerCase(); + String serviceName = hTraceSpan.getTracerId().toLowerCase(); Endpoint ep = new Endpoint(ipv4Address, (short) getPort(serviceName), serviceName); List<Annotation> annotationList = createZipkinAnnotations(hTraceSpan, ep); List<BinaryAnnotation> binaryAnnotationList = createZipkinBinaryAnnotations(hTraceSpan, ep); http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/959a6ef0/htrace-zipkin/src/test/java/org/apache/htrace/TestHTraceSpanToZipkinSpan.java ---------------------------------------------------------------------- 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 a6790f5..915bb89 100644 --- a/htrace-zipkin/src/test/java/org/apache/htrace/TestHTraceSpanToZipkinSpan.java +++ b/htrace-zipkin/src/test/java/org/apache/htrace/TestHTraceSpanToZipkinSpan.java @@ -51,7 +51,7 @@ public class TestHTraceSpanToZipkinSpan { traceId(1). parents(new long[] { } ). spanId(100). - processId("test"). + tracerId("test"). begin(System.currentTimeMillis()). build(); Span innerOne = rootSpan.child("Some good work"); @@ -76,7 +76,7 @@ public class TestHTraceSpanToZipkinSpan { long startTime = System.currentTimeMillis() * 1000; Span ms = new MilliSpan.Builder(). description(traceName).traceId(1).parents(new long[] { }). - spanId(2).processId(traceName).begin(System.currentTimeMillis()). + spanId(2).tracerId(traceName).begin(System.currentTimeMillis()). build(); Thread.sleep(500); @@ -118,7 +118,7 @@ public class TestHTraceSpanToZipkinSpan { public void testHTraceDefaultPort() throws IOException { MilliSpan ms = new MilliSpan.Builder().description("test"). traceId(1).parents(new long[] { 2 }). - spanId(3).processId("hmaster"). + spanId(3).tracerId("hmaster"). begin(System.currentTimeMillis()).build(); com.twitter.zipkin.gen.Span zs = new HTraceToZipkinConverter(12345, (short) -1).convert(ms); for (com.twitter.zipkin.gen.Annotation annotation:zs.getAnnotations()) { @@ -128,7 +128,7 @@ public class TestHTraceSpanToZipkinSpan { // make sure it's all lower cased ms = new MilliSpan.Builder().description("test").traceId(1). parents(new long[] {2}).spanId(3). - processId("HregIonServer"). + tracerId("HregIonServer"). begin(System.currentTimeMillis()).build(); zs = new HTraceToZipkinConverter(12345, (short) -1).convert(ms); for (com.twitter.zipkin.gen.Annotation annotation:zs.getAnnotations()) {
