Skip to content

Commit

Permalink
Format using make fmt
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Putilov <[email protected]>
  • Loading branch information
m8rge committed Jun 29, 2020
1 parent 8985301 commit dd374cf
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 14 deletions.
2 changes: 1 addition & 1 deletion examples/memstore-plugin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ package main

import (
"flag"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
"path"
"strings"

"github.com/spf13/viper"

"github.com/jaegertracing/jaeger/plugin/storage/grpc"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
"github.com/jaegertracing/jaeger/plugin/storage/memory"
"github.com/jaegertracing/jaeger/storage/dependencystore"
"github.com/jaegertracing/jaeger/storage/spanstore"
Expand Down
1 change: 1 addition & 0 deletions plugin/storage/grpc/archive.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package grpc

import (
"context"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
"github.com/jaegertracing/jaeger/storage/spanstore"
Expand Down
8 changes: 5 additions & 3 deletions plugin/storage/grpc/archive_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ package grpc

import (
"context"
"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"testing"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/grpc/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ package grpc
import (
"context"
"flag"
"github.com/jaegertracing/jaeger/storage"

"github.com/spf13/viper"
"github.com/uber/jaeger-lib/metrics"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/plugin/storage/grpc/config"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
"github.com/jaegertracing/jaeger/storage"
"github.com/jaegertracing/jaeger/storage/dependencystore"
"github.com/jaegertracing/jaeger/storage/spanstore"
)
Expand Down
4 changes: 2 additions & 2 deletions plugin/storage/grpc/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ package grpc

import (
"errors"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks"
"github.com/stretchr/testify/mock"
"testing"

"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/uber/jaeger-lib/metrics"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/pkg/config"
grpcConfig "github.com/jaegertracing/jaeger/plugin/storage/grpc/config"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks"
"github.com/jaegertracing/jaeger/storage"
"github.com/jaegertracing/jaeger/storage/dependencystore"
dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/grpc/shared/grpc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package shared
import (
"context"
"fmt"
"google.golang.org/grpc/codes"
"io"
"time"

"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"

Expand Down
4 changes: 2 additions & 2 deletions plugin/storage/grpc/shared/grpc_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ package shared
import (
"context"
"errors"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"io"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/proto-gen/storage_v1"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/grpc/shared/grpc_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ package shared

import (
"context"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks"
"github.com/jaegertracing/jaeger/proto-gen/storage_v1"
grpcMocks "github.com/jaegertracing/jaeger/proto-gen/storage_v1/mocks"
"github.com/jaegertracing/jaeger/storage/dependencystore"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/grpc/shared/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ package shared

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

"github.com/hashicorp/go-plugin"
"google.golang.org/grpc"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/proto-gen/storage_v1"
"github.com/jaegertracing/jaeger/storage/dependencystore"
"github.com/jaegertracing/jaeger/storage/spanstore"
Expand Down
17 changes: 16 additions & 1 deletion plugin/storage/grpc/shared/mocks/ArchiveReader.go

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

17 changes: 16 additions & 1 deletion plugin/storage/grpc/shared/mocks/ArchiveWriter.go

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

0 comments on commit dd374cf

Please sign in to comment.