Skip to content

Commit

Permalink
Replace ref to ShimmerGlass by criteo
Browse files Browse the repository at this point in the history 
Following repo ownership transfer
  • Loading branch information
@mougams
mougams committed Jan 22, 2025
1 parent 1216e14 commit 681c5d6
Show file tree
Hide file tree
Showing 18 changed files with 34 additions and 34 deletions.
10 changes: 5 additions & 5 deletions config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

"github.com/ghodss/yaml"

"github.com/shimmerglass/consul-timeline/consul"
"github.com/shimmerglass/consul-timeline/server"
cass "github.com/shimmerglass/consul-timeline/storage/cassandra"
"github.com/shimmerglass/consul-timeline/storage/memory"
"github.com/shimmerglass/consul-timeline/storage/mysql"
"github.com/criteo/consul-timeline/consul"
"github.com/criteo/consul-timeline/server"
cass "github.com/criteo/consul-timeline/storage/cassandra"
"github.com/criteo/consul-timeline/storage/memory"
"github.com/criteo/consul-timeline/storage/mysql"
)

type Config struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/shimmerglass/consul-timeline
module github.com/criteo/consul-timeline

go 1.23

Expand Down
16 changes: 8 additions & 8 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import (
"os/signal"
"syscall"

"github.com/shimmerglass/consul-timeline/consul"
"github.com/shimmerglass/consul-timeline/storage"
"github.com/criteo/consul-timeline/consul"
"github.com/criteo/consul-timeline/storage"

_ "github.com/go-sql-driver/mysql"

"github.com/shimmerglass/consul-timeline/server"
cass "github.com/shimmerglass/consul-timeline/storage/cassandra"
"github.com/shimmerglass/consul-timeline/storage/memory"
"github.com/shimmerglass/consul-timeline/storage/mysql"
tl "github.com/shimmerglass/consul-timeline/timeline"
"github.com/shimmerglass/consul-timeline/watch"
"github.com/criteo/consul-timeline/server"
cass "github.com/criteo/consul-timeline/storage/cassandra"
"github.com/criteo/consul-timeline/storage/memory"
"github.com/criteo/consul-timeline/storage/mysql"
tl "github.com/criteo/consul-timeline/timeline"
"github.com/criteo/consul-timeline/watch"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion server/api_release.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/rakyll/statik/fs"

_ "github.com/shimmerglass/consul-timeline/server/public" // TODO: Replace with the absolute import path
_ "github.com/criteo/consul-timeline/server/public" // TODO: Replace with the absolute import path
)

func (s *Server) serveStatic() {
Expand Down
2 changes: 1 addition & 1 deletion server/filter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"time"

tl "github.com/criteo/consul-timeline/timeline"
"github.com/pkg/errors"
tl "github.com/shimmerglass/consul-timeline/timeline"
)

type filter struct {
Expand Down
4 changes: 2 additions & 2 deletions server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"net/http/pprof"

"github.com/NYTimes/gziphandler"
"github.com/criteo/consul-timeline/storage"
tl "github.com/criteo/consul-timeline/timeline"
"github.com/gorilla/websocket"
"github.com/julienschmidt/httprouter"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/shimmerglass/consul-timeline/storage"
tl "github.com/shimmerglass/consul-timeline/timeline"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion server/ws.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package server
import (
"sync"

tl "github.com/criteo/consul-timeline/timeline"
"github.com/gorilla/websocket"
tl "github.com/shimmerglass/consul-timeline/timeline"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion storage/cassandra/index_global.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package cass
import (
"time"

tl "github.com/criteo/consul-timeline/timeline"
"github.com/gocql/gocql"
"github.com/pkg/errors"
"github.com/scylladb/gocqlx"
"github.com/scylladb/gocqlx/qb"
tl "github.com/shimmerglass/consul-timeline/timeline"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion storage/cassandra/index_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package cass
import (
"time"

tl "github.com/criteo/consul-timeline/timeline"
"github.com/gocql/gocql"
"github.com/pkg/errors"
"github.com/scylladb/gocqlx"
"github.com/scylladb/gocqlx/qb"
tl "github.com/shimmerglass/consul-timeline/timeline"
)

type idxService struct {
Expand Down
4 changes: 2 additions & 2 deletions storage/cassandra/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"time"

"github.com/criteo/consul-timeline/storage"
tl "github.com/criteo/consul-timeline/timeline"
"github.com/gocql/gocql"
"github.com/pkg/errors"
"github.com/shimmerglass/consul-timeline/storage"
tl "github.com/shimmerglass/consul-timeline/timeline"
)

var _ storage.Storage = (*Storage)(nil)
Expand Down
4 changes: 2 additions & 2 deletions storage/distributed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"sync/atomic"
"time"

"github.com/criteo/consul-timeline/consul"
tl "github.com/criteo/consul-timeline/timeline"
"github.com/hashicorp/consul/api"
"github.com/shimmerglass/consul-timeline/consul"
tl "github.com/shimmerglass/consul-timeline/timeline"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions storage/memory/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package memory
import (
"context"

"github.com/shimmerglass/consul-timeline/storage"
tl "github.com/shimmerglass/consul-timeline/timeline"
"github.com/criteo/consul-timeline/storage"
tl "github.com/criteo/consul-timeline/timeline"
)

type Storage struct {
Expand Down
2 changes: 1 addition & 1 deletion storage/memory/storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package memory
import (
"testing"

tl "github.com/shimmerglass/consul-timeline/timeline"
tl "github.com/criteo/consul-timeline/timeline"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion storage/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

tl "github.com/criteo/consul-timeline/timeline"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
tl "github.com/shimmerglass/consul-timeline/timeline"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions storage/mysql/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"fmt"
"time"

"github.com/criteo/consul-timeline/storage"
tl "github.com/criteo/consul-timeline/timeline"
_ "github.com/go-sql-driver/mysql"
"github.com/pkg/errors"
"github.com/shimmerglass/consul-timeline/storage"
tl "github.com/shimmerglass/consul-timeline/timeline"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion storage/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

tl "github.com/shimmerglass/consul-timeline/timeline"
tl "github.com/criteo/consul-timeline/timeline"
)

type Query struct {
Expand Down
2 changes: 1 addition & 1 deletion watch/compare.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/hashicorp/consul/types"

tl "github.com/criteo/consul-timeline/timeline"
"github.com/hashicorp/consul/agent/structs"
api "github.com/hashicorp/consul/api"
tl "github.com/shimmerglass/consul-timeline/timeline"
)

func (w *Watcher) compareServiceStates(at time.Time, old, new []structs.CheckServiceNode) {
Expand Down
2 changes: 1 addition & 1 deletion watch/watch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sync/atomic"
"time"

tl "github.com/criteo/consul-timeline/timeline"
"github.com/hashicorp/consul/agent/structs"
tl "github.com/shimmerglass/consul-timeline/timeline"
log "github.com/sirupsen/logrus"
)

Expand Down

0 comments on commit 681c5d6

Please sign in to comment.