Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Format all contrib files #4887

Merged
merged 1 commit into from
Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"go.opentelemetry.io/collector/config"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/metricstestutil"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

Expand Down
3 changes: 1 addition & 2 deletions exporter/awsemfexporter/datapoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ import (
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func generateTestIntGauge(name string) *metricspb.Metric {
Expand Down
4 changes: 1 addition & 3 deletions exporter/carbonexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ import (
"go.opentelemetry.io/collector/model/pdata"
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/metricstestutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

Expand Down
1 change: 0 additions & 1 deletion exporter/googlecloudexporter/googlecloud_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/metricstestutil"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

Expand Down
3 changes: 1 addition & 2 deletions exporter/opencensusexporter/opencensus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/receiver/opencensusreceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
)

func TestSendTraces(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions exporter/sapmexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ import (
"go.opentelemetry.io/collector/model/pdata"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
)

// TODO: Find a place for this to be shared.
Expand Down
3 changes: 1 addition & 2 deletions exporter/sapmexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ import (
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/model/pdata"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
)

func TestCreateTracesExporter(t *testing.T) {
Expand Down
4 changes: 1 addition & 3 deletions exporter/splunkhecexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ import (
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/metricstestutil"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestNew(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions internal/components/exporters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ import (
"go.opentelemetry.io/collector/exporter/otlpexporter"
"go.opentelemetry.io/collector/exporter/otlphttpexporter"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
)

func TestDefaultExporters(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions internal/components/extensions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ import (
"go.opentelemetry.io/collector/extension/pprofextension"
"go.opentelemetry.io/collector/extension/zpagesextension"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
)

func TestDefaultExtensions(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@ import (
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/processor/processorhelper"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"go.uber.org/zap"
"google.golang.org/protobuf/testing/protocmp"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestMetricsTransformProcessor(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"go.opentelemetry.io/collector/model/pdata"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/env"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/gcp/gce"
Expand Down
3 changes: 1 addition & 2 deletions receiver/awsxrayreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ import (
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/udppoller"
)

Expand Down
2 changes: 0 additions & 2 deletions receiver/carbonreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ import (
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport/client"
Expand Down
2 changes: 0 additions & 2 deletions receiver/carbonreceiver/transport/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport/client"
)
Expand Down
1 change: 0 additions & 1 deletion receiver/carbonreceiver/transport/tcp_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"go.opentelemetry.io/collector/consumer"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol"
)

Expand Down
5 changes: 2 additions & 3 deletions receiver/collectdreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,11 @@ import (
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"go.uber.org/zap"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

type metricLabel struct {
Expand Down
1 change: 0 additions & 1 deletion receiver/jaegerreceiver/jaeger_agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import (
"google.golang.org/grpc"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
)

Expand Down
1 change: 0 additions & 1 deletion receiver/jaegerreceiver/trace_receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ import (
"google.golang.org/grpc/credentials"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"k8s.io/apimachinery/pkg/types"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/utils"
)

Expand Down
3 changes: 1 addition & 2 deletions receiver/kubeletstatsreceiver/runnable.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

// todo replace with scraping lib when it's ready
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval"
internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver/internal/kubelet"
)

Expand Down
1 change: 0 additions & 1 deletion receiver/kubeletstatsreceiver/runnable_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"k8s.io/client-go/kubernetes/fake"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver/internal/kubelet"
)

Expand Down
3 changes: 1 addition & 2 deletions receiver/opencensusreceiver/opencensus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ import (
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/internalconsumertest"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

Expand Down
3 changes: 1 addition & 2 deletions receiver/receivercreator/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ import (
"go.uber.org/zap"
zapObserver "go.uber.org/zap/zaptest/observer"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer"
internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestCreateDefaultConfig(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions receiver/sapmreceiver/trace_receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ import (
"go.opentelemetry.io/collector/obsreport"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
)

var gzipWriterPool = &sync.Pool{
Expand Down
1 change: 0 additions & 1 deletion receiver/sapmreceiver/trace_receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
)

Expand Down
3 changes: 1 addition & 2 deletions receiver/signalfxreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ import (
"go.opentelemetry.io/collector/model/pdata"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
)

func Test_signalfxeceiver_New(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions receiver/splunkhecreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ import (
"go.opentelemetry.io/collector/model/pdata"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
)

Expand Down
1 change: 0 additions & 1 deletion receiver/statsdreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/transport"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/transport/client"
)
Expand Down
1 change: 0 additions & 1 deletion receiver/statsdreceiver/transport/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/transport/client"
)
Expand Down
1 change: 0 additions & 1 deletion receiver/wavefrontreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

Expand Down
1 change: 0 additions & 1 deletion receiver/zookeeperreceiver/scraper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"go.uber.org/zap/zaptest/observer"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver/internal/metadata"
)

Expand Down
3 changes: 1 addition & 2 deletions testbed/testbed/data_providers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ import (
"testing"

"github.com/stretchr/testify/require"
"go.uber.org/atomic"

"go.opentelemetry.io/collector/model/pdata"
"go.uber.org/atomic"
)

const metricsPictPairsFile = "../../internal/goldendataset/testdata/generated_pict_pairs_metrics.txt"
Expand Down
3 changes: 1 addition & 2 deletions testbed/testbed/mock_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ import (
"sync"
"time"

"go.uber.org/atomic"

"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/model/pdata"
"go.uber.org/atomic"
)

// MockBackend is a backend that allows receiving the data locally.
Expand Down
1 change: 0 additions & 1 deletion testbed/testbed/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"time"

"github.com/stretchr/testify/assert"

"go.opentelemetry.io/collector/model/pdata"
)

Expand Down