rm zap from protocol

vincentbernat · Aug 6, 2018 · 8e8c59b · 8e8c59b
1 parent 3be9d2f
commit 8e8c59b
Show file tree

Hide file tree

Showing 51 changed files with 26 additions and 664 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/jocko/context.go b/jocko/context.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/travisjeffery/jocko/protocol"
-	"go.uber.org/zap/zapcore"
 )
 
 type Context struct {
@@ -62,16 +61,3 @@ func (ctx *Context) Value(key interface{}) interface{} {
 	ctx.mu.Unlock()
 	return val
 }
-
-func (ctx *Context) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	if ctx.header != nil {
-		e.AddObject("header", ctx.header)
-	}
-	if ctx.req != nil {
-		e.AddObject("request", ctx.req.(zapcore.ObjectMarshaler))
-	}
-	if ctx.res != nil {
-		e.AddObject("response", ctx.res.(zapcore.ObjectMarshaler))
-	}
-	return nil
-}
diff --git a/protocol/alter_configs_request.go b/protocol/alter_configs_request.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 type AlterConfigsRequest struct {
 	APIVersion int16
 
@@ -93,7 +89,3 @@ func (r *AlterConfigsRequest) Key() int16 {
 func (r *AlterConfigsRequest) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *AlterConfigsRequest) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/alter_configs_response.go b/protocol/alter_configs_response.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 import "time"
 
 type AlterConfigsResponse struct {
@@ -70,7 +66,3 @@ func (r *AlterConfigsResponse) Decode(d PacketDecoder, version int16) (err error
 func (r *AlterConfigsResponse) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *AlterConfigsResponse) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/api_versions_requests.go b/protocol/api_versions_requests.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 type APIVersionsRequest struct {
 	APIVersion int16
 }
@@ -24,7 +20,3 @@ func (c *APIVersionsRequest) Key() int16 {
 func (r *APIVersionsRequest) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *APIVersionsRequest) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/api_versions_response.go b/protocol/api_versions_response.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 import "time"
 
 type APIVersionsResponse struct {
@@ -79,7 +75,3 @@ func (c *APIVersionsResponse) Decode(d PacketDecoder, version int16) error {
 func (r *APIVersionsResponse) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *APIVersionsResponse) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/controlled_shutdown_request.go b/protocol/controlled_shutdown_request.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 type ControlledShutdownRequest struct {
 	Version int16
 }
@@ -15,7 +11,3 @@ func (r *ControlledShutdownRequest) Encode(e PacketEncoder) (err error) {
 func (r *ControlledShutdownRequest) Decode(d PacketDecoder, version int16) (err error) {
 	return nil
 }
-
-func (r *ControlledShutdownRequest) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/controlled_shutdown_response.go b/protocol/controlled_shutdown_response.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 type ControlledShutdownResponse struct {
 	APIVersion int16
 }
@@ -21,7 +17,3 @@ func (r *ControlledShutdownResponse) Decode(d PacketDecoder, version int16) (err
 func (r *ControlledShutdownResponse) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *ControlledShutdownResponse) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/create_topic_requests.go b/protocol/create_topic_requests.go
@@ -1,7 +1,5 @@
 package protocol
 
-import "go.uber.org/zap/zapcore"
-
 type CreateTopicRequest struct {
 	Topic             string
 	NumPartitions     int32
@@ -141,7 +139,3 @@ func (c *CreateTopicRequests) Key() int16 {
 func (r *CreateTopicRequests) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *CreateTopicRequests) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/create_topics_response.go b/protocol/create_topics_response.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 import "time"
 
 type TopicErrorCode struct {
@@ -82,7 +78,3 @@ func (c *CreateTopicsResponse) Decode(d PacketDecoder, version int16) error {
 func (r *CreateTopicsResponse) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *CreateTopicsResponse) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/delete_topic_request.go b/protocol/delete_topic_request.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 type DeleteTopicsRequest struct {
 	APIVersion int16
 
@@ -36,7 +32,3 @@ func (c *DeleteTopicsRequest) Key() int16 {
 func (r *DeleteTopicsRequest) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *DeleteTopicsRequest) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/delete_topic_response.go b/protocol/delete_topic_response.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 import "time"
 
 type DeleteTopicsResponse struct {
@@ -59,7 +55,3 @@ func (c *DeleteTopicsResponse) Decode(d PacketDecoder, version int16) error {
 func (r *DeleteTopicsResponse) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *DeleteTopicsResponse) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/describe_configs_request.go b/protocol/describe_configs_request.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 // https://kafka.apache.org/protocol#The_Messages_DescribeConfigs
 
 type DescribeConfigsRequest struct {
@@ -73,7 +69,3 @@ func (r *DescribeConfigsRequest) Key() int16 {
 func (r *DescribeConfigsRequest) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *DescribeConfigsRequest) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/describe_configs_response.go b/protocol/describe_configs_response.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 import "time"
 
 type DescribeConfigsResponse struct {
@@ -163,7 +159,3 @@ func (r *DescribeConfigsResponse) Decode(d PacketDecoder, version int16) (err er
 func (r *DescribeConfigsResponse) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *DescribeConfigsResponse) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/describe_groups_request.go b/protocol/describe_groups_request.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 type DescribeGroupsRequest struct {
 	APIVersion int16
 
@@ -27,7 +23,3 @@ func (r *DescribeGroupsRequest) Key() int16 {
 func (r *DescribeGroupsRequest) Version() int16 {
 	return r.APIVersion
 }
-
-func (r *DescribeGroupsRequest) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/describe_groups_response.go b/protocol/describe_groups_response.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 import "time"
 
 type DescribeGroupsResponse struct {
@@ -168,7 +164,3 @@ func (r *GroupMember) Decode(d PacketDecoder, version int16) (err error) {
 	}
 	return nil
 }
-
-func (r *DescribeGroupsResponse) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	return nil
-}
diff --git a/protocol/fetch_request.go b/protocol/fetch_request.go
@@ -1,9 +1,5 @@
 package protocol
 
-import (
-	"go.uber.org/zap/zapcore"
-)
-
 type IsolationLevel int8
 
 const (
@@ -140,41 +136,6 @@ func (r *FetchRequest) Version() int16 {
 	return r.APIVersion
 }
 
-func (r *FetchRequest) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	e.AddInt32("replica id", r.ReplicaID)
-	e.AddInt32("min bytes", r.MinBytes)
-	e.AddInt32("max bytes", r.MaxBytes)
-	e.AddArray("topic", FetchTopics(r.Topics))
-	return nil
-}
-
-func (f *FetchPartition) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	e.AddInt32("partition", f.Partition)
-	e.AddInt64("fetch offset", f.FetchOffset)
-	e.AddInt32("max bytes", f.MaxBytes)
-	return nil
-}
-
 type FetchPartitions []*FetchPartition
 
-func (f FetchPartitions) MarshalLogArray(e zapcore.ArrayEncoder) error {
-	for _, t := range f {
-		e.AppendObject(t)
-	}
-	return nil
-}
-
-func (f *FetchTopic) MarshalLogObject(e zapcore.ObjectEncoder) error {
-	e.AddString("topic", f.Topic)
-	e.AddArray("partitions", FetchPartitions(f.Partitions))
-	return nil
-}
-
 type FetchTopics []*FetchTopic
-
-func (f FetchTopics) MarshalLogArray(e zapcore.ArrayEncoder) error {
-	for _, t := range f {
-		e.AppendObject(t)
-	}
-	return nil
-}