Skip to content

Commit

Permalink
Fix import grouping (#1080)
Browse files Browse the repository at this point in the history
  • Loading branch information
GNURub authored and black-adder committed Sep 24, 2018
1 parent ee56a47 commit 01ff822
Show file tree
Hide file tree
Showing 39 changed files with 85 additions and 25 deletions.
1 change: 1 addition & 0 deletions cmd/agent/app/httpserver/thrift-0.9.2/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package sampling
import (
"bytes"
"fmt"

"github.com/apache/thrift/lib/go/thrift"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/agent/app/httpserver/thrift-0.9.2/ttypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package sampling
import (
"bytes"
"fmt"

"github.com/apache/thrift/lib/go/thrift"
)

Expand Down
4 changes: 3 additions & 1 deletion cmd/agent/app/servers/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package servers

import "io"
import (
"io"
)

// Server is the interface for servers that receive inbound span submissions from client.
type Server interface {
Expand Down
3 changes: 2 additions & 1 deletion cmd/collector/app/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ const (
)

// SpanProcessorMetrics contains all the necessary metrics for the SpanProcessor
type SpanProcessorMetrics struct { //TODO - initialize metrics in the traditional factory way. Initialize map afterward.
type SpanProcessorMetrics struct {
//TODO - initialize metrics in the traditional factory way. Initialize map afterward.
// SaveLatency measures how long the actual save to storage takes
SaveLatency metrics.Timer
// InQueueLatency measures how long the span spends in the queue
Expand Down
4 changes: 3 additions & 1 deletion cmd/collector/app/model_consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package app

import "github.com/jaegertracing/jaeger/model"
import (
"github.com/jaegertracing/jaeger/model"
)

// ProcessSpan processes a Domain Model Span
type ProcessSpan func(span *model.Span)
Expand Down
4 changes: 3 additions & 1 deletion cmd/collector/app/service_name_normalizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package app

import "strings"
import (
"strings"
)

// NormalizeServiceName converts service name to a lowercase string that is safe to use in metrics
func NormalizeServiceName(serviceName string) string {
Expand Down
4 changes: 3 additions & 1 deletion cmd/ingester/app/consumer/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package consumer

import "github.com/Shopify/sarama"
import (
"github.com/Shopify/sarama"
)

// Message contains the parts of a sarama ConsumerMessage that we care about.
type Message interface {
Expand Down
4 changes: 3 additions & 1 deletion crossdock/services/mocks/AgentService.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package mocks

import "github.com/stretchr/testify/mock"
import (
"github.com/stretchr/testify/mock"
)

// AgentService is an autogenerated mock type for the AgentService type
type AgentService struct {
Expand Down
6 changes: 4 additions & 2 deletions crossdock/services/mocks/QueryService.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@

package mocks

import "github.com/stretchr/testify/mock"
import (
"github.com/stretchr/testify/mock"

import ui "github.com/jaegertracing/jaeger/model/json"
ui "github.com/jaegertracing/jaeger/model/json"
)

// QueryService is an autogenerated mock type for the QueryService type
type QueryService struct {
Expand Down
4 changes: 3 additions & 1 deletion examples/hotrod/cmd/all.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package cmd

import "github.com/spf13/cobra"
import (
"github.com/spf13/cobra"
)

// allCmd represents the all command
var allCmd = &cobra.Command{
Expand Down
4 changes: 3 additions & 1 deletion examples/hotrod/pkg/httperr/httperr.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package httperr

import "net/http"
import (
"net/http"
)

// HandleError checks if the error is not nil, writes it to the output
// with the specified status code, and returns true. If error is nil it returns false.
Expand Down
4 changes: 3 additions & 1 deletion examples/hotrod/services/customer/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package customer

import "context"
import (
"context"
)

// Customer contains data about a customer.
type Customer struct {
Expand Down
4 changes: 3 additions & 1 deletion examples/hotrod/services/driver/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package driver

import "context"
import (
"context"
)

// Driver describes a driver and the currentl car location.
type Driver struct {
Expand Down
6 changes: 4 additions & 2 deletions examples/hotrod/services/route/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@

package route

import "context"
import "time"
import (
"context"
"time"
)

// Route describes a route between Pickup and Dropoff locations and expected time to arrival.
type Route struct {
Expand Down
4 changes: 3 additions & 1 deletion model/converter/thrift/zipkin/process_hashtable.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package zipkin

import "github.com/jaegertracing/jaeger/model"
import (
"github.com/jaegertracing/jaeger/model"
)

type processHashtable struct {
processes map[uint64][]*model.Process
Expand Down
4 changes: 3 additions & 1 deletion model/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package model

import "io"
import (
"io"
)

// NewProcess creates a new Process for given serviceName and tags.
// The tags are sorted in place and kept in the the same array/slice,
Expand Down
4 changes: 3 additions & 1 deletion model/time.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package model

import "time"
import (
"time"
)

// EpochMicrosecondsAsTime converts microseconds since epoch to time.Time value.
func EpochMicrosecondsAsTime(ts uint64) time.Time {
Expand Down
4 changes: 3 additions & 1 deletion pkg/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package cache

import "time"
import (
"time"
)

// A Cache is a generalized interface to a cache. See cache.LRU for a specific
// implementation (bounded cache with LRU eviction)
Expand Down
4 changes: 3 additions & 1 deletion pkg/distributedlock/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package distributedlock

import "time"
import (
"time"
)

// Lock uses distributed lock for control of a resource.
type Lock interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package dbmodel

import "github.com/jaegertracing/jaeger/model"
import (
"github.com/jaegertracing/jaeger/model"
)

// LogFieldsFilter filters all span.Logs.Fields.
type LogFieldsFilter struct {
Expand Down
4 changes: 3 additions & 1 deletion plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package dbmodel

import "github.com/jaegertracing/jaeger/model"
import (
"github.com/jaegertracing/jaeger/model"
)

// GetAllUniqueTags creates a list of all unique tags from a set of filtered tags.
func GetAllUniqueTags(span *model.Span, tagFilter TagFilter) []TagInsertion {
Expand Down
4 changes: 3 additions & 1 deletion plugin/storage/es/spanstore/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

package spanstore

import "fmt"
import (
"fmt"
)

// TODO: resolve traceID concerns (may not require any changes here)
const mapping = `{
Expand Down
9 changes: 6 additions & 3 deletions storage/samplingstore/mocks/Store.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@

package mocks

import "github.com/jaegertracing/jaeger/cmd/collector/app/sampling/model"
import "github.com/stretchr/testify/mock"
import (
"time"

import "time"
"github.com/stretchr/testify/mock"

"github.com/jaegertracing/jaeger/cmd/collector/app/sampling/model"
)

type Store struct {
mock.Mock
Expand Down
1 change: 1 addition & 0 deletions thrift-gen/agent/agent.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/agent/constants.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/agent/ttypes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/baggage/baggagerestrictionmanager.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/baggage/constants.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/baggage/ttypes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/jaeger/agent.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/jaeger/collector.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/jaeger/constants.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/jaeger/ttypes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/sampling/constants.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/sampling/samplingmanager.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/sampling/ttypes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/zipkincore/constants.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/zipkincore/ttypes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions thrift-gen/zipkincore/zipkincollector.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 01ff822

Please sign in to comment.