Skip to content

Commit

Permalink
Find and replace all imports (#183)
Browse files Browse the repository at this point in the history
  • Loading branch information
martin308 authored Oct 3, 2020
1 parent ed521bb commit a861dee
Show file tree
Hide file tree
Showing 43 changed files with 128 additions and 128 deletions.
10 changes: 5 additions & 5 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package app

import (
"github.com/honeycombio/samproxy/collect"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/route"
"github.com/honeycombio/refinery/collect"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/route"
)

type App struct {
Expand Down
16 changes: 8 additions & 8 deletions app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ import (

"github.com/honeycombio/libhoney-go"
"github.com/honeycombio/libhoney-go/transmission"
"github.com/honeycombio/samproxy/collect"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/internal/peer"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/sample"
"github.com/honeycombio/samproxy/sharder"
"github.com/honeycombio/samproxy/transmit"
"github.com/honeycombio/refinery/collect"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/internal/peer"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/sample"
"github.com/honeycombio/refinery/sharder"
"github.com/honeycombio/refinery/transmit"
)

type countingWriterSender struct {
Expand Down
20 changes: 10 additions & 10 deletions cmd/refinery/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ import (
flag "github.com/jessevdk/go-flags"
"github.com/sirupsen/logrus"

"github.com/honeycombio/samproxy/app"
"github.com/honeycombio/samproxy/collect"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/internal/peer"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/sample"
"github.com/honeycombio/samproxy/service/debug"
"github.com/honeycombio/samproxy/sharder"
"github.com/honeycombio/samproxy/transmit"
"github.com/honeycombio/refinery/app"
"github.com/honeycombio/refinery/collect"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/internal/peer"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/sample"
"github.com/honeycombio/refinery/service/debug"
"github.com/honeycombio/refinery/sharder"
"github.com/honeycombio/refinery/transmit"
)

// set by travis.
Expand Down
2 changes: 1 addition & 1 deletion cmd/test_redimem/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/garyburd/redigo/redis"
"github.com/sirupsen/logrus"

"github.com/honeycombio/samproxy/internal/redimem"
"github.com/honeycombio/refinery/internal/redimem"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions collect/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package cache
import (
"time"

"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/types"
)

// Cache is a non-threadsafe cache. It must not be used for concurrent access.
Expand Down
6 changes: 3 additions & 3 deletions collect/cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/stretchr/testify/assert"

"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/types"
)

// TestCacheSetGet sets a value then fetches it back
Expand Down
14 changes: 7 additions & 7 deletions collect/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"time"

lru "github.com/hashicorp/golang-lru"
"github.com/honeycombio/samproxy/collect/cache"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/sample"
"github.com/honeycombio/samproxy/transmit"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/collect/cache"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/sample"
"github.com/honeycombio/refinery/transmit"
"github.com/honeycombio/refinery/types"
)

var ErrWouldBlock = errors.New("not adding span, channel buffer is full")
Expand Down
14 changes: 7 additions & 7 deletions collect/collect_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
lru "github.com/hashicorp/golang-lru"
"github.com/stretchr/testify/assert"

"github.com/honeycombio/samproxy/collect/cache"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/sample"
"github.com/honeycombio/samproxy/transmit"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/collect/cache"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/sample"
"github.com/honeycombio/refinery/transmit"
"github.com/honeycombio/refinery/types"
)

func BenchmarkCollect(b *testing.B) {
Expand Down
14 changes: 7 additions & 7 deletions collect/collect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
lru "github.com/hashicorp/golang-lru"
"github.com/stretchr/testify/assert"

"github.com/honeycombio/samproxy/collect/cache"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/sample"
"github.com/honeycombio/samproxy/transmit"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/collect/cache"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/sample"
"github.com/honeycombio/refinery/transmit"
"github.com/honeycombio/refinery/types"
)

// TestAddRootSpan tests that adding a root span winds up with a trace object in
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/honeycombio/samproxy
module github.com/honeycombio/refinery

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion internal/peer/file.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package peer

import "github.com/honeycombio/samproxy/config"
import "github.com/honeycombio/refinery/config"

type filePeers struct {
c config.Config
Expand Down
2 changes: 1 addition & 1 deletion internal/peer/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package peer
import (
"testing"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
)

func TestFilePeers(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/peer/peers.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package peer
import (
"errors"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
)

// Peers holds the collection of peers for the cluster
Expand Down
2 changes: 1 addition & 1 deletion internal/peer/peers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package peer
import (
"testing"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/peer/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"time"

"github.com/garyburd/redigo/redis"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/internal/redimem"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/internal/redimem"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion logger/honeycomb.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
libhoney "github.com/honeycombio/libhoney-go"
"github.com/honeycombio/libhoney-go/transmission"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
)

// HoneycombLogger is a Logger implementation that sends all logs to a Honeycomb
Expand Down
2 changes: 1 addition & 1 deletion logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
)

type Logger interface {
Expand Down
2 changes: 1 addition & 1 deletion logger/logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package logger
import (
"testing"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion logger/logrus.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package logger
import (
"github.com/sirupsen/logrus"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
)

// LogrusLogger is a Logger implementation that sends all logs to stdout using
Expand Down
2 changes: 1 addition & 1 deletion logger/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package logger
import (
"fmt"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
)

type MockLogger struct {
Expand Down
4 changes: 2 additions & 2 deletions metrics/honeycomb.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
libhoney "github.com/honeycombio/libhoney-go"
"github.com/honeycombio/libhoney-go/transmission"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
)

type HoneycombMetrics struct {
Expand Down
2 changes: 1 addition & 1 deletion metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/refinery/config"
)

type Metrics interface {
Expand Down
4 changes: 2 additions & 2 deletions metrics/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/prometheus/client_golang/prometheus/promhttp"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
)

type PromMetrics struct {
Expand Down
2 changes: 1 addition & 1 deletion route/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http/httptest"
"testing"

"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/refinery/logger"
)

func TestHandlerReturnWithError(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion route/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/gorilla/mux"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/types"
)

// for generating request IDs
Expand Down
14 changes: 7 additions & 7 deletions route/route.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import (
"github.com/klauspost/compress/zstd"
"github.com/vmihailenco/msgpack/v4"

"github.com/honeycombio/samproxy/collect"
"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/sharder"
"github.com/honeycombio/samproxy/transmit"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/collect"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/sharder"
"github.com/honeycombio/refinery/transmit"
"github.com/honeycombio/refinery/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions sample/deterministic.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"crypto/sha1"
"math"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/types"
)

// shardingSalt is a random bit to make sure we don't shard the same as any
Expand Down
6 changes: 3 additions & 3 deletions sample/deterministic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/stretchr/testify/assert"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/types"
)

// TestInitialization tests that sample rates are consistently returned
Expand Down
8 changes: 4 additions & 4 deletions sample/dynamic.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (

dynsampler "github.com/honeycombio/dynsampler-go"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/types"
)

type DynamicSampler struct {
Expand Down
8 changes: 4 additions & 4 deletions sample/dynamic_ema.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (

dynsampler "github.com/honeycombio/dynsampler-go"

"github.com/honeycombio/samproxy/config"
"github.com/honeycombio/samproxy/logger"
"github.com/honeycombio/samproxy/metrics"
"github.com/honeycombio/samproxy/types"
"github.com/honeycombio/refinery/config"
"github.com/honeycombio/refinery/logger"
"github.com/honeycombio/refinery/metrics"
"github.com/honeycombio/refinery/types"
)

type EMADynamicSampler struct {
Expand Down
Loading

0 comments on commit a861dee

Please sign in to comment.