Fix more paths

mariomac · mariomac · commit 313c3d3a1229 · 2025-10-30T14:27:29.000+01:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -27,7 +27,7 @@
     },
     {
       "description": "Disable Go 1.17 testserver updates",
-      "matchFileNames": ["test/integration/components/testserver_1.17/Dockerfile"],
+      "matchFileNames": ["internal/test/integration/components/testserver_1.17"],
       "matchDatasources": ["docker"],
       "matchPackageNames": ["golang"],
       "enabled": false
diff --git a/.github/workflows/ghcr_publish_testing_images.yml b/.github/workflows/ghcr_publish_testing_images.yml
@@ -96,68 +96,68 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: rust
-          file: test/integration/components/rusttestserver/Dockerfile
+          file: internal/test/integration/components/rusttestserver/Dockerfile/rusttestserver/Dockerfile
 
       - name: rust-ssl
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: rust-ssl
-          file: test/integration/components/rustssltestserver/Dockerfile
+          file: internal/test/integration/components/rusttestserver/Dockerfile/rustssltestserver/Dockerfile
 
       - name: rails
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: rails
-          file: test/integration/components/rubytestserver/testapi/Dockerfile
+          file: internal/test/integration/components/rusttestserver/Dockerfile/rubytestserver/testapi/Dockerfile
 
       - name: rails-ssl
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: rails-ssl
-          file: test/integration/components/rubytestserver/testapi/Dockerfile_tls
+          file: internal/test/integration/components/rusttestserver/Dockerfile/rubytestserver/testapi/Dockerfile_tls
 
       - name: java-jar
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: java-jar
-          file: test/integration/components/javatestserver/Dockerfile_jar
+          file: internal/test/integration/components/rusttestserver/Dockerfile/javatestserver/Dockerfile_jar
 
       - name: java-native
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: java-native
-          file: test/integration/components/javatestserver/Dockerfile
+          file: internal/test/integration/components/rusttestserver/Dockerfile/javatestserver/Dockerfile
 
       - name: node
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: node
-          file: test/integration/components/nodejsserver/Dockerfile
+          file: internal/test/integration/components/rusttestserver/Dockerfile/nodejsserver/Dockerfile
 
       - name: go
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: go
-          file: test/integration/components/testserver/Dockerfile
+          file: internal/test/integration/components/rusttestserver/Dockerfile/testserver/Dockerfile
 
       - name: python
         uses: ./.github/actions/integration-test-image-build
         with:
           labels: ${{ steps.meta.outputs.labels }}
           tag-version: ${{ steps.image_tag.outputs.imgtag }}
           tag-id: python
-          file: test/integration/components/pythonserver/Dockerfile
+          file: internal/test/integration/components/rusttestserver/Dockerfile/pythonserver/Dockerfile
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ make oats-test
 
 , or all the above tasks. Each integration test target can take up to 50 minutes to complete, but you can
 use standard `go` command-line tooling to individually run each integration test suite under
-the [test/integration](./internal/test/integration) and [test/integration/k8s](./internal/test/integration/k8s) folder.
+the [internal/test/integration](./internal/test/integration) and [internal/test/integration/k8s](./internal/test/integration/k8s) folder.
 
 ## Contributing
 
diff --git a/internal/test/integration/components/go_grpc_server_mux/go.mod b/internal/test/integration/components/go_grpc_server_mux/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/go_grpc_server_mux
+module go.opentelemetry.io/obi/internal/test/integration/components/go_grpc_server_mux
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/go_otel/go.mod b/internal/test/integration/components/go_otel/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/go_otel
+module go.opentelemetry.io/obi/internal/test/integration/components/go_otel
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/go_otel_grpc/go.mod b/internal/test/integration/components/go_otel_grpc/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/go_otel_grpc
+module go.opentelemetry.io/obi/internal/test/integration/components/go_otel_grpc
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/gohttp2/client/go.mod b/internal/test/integration/components/gohttp2/client/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/go_http2/client
+module go.opentelemetry.io/obi/internal/test/integration/components/go_http2/client
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/gohttp2/server/go.mod b/internal/test/integration/components/gohttp2/server/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/go_http2/server
+module go.opentelemetry.io/obi/internal/test/integration/components/go_http2/server
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/gokafka-seg/go.mod b/internal/test/integration/components/gokafka-seg/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/gokafka-seg
+module go.opentelemetry.io/obi/internal/test/integration/components/gokafka-seg
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/gokafka/go.mod b/internal/test/integration/components/gokafka/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/gokafka
+module go.opentelemetry.io/obi/internal/test/integration/components/gokafka
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/goredis/go.mod b/internal/test/integration/components/goredis/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/goredis
+module go.opentelemetry.io/obi/internal/test/integration/components/goredis
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/gosql/go.mod b/internal/test/integration/components/gosql/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/gosql
+module go.opentelemetry.io/obi/internal/test/integration/components/gosql
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/old_grpc/backend/Dockerfile b/internal/test/integration/components/old_grpc/backend/Dockerfile
@@ -1,17 +1,17 @@
 FROM golang:1.25@sha256:1a13867f40c6ba8c3e7c07ab5fa921cb58cf8402bcbe452f4d41cd614655e700 AS builder
 
-WORKDIR /src/go.opentelemetry.io/obi/test/integration/components/old_grpc/
+WORKDIR /src/go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/
 
 COPY internal/test/integration/components/old_grpc/worker ./worker
 COPY internal/test/integration/components/old_grpc/backend ./backend
 
-WORKDIR /src/go.opentelemetry.io/obi/test/integration/components/old_grpc/backend
+WORKDIR /src/go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/backend
 
 RUN make compile
 
 FROM ubuntu:latest@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252
 
 WORKDIR /
-COPY --from=builder /src/go.opentelemetry.io/obi/test/integration/components/old_grpc/backend/bin/backend /backend
+COPY --from=builder /src/go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/backend/bin/backend /backend
 
 ENTRYPOINT ["/backend"]
diff --git a/internal/test/integration/components/old_grpc/backend/go.mod b/internal/test/integration/components/old_grpc/backend/go.mod
@@ -1,10 +1,10 @@
-module go.opentelemetry.io/obi/test/integration/components/old_grpc/backend
+module go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/backend
 
 go 1.25.0
 
 require (
 	github.com/caarlos0/env/v7 v7.1.0
-	go.opentelemetry.io/obi/test/integration/components/old_grpc/worker v0.0.0-20251020181413-b62a788abdb6
+	go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/worker v0.0.0-20251020181413-b62a788abdb6
 	google.golang.org/grpc v1.55.0
 	google.golang.org/protobuf v1.30.0
 )
@@ -19,4 +19,4 @@ require (
 
 replace go.opentelemetry.io/obi v0.0.0 => ../../../../../../../
 
-replace go.opentelemetry.io/obi/test/integration/components/old_grpc/worker => ../worker/
+replace go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/worker => ../worker/
diff --git a/internal/test/integration/components/old_grpc/worker/go.mod b/internal/test/integration/components/old_grpc/worker/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/old_grpc/worker
+module go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/worker
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx
@@ -16,7 +16,7 @@ RUN mkdir /etc/nginx/sites-available && mkdir /etc/nginx/sites-enabled
 
 COPY internal/test/integration/components/php/unix_sock_sql/config/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY internal/test/integration/components/php/unix_sock_sql/config/nginx/sites-available /etc/nginx/sites-available
-COPY --chown=www-data:www-data test/integration/components/php/unix_sock_sql/src/ /var/www/html/
+COPY --chown=www-data:www-data internal/test/integration/components/php/unix_sock_sql/src/ /var/www/html/
  
 RUN  ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/  
 
diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php
@@ -19,7 +19,7 @@ EXPOSE 9000
 
 RUN install -d -m 0755 -o www-data -g www-data /run/php-fpm
 
-COPY --chown=www-data:www-data test/integration/components/php/unix_sock_sql/src/ /var/www/html/
+COPY --chown=www-data:www-data internal/test/integration/components/php/unix_sock_sql/src/ /var/www/html/
 COPY internal/test/integration/components/php/unix_sock_sql/config/php/ /usr/local/etc/
 COPY internal/test/integration/components/php/unix_sock_sql/config/php/php/php.ini  /usr/local/etc/php/
 
diff --git a/internal/test/integration/components/sqlclient/go.mod b/internal/test/integration/components/sqlclient/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/sqlclient
+module go.opentelemetry.io/obi/internal/test/integration/components/sqlclient
 
 go 1.25.0
 
diff --git a/internal/test/integration/components/testserver_1.17/go.mod b/internal/test/integration/components/testserver_1.17/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/integration/components/testserver_1.17
+module go.opentelemetry.io/obi/internal/test/integration/components/testserver_1.17
 
 go 1.17
 
diff --git a/internal/test/oats/http/go.mod b/internal/test/oats/http/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/oats/http
+module go.opentelemetry.io/obi/internal/test/oats/http
 
 go 1.25.0
 
diff --git a/internal/test/oats/kafka/go.mod b/internal/test/oats/kafka/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/oats/kafka
+module go.opentelemetry.io/obi/internal/test/oats/kafka
 
 go 1.25.0
 
diff --git a/internal/test/oats/mongo/go.mod b/internal/test/oats/mongo/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/oats/http
+module go.opentelemetry.io/obi/internal/test/oats/http
 
 go 1.25.0
 
diff --git a/internal/test/oats/redis/go.mod b/internal/test/oats/redis/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/oats/redis
+module go.opentelemetry.io/obi/internal/test/oats/redis
 
 go 1.25.0
 
diff --git a/internal/test/oats/sql/go.mod b/internal/test/oats/sql/go.mod
@@ -1,4 +1,4 @@
-module go.opentelemetry.io/obi/test/oats/sql
+module go.opentelemetry.io/obi/internal/test/oats/sql
 
 go 1.25.0
 
diff --git a/scripts/generate-dir-matrix.sh b/scripts/generate-dir-matrix.sh
@@ -8,7 +8,7 @@
 set -e
 
 # Find all test directories
-SEARCH_DIR="${1:-test/integration/k8s}"
+SEARCH_DIR="${1:-internal/test/integration/k8s}"
 EXCLUDE_PATTERN="${2:-common}"
 TEST_DIRS=$(find "$SEARCH_DIR" -name "*_test.go" | grep -v "$EXCLUDE_PATTERN" | sort | xargs dirname | xargs basename -a | sort -u)
 
diff --git a/scripts/generate-integration-matrix.sh b/scripts/generate-integration-matrix.sh
@@ -8,7 +8,7 @@
 set -e
 
 TEST_TAGS="${1:-integration}"
-SEARCH_DIR="${2:-test/integration}"
+SEARCH_DIR="${2:-internal/test/integration}"
 PARTITIONS="${3:-5}"
 TEST_PATTERN="${4:-Test}"
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"description": "Disable Go 1.17 testserver updates",`
`30`		`- "matchFileNames": ["test/integration/components/testserver_1.17/Dockerfile"],`
	`30`	`+ "matchFileNames": ["internal/test/integration/components/testserver_1.17"],`
`31`	`31`	`"matchDatasources": ["docker"],`
`32`	`32`	`"matchPackageNames": ["golang"],`
`33`	`33`	`"enabled": false`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module go.opentelemetry.io/obi/test/integration/components/go_grpc_server_mux`
	`1`	`+module go.opentelemetry.io/obi/internal/test/integration/components/go_grpc_server_mux`
`2`	`2`
`3`	`3`	`go 1.25.0`
`4`	`4`