diff --git a/Godeps b/Godeps index 0b0eb7f8af..7fec58fbb2 100644 --- a/Godeps +++ b/Godeps @@ -16,5 +16,5 @@ github.com/peterh/liner 8975875355a81d612fafb9f5a6037bdcc2d9b073 github.com/rakyll/statik e383bbf6b2ec1a2fb8492dfd152d945fb88919b6 github.com/retailnext/hllpp 38a7bb71b483e855d35010808143beaf05b67f9d github.com/uber-go/atomic 9e99152552a6ce13fa3b2ce4a9c4fb117cca4506 -github.com/uber-go/zap fbae0281ffd546fa6d1959fec6075ac5da7fb577 +go.uber.org/zap 05dadc4e239529c50d6f730c17f0a3aaf35b64fd golang.org/x/crypto 9477e0b78b9ac3d0b03822fd95422e2fe07627cd diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go index 98873637f0..8859d12eaf 100644 --- a/cmd/influxd/main.go +++ b/cmd/influxd/main.go @@ -15,7 +15,7 @@ import ( "github.com/influxdata/influxdb/cmd/influxd/help" "github.com/influxdata/influxdb/cmd/influxd/restore" "github.com/influxdata/influxdb/cmd/influxd/run" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // These variables are populated via the Go linker. diff --git a/cmd/influxd/run/command.go b/cmd/influxd/run/command.go index 2b7af9a6c1..6f10fb2575 100644 --- a/cmd/influxd/run/command.go +++ b/cmd/influxd/run/command.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const logo = ` diff --git a/cmd/influxd/run/server.go b/cmd/influxd/run/server.go index 2c35ebe6e5..e462f89610 100644 --- a/cmd/influxd/run/server.go +++ b/cmd/influxd/run/server.go @@ -31,7 +31,7 @@ import ( "github.com/influxdata/influxdb/tcp" "github.com/influxdata/influxdb/tsdb" client "github.com/influxdata/usage-client/v1" - "github.com/uber-go/zap" + "go.uber.org/zap" // Initialize the engine packages _ "github.com/influxdata/influxdb/tsdb/engine" ) diff --git a/coordinator/points_writer.go b/coordinator/points_writer.go index f818ce8901..1fbb5adf49 100644 --- a/coordinator/points_writer.go +++ b/coordinator/points_writer.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // The statistics generated by the "write" mdoule diff --git a/coordinator/statement_executor_test.go b/coordinator/statement_executor_test.go index 15f558e490..f41cdee559 100644 --- a/coordinator/statement_executor_test.go +++ b/coordinator/statement_executor_test.go @@ -16,7 +16,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const ( diff --git a/influxql/query_executor.go b/influxql/query_executor.go index a1bb04a230..65026a205a 100644 --- a/influxql/query_executor.go +++ b/influxql/query_executor.go @@ -9,7 +9,7 @@ import ( "time" "github.com/influxdata/influxdb/models" - "github.com/uber-go/zap" + "go.uber.org/zap" ) var ( diff --git a/influxql/task_manager.go b/influxql/task_manager.go index 99e405ec20..e69bda3cee 100644 --- a/influxql/task_manager.go +++ b/influxql/task_manager.go @@ -6,7 +6,7 @@ import ( "time" "github.com/influxdata/influxdb/models" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const ( diff --git a/monitor/service.go b/monitor/service.go index e0503b5417..ea105cfff7 100644 --- a/monitor/service.go +++ b/monitor/service.go @@ -14,7 +14,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/monitor/diagnostics" "github.com/influxdata/influxdb/services/meta" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // Policy constants. diff --git a/services/admin/service.go b/services/admin/service.go index 106cd14f2d..41bae112a1 100644 --- a/services/admin/service.go +++ b/services/admin/service.go @@ -10,7 +10,7 @@ import ( // Register static assets via statik. _ "github.com/influxdata/influxdb/services/admin/statik" "github.com/rakyll/statik/fs" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // Service manages the listener for an admin endpoint. diff --git a/services/collectd/service.go b/services/collectd/service.go index 1e2be0a400..da3353e459 100644 --- a/services/collectd/service.go +++ b/services/collectd/service.go @@ -16,7 +16,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // statistics gathered by the collectd service. diff --git a/services/collectd/service_test.go b/services/collectd/service_test.go index fd588e6446..30f02c0cf0 100644 --- a/services/collectd/service_test.go +++ b/services/collectd/service_test.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/toml" - "github.com/uber-go/zap" + "go.uber.org/zap" ) func TestService_OpenClose(t *testing.T) { diff --git a/services/continuous_querier/service.go b/services/continuous_querier/service.go index ae8ea9fc9d..a5e2662595 100644 --- a/services/continuous_querier/service.go +++ b/services/continuous_querier/service.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/influxdb/influxql" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const ( diff --git a/services/continuous_querier/service_test.go b/services/continuous_querier/service_test.go index 8ba4f06779..512a3f3e4d 100644 --- a/services/continuous_querier/service_test.go +++ b/services/continuous_querier/service_test.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/influxdb/influxql" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" - "github.com/uber-go/zap" + "go.uber.org/zap" ) var ( diff --git a/services/graphite/service.go b/services/graphite/service.go index 00921705dd..cf696a1954 100644 --- a/services/graphite/service.go +++ b/services/graphite/service.go @@ -14,7 +14,7 @@ import ( "github.com/influxdata/influxdb/monitor/diagnostics" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const udpBufferSize = 65536 diff --git a/services/graphite/service_test.go b/services/graphite/service_test.go index ca3fe30eac..8a0c016bbe 100644 --- a/services/graphite/service_test.go +++ b/services/graphite/service_test.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/toml" - "github.com/uber-go/zap" + "go.uber.org/zap" ) func Test_Service_OpenClose(t *testing.T) { diff --git a/services/httpd/handler.go b/services/httpd/handler.go index a4ee77e1d2..88bac81d73 100644 --- a/services/httpd/handler.go +++ b/services/httpd/handler.go @@ -27,7 +27,7 @@ import ( "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxdb/uuid" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const ( diff --git a/services/httpd/service.go b/services/httpd/service.go index 524fb88fc7..21466dd661 100644 --- a/services/httpd/service.go +++ b/services/httpd/service.go @@ -13,7 +13,7 @@ import ( "time" "github.com/influxdata/influxdb/models" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // statistics gathered by the httpd package. diff --git a/services/meta/client.go b/services/meta/client.go index 520e4d38ce..bc1702dedc 100644 --- a/services/meta/client.go +++ b/services/meta/client.go @@ -18,7 +18,7 @@ import ( "github.com/influxdata/influxdb" "github.com/influxdata/influxdb/influxql" - "github.com/uber-go/zap" + "go.uber.org/zap" "golang.org/x/crypto/bcrypt" ) diff --git a/services/opentsdb/handler.go b/services/opentsdb/handler.go index 7da6757797..f6d3258ccb 100644 --- a/services/opentsdb/handler.go +++ b/services/opentsdb/handler.go @@ -15,7 +15,7 @@ import ( "github.com/influxdata/influxdb" "github.com/influxdata/influxdb/models" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // Handler is an http.Handler for the service. diff --git a/services/opentsdb/service.go b/services/opentsdb/service.go index 9b55c6e2fc..208bd06d7e 100644 --- a/services/opentsdb/service.go +++ b/services/opentsdb/service.go @@ -18,7 +18,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // statistics gathered by the openTSDB package. diff --git a/services/opentsdb/service_test.go b/services/opentsdb/service_test.go index a8234553dd..2ace559c6c 100644 --- a/services/opentsdb/service_test.go +++ b/services/opentsdb/service_test.go @@ -16,7 +16,7 @@ import ( "github.com/influxdata/influxdb/internal" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" - "github.com/uber-go/zap" + "go.uber.org/zap" ) func Test_Service_OpenClose(t *testing.T) { diff --git a/services/precreator/service.go b/services/precreator/service.go index dd23c3d03b..74f0ea2e0d 100644 --- a/services/precreator/service.go +++ b/services/precreator/service.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // Service manages the shard precreation service. diff --git a/services/retention/service.go b/services/retention/service.go index 83dc33309d..15054c6ce4 100644 --- a/services/retention/service.go +++ b/services/retention/service.go @@ -6,7 +6,7 @@ import ( "time" "github.com/influxdata/influxdb/services/meta" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // Service represents the retention policy enforcement service. diff --git a/services/snapshotter/service.go b/services/snapshotter/service.go index 03fa9d2260..520e69877a 100644 --- a/services/snapshotter/service.go +++ b/services/snapshotter/service.go @@ -14,7 +14,7 @@ import ( "github.com/influxdata/influxdb" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const ( diff --git a/services/subscriber/service.go b/services/subscriber/service.go index b198855ca8..55a6a3c0ea 100644 --- a/services/subscriber/service.go +++ b/services/subscriber/service.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/monitor" "github.com/influxdata/influxdb/services/meta" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // Statistics for the Subscriber service. diff --git a/services/udp/service.go b/services/udp/service.go index 6ddef32f73..941f3c776f 100644 --- a/services/udp/service.go +++ b/services/udp/service.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const ( diff --git a/services/udp/service_test.go b/services/udp/service_test.go index 8d66475b36..d34f1d82f3 100644 --- a/services/udp/service_test.go +++ b/services/udp/service_test.go @@ -9,7 +9,7 @@ import ( "github.com/influxdata/influxdb/internal" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" - "github.com/uber-go/zap" + "go.uber.org/zap" ) func TestService_OpenClose(t *testing.T) { diff --git a/tsdb/engine.go b/tsdb/engine.go index 2ca6ebee5a..5ec979bce6 100644 --- a/tsdb/engine.go +++ b/tsdb/engine.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/influxdb/influxql" "github.com/influxdata/influxdb/models" - "github.com/uber-go/zap" + "go.uber.org/zap" ) var ( diff --git a/tsdb/engine/tsm1/cache.go b/tsdb/engine/tsm1/cache.go index 6faffb795f..062784138f 100644 --- a/tsdb/engine/tsm1/cache.go +++ b/tsdb/engine/tsm1/cache.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // ringShards specifies the number of partitions that the hash ring used to diff --git a/tsdb/engine/tsm1/engine.go b/tsdb/engine/tsm1/engine.go index e01b953a1c..cd161eb797 100644 --- a/tsdb/engine/tsm1/engine.go +++ b/tsdb/engine/tsm1/engine.go @@ -19,7 +19,7 @@ import ( "github.com/influxdata/influxdb/influxql" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/tsdb" - "github.com/uber-go/zap" + "go.uber.org/zap" ) //go:generate tmpl -data=@iterator.gen.go.tmpldata iterator.gen.go.tmpl diff --git a/tsdb/engine/tsm1/file_store.go b/tsdb/engine/tsm1/file_store.go index 953715f8f8..18c41c55d0 100644 --- a/tsdb/engine/tsm1/file_store.go +++ b/tsdb/engine/tsm1/file_store.go @@ -15,7 +15,7 @@ import ( "time" "github.com/influxdata/influxdb/models" - "github.com/uber-go/zap" + "go.uber.org/zap" ) type TSMFile interface { diff --git a/tsdb/engine/tsm1/file_store_test.go b/tsdb/engine/tsm1/file_store_test.go index 8ae7544db8..d6cbb3b5e9 100644 --- a/tsdb/engine/tsm1/file_store_test.go +++ b/tsdb/engine/tsm1/file_store_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/influxdata/influxdb/tsdb/engine/tsm1" - "github.com/uber-go/zap" + "go.uber.org/zap" ) func TestFileStore_Read(t *testing.T) { diff --git a/tsdb/engine/tsm1/wal.go b/tsdb/engine/tsm1/wal.go index b92a07b47b..7e1da61513 100644 --- a/tsdb/engine/tsm1/wal.go +++ b/tsdb/engine/tsm1/wal.go @@ -19,7 +19,7 @@ import ( "github.com/golang/snappy" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/pkg/limiter" - "github.com/uber-go/zap" + "go.uber.org/zap" ) const ( diff --git a/tsdb/shard.go b/tsdb/shard.go index 8bcde5cb66..2f436721a0 100644 --- a/tsdb/shard.go +++ b/tsdb/shard.go @@ -17,7 +17,7 @@ import ( "github.com/influxdata/influxdb/influxql" "github.com/influxdata/influxdb/models" internal "github.com/influxdata/influxdb/tsdb/internal" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // monitorStatInterval is the interval at which the shard is inspected diff --git a/tsdb/shard_test.go b/tsdb/shard_test.go index 0710094c5c..61d4732fa2 100644 --- a/tsdb/shard_test.go +++ b/tsdb/shard_test.go @@ -19,7 +19,7 @@ import ( "github.com/influxdata/influxdb/pkg/deep" "github.com/influxdata/influxdb/tsdb" _ "github.com/influxdata/influxdb/tsdb/engine" - "github.com/uber-go/zap" + "go.uber.org/zap" ) // DefaultPrecision is the precision used by the MustWritePointsString() function. diff --git a/tsdb/store.go b/tsdb/store.go index 9181f3a4c8..c6c0ce09ed 100644 --- a/tsdb/store.go +++ b/tsdb/store.go @@ -17,7 +17,7 @@ import ( "github.com/influxdata/influxdb/influxql" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/pkg/limiter" - "github.com/uber-go/zap" + "go.uber.org/zap" ) var (