Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change package from uber to jaegertracing #528

Merged
merged 1 commit into from
Nov 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: required

language: go
go_import_path: github.com/uber/jaeger
go_import_path: github.com/jaegertracing/jaeger

dist: trusty

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions cmd/agent/app/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/httpserver/collector_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/httpserver/collector_proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/httpserver/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/httpserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/httpserver/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/processors/thrift_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions cmd/agent/app/processors/thrift_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/reporter/reporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/reporter/reporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/reporter/tchannel/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/tchannel/bulider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/reporter/tchannel/reporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/reporter/tchannel/reporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/agent/app/servers/tbuffered_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/testutils/in_memory_reporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/testutils/in_memory_reporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions cmd/agent/app/testutils/mock_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions cmd/agent/app/testutils/mock_collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/testutils/mock_sampling_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/testutils/thriftudp_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions cmd/agent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/builder/builder_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/builder/builder_options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/builder/builder_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/spf13/viper"

"github.com/uber/jaeger/cmd/collector/app"
"github.com/jaegertracing/jaeger/cmd/collector/app"
)

const (
Expand Down
Loading