Skip to content

Commit

Permalink
fix import paths for integration test module (#700)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dashpole
dashpole authored Aug 8, 2023
1 parent 0c4b0bb commit 419d54a
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 23 deletions.
7 changes: 3 additions & 4 deletions exporter/collector/integrationtest/cmd/recordfixtures/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ import (

"github.com/stretchr/testify/require"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest"
)

type FakeTesting struct {
Expand Down
4 changes: 2 additions & 2 deletions exporter/collector/integrationtest/diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/testing/protocmp"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/inmemoryocexporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"google.golang.org/grpc/credentials/insecure"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/logsutil"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/logs_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"
"time"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/plog"
Expand Down
4 changes: 2 additions & 2 deletions exporter/collector/integrationtest/logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/stretchr/testify/require"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/metrics_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"
"time"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pmetric"
Expand Down
4 changes: 2 additions & 2 deletions exporter/collector/integrationtest/metrics_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock"
)
Expand Down
8 changes: 4 additions & 4 deletions exporter/collector/integrationtest/protos/fixtures.pb.go
View file

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

2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/protos/fixtures.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

syntax = "proto3";
package fixtures;
option go_package = "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos";
option go_package = "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos";

import "metric_service.proto";
import "logging_service.proto";
Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/testcases/testcase.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"
distributionpb "google.golang.org/genproto/googleapis/api/distribution"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric"

"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/traces_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"time"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions exporter/collector/integrationtest/traces_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/stretchr/testify/require"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/protos"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/integrationtest/testcases"
"github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock"
)

Expand Down

0 comments on commit 419d54a

Please sign in to comment.