diff --git a/exporter/collector/integrationtest/cmd/recordfixtures/main.go b/exporter/collector/integrationtest/cmd/recordfixtures/main.go index 0eac12edc..73de66e2f 100644 --- a/exporter/collector/integrationtest/cmd/recordfixtures/main.go +++ b/exporter/collector/integrationtest/cmd/recordfixtures/main.go @@ -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 { diff --git a/exporter/collector/integrationtest/diff.go b/exporter/collector/integrationtest/diff.go index 2e8dff001..318fbeafb 100644 --- a/exporter/collector/integrationtest/diff.go +++ b/exporter/collector/integrationtest/diff.go @@ -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 ( diff --git a/exporter/collector/integrationtest/go.mod b/exporter/collector/integrationtest/go.mod index 56878ae54..5ea05fb0b 100644 --- a/exporter/collector/integrationtest/go.mod +++ b/exporter/collector/integrationtest/go.mod @@ -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 diff --git a/exporter/collector/integrationtest/inmemoryocexporter.go b/exporter/collector/integrationtest/inmemoryocexporter.go index d7f5a51df..b3835e355 100644 --- a/exporter/collector/integrationtest/inmemoryocexporter.go +++ b/exporter/collector/integrationtest/inmemoryocexporter.go @@ -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" ) diff --git a/exporter/collector/integrationtest/logs_integration_test.go b/exporter/collector/integrationtest/logs_integration_test.go index c95b3bc1b..eb4f55713 100644 --- a/exporter/collector/integrationtest/logs_integration_test.go +++ b/exporter/collector/integrationtest/logs_integration_test.go @@ -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" diff --git a/exporter/collector/integrationtest/logs_test.go b/exporter/collector/integrationtest/logs_test.go index e099eb5fa..e74aae7fc 100644 --- a/exporter/collector/integrationtest/logs_test.go +++ b/exporter/collector/integrationtest/logs_test.go @@ -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" ) diff --git a/exporter/collector/integrationtest/metrics_integration_test.go b/exporter/collector/integrationtest/metrics_integration_test.go index 16f2b80ae..dfc7bc69e 100644 --- a/exporter/collector/integrationtest/metrics_integration_test.go +++ b/exporter/collector/integrationtest/metrics_integration_test.go @@ -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" diff --git a/exporter/collector/integrationtest/metrics_test.go b/exporter/collector/integrationtest/metrics_test.go index 0be6f2325..d38c8057b 100644 --- a/exporter/collector/integrationtest/metrics_test.go +++ b/exporter/collector/integrationtest/metrics_test.go @@ -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" ) diff --git a/exporter/collector/integrationtest/protos/fixtures.pb.go b/exporter/collector/integrationtest/protos/fixtures.pb.go index dfc0937d8..5325324cf 100644 --- a/exporter/collector/integrationtest/protos/fixtures.pb.go +++ b/exporter/collector/integrationtest/protos/fixtures.pb.go @@ -328,14 +328,14 @@ var file_fixtures_proto_rawDesc = []byte{ 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x70, 0x61, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x16, 0x62, 0x61, 0x74, 0x63, 0x68, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x70, 0x61, 0x6e, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x42, 0x6f, 0x5a, 0x6d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x75, 0x65, 0x73, 0x74, 0x42, 0x66, 0x5a, 0x64, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2d, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, - 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/exporter/collector/integrationtest/protos/fixtures.proto b/exporter/collector/integrationtest/protos/fixtures.proto index e8ffdf3b1..b9b753c28 100644 --- a/exporter/collector/integrationtest/protos/fixtures.proto +++ b/exporter/collector/integrationtest/protos/fixtures.proto @@ -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"; diff --git a/exporter/collector/integrationtest/testcases/testcase.go b/exporter/collector/integrationtest/testcases/testcase.go index 13ffebe56..538967420 100644 --- a/exporter/collector/integrationtest/testcases/testcase.go +++ b/exporter/collector/integrationtest/testcases/testcase.go @@ -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" diff --git a/exporter/collector/integrationtest/traces_integration_test.go b/exporter/collector/integrationtest/traces_integration_test.go index c916e956c..bab28fda1 100644 --- a/exporter/collector/integrationtest/traces_integration_test.go +++ b/exporter/collector/integrationtest/traces_integration_test.go @@ -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" ) diff --git a/exporter/collector/integrationtest/traces_test.go b/exporter/collector/integrationtest/traces_test.go index b68e1c9d5..477285e37 100644 --- a/exporter/collector/integrationtest/traces_test.go +++ b/exporter/collector/integrationtest/traces_test.go @@ -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" )