Skip to content

Commit

Permalink
Fix order import and lint
Browse files Browse the repository at this point in the history
  • Loading branch information
geobeau committed Dec 16, 2018
1 parent af512e0 commit 0ffd48e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/cassandra/config/config.go
Expand Up @@ -150,9 +150,9 @@ func (c *Configuration) NewCluster() *gocql.ClusterConfig {
}
// If tunneling connection to C*, disable cluster autodiscovery features.
if c.DisableAutoDiscovery {
cluster.DisableInitialHostLookup = true
cluster.IgnorePeerAddr = true
}
cluster.DisableInitialHostLookup = true
return cluster
}

Expand Down
4 changes: 2 additions & 2 deletions plugin/storage/kafka/options.go
Expand Up @@ -30,8 +30,8 @@ const (
suffixTopic = ".topic"
suffixEncoding = ".encoding"

encodingJSON = "json"
encodingProto = "protobuf"
encodingJSON = "json"
encodingProto = "protobuf"
EncodingZipkinT = "zipkinThrift"

defaultBroker = "127.0.0.1:9092"
Expand Down
4 changes: 2 additions & 2 deletions plugin/storage/kafka/unmarshaller.go
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/gogo/protobuf/jsonpb"
"github.com/gogo/protobuf/proto"

"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

// Unmarshaller decodes a byte array to a span
Expand Down

0 comments on commit 0ffd48e

Please sign in to comment.