Change package from uber to jaegertracing

Signed-off-by: Gary Brown <gary@brownuk.com>
jaegertracing · Nov 10, 2017 · 9631dc8 · 9631dc8
1 parent a2ed9b8
commit 9631dc8
Show file tree

Hide file tree

Showing 215 changed files with 505 additions and 505 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: required
 
 language: go
-go_import_path: github.com/uber/jaeger
+go_import_path: github.com/jaegertracing/jaeger
 
 dist: trusty
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PROJECT_ROOT=github.com/uber/jaeger
+PROJECT_ROOT=github.com/jaegertracing/jaeger
 TOP_PKGS := $(shell glide novendor | grep -v -e ./thrift-gen/... -e ./examples/... -e ./scripts/...)
 
 # all .go files that don't exist in hidden directories
@@ -23,7 +23,7 @@ MKDOCS_VIRTUAL_ENV=.mkdocs-virtual-env
 GIT_SHA=$(shell git rev-parse HEAD)
 GIT_CLOSEST_TAG=$(shell git describe --abbrev=0 --tags)
 DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
-BUILD_INFO_IMPORT_PATH=github.com/uber/jaeger/pkg/version
+BUILD_INFO_IMPORT_PATH=github.com/jaegertracing/jaeger/pkg/version
 BUILD_INFO=-ldflags "-X $(BUILD_INFO_IMPORT_PATH).commitSHA=$(GIT_SHA) -X $(BUILD_INFO_IMPORT_PATH).latestVersion=$(GIT_CLOSEST_TAG) -X $(BUILD_INFO_IMPORT_PATH).date=$(DATE)"
 
 SED=sed

diff --git a/cmd/agent/app/agent.go b/cmd/agent/app/agent.go
@@ -21,7 +21,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/uber/jaeger/cmd/agent/app/processors"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/processors"
 )
 
 // Agent is a composition of all services / components

diff --git a/cmd/agent/app/builder.go b/cmd/agent/app/builder.go
@@ -24,15 +24,15 @@ import (
 	"github.com/uber/tchannel-go"
 	"go.uber.org/zap"
 
-	"github.com/uber/jaeger/cmd/agent/app/httpserver"
-	"github.com/uber/jaeger/cmd/agent/app/processors"
-	"github.com/uber/jaeger/cmd/agent/app/reporter"
-	tchreporter "github.com/uber/jaeger/cmd/agent/app/reporter/tchannel"
-	"github.com/uber/jaeger/cmd/agent/app/servers"
-	"github.com/uber/jaeger/cmd/agent/app/servers/thriftudp"
-	jmetrics "github.com/uber/jaeger/pkg/metrics"
-	zipkinThrift "github.com/uber/jaeger/thrift-gen/agent"
-	jaegerThrift "github.com/uber/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/httpserver"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/processors"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
+	tchreporter "github.com/jaegertracing/jaeger/cmd/agent/app/reporter/tchannel"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/servers"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
+	jmetrics "github.com/jaegertracing/jaeger/pkg/metrics"
+	zipkinThrift "github.com/jaegertracing/jaeger/thrift-gen/agent"
+	jaegerThrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
 )
 
 const (

diff --git a/cmd/agent/app/builder_test.go b/cmd/agent/app/builder_test.go
@@ -25,8 +25,8 @@ import (
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
 
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 var yamlConfig = `

diff --git a/cmd/agent/app/httpserver/collector_proxy.go b/cmd/agent/app/httpserver/collector_proxy.go
@@ -21,8 +21,8 @@ import (
 	"github.com/uber/tchannel-go"
 	"github.com/uber/tchannel-go/thrift"
 
-	"github.com/uber/jaeger/thrift-gen/baggage"
-	"github.com/uber/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger/thrift-gen/baggage"
+	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
 )
 
 type collectorProxy struct {

diff --git a/cmd/agent/app/httpserver/collector_proxy_test.go b/cmd/agent/app/httpserver/collector_proxy_test.go
@@ -25,9 +25,9 @@ import (
 	mTestutils "github.com/uber/jaeger-lib/metrics/testutils"
 	"github.com/uber/tchannel-go/thrift"
 
-	"github.com/uber/jaeger/cmd/agent/app/testutils"
-	"github.com/uber/jaeger/thrift-gen/baggage"
-	"github.com/uber/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
+	"github.com/jaegertracing/jaeger/thrift-gen/baggage"
+	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
 )
 
 func TestCollectorProxy(t *testing.T) {

diff --git a/cmd/agent/app/httpserver/manager.go b/cmd/agent/app/httpserver/manager.go
@@ -15,8 +15,8 @@
 package httpserver
 
 import (
-	"github.com/uber/jaeger/thrift-gen/baggage"
-	"github.com/uber/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger/thrift-gen/baggage"
+	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
 )
 
 // ClientConfigManager decides:

diff --git a/cmd/agent/app/httpserver/server.go b/cmd/agent/app/httpserver/server.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/uber/jaeger-lib/metrics"
 
-	tSampling "github.com/uber/jaeger/thrift-gen/sampling"
+	tSampling "github.com/jaegertracing/jaeger/thrift-gen/sampling"
 )
 
 const mimeTypeApplicationJSON = "application/json"

diff --git a/cmd/agent/app/httpserver/server_test.go b/cmd/agent/app/httpserver/server_test.go
@@ -29,9 +29,9 @@ import (
 	"github.com/uber/jaeger-lib/metrics/testutils"
 	mTestutils "github.com/uber/jaeger-lib/metrics/testutils"
 
-	tSampling092 "github.com/uber/jaeger/cmd/agent/app/httpserver/thrift-0.9.2"
-	"github.com/uber/jaeger/thrift-gen/baggage"
-	"github.com/uber/jaeger/thrift-gen/sampling"
+	tSampling092 "github.com/jaegertracing/jaeger/cmd/agent/app/httpserver/thrift-0.9.2"
+	"github.com/jaegertracing/jaeger/thrift-gen/baggage"
+	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
 )
 
 type testServer struct {

diff --git a/cmd/agent/app/processors/thrift_processor.go b/cmd/agent/app/processors/thrift_processor.go
@@ -21,8 +21,8 @@ import (
 	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/uber/jaeger-lib/metrics"
 
-	"github.com/uber/jaeger/cmd/agent/app/customtransports"
-	"github.com/uber/jaeger/cmd/agent/app/servers"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/customtransports"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/servers"
 )
 
 // ThriftProcessor is a server that processes spans using a TBuffered Server

diff --git a/cmd/agent/app/processors/thrift_processor_test.go b/cmd/agent/app/processors/thrift_processor_test.go
@@ -27,14 +27,14 @@ import (
 	mTestutils "github.com/uber/jaeger-lib/metrics/testutils"
 	"go.uber.org/zap"
 
-	"github.com/uber/jaeger/cmd/agent/app/reporter"
-	tchreporter "github.com/uber/jaeger/cmd/agent/app/reporter/tchannel"
-	"github.com/uber/jaeger/cmd/agent/app/servers"
-	"github.com/uber/jaeger/cmd/agent/app/servers/thriftudp"
-	"github.com/uber/jaeger/cmd/agent/app/testutils"
-	"github.com/uber/jaeger/thrift-gen/agent"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
+	tchreporter "github.com/jaegertracing/jaeger/cmd/agent/app/reporter/tchannel"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/servers"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
+	"github.com/jaegertracing/jaeger/thrift-gen/agent"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 // TODO make these tests faster, they take almost 4 seconds

diff --git a/cmd/agent/app/reporter/reporter.go b/cmd/agent/app/reporter/reporter.go
@@ -15,9 +15,9 @@
 package reporter
 
 import (
-	"github.com/uber/jaeger/pkg/multierror"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/pkg/multierror"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 // Reporter handles spans received by Processor and forwards them to central

diff --git a/cmd/agent/app/reporter/reporter_test.go b/cmd/agent/app/reporter/reporter_test.go
@@ -19,11 +19,11 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 	"github.com/stretchr/testify/assert"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
 
-	"github.com/uber/jaeger/cmd/agent/app/testutils"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
 )
 
 func TestMultiReporter(t *testing.T) {

diff --git a/cmd/agent/app/reporter/tchannel/builder_test.go b/cmd/agent/app/reporter/tchannel/builder_test.go
@@ -24,7 +24,7 @@ import (
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
 
-	"github.com/uber/jaeger/pkg/discovery"
+	"github.com/jaegertracing/jaeger/pkg/discovery"
 )
 
 var yamlConfig = `

diff --git a/cmd/agent/app/reporter/tchannel/bulider.go b/cmd/agent/app/reporter/tchannel/bulider.go
@@ -20,8 +20,8 @@ import (
 	"github.com/uber/tchannel-go"
 	"go.uber.org/zap"
 
-	"github.com/uber/jaeger/pkg/discovery"
-	"github.com/uber/jaeger/pkg/discovery/peerlistmgr"
+	"github.com/jaegertracing/jaeger/pkg/discovery"
+	"github.com/jaegertracing/jaeger/pkg/discovery/peerlistmgr"
 )
 
 const (

diff --git a/cmd/agent/app/reporter/tchannel/reporter.go b/cmd/agent/app/reporter/tchannel/reporter.go
@@ -22,9 +22,9 @@ import (
 	"github.com/uber/tchannel-go/thrift"
 	"go.uber.org/zap"
 
-	"github.com/uber/jaeger/pkg/discovery/peerlistmgr"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/pkg/discovery/peerlistmgr"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 const (

diff --git a/cmd/agent/app/reporter/tchannel/reporter_test.go b/cmd/agent/app/reporter/tchannel/reporter_test.go
@@ -25,9 +25,9 @@ import (
 	mTestutils "github.com/uber/jaeger-lib/metrics/testutils"
 	"go.uber.org/zap"
 
-	"github.com/uber/jaeger/cmd/agent/app/testutils"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 func initRequirements(t *testing.T) (*metrics.LocalFactory, *testutils.MockTCollector, *Reporter) {

diff --git a/cmd/agent/app/servers/tbuffered_server_test.go b/cmd/agent/app/servers/tbuffered_server_test.go
@@ -24,12 +24,12 @@ import (
 	"github.com/uber/jaeger-lib/metrics"
 	mTestutils "github.com/uber/jaeger-lib/metrics/testutils"
 
-	"github.com/uber/jaeger/thrift-gen/agent"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/thrift-gen/agent"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 
-	"github.com/uber/jaeger/cmd/agent/app/customtransports"
-	"github.com/uber/jaeger/cmd/agent/app/servers/thriftudp"
-	"github.com/uber/jaeger/cmd/agent/app/testutils"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/customtransports"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
 )
 
 func TestTBufferedServer(t *testing.T) {

diff --git a/cmd/agent/app/testutils/in_memory_reporter.go b/cmd/agent/app/testutils/in_memory_reporter.go
@@ -17,8 +17,8 @@ package testutils
 import (
 	"sync"
 
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 // InMemoryReporter collects spans in memory

diff --git a/cmd/agent/app/testutils/in_memory_reporter_test.go b/cmd/agent/app/testutils/in_memory_reporter_test.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 func TestInMemoryReporter(t *testing.T) {

diff --git a/cmd/agent/app/testutils/mock_baggage_restriction_manager.go b/cmd/agent/app/testutils/mock_baggage_restriction_manager.go
@@ -17,7 +17,7 @@ package testutils
 import (
 	"sync"
 
-	"github.com/uber/jaeger/thrift-gen/baggage"
+	"github.com/jaegertracing/jaeger/thrift-gen/baggage"
 )
 
 func newBaggageRestrictionManager() *baggageRestrictionManager {

diff --git a/cmd/agent/app/testutils/mock_collector.go b/cmd/agent/app/testutils/mock_collector.go
@@ -21,10 +21,10 @@ import (
 	"github.com/uber/tchannel-go"
 	"github.com/uber/tchannel-go/thrift"
 
-	"github.com/uber/jaeger/thrift-gen/baggage"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/sampling"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/thrift-gen/baggage"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 // StartMockTCollector runs a mock representation of Jaeger Collector.

diff --git a/cmd/agent/app/testutils/mock_collector_test.go b/cmd/agent/app/testutils/mock_collector_test.go
@@ -22,10 +22,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/uber/tchannel-go/thrift"
 
-	"github.com/uber/jaeger/thrift-gen/baggage"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
-	"github.com/uber/jaeger/thrift-gen/sampling"
-	"github.com/uber/jaeger/thrift-gen/zipkincore"
+	"github.com/jaegertracing/jaeger/thrift-gen/baggage"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
 func withTCollector(t *testing.T, fn func(collector *MockTCollector, ctx thrift.Context)) {

diff --git a/cmd/agent/app/testutils/mock_sampling_manager.go b/cmd/agent/app/testutils/mock_sampling_manager.go
@@ -17,7 +17,7 @@ package testutils
 import (
 	"sync"
 
-	"github.com/uber/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
 )
 
 func newSamplingManager() *samplingManager {

diff --git a/cmd/agent/app/testutils/thriftudp_client.go b/cmd/agent/app/testutils/thriftudp_client.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/apache/thrift/lib/go/thrift"
 
-	"github.com/uber/jaeger/cmd/agent/app/servers/thriftudp"
-	"github.com/uber/jaeger/thrift-gen/agent"
-	"github.com/uber/jaeger/thrift-gen/jaeger"
+	"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
+	"github.com/jaegertracing/jaeger/thrift-gen/agent"
+	"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
 )
 
 // NewZipkinThriftUDPClient creates a new zipking agent client that works like Jaeger client

diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -22,11 +22,11 @@ import (
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 
-	"github.com/uber/jaeger/cmd/agent/app"
-	"github.com/uber/jaeger/cmd/flags"
-	"github.com/uber/jaeger/pkg/config"
-	"github.com/uber/jaeger/pkg/metrics"
-	"github.com/uber/jaeger/pkg/version"
+	"github.com/jaegertracing/jaeger/cmd/agent/app"
+	"github.com/jaegertracing/jaeger/cmd/flags"
+	"github.com/jaegertracing/jaeger/pkg/config"
+	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/version"
 )
 
 func main() {

diff --git a/cmd/builder/builder_options.go b/cmd/builder/builder_options.go
@@ -18,9 +18,9 @@ import (
 	"github.com/uber/jaeger-lib/metrics"
 	"go.uber.org/zap"
 
-	cascfg "github.com/uber/jaeger/pkg/cassandra/config"
-	escfg "github.com/uber/jaeger/pkg/es/config"
-	"github.com/uber/jaeger/storage/spanstore/memory"
+	cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
+	escfg "github.com/jaegertracing/jaeger/pkg/es/config"
+	"github.com/jaegertracing/jaeger/storage/spanstore/memory"
 )
 
 // BasicOptions is a set of basic building blocks for most Jaeger executables

diff --git a/cmd/builder/builder_options_test.go b/cmd/builder/builder_options_test.go
@@ -20,10 +20,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 
+	cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
+	escfg "github.com/jaegertracing/jaeger/pkg/es/config"
+	"github.com/jaegertracing/jaeger/storage/spanstore/memory"
 	"github.com/uber/jaeger-lib/metrics"
-	cascfg "github.com/uber/jaeger/pkg/cassandra/config"
-	escfg "github.com/uber/jaeger/pkg/es/config"
-	"github.com/uber/jaeger/storage/spanstore/memory"
 )
 
 func TestApplyOptions(t *testing.T) {

diff --git a/cmd/collector/app/builder/builder_flags.go b/cmd/collector/app/builder/builder_flags.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/uber/jaeger/cmd/collector/app"
+	"github.com/jaegertracing/jaeger/cmd/collector/app"
 )
 
 const (