Define import path in preparation of repository move to jaegertracing (…

…jaegertracing#408)

.travis.yml

@@ -1,6 +1,7 @@
 sudo: required
 
 language: go
+go_import_path: github.com/uber/jaeger
 
 dist: trusty
 

crossdock/services/tracehandler.go

@@ -129,10 +129,7 @@ func (h *TraceHandler) runTest(service string, request *traceRequest, tFunc test
 	if err != nil {
 		return err
 	}
-	if err := vFunc(request, traces); err != nil {
-		return err
-	}
-	return nil
+	return vFunc(request, traces)
 }
 
 func (h *TraceHandler) adaptiveSamplingTest(service string, request *traceRequest) ([]*ui.Trace, error) {

model/converter/thrift/zipkin/to_domain.go

@@ -267,10 +267,7 @@ func (td toDomain) transformBinaryAnnotation(binaryAnnotation *zipkincore.Binary
 
 func bytesToNumber(b []byte, number interface{}) error {
 	buf := bytes.NewReader(b)
-	if err := binary.Read(buf, binary.BigEndian, number); err != nil {
-		return err
-	}
-	return nil
+	return binary.Read(buf, binary.BigEndian, number)
 }
 
 func (td toDomain) getLogs(annotations []*zipkincore.Annotation) []model.Log {

plugin/storage/es/dependencystore/storage.go

@@ -59,10 +59,7 @@ func (s *DependencyStore) WriteDependencies(ts time.Time, dependencies []model.D
 	if err := s.createIndex(indexName); err != nil {
 		return err
 	}
-	if err := s.writeDependencies(indexName, ts, dependencies); err != nil {
-		return err
-	}
-	return nil
+	return s.writeDependencies(indexName, ts, dependencies)
 }
 
 func (s *DependencyStore) createIndex(indexName string) error {

plugin/storage/es/spanstore/reader_test.go

@@ -146,7 +146,7 @@ func TestSpanReader_GetTraceQueryError(t *testing.T) {
 
 func TestSpanReader_GetTraceNilHitsError(t *testing.T) {
 	withSpanReader(func(r *spanReaderTest) {
-		hits := make([]*elastic.SearchHit, 0)
+		var hits []*elastic.SearchHit
 		searchHits := &elastic.SearchHits{Hits: hits}
 
 		mockSearchService(r).Return(&elastic.SearchResult{Hits: searchHits}, nil)

plugin/storage/es/spanstore/writer.go

@@ -117,10 +117,7 @@ func (s *SpanWriter) WriteSpan(span *model.Span) error {
 	if err := s.createIndex(spanIndexName, spanMapping, jsonSpan); err != nil {
 		return err
 	}
-	if err := s.writeSpan(spanIndexName, jsonSpan); err != nil {
-		return err
-	}
-	return nil
+	return s.writeSpan(spanIndexName, jsonSpan)
 }
 
 func indexNames(span *model.Span) (string, string) {