Skip to content

Commit 7f723b2

Browse files
authored
[refactor] Move integration package to internal (jaegertracing#6657)
## Which problem is this PR solving? - Towards jaegertracing#6637 ## Description of the changes - This PR moves the integration package from `plugin/storage/integration` to `internal/storage/integration` ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` Signed-off-by: Mahad Zaryab <[email protected]>
1 parent 06e5034 commit 7f723b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+15
-15
lines changed

.codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ignore:
1212
- "**/thrift-0.9.2/*"
1313
- "**/main.go"
1414
- "examples/hotrod"
15-
- "plugin/storage/integration"
15+
- "internal/storage/integration"
1616
- "cmd/jaeger/internal/integration"
1717
- "internal/tools"
1818

Makefile.IntegrationTests.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2023 The Jaeger Authors.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
STORAGE_PKGS = ./plugin/storage/integration/...
4+
STORAGE_PKGS = ./internal/storage/integration/...
55
JAEGER_V2_STORAGE_PKGS = ./cmd/jaeger/internal/integration
66

77
.PHONY: all-in-one-integration-test

cmd/jaeger/internal/integration/README.md

+1-1

cmd/jaeger/internal/integration/badger_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package integration
66
import (
77
"testing"
88

9-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
9+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1010
)
1111

1212
func TestBadgerStorage(t *testing.T) {

cmd/jaeger/internal/integration/cassandra_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package integration
66
import (
77
"testing"
88

9-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
9+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1010
)
1111

1212
func TestCassandraStorage(t *testing.T) {

cmd/jaeger/internal/integration/e2e_integration.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"gopkg.in/yaml.v3"
2121

2222
"github.com/jaegertracing/jaeger/cmd/jaeger/internal/integration/storagecleaner"
23-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
23+
"github.com/jaegertracing/jaeger/internal/storage/integration"
2424
"github.com/jaegertracing/jaeger/ports"
2525
)
2626

cmd/jaeger/internal/integration/elasticsearch_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package integration
66
import (
77
"testing"
88

9-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
9+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1010
)
1111

1212
func TestElasticsearchStorage(t *testing.T) {

cmd/jaeger/internal/integration/grpc_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package integration
66
import (
77
"testing"
88

9-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
9+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1010
"github.com/jaegertracing/jaeger/ports"
1111
)
1212

cmd/jaeger/internal/integration/kafka_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
11+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1212
)
1313

1414
func TestKafkaStorage(t *testing.T) {

cmd/jaeger/internal/integration/memory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package integration
66
import (
77
"testing"
88

9-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
9+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1010
)
1111

1212
func TestMemoryStorage(t *testing.T) {

cmd/jaeger/internal/integration/opensearch_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package integration
66
import (
77
"testing"
88

9-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
9+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1010
)
1111

1212
func TestOpenSearchStorage(t *testing.T) {

cmd/jaeger/internal/integration/tailsampling_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/stretchr/testify/assert"
1515
"github.com/stretchr/testify/require"
1616

17-
"github.com/jaegertracing/jaeger/plugin/storage/integration"
17+
"github.com/jaegertracing/jaeger/internal/storage/integration"
1818
)
1919

2020
// TailSamplingIntegration contains the test components to perform an integration test

internal/storage/v1/grpc/README.md

+2-2

scripts/lint/check-goleak-files.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ for dir in $*; do
2424
invalid=0
2525
for test in ${testFiles}; do
2626
if grep -q "TestMain" "${test}" && grep -q "testutils.VerifyGoLeaks" "${test}"; then
27-
if [ "${dir}" != "./plugin/storage/integration/" ] && grep -q "testutils.VerifyGoLeaksForES" "${test}"; then
27+
if [ "${dir}" != "./internal/storage/integration/" ] && grep -q "testutils.VerifyGoLeaksForES" "${test}"; then
2828
invalid=1
2929
break
3030
fi

0 commit comments

Comments
 (0)