diff --git a/.travis.yml b/.travis.yml index d0951b9bdb8..57a99fbf20c 100644 --- 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 index 4b0f6da7f00..636dabe18eb 100644 --- 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 index ff88fd56525..c41a179f9de 100644 --- 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 index a73e67f9992..fa55b8adcb2 100644 --- 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 index 9a5885838b0..0eb82c57bdb 100644 --- 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 index e9dcf00d938..40b4d0a2c40 100644 --- 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 index f630c4e01fe..42b3dbda7a7 100644 --- 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 index f983059d468..9b714c6518d 100644 --- 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 index 226b1d7b9ac..dedadd91574 100644 --- 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 index db96ff69954..799942519fe 100644 --- 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 index 4e96b9ef2a6..3089dc9b891 100644 --- 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 index 50e5f2cae26..5dc940738c5 100644 --- 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 index 0fc08058ad8..6ea9c3ba375 100644 --- 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 index 69ec9477491..9141820ea02 100644 --- 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 index 936c11760b2..e92a18e9d2c 100644 --- 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 index 33e6c896e01..e6ac6229290 100644 --- 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 index 00f4ac91ade..1bf955eef36 100644 --- 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 index 4ecd4bec6d0..4445fc41a11 100644 --- 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 index 0e754f19b60..438755065f6 100644 --- 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 index f9c642e2e42..e75919a988f 100644 --- 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 index 27ea6f8216a..51635e9cdb8 100644 --- 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 index 4418c718386..651c255e9ff 100644 --- 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 index f280f3e6a8c..e93007fbfcb 100644 --- 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 index b23d6b99fb6..ffbdb7356fc 100644 --- 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 index 53fd1d9d8c0..6a89350bce9 100644 --- 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 index a7398a34db3..d7cb9729290 100644 --- 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 index 1cf9fcc870b..d425d1b59f8 100644 --- 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 index 34aeb6d067e..cc0c1f0bad3 100644 --- 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 index baab6c2ab9c..cf23c54bf33 100644 --- 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 index e8de932eb56..5be225589bd 100644 --- 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 ( diff --git a/cmd/collector/app/builder/span_handler_builder.go b/cmd/collector/app/builder/span_handler_builder.go index 10c48011811..9a15e849af6 100644 --- a/cmd/collector/app/builder/span_handler_builder.go +++ b/cmd/collector/app/builder/span_handler_builder.go @@ -21,16 +21,16 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - basicB "github.com/uber/jaeger/cmd/builder" - "github.com/uber/jaeger/cmd/collector/app" - zs "github.com/uber/jaeger/cmd/collector/app/sanitizer/zipkin" - "github.com/uber/jaeger/cmd/flags" - "github.com/uber/jaeger/model" - cascfg "github.com/uber/jaeger/pkg/cassandra/config" - escfg "github.com/uber/jaeger/pkg/es/config" - casSpanstore "github.com/uber/jaeger/plugin/storage/cassandra/spanstore" - esSpanstore "github.com/uber/jaeger/plugin/storage/es/spanstore" - "github.com/uber/jaeger/storage/spanstore" + basicB "github.com/jaegertracing/jaeger/cmd/builder" + "github.com/jaegertracing/jaeger/cmd/collector/app" + zs "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin" + "github.com/jaegertracing/jaeger/cmd/flags" + "github.com/jaegertracing/jaeger/model" + cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config" + escfg "github.com/jaegertracing/jaeger/pkg/es/config" + casSpanstore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore" + esSpanstore "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore" + "github.com/jaegertracing/jaeger/storage/spanstore" ) var ( diff --git a/cmd/collector/app/builder/span_handler_builder_test.go b/cmd/collector/app/builder/span_handler_builder_test.go index 4623ca62c6a..ca9813ca692 100644 --- a/cmd/collector/app/builder/span_handler_builder_test.go +++ b/cmd/collector/app/builder/span_handler_builder_test.go @@ -22,16 +22,16 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/cmd/builder" - "github.com/uber/jaeger/cmd/flags" - "github.com/uber/jaeger/pkg/cassandra" - cascfg "github.com/uber/jaeger/pkg/cassandra/config" - "github.com/uber/jaeger/pkg/cassandra/mocks" - "github.com/uber/jaeger/pkg/config" - "github.com/uber/jaeger/pkg/es" - escfg "github.com/uber/jaeger/pkg/es/config" - esMocks "github.com/uber/jaeger/pkg/es/mocks" - "github.com/uber/jaeger/storage/spanstore/memory" + "github.com/jaegertracing/jaeger/cmd/builder" + "github.com/jaegertracing/jaeger/cmd/flags" + "github.com/jaegertracing/jaeger/pkg/cassandra" + cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/config" + "github.com/jaegertracing/jaeger/pkg/es" + escfg "github.com/jaegertracing/jaeger/pkg/es/config" + esMocks "github.com/jaegertracing/jaeger/pkg/es/mocks" + "github.com/jaegertracing/jaeger/storage/spanstore/memory" ) type mockSessionBuilder struct { diff --git a/cmd/collector/app/http_handler.go b/cmd/collector/app/http_handler.go index 452ab42de17..3acf5720089 100644 --- a/cmd/collector/app/http_handler.go +++ b/cmd/collector/app/http_handler.go @@ -25,7 +25,7 @@ import ( "github.com/gorilla/mux" tchanThrift "github.com/uber/tchannel-go/thrift" - tJaeger "github.com/uber/jaeger/thrift-gen/jaeger" + tJaeger "github.com/jaegertracing/jaeger/thrift-gen/jaeger" ) const ( diff --git a/cmd/collector/app/http_handler_test.go b/cmd/collector/app/http_handler_test.go index 87da446e52b..ad56c3f6416 100644 --- a/cmd/collector/app/http_handler_test.go +++ b/cmd/collector/app/http_handler_test.go @@ -31,7 +31,7 @@ import ( "github.com/uber/jaeger-client-go/transport" tchanThrift "github.com/uber/tchannel-go/thrift" - "github.com/uber/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/thrift-gen/jaeger" ) var httpClient = &http.Client{Timeout: 2 * time.Second} diff --git a/cmd/collector/app/metrics.go b/cmd/collector/app/metrics.go index a5bd2086a74..2846be6a0e8 100644 --- a/cmd/collector/app/metrics.go +++ b/cmd/collector/app/metrics.go @@ -17,8 +17,8 @@ package app import ( "sync" + "github.com/jaegertracing/jaeger/model" "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/model" ) const ( diff --git a/cmd/collector/app/metrics_test.go b/cmd/collector/app/metrics_test.go index a1b8342bde7..2d542756b7e 100644 --- a/cmd/collector/app/metrics_test.go +++ b/cmd/collector/app/metrics_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" + "github.com/jaegertracing/jaeger/model" jaegerM "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/model" ) func TestProcessorMetrics(t *testing.T) { diff --git a/cmd/collector/app/model_consumer.go b/cmd/collector/app/model_consumer.go index a0ebef7d42b..e335147cc84 100644 --- a/cmd/collector/app/model_consumer.go +++ b/cmd/collector/app/model_consumer.go @@ -14,7 +14,7 @@ package app -import "github.com/uber/jaeger/model" +import "github.com/jaegertracing/jaeger/model" // ProcessSpan processes a Domain Model Span type ProcessSpan func(span *model.Span) diff --git a/cmd/collector/app/model_consumer_test.go b/cmd/collector/app/model_consumer_test.go index 4a1c90cae83..b1d21e7fbdb 100644 --- a/cmd/collector/app/model_consumer_test.go +++ b/cmd/collector/app/model_consumer_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestChainedProcessSpan(t *testing.T) { diff --git a/cmd/collector/app/options.go b/cmd/collector/app/options.go index deff04e2d7f..f05ff5ed5ac 100644 --- a/cmd/collector/app/options.go +++ b/cmd/collector/app/options.go @@ -17,10 +17,10 @@ package app import ( "go.uber.org/zap" + "github.com/jaegertracing/jaeger/model" "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/cmd/collector/app/sanitizer" + "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer" ) const ( diff --git a/cmd/collector/app/options_test.go b/cmd/collector/app/options_test.go index 6220eaed34c..0eadb73bcd3 100644 --- a/cmd/collector/app/options_test.go +++ b/cmd/collector/app/options_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" + "github.com/jaegertracing/jaeger/model" "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/model" ) func TestAllOptionSet(t *testing.T) { diff --git a/cmd/collector/app/sanitizer/cache/auto_refresh_cache_test.go b/cmd/collector/app/sanitizer/cache/auto_refresh_cache_test.go index ab0f4070c38..5e6c152d4f5 100644 --- a/cmd/collector/app/sanitizer/cache/auto_refresh_cache_test.go +++ b/cmd/collector/app/sanitizer/cache/auto_refresh_cache_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/uber/jaeger/cmd/collector/app/sanitizer/cache/mocks" + "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/cache/mocks" ) var ( diff --git a/cmd/collector/app/sanitizer/sanitizer.go b/cmd/collector/app/sanitizer/sanitizer.go index 94768216f51..ad04f7a2be4 100644 --- a/cmd/collector/app/sanitizer/sanitizer.go +++ b/cmd/collector/app/sanitizer/sanitizer.go @@ -15,7 +15,7 @@ package sanitizer import ( - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // SanitizeSpan sanitizes/normalizes spans. Any business logic that needs to be applied to normalize the contents of a diff --git a/cmd/collector/app/sanitizer/service_name_sanitizer.go b/cmd/collector/app/sanitizer/service_name_sanitizer.go index e2726deb2a9..64fc679e7ae 100644 --- a/cmd/collector/app/sanitizer/service_name_sanitizer.go +++ b/cmd/collector/app/sanitizer/service_name_sanitizer.go @@ -15,8 +15,8 @@ package sanitizer import ( - "github.com/uber/jaeger/cmd/collector/app/sanitizer/cache" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/cache" + "github.com/jaegertracing/jaeger/model" ) // NewServiceNameSanitizer creates a service name sanitizer. diff --git a/cmd/collector/app/sanitizer/service_name_sanitizer_test.go b/cmd/collector/app/sanitizer/service_name_sanitizer_test.go index 0acbc47363b..229d35b895e 100644 --- a/cmd/collector/app/sanitizer/service_name_sanitizer_test.go +++ b/cmd/collector/app/sanitizer/service_name_sanitizer_test.go @@ -17,8 +17,8 @@ package sanitizer import ( "testing" + "github.com/jaegertracing/jaeger/model" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" ) var ( diff --git a/cmd/collector/app/sanitizer/utf8_sanitizer.go b/cmd/collector/app/sanitizer/utf8_sanitizer.go index 67ce220b74b..cfd70c46fc3 100644 --- a/cmd/collector/app/sanitizer/utf8_sanitizer.go +++ b/cmd/collector/app/sanitizer/utf8_sanitizer.go @@ -18,7 +18,7 @@ import ( "fmt" "unicode/utf8" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/cmd/collector/app/sanitizer/utf8_sanitizer_test.go b/cmd/collector/app/sanitizer/utf8_sanitizer_test.go index bfcc47c1588..eaba7158021 100644 --- a/cmd/collector/app/sanitizer/utf8_sanitizer_test.go +++ b/cmd/collector/app/sanitizer/utf8_sanitizer_test.go @@ -18,8 +18,8 @@ import ( "encoding/hex" "testing" + "github.com/jaegertracing/jaeger/model" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" "go.uber.org/zap" ) diff --git a/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go b/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go index c056d1c7958..90c706e814e 100644 --- a/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go +++ b/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - zc "github.com/uber/jaeger/thrift-gen/zipkincore" + zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) const ( diff --git a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go index 47f1bd6253b..2c5ca0e6dfc 100644 --- a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go +++ b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) var ( diff --git a/cmd/collector/app/span_handler.go b/cmd/collector/app/span_handler.go index 68739f5b397..fafd47d3420 100644 --- a/cmd/collector/app/span_handler.go +++ b/cmd/collector/app/span_handler.go @@ -18,12 +18,12 @@ import ( "github.com/uber/tchannel-go/thrift" "go.uber.org/zap" - zipkinS "github.com/uber/jaeger/cmd/collector/app/sanitizer/zipkin" - "github.com/uber/jaeger/model" - jConv "github.com/uber/jaeger/model/converter/thrift/jaeger" - "github.com/uber/jaeger/model/converter/thrift/zipkin" - "github.com/uber/jaeger/thrift-gen/jaeger" - "github.com/uber/jaeger/thrift-gen/zipkincore" + zipkinS "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin" + "github.com/jaegertracing/jaeger/model" + jConv "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger" + "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" + "github.com/jaegertracing/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) const ( diff --git a/cmd/collector/app/span_handler_test.go b/cmd/collector/app/span_handler_test.go index 7a9c30f6835..651a9319568 100644 --- a/cmd/collector/app/span_handler_test.go +++ b/cmd/collector/app/span_handler_test.go @@ -23,10 +23,10 @@ import ( "github.com/uber/tchannel-go/thrift" "go.uber.org/zap" - "github.com/uber/jaeger/cmd/collector/app/sanitizer/zipkin" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/thrift-gen/jaeger" - "github.com/uber/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) func TestJaegerSpanHandler(t *testing.T) { diff --git a/cmd/collector/app/span_processor.go b/cmd/collector/app/span_processor.go index ac4527f3458..38dde6ac84d 100644 --- a/cmd/collector/app/span_processor.go +++ b/cmd/collector/app/span_processor.go @@ -20,11 +20,11 @@ import ( "github.com/uber/tchannel-go" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/spanstore" - "github.com/uber/jaeger/cmd/collector/app/sanitizer" - "github.com/uber/jaeger/pkg/queue" + "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer" + "github.com/jaegertracing/jaeger/pkg/queue" ) type spanProcessor struct { diff --git a/cmd/collector/app/span_processor_test.go b/cmd/collector/app/span_processor_test.go index 835c1769106..630eae68661 100644 --- a/cmd/collector/app/span_processor_test.go +++ b/cmd/collector/app/span_processor_test.go @@ -27,11 +27,11 @@ import ( "go.uber.org/zap" "golang.org/x/net/context" - zipkinSanitizer "github.com/uber/jaeger/cmd/collector/app/sanitizer/zipkin" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/thrift-gen/jaeger" - zc "github.com/uber/jaeger/thrift-gen/zipkincore" + zipkinSanitizer "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/thrift-gen/jaeger" + zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) var blackListedService = "zoidberg" diff --git a/cmd/collector/app/zipkin/annotation.go b/cmd/collector/app/zipkin/annotation.go index 77d9d7856c4..465b4fe073a 100644 --- a/cmd/collector/app/zipkin/annotation.go +++ b/cmd/collector/app/zipkin/annotation.go @@ -17,7 +17,7 @@ package zipkin import ( "strings" - "github.com/uber/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) // IsServerCore checks to see if an annotation is a core server annotation diff --git a/cmd/collector/app/zipkin/annotation_test.go b/cmd/collector/app/zipkin/annotation_test.go index 7592688ebd5..a8bd2cda76e 100644 --- a/cmd/collector/app/zipkin/annotation_test.go +++ b/cmd/collector/app/zipkin/annotation_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - zc "github.com/uber/jaeger/thrift-gen/zipkincore" + zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) func TestCoreChecks(t *testing.T) { diff --git a/cmd/collector/app/zipkin/http_handler.go b/cmd/collector/app/zipkin/http_handler.go index 0848c3a51a3..10f5410c11b 100644 --- a/cmd/collector/app/zipkin/http_handler.go +++ b/cmd/collector/app/zipkin/http_handler.go @@ -26,8 +26,8 @@ import ( "github.com/gorilla/mux" tchanThrift "github.com/uber/tchannel-go/thrift" - "github.com/uber/jaeger/cmd/collector/app" - "github.com/uber/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/cmd/collector/app" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) // APIHandler handles all HTTP calls to the collector diff --git a/cmd/collector/app/zipkin/http_handler_test.go b/cmd/collector/app/zipkin/http_handler_test.go index ef9794a2879..f367bb3c5b8 100644 --- a/cmd/collector/app/zipkin/http_handler_test.go +++ b/cmd/collector/app/zipkin/http_handler_test.go @@ -33,7 +33,7 @@ import ( zipkinTransport "github.com/uber/jaeger-client-go/transport/zipkin" tchanThrift "github.com/uber/tchannel-go/thrift" - "github.com/uber/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) var httpClient = &http.Client{Timeout: 2 * time.Second} diff --git a/cmd/collector/app/zipkin/json.go b/cmd/collector/app/zipkin/json.go index 99a65e0fb2b..d27fefbd4fd 100644 --- a/cmd/collector/app/zipkin/json.go +++ b/cmd/collector/app/zipkin/json.go @@ -24,8 +24,8 @@ import ( "math" "net" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) type endpoint struct { diff --git a/cmd/collector/app/zipkin/json_test.go b/cmd/collector/app/zipkin/json_test.go index 70f8176043d..7b99acdfafb 100644 --- a/cmd/collector/app/zipkin/json_test.go +++ b/cmd/collector/app/zipkin/json_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/thrift-gen/zipkincore" ) var endpointFmt = `{"serviceName": "%s", "ipv4": "%s", "ipv6": "%s", "port": %d}` diff --git a/cmd/collector/main.go b/cmd/collector/main.go index af6b72e38d5..fe8b200ecf1 100644 --- a/cmd/collector/main.go +++ b/cmd/collector/main.go @@ -31,19 +31,19 @@ import ( "github.com/uber/tchannel-go/thrift" "go.uber.org/zap" - basicB "github.com/uber/jaeger/cmd/builder" - "github.com/uber/jaeger/cmd/collector/app" - "github.com/uber/jaeger/cmd/collector/app/builder" - "github.com/uber/jaeger/cmd/collector/app/zipkin" - "github.com/uber/jaeger/cmd/flags" - casFlags "github.com/uber/jaeger/cmd/flags/cassandra" - esFlags "github.com/uber/jaeger/cmd/flags/es" - "github.com/uber/jaeger/pkg/config" - "github.com/uber/jaeger/pkg/healthcheck" - "github.com/uber/jaeger/pkg/recoveryhandler" - "github.com/uber/jaeger/pkg/version" - jc "github.com/uber/jaeger/thrift-gen/jaeger" - zc "github.com/uber/jaeger/thrift-gen/zipkincore" + basicB "github.com/jaegertracing/jaeger/cmd/builder" + "github.com/jaegertracing/jaeger/cmd/collector/app" + "github.com/jaegertracing/jaeger/cmd/collector/app/builder" + "github.com/jaegertracing/jaeger/cmd/collector/app/zipkin" + "github.com/jaegertracing/jaeger/cmd/flags" + casFlags "github.com/jaegertracing/jaeger/cmd/flags/cassandra" + esFlags "github.com/jaegertracing/jaeger/cmd/flags/es" + "github.com/jaegertracing/jaeger/pkg/config" + "github.com/jaegertracing/jaeger/pkg/healthcheck" + "github.com/jaegertracing/jaeger/pkg/recoveryhandler" + "github.com/jaegertracing/jaeger/pkg/version" + jc "github.com/jaegertracing/jaeger/thrift-gen/jaeger" + zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) func main() { diff --git a/cmd/flags/cassandra/options.go b/cmd/flags/cassandra/options.go index 9db837b37a8..ecc753867c4 100644 --- a/cmd/flags/cassandra/options.go +++ b/cmd/flags/cassandra/options.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/viper" - "github.com/uber/jaeger/pkg/cassandra/config" + "github.com/jaegertracing/jaeger/pkg/cassandra/config" ) const ( diff --git a/cmd/flags/cassandra/options_test.go b/cmd/flags/cassandra/options_test.go index d1411867aeb..54394896a57 100644 --- a/cmd/flags/cassandra/options_test.go +++ b/cmd/flags/cassandra/options_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/pkg/config" + "github.com/jaegertracing/jaeger/pkg/config" ) func TestOptions(t *testing.T) { diff --git a/cmd/flags/es/options.go b/cmd/flags/es/options.go index ad7a4ed0459..a46e46143ae 100644 --- a/cmd/flags/es/options.go +++ b/cmd/flags/es/options.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/viper" - "github.com/uber/jaeger/pkg/es/config" + "github.com/jaegertracing/jaeger/pkg/es/config" ) const ( diff --git a/cmd/flags/es/options_test.go b/cmd/flags/es/options_test.go index c67d3fb1810..5d98cd8dad5 100644 --- a/cmd/flags/es/options_test.go +++ b/cmd/flags/es/options_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/pkg/config" + "github.com/jaegertracing/jaeger/pkg/config" ) func TestOptions(t *testing.T) { diff --git a/cmd/query/app/adjusters.go b/cmd/query/app/adjusters.go index d1ed800f65f..3757a4e2684 100644 --- a/cmd/query/app/adjusters.go +++ b/cmd/query/app/adjusters.go @@ -15,7 +15,7 @@ package app import ( - "github.com/uber/jaeger/model/adjuster" + "github.com/jaegertracing/jaeger/model/adjuster" ) // StandardAdjusters is a list of model adjusters applied by the query service diff --git a/cmd/query/app/builder/builder_flags_test.go b/cmd/query/app/builder/builder_flags_test.go index b008df45dd0..c1f67da840d 100644 --- a/cmd/query/app/builder/builder_flags_test.go +++ b/cmd/query/app/builder/builder_flags_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/pkg/config" + "github.com/jaegertracing/jaeger/pkg/config" ) func TestQueryBuilderFlags(t *testing.T) { diff --git a/cmd/query/app/builder/cassandra.go b/cmd/query/app/builder/cassandra.go index 04313a78ef4..0c65c3a8637 100644 --- a/cmd/query/app/builder/cassandra.go +++ b/cmd/query/app/builder/cassandra.go @@ -17,9 +17,9 @@ package builder import ( "time" - "github.com/uber/jaeger/pkg/cassandra/config" - "github.com/uber/jaeger/plugin/storage/cassandra/dependencystore" - "github.com/uber/jaeger/plugin/storage/cassandra/spanstore" + "github.com/jaegertracing/jaeger/pkg/cassandra/config" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/dependencystore" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore" ) func (sb *StorageBuilder) newCassandraBuilder(sessionBuilder config.SessionBuilder, dependencyDataFreq time.Duration) error { diff --git a/cmd/query/app/builder/cassandra_test.go b/cmd/query/app/builder/cassandra_test.go index d9cd0c2d2f3..94bdc3252cb 100644 --- a/cmd/query/app/builder/cassandra_test.go +++ b/cmd/query/app/builder/cassandra_test.go @@ -20,10 +20,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/cmd/flags" - "github.com/uber/jaeger/pkg/cassandra" - "github.com/uber/jaeger/pkg/cassandra/config" - "github.com/uber/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/cmd/flags" + "github.com/jaegertracing/jaeger/pkg/cassandra" + "github.com/jaegertracing/jaeger/pkg/cassandra/config" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" ) type mockSessionBuilder struct { diff --git a/cmd/query/app/builder/elastic_search.go b/cmd/query/app/builder/elastic_search.go index 1c7ee395360..0569f02dbb1 100644 --- a/cmd/query/app/builder/elastic_search.go +++ b/cmd/query/app/builder/elastic_search.go @@ -15,9 +15,9 @@ package builder import ( - "github.com/uber/jaeger/pkg/es/config" - "github.com/uber/jaeger/plugin/storage/es/dependencystore" - "github.com/uber/jaeger/plugin/storage/es/spanstore" + "github.com/jaegertracing/jaeger/pkg/es/config" + "github.com/jaegertracing/jaeger/plugin/storage/es/dependencystore" + "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore" ) func (sb *StorageBuilder) newESBuilder(builder config.ClientBuilder) error { diff --git a/cmd/query/app/builder/elastic_search_test.go b/cmd/query/app/builder/elastic_search_test.go index cf553576f00..5a033cd8ca3 100644 --- a/cmd/query/app/builder/elastic_search_test.go +++ b/cmd/query/app/builder/elastic_search_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/pkg/es" - "github.com/uber/jaeger/pkg/es/config" - "github.com/uber/jaeger/pkg/es/mocks" + "github.com/jaegertracing/jaeger/pkg/es" + "github.com/jaegertracing/jaeger/pkg/es/config" + "github.com/jaegertracing/jaeger/pkg/es/mocks" ) type mockEsBuilder struct { diff --git a/cmd/query/app/builder/memory.go b/cmd/query/app/builder/memory.go index 17bf6567a2e..5fd9d0475b1 100644 --- a/cmd/query/app/builder/memory.go +++ b/cmd/query/app/builder/memory.go @@ -15,7 +15,7 @@ package builder import ( - "github.com/uber/jaeger/storage/spanstore/memory" + "github.com/jaegertracing/jaeger/storage/spanstore/memory" ) func (sb *StorageBuilder) newMemoryStoreBuilder(memStore *memory.Store) { diff --git a/cmd/query/app/builder/memory_test.go b/cmd/query/app/builder/memory_test.go index fd56eb4b09e..d95f35b9d58 100644 --- a/cmd/query/app/builder/memory_test.go +++ b/cmd/query/app/builder/memory_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/storage/spanstore/memory" + "github.com/jaegertracing/jaeger/storage/spanstore/memory" ) func TestMemoryStoreBuilder(t *testing.T) { diff --git a/cmd/query/app/builder/storage.go b/cmd/query/app/builder/storage.go index f31454f6db7..79feef8cd47 100644 --- a/cmd/query/app/builder/storage.go +++ b/cmd/query/app/builder/storage.go @@ -21,10 +21,10 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - basicB "github.com/uber/jaeger/cmd/builder" - "github.com/uber/jaeger/cmd/flags" - "github.com/uber/jaeger/storage/dependencystore" - "github.com/uber/jaeger/storage/spanstore" + basicB "github.com/jaegertracing/jaeger/cmd/builder" + "github.com/jaegertracing/jaeger/cmd/flags" + "github.com/jaegertracing/jaeger/storage/dependencystore" + "github.com/jaegertracing/jaeger/storage/spanstore" ) // StorageBuilder is the interface that provides the necessary store readers diff --git a/cmd/query/app/builder/storage_test.go b/cmd/query/app/builder/storage_test.go index d108cd96b30..a2fdc428ed6 100644 --- a/cmd/query/app/builder/storage_test.go +++ b/cmd/query/app/builder/storage_test.go @@ -22,11 +22,11 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - basicB "github.com/uber/jaeger/cmd/builder" - "github.com/uber/jaeger/cmd/flags" - casCfg "github.com/uber/jaeger/pkg/cassandra/config" - "github.com/uber/jaeger/pkg/config" - "github.com/uber/jaeger/storage/spanstore/memory" + basicB "github.com/jaegertracing/jaeger/cmd/builder" + "github.com/jaegertracing/jaeger/cmd/flags" + casCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config" + "github.com/jaegertracing/jaeger/pkg/config" + "github.com/jaegertracing/jaeger/storage/spanstore/memory" ) func newStorageBuilder() *StorageBuilder { diff --git a/cmd/query/app/handler.go b/cmd/query/app/handler.go index e23f2bf3421..a070d7673ad 100644 --- a/cmd/query/app/handler.go +++ b/cmd/query/app/handler.go @@ -27,13 +27,13 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/adjuster" - uiconv "github.com/uber/jaeger/model/converter/json" - ui "github.com/uber/jaeger/model/json" - "github.com/uber/jaeger/pkg/multierror" - "github.com/uber/jaeger/storage/dependencystore" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/adjuster" + uiconv "github.com/jaegertracing/jaeger/model/converter/json" + ui "github.com/jaegertracing/jaeger/model/json" + "github.com/jaegertracing/jaeger/pkg/multierror" + "github.com/jaegertracing/jaeger/storage/dependencystore" + "github.com/jaegertracing/jaeger/storage/spanstore" ) const ( diff --git a/cmd/query/app/handler_archive_test.go b/cmd/query/app/handler_archive_test.go index 0543bbb9a9d..8cddbf180fe 100644 --- a/cmd/query/app/handler_archive_test.go +++ b/cmd/query/app/handler_archive_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/spanstore" - spanstoremocks "github.com/uber/jaeger/storage/spanstore/mocks" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/spanstore" + spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks" ) func TestGetArchivedTrace_NotFound(t *testing.T) { diff --git a/cmd/query/app/handler_deps_test.go b/cmd/query/app/handler_deps_test.go index 45b97926d7b..01d926f837c 100644 --- a/cmd/query/app/handler_deps_test.go +++ b/cmd/query/app/handler_deps_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" - ui "github.com/uber/jaeger/model/json" + "github.com/jaegertracing/jaeger/model" + ui "github.com/jaegertracing/jaeger/model/json" ) func TestDeduplicateDependencies(t *testing.T) { diff --git a/cmd/query/app/handler_options.go b/cmd/query/app/handler_options.go index 50e60fb5f1f..b494688d594 100644 --- a/cmd/query/app/handler_options.go +++ b/cmd/query/app/handler_options.go @@ -20,8 +20,8 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" - "github.com/uber/jaeger/model/adjuster" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model/adjuster" + "github.com/jaegertracing/jaeger/storage/spanstore" ) // HandlerOption is a function that sets some option on the APIHandler diff --git a/cmd/query/app/handler_test.go b/cmd/query/app/handler_test.go index 685349a632d..7d496e34593 100644 --- a/cmd/query/app/handler_test.go +++ b/cmd/query/app/handler_test.go @@ -31,13 +31,13 @@ import ( "github.com/stretchr/testify/mock" "go.uber.org/zap" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/adjuster" + ui "github.com/jaegertracing/jaeger/model/json" + depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks" + "github.com/jaegertracing/jaeger/storage/spanstore" + spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks" jaeger "github.com/uber/jaeger-client-go" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/adjuster" - ui "github.com/uber/jaeger/model/json" - depsmocks "github.com/uber/jaeger/storage/dependencystore/mocks" - "github.com/uber/jaeger/storage/spanstore" - spanstoremocks "github.com/uber/jaeger/storage/spanstore/mocks" ) const millisToNanosMultiplier = int64(time.Millisecond / time.Nanosecond) diff --git a/cmd/query/app/query_parser.go b/cmd/query/app/query_parser.go index c8e5c26f298..a9310fb59af 100644 --- a/cmd/query/app/query_parser.go +++ b/cmd/query/app/query_parser.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/spanstore" ) const ( diff --git a/cmd/query/app/query_parser_test.go b/cmd/query/app/query_parser_test.go index daaa3e5dd08..717af1d62eb 100644 --- a/cmd/query/app/query_parser_test.go +++ b/cmd/query/app/query_parser_test.go @@ -22,8 +22,8 @@ import ( "github.com/kr/pretty" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/spanstore" ) var errParseInt = `strconv.ParseInt: parsing "string": invalid syntax` diff --git a/cmd/query/main.go b/cmd/query/main.go index bc80e4ab5a8..6eb2fb15a04 100644 --- a/cmd/query/main.go +++ b/cmd/query/main.go @@ -29,16 +29,16 @@ import ( "github.com/uber/jaeger-lib/metrics/go-kit/expvar" "go.uber.org/zap" - basicB "github.com/uber/jaeger/cmd/builder" - "github.com/uber/jaeger/cmd/flags" - casFlags "github.com/uber/jaeger/cmd/flags/cassandra" - esFlags "github.com/uber/jaeger/cmd/flags/es" - "github.com/uber/jaeger/cmd/query/app" - "github.com/uber/jaeger/cmd/query/app/builder" - "github.com/uber/jaeger/pkg/config" - "github.com/uber/jaeger/pkg/healthcheck" - "github.com/uber/jaeger/pkg/recoveryhandler" - "github.com/uber/jaeger/pkg/version" + basicB "github.com/jaegertracing/jaeger/cmd/builder" + "github.com/jaegertracing/jaeger/cmd/flags" + casFlags "github.com/jaegertracing/jaeger/cmd/flags/cassandra" + esFlags "github.com/jaegertracing/jaeger/cmd/flags/es" + "github.com/jaegertracing/jaeger/cmd/query/app" + "github.com/jaegertracing/jaeger/cmd/query/app/builder" + "github.com/jaegertracing/jaeger/pkg/config" + "github.com/jaegertracing/jaeger/pkg/healthcheck" + "github.com/jaegertracing/jaeger/pkg/recoveryhandler" + "github.com/jaegertracing/jaeger/pkg/version" ) func main() { diff --git a/cmd/standalone/main.go b/cmd/standalone/main.go index bcfbe5aaf60..9e2376a1948 100644 --- a/cmd/standalone/main.go +++ b/cmd/standalone/main.go @@ -32,21 +32,21 @@ import ( "github.com/uber/tchannel-go/thrift" "go.uber.org/zap" - agentApp "github.com/uber/jaeger/cmd/agent/app" - basic "github.com/uber/jaeger/cmd/builder" - collectorApp "github.com/uber/jaeger/cmd/collector/app" - collector "github.com/uber/jaeger/cmd/collector/app/builder" - "github.com/uber/jaeger/cmd/collector/app/zipkin" - "github.com/uber/jaeger/cmd/flags" - queryApp "github.com/uber/jaeger/cmd/query/app" - query "github.com/uber/jaeger/cmd/query/app/builder" - "github.com/uber/jaeger/pkg/config" - pMetrics "github.com/uber/jaeger/pkg/metrics" - "github.com/uber/jaeger/pkg/recoveryhandler" - "github.com/uber/jaeger/pkg/version" - "github.com/uber/jaeger/storage/spanstore/memory" - jc "github.com/uber/jaeger/thrift-gen/jaeger" - zc "github.com/uber/jaeger/thrift-gen/zipkincore" + agentApp "github.com/jaegertracing/jaeger/cmd/agent/app" + basic "github.com/jaegertracing/jaeger/cmd/builder" + collectorApp "github.com/jaegertracing/jaeger/cmd/collector/app" + collector "github.com/jaegertracing/jaeger/cmd/collector/app/builder" + "github.com/jaegertracing/jaeger/cmd/collector/app/zipkin" + "github.com/jaegertracing/jaeger/cmd/flags" + queryApp "github.com/jaegertracing/jaeger/cmd/query/app" + query "github.com/jaegertracing/jaeger/cmd/query/app/builder" + "github.com/jaegertracing/jaeger/pkg/config" + pMetrics "github.com/jaegertracing/jaeger/pkg/metrics" + "github.com/jaegertracing/jaeger/pkg/recoveryhandler" + "github.com/jaegertracing/jaeger/pkg/version" + "github.com/jaegertracing/jaeger/storage/spanstore/memory" + jc "github.com/jaegertracing/jaeger/thrift-gen/jaeger" + zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) // standalone/main is a standalone full-stack jaeger backend, backed by a memory store diff --git a/cmd/standalone/standalone_test.go b/cmd/standalone/standalone_test.go index 26cf3a7851c..7a129011eaa 100644 --- a/cmd/standalone/standalone_test.go +++ b/cmd/standalone/standalone_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - ui "github.com/uber/jaeger/model/json" + ui "github.com/jaegertracing/jaeger/model/json" ) const ( diff --git a/crossdock/main.go b/crossdock/main.go index 60f8d014cd2..76da59e0451 100644 --- a/crossdock/main.go +++ b/crossdock/main.go @@ -22,7 +22,7 @@ import ( "github.com/crossdock/crossdock-go" "go.uber.org/zap" - "github.com/uber/jaeger/crossdock/services" + "github.com/jaegertracing/jaeger/crossdock/services" ) const ( diff --git a/crossdock/services/agent.go b/crossdock/services/agent.go index e040457f1ff..d326a1fa809 100644 --- a/crossdock/services/agent.go +++ b/crossdock/services/agent.go @@ -23,7 +23,7 @@ import ( "go.uber.org/zap" - "github.com/uber/jaeger/thrift-gen/sampling" + "github.com/jaegertracing/jaeger/thrift-gen/sampling" ) var ( diff --git a/crossdock/services/agent_test.go b/crossdock/services/agent_test.go index 10c119b1220..85485431007 100644 --- a/crossdock/services/agent_test.go +++ b/crossdock/services/agent_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/uber/jaeger/thrift-gen/sampling" + "github.com/jaegertracing/jaeger/thrift-gen/sampling" ) var ( diff --git a/crossdock/services/mocks/QueryService.go b/crossdock/services/mocks/QueryService.go index e87b65b705e..0f95b1fba3b 100644 --- a/crossdock/services/mocks/QueryService.go +++ b/crossdock/services/mocks/QueryService.go @@ -16,7 +16,7 @@ package mocks import "github.com/stretchr/testify/mock" -import ui "github.com/uber/jaeger/model/json" +import ui "github.com/jaegertracing/jaeger/model/json" // QueryService is an autogenerated mock type for the QueryService type type QueryService struct { diff --git a/crossdock/services/query.go b/crossdock/services/query.go index 600e6237ecd..30fc41eff12 100644 --- a/crossdock/services/query.go +++ b/crossdock/services/query.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" - ui "github.com/uber/jaeger/model/json" + ui "github.com/jaegertracing/jaeger/model/json" ) // QueryService is the service used to query cassandra tables for traces diff --git a/crossdock/services/query_test.go b/crossdock/services/query_test.go index 20b82ccfd20..364f14697f1 100644 --- a/crossdock/services/query_test.go +++ b/crossdock/services/query_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - ui "github.com/uber/jaeger/model/json" + ui "github.com/jaegertracing/jaeger/model/json" ) type testQueryHandler struct{} diff --git a/crossdock/services/tracehandler.go b/crossdock/services/tracehandler.go index dbfd25f2e60..dd2bde853ee 100644 --- a/crossdock/services/tracehandler.go +++ b/crossdock/services/tracehandler.go @@ -28,7 +28,7 @@ import ( "github.com/uber/jaeger-client-go" "go.uber.org/zap" - ui "github.com/uber/jaeger/model/json" + ui "github.com/jaegertracing/jaeger/model/json" ) const ( diff --git a/crossdock/services/tracehandler_test.go b/crossdock/services/tracehandler_test.go index 37cc2ad45a1..7561885b2b5 100644 --- a/crossdock/services/tracehandler_test.go +++ b/crossdock/services/tracehandler_test.go @@ -30,8 +30,8 @@ import ( "github.com/uber/jaeger-client-go" "go.uber.org/zap" - "github.com/uber/jaeger/crossdock/services/mocks" - ui "github.com/uber/jaeger/model/json" + "github.com/jaegertracing/jaeger/crossdock/services/mocks" + ui "github.com/jaegertracing/jaeger/model/json" ) var ( diff --git a/examples/hotrod/cmd/customer.go b/examples/hotrod/cmd/customer.go index 4333e5a2182..2e669625558 100644 --- a/examples/hotrod/cmd/customer.go +++ b/examples/hotrod/cmd/customer.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" - "github.com/uber/jaeger/examples/hotrod/services/customer" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/services/customer" ) // customerCmd represents the customer command diff --git a/examples/hotrod/cmd/driver.go b/examples/hotrod/cmd/driver.go index c0920f218f3..33ac2bf3498 100644 --- a/examples/hotrod/cmd/driver.go +++ b/examples/hotrod/cmd/driver.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" - "github.com/uber/jaeger/examples/hotrod/services/driver" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/services/driver" ) // driverCmd represents the driver command diff --git a/examples/hotrod/cmd/frontend.go b/examples/hotrod/cmd/frontend.go index 7c4ffcc9e20..9f5824c9c3c 100644 --- a/examples/hotrod/cmd/frontend.go +++ b/examples/hotrod/cmd/frontend.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" - "github.com/uber/jaeger/examples/hotrod/services/frontend" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/services/frontend" ) // frontendCmd represents the frontend command diff --git a/examples/hotrod/cmd/route.go b/examples/hotrod/cmd/route.go index 3df1422110c..8ba06c7714a 100644 --- a/examples/hotrod/cmd/route.go +++ b/examples/hotrod/cmd/route.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" - "github.com/uber/jaeger/examples/hotrod/services/route" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/services/route" ) // routeCmd represents the route command diff --git a/examples/hotrod/main.go b/examples/hotrod/main.go index f0d06277770..c2340be028f 100644 --- a/examples/hotrod/main.go +++ b/examples/hotrod/main.go @@ -5,7 +5,7 @@ package main import ( "runtime" - "github.com/uber/jaeger/examples/hotrod/cmd" + "github.com/jaegertracing/jaeger/examples/hotrod/cmd" ) func main() { diff --git a/examples/hotrod/pkg/tracing/init.go b/examples/hotrod/pkg/tracing/init.go index 9cdb3b3f84a..690d9c8f19d 100644 --- a/examples/hotrod/pkg/tracing/init.go +++ b/examples/hotrod/pkg/tracing/init.go @@ -24,7 +24,7 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" ) // Init creates a new instance of Jaeger tracer. diff --git a/examples/hotrod/services/customer/client.go b/examples/hotrod/services/customer/client.go index ac199733386..85917da4e3e 100644 --- a/examples/hotrod/services/customer/client.go +++ b/examples/hotrod/services/customer/client.go @@ -23,8 +23,8 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" ) // Client is a remote client that implements customer.Interface diff --git a/examples/hotrod/services/customer/database.go b/examples/hotrod/services/customer/database.go index c520773c895..5a833914627 100644 --- a/examples/hotrod/services/customer/database.go +++ b/examples/hotrod/services/customer/database.go @@ -23,10 +23,10 @@ import ( "github.com/opentracing/opentracing-go" tags "github.com/opentracing/opentracing-go/ext" - "github.com/uber/jaeger/examples/hotrod/pkg/delay" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" - "github.com/uber/jaeger/examples/hotrod/services/config" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/delay" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/services/config" ) // database simulates Customer repository implemented on top of an SQL database diff --git a/examples/hotrod/services/customer/server.go b/examples/hotrod/services/customer/server.go index 8812a90d6fa..9f40064d0e5 100644 --- a/examples/hotrod/services/customer/server.go +++ b/examples/hotrod/services/customer/server.go @@ -22,9 +22,9 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/httperr" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/httperr" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" ) // Server implements Customer service diff --git a/examples/hotrod/services/driver/client.go b/examples/hotrod/services/driver/client.go index 98a85d57cb7..470df01797e 100644 --- a/examples/hotrod/services/driver/client.go +++ b/examples/hotrod/services/driver/client.go @@ -23,8 +23,8 @@ import ( "github.com/uber/tchannel-go/thrift" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/services/driver/thrift-gen/driver" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/services/driver/thrift-gen/driver" ) // Client is a remote client that implements driver.Interface diff --git a/examples/hotrod/services/driver/redis.go b/examples/hotrod/services/driver/redis.go index f311fc1140f..60feb7b7604 100644 --- a/examples/hotrod/services/driver/redis.go +++ b/examples/hotrod/services/driver/redis.go @@ -26,10 +26,10 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/delay" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" - "github.com/uber/jaeger/examples/hotrod/services/config" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/delay" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/services/config" ) // Redis is a simulator of remote Redis cache diff --git a/examples/hotrod/services/driver/server.go b/examples/hotrod/services/driver/server.go index d5b7cf149bd..274ceb7db07 100644 --- a/examples/hotrod/services/driver/server.go +++ b/examples/hotrod/services/driver/server.go @@ -21,8 +21,8 @@ import ( "github.com/uber/tchannel-go/thrift" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/services/driver/thrift-gen/driver" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/services/driver/thrift-gen/driver" ) // Server implements jaeger-demo-frontend service diff --git a/examples/hotrod/services/frontend/best_eta.go b/examples/hotrod/services/frontend/best_eta.go index 6194f4a01fd..296a4773859 100644 --- a/examples/hotrod/services/frontend/best_eta.go +++ b/examples/hotrod/services/frontend/best_eta.go @@ -24,12 +24,12 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/pool" - "github.com/uber/jaeger/examples/hotrod/services/config" - "github.com/uber/jaeger/examples/hotrod/services/customer" - "github.com/uber/jaeger/examples/hotrod/services/driver" - "github.com/uber/jaeger/examples/hotrod/services/route" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/pool" + "github.com/jaegertracing/jaeger/examples/hotrod/services/config" + "github.com/jaegertracing/jaeger/examples/hotrod/services/customer" + "github.com/jaegertracing/jaeger/examples/hotrod/services/driver" + "github.com/jaegertracing/jaeger/examples/hotrod/services/route" ) type bestETA struct { diff --git a/examples/hotrod/services/frontend/server.go b/examples/hotrod/services/frontend/server.go index 3bd7c7413c4..4d91888dfa4 100644 --- a/examples/hotrod/services/frontend/server.go +++ b/examples/hotrod/services/frontend/server.go @@ -21,9 +21,9 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/httperr" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/httperr" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" ) // Server implements jaeger-demo-frontend service diff --git a/examples/hotrod/services/route/client.go b/examples/hotrod/services/route/client.go index caa6abf109c..893db4a67a3 100644 --- a/examples/hotrod/services/route/client.go +++ b/examples/hotrod/services/route/client.go @@ -23,8 +23,8 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" ) // Client is a remote client that implements route.Interface diff --git a/examples/hotrod/services/route/server.go b/examples/hotrod/services/route/server.go index c19f5eacfa2..303cfceb7ee 100644 --- a/examples/hotrod/services/route/server.go +++ b/examples/hotrod/services/route/server.go @@ -26,11 +26,11 @@ import ( "github.com/opentracing/opentracing-go" "go.uber.org/zap" - "github.com/uber/jaeger/examples/hotrod/pkg/delay" - "github.com/uber/jaeger/examples/hotrod/pkg/httperr" - "github.com/uber/jaeger/examples/hotrod/pkg/log" - "github.com/uber/jaeger/examples/hotrod/pkg/tracing" - "github.com/uber/jaeger/examples/hotrod/services/config" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/delay" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/httperr" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/log" + "github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing" + "github.com/jaegertracing/jaeger/examples/hotrod/services/config" ) // Server implements Route service diff --git a/model/adjuster/adjuster.go b/model/adjuster/adjuster.go index 8e5e6dec780..0a339be5dab 100644 --- a/model/adjuster/adjuster.go +++ b/model/adjuster/adjuster.go @@ -15,8 +15,8 @@ package adjuster import ( - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/multierror" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/multierror" ) // Adjuster applies certain modifications to a Trace object. diff --git a/model/adjuster/adjuster_test.go b/model/adjuster/adjuster_test.go index b37f5dbf446..fb290513d7b 100644 --- a/model/adjuster/adjuster_test.go +++ b/model/adjuster/adjuster_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/adjuster" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/adjuster" ) func TestSequences(t *testing.T) { diff --git a/model/adjuster/clockskew.go b/model/adjuster/clockskew.go index b05e7dcfa47..04bd37fa589 100644 --- a/model/adjuster/clockskew.go +++ b/model/adjuster/clockskew.go @@ -20,7 +20,7 @@ import ( "net" "time" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // ClockSkew returns an adjuster that modifies start time and log timestamps diff --git a/model/adjuster/clockskew_test.go b/model/adjuster/clockskew_test.go index 6e4ba678cfa..aafbb4fe7b6 100644 --- a/model/adjuster/clockskew_test.go +++ b/model/adjuster/clockskew_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestClockSkewAdjuster(t *testing.T) { diff --git a/model/adjuster/ip_tag.go b/model/adjuster/ip_tag.go index 912265c64c2..47637ccafe9 100644 --- a/model/adjuster/ip_tag.go +++ b/model/adjuster/ip_tag.go @@ -19,7 +19,7 @@ import ( "encoding/binary" "strconv" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) var ipTagsToCorrect = map[string]struct{}{ diff --git a/model/adjuster/ip_tag_test.go b/model/adjuster/ip_tag_test.go index cfcf8dbc5be..939c7a22403 100644 --- a/model/adjuster/ip_tag_test.go +++ b/model/adjuster/ip_tag_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestIPTagAdjuster(t *testing.T) { diff --git a/model/adjuster/sort_log_fields.go b/model/adjuster/sort_log_fields.go index 98ce40a6162..235bdc46a1a 100644 --- a/model/adjuster/sort_log_fields.go +++ b/model/adjuster/sort_log_fields.go @@ -15,7 +15,7 @@ package adjuster import ( - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // SortLogFields returns an Adjuster that sorts the fields in the span logs. diff --git a/model/adjuster/sort_log_fields_test.go b/model/adjuster/sort_log_fields_test.go index 18519012be3..52204695bbb 100644 --- a/model/adjuster/sort_log_fields_test.go +++ b/model/adjuster/sort_log_fields_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestSortLogFields(t *testing.T) { diff --git a/model/adjuster/span_id_deduper.go b/model/adjuster/span_id_deduper.go index 9b7a37725d8..b72f0b98ab3 100644 --- a/model/adjuster/span_id_deduper.go +++ b/model/adjuster/span_id_deduper.go @@ -17,7 +17,7 @@ package adjuster import ( "errors" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // SpanIDDeduper returns an adjuster that changes span ids for server diff --git a/model/adjuster/span_id_deduper_test.go b/model/adjuster/span_id_deduper_test.go index 5485d83aee4..d14678b2c83 100644 --- a/model/adjuster/span_id_deduper_test.go +++ b/model/adjuster/span_id_deduper_test.go @@ -20,7 +20,7 @@ import ( "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) const ( diff --git a/model/converter/json/domain_span_compare_test.go b/model/converter/json/domain_span_compare_test.go index abbc1345502..33a6a6d00bc 100644 --- a/model/converter/json/domain_span_compare_test.go +++ b/model/converter/json/domain_span_compare_test.go @@ -21,7 +21,7 @@ import ( "github.com/kr/pretty" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func CompareModelSpans(t *testing.T, expected *model.Span, actual *model.Span) { diff --git a/model/converter/json/from_domain.go b/model/converter/json/from_domain.go index 9b788a7125d..0443c92afc6 100644 --- a/model/converter/json/from_domain.go +++ b/model/converter/json/from_domain.go @@ -15,8 +15,8 @@ package json import ( - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/json" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/json" ) // FromDomain converts model.Trace into json.Trace format. diff --git a/model/converter/json/from_domain_test.go b/model/converter/json/from_domain_test.go index b567dc51d99..8879c8a9c13 100644 --- a/model/converter/json/from_domain_test.go +++ b/model/converter/json/from_domain_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/model" - jModel "github.com/uber/jaeger/model/json" + "github.com/jaegertracing/jaeger/model" + jModel "github.com/jaegertracing/jaeger/model/json" ) const NumberOfFixtures = 1 diff --git a/model/converter/json/json_span_compare_test.go b/model/converter/json/json_span_compare_test.go index 50fe0385ade..4f83afc1504 100644 --- a/model/converter/json/json_span_compare_test.go +++ b/model/converter/json/json_span_compare_test.go @@ -22,7 +22,7 @@ import ( "github.com/kr/pretty" "github.com/stretchr/testify/assert" - esJson "github.com/uber/jaeger/model/json" + esJson "github.com/jaegertracing/jaeger/model/json" ) func CompareJSONSpans(t *testing.T, expected *esJson.Span, actual *esJson.Span) { diff --git a/model/converter/json/process_hashtable.go b/model/converter/json/process_hashtable.go index fe91d62f220..6eac447c91c 100644 --- a/model/converter/json/process_hashtable.go +++ b/model/converter/json/process_hashtable.go @@ -17,7 +17,7 @@ package json import ( "strconv" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) type processHashtable struct { diff --git a/model/converter/json/process_hashtable_test.go b/model/converter/json/process_hashtable_test.go index 22d7deb4561..d015ae7d1f4 100644 --- a/model/converter/json/process_hashtable_test.go +++ b/model/converter/json/process_hashtable_test.go @@ -17,8 +17,8 @@ package json import ( "testing" + "github.com/jaegertracing/jaeger/model" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" ) func TestProcessHashtable(t *testing.T) { diff --git a/model/converter/json/to_domain.go b/model/converter/json/to_domain.go index 23c04048927..5eab3484664 100644 --- a/model/converter/json/to_domain.go +++ b/model/converter/json/to_domain.go @@ -19,9 +19,9 @@ import ( "fmt" "strconv" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/json" "github.com/pkg/errors" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/json" ) // SpanToDomain converts json.Span with embedded Process into model.Span format. diff --git a/model/converter/json/to_domain_test.go b/model/converter/json/to_domain_test.go index 18192618033..2c3b1a55130 100644 --- a/model/converter/json/to_domain_test.go +++ b/model/converter/json/to_domain_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/model" - jModel "github.com/uber/jaeger/model/json" + "github.com/jaegertracing/jaeger/model" + jModel "github.com/jaegertracing/jaeger/model/json" ) func TestToDomainEmbeddedProcess(t *testing.T) { diff --git a/model/converter/thrift/jaeger/from_domain.go b/model/converter/thrift/jaeger/from_domain.go index 550321d300a..6872ed01c35 100644 --- a/model/converter/thrift/jaeger/from_domain.go +++ b/model/converter/thrift/jaeger/from_domain.go @@ -17,8 +17,8 @@ package jaeger import ( "fmt" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/thrift-gen/jaeger" ) // FromDomain takes an arrya of model.Span and returns diff --git a/model/converter/thrift/jaeger/from_domain_test.go b/model/converter/thrift/jaeger/from_domain_test.go index df915859ed0..41f35f38b44 100644 --- a/model/converter/thrift/jaeger/from_domain_test.go +++ b/model/converter/thrift/jaeger/from_domain_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" - j "github.com/uber/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/model" + j "github.com/jaegertracing/jaeger/thrift-gen/jaeger" ) const ( diff --git a/model/converter/thrift/jaeger/to_domain.go b/model/converter/thrift/jaeger/to_domain.go index b3b9fb0f00a..8c11b6a923b 100644 --- a/model/converter/thrift/jaeger/to_domain.go +++ b/model/converter/thrift/jaeger/to_domain.go @@ -17,8 +17,8 @@ package jaeger import ( "fmt" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/thrift-gen/jaeger" ) // ToDomain transforms a set of spans and a process in jaeger.thrift format into a slice of model.Span. diff --git a/model/converter/thrift/jaeger/to_domain_test.go b/model/converter/thrift/jaeger/to_domain_test.go index 1042d0fec6b..99dc24f2162 100644 --- a/model/converter/thrift/jaeger/to_domain_test.go +++ b/model/converter/thrift/jaeger/to_domain_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/thrift-gen/jaeger" ) const NumberOfFixtures = 2 diff --git a/model/converter/thrift/zipkin/process_hashtable.go b/model/converter/thrift/zipkin/process_hashtable.go index 742bbeb38ae..ce4ec0583a7 100644 --- a/model/converter/thrift/zipkin/process_hashtable.go +++ b/model/converter/thrift/zipkin/process_hashtable.go @@ -14,7 +14,7 @@ package zipkin -import "github.com/uber/jaeger/model" +import "github.com/jaegertracing/jaeger/model" type processHashtable struct { processes map[uint64][]*model.Process diff --git a/model/converter/thrift/zipkin/process_hashtable_test.go b/model/converter/thrift/zipkin/process_hashtable_test.go index 965fdb2b79e..10206da1f10 100644 --- a/model/converter/thrift/zipkin/process_hashtable_test.go +++ b/model/converter/thrift/zipkin/process_hashtable_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestProcessHashtable(t *testing.T) { diff --git a/model/converter/thrift/zipkin/to_domain.go b/model/converter/thrift/zipkin/to_domain.go index 417d335da09..320f9adcbb5 100644 --- a/model/converter/thrift/zipkin/to_domain.go +++ b/model/converter/thrift/zipkin/to_domain.go @@ -23,9 +23,9 @@ import ( "github.com/opentracing/opentracing-go/ext" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/multierror" - "github.com/uber/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/multierror" + "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" ) const ( diff --git a/model/converter/thrift/zipkin/to_domain_test.go b/model/converter/thrift/zipkin/to_domain_test.go index 6f14eb867cf..01a1ac75bbb 100644 --- a/model/converter/thrift/zipkin/to_domain_test.go +++ b/model/converter/thrift/zipkin/to_domain_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/jaegertracing/jaeger/model" + z "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/uber/jaeger/model" - z "github.com/uber/jaeger/thrift-gen/zipkincore" ) const NumberOfFixtures = 3 diff --git a/model/hash_test.go b/model/hash_test.go index 0bbc4e04839..fc379062313 100644 --- a/model/hash_test.go +++ b/model/hash_test.go @@ -20,8 +20,8 @@ import ( "io" "testing" + "github.com/jaegertracing/jaeger/model" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" ) type mockHashWwiterAnswer struct { diff --git a/model/json/model_test.go b/model/json/model_test.go index ae2d7192018..7e4a56675f0 100644 --- a/model/json/model_test.go +++ b/model/json/model_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "github.com/uber/jaeger/model/json" + . "github.com/jaegertracing/jaeger/model/json" ) func TestFromFile(t *testing.T) { diff --git a/model/keyvalue_test.go b/model/keyvalue_test.go index adde30726b2..118f55fe155 100644 --- a/model/keyvalue_test.go +++ b/model/keyvalue_test.go @@ -21,7 +21,7 @@ import ( "encoding/json" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestValueTypeToFromString(t *testing.T) { diff --git a/model/keyvalues_test.go b/model/keyvalues_test.go index 3fd20b7a8c3..ac88cedbb0e 100644 --- a/model/keyvalues_test.go +++ b/model/keyvalues_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestKeyValuesSort(t *testing.T) { diff --git a/model/process_test.go b/model/process_test.go index c8d62eb23aa..4c4fdbf889d 100644 --- a/model/process_test.go +++ b/model/process_test.go @@ -23,8 +23,8 @@ import ( "errors" + "github.com/jaegertracing/jaeger/model" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/model" ) func TestProcessEqual(t *testing.T) { diff --git a/model/span_test.go b/model/span_test.go index 8c001f3e2ef..1123038b806 100644 --- a/model/span_test.go +++ b/model/span_test.go @@ -24,8 +24,8 @@ import ( "bytes" + "github.com/jaegertracing/jaeger/model" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/model" ) type TraceIDContainer struct { diff --git a/model/spanref_test.go b/model/spanref_test.go index 37b9676b394..bc91b4e831a 100644 --- a/model/spanref_test.go +++ b/model/spanref_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestSpanRefTypeToFromString(t *testing.T) { diff --git a/model/time_test.go b/model/time_test.go index 8156499c57b..892845541c6 100644 --- a/model/time_test.go +++ b/model/time_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestTimeConversion(t *testing.T) { diff --git a/model/trace_test.go b/model/trace_test.go index 3208a1e11e1..bc50d7f648c 100644 --- a/model/trace_test.go +++ b/model/trace_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestTraceFindSpanByID(t *testing.T) { diff --git a/pkg/cassandra/config/config.go b/pkg/cassandra/config/config.go index 174c6794e08..231076c7c50 100644 --- a/pkg/cassandra/config/config.go +++ b/pkg/cassandra/config/config.go @@ -20,8 +20,8 @@ import ( "github.com/gocql/gocql" - "github.com/uber/jaeger/pkg/cassandra" - gocqlw "github.com/uber/jaeger/pkg/cassandra/gocql" + "github.com/jaegertracing/jaeger/pkg/cassandra" + gocqlw "github.com/jaegertracing/jaeger/pkg/cassandra/gocql" ) // Configuration describes the configuration properties needed to connect to a Cassandra cluster diff --git a/pkg/cassandra/gocql/gocql.go b/pkg/cassandra/gocql/gocql.go index ef9ac184460..19f1ce23992 100644 --- a/pkg/cassandra/gocql/gocql.go +++ b/pkg/cassandra/gocql/gocql.go @@ -17,7 +17,7 @@ package gocql import ( "github.com/gocql/gocql" - "github.com/uber/jaeger/pkg/cassandra" + "github.com/jaegertracing/jaeger/pkg/cassandra" ) // CQLSession is a wrapper around gocql.Session. diff --git a/pkg/cassandra/metrics/table.go b/pkg/cassandra/metrics/table.go index c82d10e1307..e6988b824e4 100644 --- a/pkg/cassandra/metrics/table.go +++ b/pkg/cassandra/metrics/table.go @@ -21,8 +21,8 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/pkg/cassandra" - storageMetrics "github.com/uber/jaeger/storage/spanstore/metrics" + "github.com/jaegertracing/jaeger/pkg/cassandra" + storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics" ) // Table is a collection of metrics about Cassandra write operations. diff --git a/pkg/cassandra/metrics/table_test.go b/pkg/cassandra/metrics/table_test.go index 7fa7803d4c5..2833453b0d9 100644 --- a/pkg/cassandra/metrics/table_test.go +++ b/pkg/cassandra/metrics/table_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" + "github.com/jaegertracing/jaeger/pkg/testutils" "github.com/stretchr/testify/assert" "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/pkg/testutils" ) func TestTableEmit(t *testing.T) { diff --git a/pkg/cassandra/mocks/Iterator.go b/pkg/cassandra/mocks/Iterator.go index b6ba4efadf7..3d965122c6f 100644 --- a/pkg/cassandra/mocks/Iterator.go +++ b/pkg/cassandra/mocks/Iterator.go @@ -14,7 +14,7 @@ package mocks -import cassandra "github.com/uber/jaeger/pkg/cassandra" +import cassandra "github.com/jaegertracing/jaeger/pkg/cassandra" import mock "github.com/stretchr/testify/mock" // Iterator is an autogenerated mock type for the Iterator type diff --git a/pkg/cassandra/mocks/Query.go b/pkg/cassandra/mocks/Query.go index fb884afb182..0967dcbacfc 100644 --- a/pkg/cassandra/mocks/Query.go +++ b/pkg/cassandra/mocks/Query.go @@ -14,7 +14,7 @@ package mocks -import cassandra "github.com/uber/jaeger/pkg/cassandra" +import cassandra "github.com/jaegertracing/jaeger/pkg/cassandra" import mock "github.com/stretchr/testify/mock" // Query is an autogenerated mock type for the Query type diff --git a/pkg/cassandra/mocks/Session.go b/pkg/cassandra/mocks/Session.go index 9d7019c3964..04b6495ed96 100644 --- a/pkg/cassandra/mocks/Session.go +++ b/pkg/cassandra/mocks/Session.go @@ -14,7 +14,7 @@ package mocks -import cassandra "github.com/uber/jaeger/pkg/cassandra" +import cassandra "github.com/jaegertracing/jaeger/pkg/cassandra" import mock "github.com/stretchr/testify/mock" // Session is an autogenerated mock type for the Session type diff --git a/pkg/discovery/peerlistmgr/peer_list_mgr.go b/pkg/discovery/peerlistmgr/peer_list_mgr.go index d77e63293d0..1e0cba1a5d2 100644 --- a/pkg/discovery/peerlistmgr/peer_list_mgr.go +++ b/pkg/discovery/peerlistmgr/peer_list_mgr.go @@ -24,7 +24,7 @@ import ( "github.com/uber/tchannel-go" "go.uber.org/zap" - "github.com/uber/jaeger/pkg/discovery" + "github.com/jaegertracing/jaeger/pkg/discovery" ) var introspectOptions = &tchannel.IntrospectionOptions{IncludeEmptyPeers: true} diff --git a/pkg/discovery/peerlistmgr/peer_list_mgr_test.go b/pkg/discovery/peerlistmgr/peer_list_mgr_test.go index d7ca580bf36..c66a39f48f1 100644 --- a/pkg/discovery/peerlistmgr/peer_list_mgr_test.go +++ b/pkg/discovery/peerlistmgr/peer_list_mgr_test.go @@ -29,7 +29,7 @@ import ( "go.uber.org/zap" "golang.org/x/net/context" - "github.com/uber/jaeger/pkg/discovery" + "github.com/jaegertracing/jaeger/pkg/discovery" ) type testManager struct { diff --git a/pkg/es/config/config.go b/pkg/es/config/config.go index 7b12221e1df..28cddb57e15 100644 --- a/pkg/es/config/config.go +++ b/pkg/es/config/config.go @@ -20,7 +20,7 @@ import ( "github.com/pkg/errors" "gopkg.in/olivere/elastic.v5" - "github.com/uber/jaeger/pkg/es" + "github.com/jaegertracing/jaeger/pkg/es" ) // Configuration describes the configuration properties needed to connect to an ElasticSearch cluster diff --git a/pkg/es/mocks/Client.go b/pkg/es/mocks/Client.go index 6dfdd4a48a0..90783af50c5 100644 --- a/pkg/es/mocks/Client.go +++ b/pkg/es/mocks/Client.go @@ -16,7 +16,7 @@ package mocks -import es "github.com/uber/jaeger/pkg/es" +import es "github.com/jaegertracing/jaeger/pkg/es" import mock "github.com/stretchr/testify/mock" // Client is an autogenerated mock type for the Client type diff --git a/pkg/es/mocks/IndexService.go b/pkg/es/mocks/IndexService.go index 3d9e453f128..bf49c20d176 100644 --- a/pkg/es/mocks/IndexService.go +++ b/pkg/es/mocks/IndexService.go @@ -18,7 +18,7 @@ package mocks import context "context" import elastic "gopkg.in/olivere/elastic.v5" -import es "github.com/uber/jaeger/pkg/es" +import es "github.com/jaegertracing/jaeger/pkg/es" import mock "github.com/stretchr/testify/mock" // IndexService is an autogenerated mock type for the IndexService type diff --git a/pkg/es/mocks/IndicesCreateService.go b/pkg/es/mocks/IndicesCreateService.go index 046cc00c36f..f9b9a1751cf 100644 --- a/pkg/es/mocks/IndicesCreateService.go +++ b/pkg/es/mocks/IndicesCreateService.go @@ -18,7 +18,7 @@ package mocks import context "context" import elastic "gopkg.in/olivere/elastic.v5" -import es "github.com/uber/jaeger/pkg/es" +import es "github.com/jaegertracing/jaeger/pkg/es" import mock "github.com/stretchr/testify/mock" // IndicesCreateService is an autogenerated mock type for the IndicesCreateService type diff --git a/pkg/es/mocks/MultiSearchService.go b/pkg/es/mocks/MultiSearchService.go index 64900beebf7..a565e0a4a47 100644 --- a/pkg/es/mocks/MultiSearchService.go +++ b/pkg/es/mocks/MultiSearchService.go @@ -18,7 +18,7 @@ package mocks import context "context" import elastic "gopkg.in/olivere/elastic.v5" -import es "github.com/uber/jaeger/pkg/es" +import es "github.com/jaegertracing/jaeger/pkg/es" import mock "github.com/stretchr/testify/mock" // MultiSearchService is an autogenerated mock type for the MultiSearchService type diff --git a/pkg/es/mocks/SearchService.go b/pkg/es/mocks/SearchService.go index fe876cba8ce..6bb72f59333 100644 --- a/pkg/es/mocks/SearchService.go +++ b/pkg/es/mocks/SearchService.go @@ -18,7 +18,7 @@ package mocks import context "context" import elastic "gopkg.in/olivere/elastic.v5" -import es "github.com/uber/jaeger/pkg/es" +import es "github.com/jaegertracing/jaeger/pkg/es" import mock "github.com/stretchr/testify/mock" // SearchService is an autogenerated mock type for the SearchService type diff --git a/pkg/healthcheck/handler.go b/pkg/healthcheck/handler.go index a2189ae73ab..d87db792a3e 100644 --- a/pkg/healthcheck/handler.go +++ b/pkg/healthcheck/handler.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" - "github.com/uber/jaeger/pkg/version" + "github.com/jaegertracing/jaeger/pkg/version" ) // State represents the current health check state diff --git a/pkg/healthcheck/handler_test.go b/pkg/healthcheck/handler_test.go index d221b2da605..1c79af5fbdd 100644 --- a/pkg/healthcheck/handler_test.go +++ b/pkg/healthcheck/handler_test.go @@ -20,9 +20,9 @@ import ( "net/http/httptest" "testing" + "github.com/jaegertracing/jaeger/pkg/healthcheck" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/pkg/healthcheck" "go.uber.org/zap" ) diff --git a/pkg/recoveryhandler/zap_test.go b/pkg/recoveryhandler/zap_test.go index 0d0701f0091..847390d43de 100644 --- a/pkg/recoveryhandler/zap_test.go +++ b/pkg/recoveryhandler/zap_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/pkg/testutils" ) func TestNewRecoveryHandler(t *testing.T) { diff --git a/plugin/pkg/distributedlock/cassandra/lock.go b/plugin/pkg/distributedlock/cassandra/lock.go index 13b154e6e25..3605f74781e 100644 --- a/plugin/pkg/distributedlock/cassandra/lock.go +++ b/plugin/pkg/distributedlock/cassandra/lock.go @@ -19,7 +19,7 @@ import ( "github.com/pkg/errors" - "github.com/uber/jaeger/pkg/cassandra" + "github.com/jaegertracing/jaeger/pkg/cassandra" ) // Lock is a distributed lock based off Cassandra. diff --git a/plugin/pkg/distributedlock/cassandra/lock_test.go b/plugin/pkg/distributedlock/cassandra/lock_test.go index b888288d72d..b70e18d1f99 100644 --- a/plugin/pkg/distributedlock/cassandra/lock_test.go +++ b/plugin/pkg/distributedlock/cassandra/lock_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/uber/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" ) var ( diff --git a/plugin/storage/cassandra/dependencystore/model_test.go b/plugin/storage/cassandra/dependencystore/model_test.go index 53ef4b561c6..d86b9e74809 100644 --- a/plugin/storage/cassandra/dependencystore/model_test.go +++ b/plugin/storage/cassandra/dependencystore/model_test.go @@ -19,7 +19,7 @@ import ( "github.com/gocql/gocql" - "github.com/uber/jaeger/pkg/cassandra/gocql/testutils" + "github.com/jaegertracing/jaeger/pkg/cassandra/gocql/testutils" ) func TestDependencyUDT(t *testing.T) { diff --git a/plugin/storage/cassandra/dependencystore/storage.go b/plugin/storage/cassandra/dependencystore/storage.go index b6d09679426..72c3c470548 100644 --- a/plugin/storage/cassandra/dependencystore/storage.go +++ b/plugin/storage/cassandra/dependencystore/storage.go @@ -21,9 +21,9 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/cassandra" - casMetrics "github.com/uber/jaeger/pkg/cassandra/metrics" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/cassandra" + casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics" ) const ( diff --git a/plugin/storage/cassandra/dependencystore/storage_test.go b/plugin/storage/cassandra/dependencystore/storage_test.go index efb83acefdf..168f499029b 100644 --- a/plugin/storage/cassandra/dependencystore/storage_test.go +++ b/plugin/storage/cassandra/dependencystore/storage_test.go @@ -25,11 +25,11 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/cassandra" - "github.com/uber/jaeger/pkg/cassandra/mocks" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/storage/dependencystore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/cassandra" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/storage/dependencystore" ) type depStorageTest struct { diff --git a/plugin/storage/cassandra/samplingstore/storage.go b/plugin/storage/cassandra/samplingstore/storage.go index 63497f4b5c4..37ae0b96a9a 100644 --- a/plugin/storage/cassandra/samplingstore/storage.go +++ b/plugin/storage/cassandra/samplingstore/storage.go @@ -27,9 +27,9 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/cmd/collector/app/sampling/model" - "github.com/uber/jaeger/pkg/cassandra" - casMetrics "github.com/uber/jaeger/pkg/cassandra/metrics" + "github.com/jaegertracing/jaeger/cmd/collector/app/sampling/model" + "github.com/jaegertracing/jaeger/pkg/cassandra" + casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics" ) const ( diff --git a/plugin/storage/cassandra/samplingstore/storage_test.go b/plugin/storage/cassandra/samplingstore/storage_test.go index 3860eed59f0..c71a619a917 100644 --- a/plugin/storage/cassandra/samplingstore/storage_test.go +++ b/plugin/storage/cassandra/samplingstore/storage_test.go @@ -25,10 +25,10 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/cmd/collector/app/sampling/model" - "github.com/uber/jaeger/pkg/cassandra/mocks" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/storage/samplingstore" + "github.com/jaegertracing/jaeger/cmd/collector/app/sampling/model" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/storage/samplingstore" ) var ( diff --git a/plugin/storage/cassandra/savetracetest/main.go b/plugin/storage/cassandra/savetracetest/main.go index ba45206192c..d01de4036a3 100644 --- a/plugin/storage/cassandra/savetracetest/main.go +++ b/plugin/storage/cassandra/savetracetest/main.go @@ -20,10 +20,10 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - cascfg "github.com/uber/jaeger/pkg/cassandra/config" - cSpanStore "github.com/uber/jaeger/plugin/storage/cassandra/spanstore" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config" + cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore" + "github.com/jaegertracing/jaeger/storage/spanstore" ) var logger, _ = zap.NewDevelopment() diff --git a/plugin/storage/cassandra/spanstore/dbmodel/converter.go b/plugin/storage/cassandra/spanstore/dbmodel/converter.go index 10f90998567..50683f7d5d0 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/converter.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/converter.go @@ -17,7 +17,7 @@ package dbmodel import ( "errors" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // ErrUnknownKeyValueTypeFromCassandra is an error that occurs when trying to decipher an unknown tag type from the database diff --git a/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go b/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go index c2c26102546..41e1880df90 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/converter_test.go @@ -20,7 +20,7 @@ import ( "github.com/kr/pretty" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) var ( diff --git a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go b/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go index 18422a3087f..45bff22dee9 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go @@ -22,8 +22,8 @@ import ( "github.com/gocql/gocql" "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/cassandra/gocql/testutils" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/cassandra/gocql/testutils" ) func TestDBModelUDTMarshall(t *testing.T) { diff --git a/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go b/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go index c7f81c70187..47eb4f4b6f1 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/log_fields_filter.go @@ -14,7 +14,7 @@ package dbmodel -import "github.com/uber/jaeger/model" +import "github.com/jaegertracing/jaeger/model" // LogFieldsFilter filters all span.Logs.Fields. type LogFieldsFilter struct { diff --git a/plugin/storage/cassandra/spanstore/dbmodel/model.go b/plugin/storage/cassandra/spanstore/dbmodel/model.go index d957dd7eac7..4868cf4b3f4 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/model.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/model.go @@ -18,7 +18,7 @@ import ( "bytes" "encoding/binary" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // TraceID is a serializable form of model.TraceID diff --git a/plugin/storage/cassandra/spanstore/dbmodel/model_test.go b/plugin/storage/cassandra/spanstore/dbmodel/model_test.go index f1c6edaa84e..6802ec2526e 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/model_test.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/model_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestTagInsertionString(t *testing.T) { diff --git a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go b/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go index 6c98daf7004..30b41a7a25b 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go @@ -15,7 +15,7 @@ package dbmodel import ( - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // TODO (black-adder) add a chain filter diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go b/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go index c4cc89279f9..6e10cae586f 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func TestGetIntersectedTraceIDs(t *testing.T) { diff --git a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go b/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go index efcbc79a4ab..894216e22e3 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go @@ -14,7 +14,7 @@ package dbmodel -import "github.com/uber/jaeger/model" +import "github.com/jaegertracing/jaeger/model" // GetAllUniqueTags creates a list of all unique tags from a set of filtered tags. func GetAllUniqueTags(span *model.Span, tagFilter TagFilter) []TagInsertion { diff --git a/plugin/storage/cassandra/spanstore/operation_names.go b/plugin/storage/cassandra/spanstore/operation_names.go index cb5af615b2c..25d9c624205 100644 --- a/plugin/storage/cassandra/spanstore/operation_names.go +++ b/plugin/storage/cassandra/spanstore/operation_names.go @@ -21,9 +21,9 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/pkg/cache" - "github.com/uber/jaeger/pkg/cassandra" - casMetrics "github.com/uber/jaeger/pkg/cassandra/metrics" + "github.com/jaegertracing/jaeger/pkg/cache" + "github.com/jaegertracing/jaeger/pkg/cassandra" + casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics" ) const ( diff --git a/plugin/storage/cassandra/spanstore/operation_names_test.go b/plugin/storage/cassandra/spanstore/operation_names_test.go index df69f5720e7..59d6a4b2aa1 100644 --- a/plugin/storage/cassandra/spanstore/operation_names_test.go +++ b/plugin/storage/cassandra/spanstore/operation_names_test.go @@ -25,8 +25,8 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/pkg/cassandra/mocks" - "github.com/uber/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" ) type operationNameStorageTest struct { diff --git a/plugin/storage/cassandra/spanstore/reader.go b/plugin/storage/cassandra/spanstore/reader.go index 23956b63e8a..2f347ecf62a 100644 --- a/plugin/storage/cassandra/spanstore/reader.go +++ b/plugin/storage/cassandra/spanstore/reader.go @@ -21,11 +21,11 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/cassandra" - casMetrics "github.com/uber/jaeger/pkg/cassandra/metrics" - "github.com/uber/jaeger/plugin/storage/cassandra/spanstore/dbmodel" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/cassandra" + casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel" + "github.com/jaegertracing/jaeger/storage/spanstore" ) const ( diff --git a/plugin/storage/cassandra/spanstore/reader_test.go b/plugin/storage/cassandra/spanstore/reader_test.go index 9f58fcad225..5b316a61e24 100644 --- a/plugin/storage/cassandra/spanstore/reader_test.go +++ b/plugin/storage/cassandra/spanstore/reader_test.go @@ -25,12 +25,12 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/cassandra" - "github.com/uber/jaeger/pkg/cassandra/mocks" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/plugin/storage/cassandra/spanstore/dbmodel" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/cassandra" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel" + "github.com/jaegertracing/jaeger/storage/spanstore" ) type spanReaderTest struct { diff --git a/plugin/storage/cassandra/spanstore/service_names.go b/plugin/storage/cassandra/spanstore/service_names.go index b8369eec722..512a1db15e8 100644 --- a/plugin/storage/cassandra/spanstore/service_names.go +++ b/plugin/storage/cassandra/spanstore/service_names.go @@ -21,9 +21,9 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/pkg/cache" - "github.com/uber/jaeger/pkg/cassandra" - casMetrics "github.com/uber/jaeger/pkg/cassandra/metrics" + "github.com/jaegertracing/jaeger/pkg/cache" + "github.com/jaegertracing/jaeger/pkg/cassandra" + casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics" ) const ( diff --git a/plugin/storage/cassandra/spanstore/service_names_test.go b/plugin/storage/cassandra/spanstore/service_names_test.go index 7a8ac9d7d08..1b6e81ab942 100644 --- a/plugin/storage/cassandra/spanstore/service_names_test.go +++ b/plugin/storage/cassandra/spanstore/service_names_test.go @@ -25,8 +25,8 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/pkg/cassandra/mocks" - "github.com/uber/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" ) type serviceNameStorageTest struct { diff --git a/plugin/storage/cassandra/spanstore/writer.go b/plugin/storage/cassandra/spanstore/writer.go index 11849f863ac..e45a6481562 100644 --- a/plugin/storage/cassandra/spanstore/writer.go +++ b/plugin/storage/cassandra/spanstore/writer.go @@ -25,10 +25,10 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/cassandra" - casMetrics "github.com/uber/jaeger/pkg/cassandra/metrics" - "github.com/uber/jaeger/plugin/storage/cassandra/spanstore/dbmodel" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/cassandra" + casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel" ) const ( diff --git a/plugin/storage/cassandra/spanstore/writer_options.go b/plugin/storage/cassandra/spanstore/writer_options.go index 80030e984fd..c7e21eca4db 100644 --- a/plugin/storage/cassandra/spanstore/writer_options.go +++ b/plugin/storage/cassandra/spanstore/writer_options.go @@ -15,7 +15,7 @@ package spanstore import ( - "github.com/uber/jaeger/plugin/storage/cassandra/spanstore/dbmodel" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel" ) // Option is a function that sets some option on the writer. diff --git a/plugin/storage/cassandra/spanstore/writer_options_test.go b/plugin/storage/cassandra/spanstore/writer_options_test.go index e1918752ce1..b08f0ecf514 100644 --- a/plugin/storage/cassandra/spanstore/writer_options_test.go +++ b/plugin/storage/cassandra/spanstore/writer_options_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/plugin/storage/cassandra/spanstore/dbmodel" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel" ) func TestWriterOpetions(t *testing.T) { diff --git a/plugin/storage/cassandra/spanstore/writer_test.go b/plugin/storage/cassandra/spanstore/writer_test.go index f69b659a79c..005c0126aca 100644 --- a/plugin/storage/cassandra/spanstore/writer_test.go +++ b/plugin/storage/cassandra/spanstore/writer_test.go @@ -24,11 +24,11 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/cassandra/mocks" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/plugin/storage/cassandra/spanstore/dbmodel" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/cassandra/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel" + "github.com/jaegertracing/jaeger/storage/spanstore" ) type spanWriterTest struct { diff --git a/plugin/storage/es/dependencystore/storage.go b/plugin/storage/es/dependencystore/storage.go index 1981582011f..34f1dfecc40 100644 --- a/plugin/storage/es/dependencystore/storage.go +++ b/plugin/storage/es/dependencystore/storage.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" "gopkg.in/olivere/elastic.v5" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/es" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/es" ) const ( diff --git a/plugin/storage/es/dependencystore/storage_test.go b/plugin/storage/es/dependencystore/storage_test.go index 989a2c61eef..9620de7e6af 100644 --- a/plugin/storage/es/dependencystore/storage_test.go +++ b/plugin/storage/es/dependencystore/storage_test.go @@ -26,10 +26,10 @@ import ( "go.uber.org/zap" "gopkg.in/olivere/elastic.v5" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/es/mocks" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/storage/dependencystore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/es/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/storage/dependencystore" ) type depStorageTest struct { diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go index 9b85cc72202..a42ac336c1b 100644 --- a/plugin/storage/es/spanstore/reader.go +++ b/plugin/storage/es/spanstore/reader.go @@ -25,12 +25,12 @@ import ( "go.uber.org/zap" "gopkg.in/olivere/elastic.v5" - "github.com/uber/jaeger/model" - jConverter "github.com/uber/jaeger/model/converter/json" - jModel "github.com/uber/jaeger/model/json" - "github.com/uber/jaeger/pkg/es" - "github.com/uber/jaeger/storage/spanstore" - storageMetrics "github.com/uber/jaeger/storage/spanstore/metrics" + "github.com/jaegertracing/jaeger/model" + jConverter "github.com/jaegertracing/jaeger/model/converter/json" + jModel "github.com/jaegertracing/jaeger/model/json" + "github.com/jaegertracing/jaeger/pkg/es" + "github.com/jaegertracing/jaeger/storage/spanstore" + storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics" ) const ( diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go index 9071309a98d..8144ec3be12 100644 --- a/plugin/storage/es/spanstore/reader_test.go +++ b/plugin/storage/es/spanstore/reader_test.go @@ -26,12 +26,12 @@ import ( "go.uber.org/zap" "gopkg.in/olivere/elastic.v5" + "github.com/jaegertracing/jaeger/model" + esJson "github.com/jaegertracing/jaeger/model/json" + "github.com/jaegertracing/jaeger/pkg/es/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/storage/spanstore" "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/model" - esJson "github.com/uber/jaeger/model/json" - "github.com/uber/jaeger/pkg/es/mocks" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/storage/spanstore" ) var exampleESSpan = []byte( diff --git a/plugin/storage/es/spanstore/service_operation.go b/plugin/storage/es/spanstore/service_operation.go index efd565ec979..452635bbb8e 100644 --- a/plugin/storage/es/spanstore/service_operation.go +++ b/plugin/storage/es/spanstore/service_operation.go @@ -24,10 +24,10 @@ import ( "go.uber.org/zap" "gopkg.in/olivere/elastic.v5" - jModel "github.com/uber/jaeger/model/json" - "github.com/uber/jaeger/pkg/cache" - "github.com/uber/jaeger/pkg/es" - storageMetrics "github.com/uber/jaeger/storage/spanstore/metrics" + jModel "github.com/jaegertracing/jaeger/model/json" + "github.com/jaegertracing/jaeger/pkg/cache" + "github.com/jaegertracing/jaeger/pkg/es" + storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics" ) const ( diff --git a/plugin/storage/es/spanstore/service_operation_test.go b/plugin/storage/es/spanstore/service_operation_test.go index 7b8123f8cbc..0fcbe0cdffc 100644 --- a/plugin/storage/es/spanstore/service_operation_test.go +++ b/plugin/storage/es/spanstore/service_operation_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/olivere/elastic.v5" - jModel "github.com/uber/jaeger/model/json" - "github.com/uber/jaeger/pkg/es/mocks" + jModel "github.com/jaegertracing/jaeger/model/json" + "github.com/jaegertracing/jaeger/pkg/es/mocks" ) func TestWriteService(t *testing.T) { diff --git a/plugin/storage/es/spanstore/writer.go b/plugin/storage/es/spanstore/writer.go index b279c01ce2d..24aaf666198 100644 --- a/plugin/storage/es/spanstore/writer.go +++ b/plugin/storage/es/spanstore/writer.go @@ -24,12 +24,12 @@ import ( "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/converter/json" - jModel "github.com/uber/jaeger/model/json" - "github.com/uber/jaeger/pkg/cache" - "github.com/uber/jaeger/pkg/es" - storageMetrics "github.com/uber/jaeger/storage/spanstore/metrics" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/converter/json" + jModel "github.com/jaegertracing/jaeger/model/json" + "github.com/jaegertracing/jaeger/pkg/cache" + "github.com/jaegertracing/jaeger/pkg/es" + storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics" ) const ( diff --git a/plugin/storage/es/spanstore/writer_test.go b/plugin/storage/es/spanstore/writer_test.go index 0fcffb0b63b..0d29ca7e6fb 100644 --- a/plugin/storage/es/spanstore/writer_test.go +++ b/plugin/storage/es/spanstore/writer_test.go @@ -27,11 +27,11 @@ import ( "go.uber.org/zap" "gopkg.in/olivere/elastic.v5" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/json" - "github.com/uber/jaeger/pkg/es/mocks" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/json" + "github.com/jaegertracing/jaeger/pkg/es/mocks" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/storage/spanstore" ) type spanWriterTest struct { diff --git a/plugin/storage/integration/domain_trace_compare_test.go b/plugin/storage/integration/domain_trace_compare_test.go index f77326bf5b8..435073954a6 100644 --- a/plugin/storage/integration/domain_trace_compare_test.go +++ b/plugin/storage/integration/domain_trace_compare_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) func CompareSliceOfTraces(t *testing.T, expected []*model.Trace, actual []*model.Trace) { diff --git a/plugin/storage/integration/es_integration_test.go b/plugin/storage/integration/es_integration_test.go index 1b2a9e72c8a..923c3d2e360 100644 --- a/plugin/storage/integration/es_integration_test.go +++ b/plugin/storage/integration/es_integration_test.go @@ -26,10 +26,10 @@ import ( "github.com/uber/jaeger-lib/metrics" "gopkg.in/olivere/elastic.v5" - "github.com/uber/jaeger/pkg/es" - "github.com/uber/jaeger/pkg/testutils" - "github.com/uber/jaeger/plugin/storage/es/dependencystore" - "github.com/uber/jaeger/plugin/storage/es/spanstore" + "github.com/jaegertracing/jaeger/pkg/es" + "github.com/jaegertracing/jaeger/pkg/testutils" + "github.com/jaegertracing/jaeger/plugin/storage/es/dependencystore" + "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore" ) const ( diff --git a/plugin/storage/integration/integration_test.go b/plugin/storage/integration/integration_test.go index a3a9bf3bd68..56fb1b8f542 100644 --- a/plugin/storage/integration/integration_test.go +++ b/plugin/storage/integration/integration_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/dependencystore" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/dependencystore" + "github.com/jaegertracing/jaeger/storage/spanstore" ) const ( diff --git a/scripts/cover.sh b/scripts/cover.sh index 63b1104c32a..86ccbdadaff 100755 --- a/scripts/cover.sh +++ b/scripts/cover.sh @@ -3,7 +3,7 @@ set -e COVER=.cover -ROOT_PKG=github.com/uber/jaeger/ +ROOT_PKG=github.com/jaegertracing/jaeger/ if [[ -d "$COVER" ]]; then rm -rf "$COVER" diff --git a/storage/dependencystore/interface.go b/storage/dependencystore/interface.go index 6333908da6f..f8f9036033a 100644 --- a/storage/dependencystore/interface.go +++ b/storage/dependencystore/interface.go @@ -17,7 +17,7 @@ package dependencystore import ( "time" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // Writer stores service dependencies into storage. diff --git a/storage/dependencystore/mocks/Reader.go b/storage/dependencystore/mocks/Reader.go index 2bf19e00809..a7c27bd4c3e 100644 --- a/storage/dependencystore/mocks/Reader.go +++ b/storage/dependencystore/mocks/Reader.go @@ -14,9 +14,9 @@ package mocks -import dependencystore "github.com/uber/jaeger/storage/dependencystore" +import dependencystore "github.com/jaegertracing/jaeger/storage/dependencystore" import mock "github.com/stretchr/testify/mock" -import model "github.com/uber/jaeger/model" +import model "github.com/jaegertracing/jaeger/model" import time "time" // Reader is an autogenerated mock type for the Reader type diff --git a/storage/samplingstore/interface.go b/storage/samplingstore/interface.go index bce767146e9..cbfb8b1e92a 100644 --- a/storage/samplingstore/interface.go +++ b/storage/samplingstore/interface.go @@ -17,7 +17,7 @@ package samplingstore import ( "time" - "github.com/uber/jaeger/cmd/collector/app/sampling/model" + "github.com/jaegertracing/jaeger/cmd/collector/app/sampling/model" ) // Store writes and retrieves sampling data to and from storage. diff --git a/storage/samplingstore/mocks/Store.go b/storage/samplingstore/mocks/Store.go index a8ac930ff83..c2732080c41 100644 --- a/storage/samplingstore/mocks/Store.go +++ b/storage/samplingstore/mocks/Store.go @@ -14,7 +14,7 @@ package mocks -import "github.com/uber/jaeger/cmd/collector/app/sampling/model" +import "github.com/jaegertracing/jaeger/cmd/collector/app/sampling/model" import "github.com/stretchr/testify/mock" import "time" diff --git a/storage/spanstore/interface.go b/storage/spanstore/interface.go index 13168a89940..4b005d53ae8 100644 --- a/storage/spanstore/interface.go +++ b/storage/spanstore/interface.go @@ -18,7 +18,7 @@ import ( "errors" "time" - "github.com/uber/jaeger/model" + "github.com/jaegertracing/jaeger/model" ) // Writer writes spans to storage. diff --git a/storage/spanstore/memory/memory.go b/storage/spanstore/memory/memory.go index 80440763430..7cc191f7837 100644 --- a/storage/spanstore/memory/memory.go +++ b/storage/spanstore/memory/memory.go @@ -19,9 +19,9 @@ import ( "sync" "time" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/model/adjuster" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/model/adjuster" + "github.com/jaegertracing/jaeger/storage/spanstore" ) var errTraceNotFound = errors.New("Trace was not found") diff --git a/storage/spanstore/memory/memory_test.go b/storage/spanstore/memory/memory_test.go index 51a5e12c4cf..428b0118438 100644 --- a/storage/spanstore/memory/memory_test.go +++ b/storage/spanstore/memory/memory_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/spanstore" ) var testingSpan = &model.Span{ diff --git a/storage/spanstore/metrics/decorator.go b/storage/spanstore/metrics/decorator.go index 374ff79757f..3a638b9b562 100644 --- a/storage/spanstore/metrics/decorator.go +++ b/storage/spanstore/metrics/decorator.go @@ -19,8 +19,8 @@ import ( "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/spanstore" ) // ReadMetricsDecorator wraps a spanstore.Reader and collects metrics around each read operation. diff --git a/storage/spanstore/metrics/decorator_test.go b/storage/spanstore/metrics/decorator_test.go index 4b1667ef876..ec3390642ef 100644 --- a/storage/spanstore/metrics/decorator_test.go +++ b/storage/spanstore/metrics/decorator_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/storage/spanstore" - . "github.com/uber/jaeger/storage/spanstore/metrics" - "github.com/uber/jaeger/storage/spanstore/mocks" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/storage/spanstore" + . "github.com/jaegertracing/jaeger/storage/spanstore/metrics" + "github.com/jaegertracing/jaeger/storage/spanstore/mocks" ) func TestSuccessfulUnderlyingCalls(t *testing.T) { diff --git a/storage/spanstore/mocks/Reader.go b/storage/spanstore/mocks/Reader.go index 4a708bca4de..236eef8bc7c 100644 --- a/storage/spanstore/mocks/Reader.go +++ b/storage/spanstore/mocks/Reader.go @@ -15,8 +15,8 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/uber/jaeger/model" -import spanstore "github.com/uber/jaeger/storage/spanstore" +import model "github.com/jaegertracing/jaeger/model" +import spanstore "github.com/jaegertracing/jaeger/storage/spanstore" // Reader is an autogenerated mock type for the Reader type type Reader struct { diff --git a/storage/spanstore/mocks/Writer.go b/storage/spanstore/mocks/Writer.go index 9f55d918f1c..4ce968960c6 100644 --- a/storage/spanstore/mocks/Writer.go +++ b/storage/spanstore/mocks/Writer.go @@ -15,8 +15,8 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/uber/jaeger/model" -import spanstore "github.com/uber/jaeger/storage/spanstore" +import model "github.com/jaegertracing/jaeger/model" +import spanstore "github.com/jaegertracing/jaeger/storage/spanstore" // Writer is an autogenerated mock type for the Writer type type Writer struct { diff --git a/storage/spanstore/multiplex.go b/storage/spanstore/multiplex.go index 9492a783247..4e8042e7829 100644 --- a/storage/spanstore/multiplex.go +++ b/storage/spanstore/multiplex.go @@ -15,8 +15,8 @@ package spanstore import ( - "github.com/uber/jaeger/model" - "github.com/uber/jaeger/pkg/multierror" + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/pkg/multierror" ) // MultiplexWriter is a span Writer that tries to save spans into several underlying span Writers diff --git a/storage/spanstore/multiplex_test.go b/storage/spanstore/multiplex_test.go index 7d999e05aae..b158df1af44 100644 --- a/storage/spanstore/multiplex_test.go +++ b/storage/spanstore/multiplex_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/uber/jaeger/model" - . "github.com/uber/jaeger/storage/spanstore" + "github.com/jaegertracing/jaeger/model" + . "github.com/jaegertracing/jaeger/storage/spanstore" ) var errIWillAlwaysFail = errors.New("ErrProneWriteSpanStore will always fail") diff --git a/thrift-gen/agent/agent.go b/thrift-gen/agent/agent.go index b97c2cb4623..874b14723aa 100644 --- a/thrift-gen/agent/agent.go +++ b/thrift-gen/agent/agent.go @@ -7,8 +7,8 @@ import ( "bytes" "fmt" "github.com/apache/thrift/lib/go/thrift" - "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" ) // (needed to ensure safety because of naive import list construction.) diff --git a/thrift-gen/agent/constants.go b/thrift-gen/agent/constants.go index 05892a6d848..3cfe4787f7f 100644 --- a/thrift-gen/agent/constants.go +++ b/thrift-gen/agent/constants.go @@ -7,8 +7,8 @@ import ( "bytes" "fmt" "github.com/apache/thrift/lib/go/thrift" - "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" ) // (needed to ensure safety because of naive import list construction.) diff --git a/thrift-gen/agent/ttypes.go b/thrift-gen/agent/ttypes.go index 114feae6a0f..7ad797b0480 100644 --- a/thrift-gen/agent/ttypes.go +++ b/thrift-gen/agent/ttypes.go @@ -7,8 +7,8 @@ import ( "bytes" "fmt" "github.com/apache/thrift/lib/go/thrift" - "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" ) // (needed to ensure safety because of naive import list construction.)