Rename support package: detectors -> detection

Support library was using the same package as the detectors library. This rename would avoid potential conflicts and import issues.
GoogleCloudPlatform · Jan 11, 2024 · d529469 · d529469
1 parent 4d577f0
commit d529469
Show file tree

Hide file tree

Showing 18 changed files with 92 additions and 90 deletions.
diff --git a/...pentelemetry/detectors/AttributeKeys.java → ...pentelemetry/detection/AttributeKeys.java b/...pentelemetry/detectors/AttributeKeys.java → ...pentelemetry/detection/AttributeKeys.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 /**
  * Contains constants that act as keys for the known attributes for {@link
- * com.google.cloud.opentelemetry.detectors.GCPPlatformDetector.SupportedPlatform}s.
+ * GCPPlatformDetector.SupportedPlatform}s.
  */
 public final class AttributeKeys {
   // GCE Attributes

diff --git a/...telemetry/detectors/DetectedPlatform.java → ...telemetry/detection/DetectedPlatform.java b/...telemetry/detectors/DetectedPlatform.java → ...telemetry/detection/DetectedPlatform.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 import java.util.Map;
 

diff --git a/...metry/detectors/EnvironmentVariables.java → ...metry/detection/EnvironmentVariables.java b/...metry/detectors/EnvironmentVariables.java → ...metry/detection/EnvironmentVariables.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 /**
  * Provides API to fetch environment variables. This is useful in order to create a mock class for

diff --git a/...elemetry/detectors/GCPMetadataConfig.java → ...elemetry/detection/GCPMetadataConfig.java b/...elemetry/detectors/GCPMetadataConfig.java → ...elemetry/detection/GCPMetadataConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...emetry/detectors/GCPPlatformDetector.java → ...emetry/detection/GCPPlatformDetector.java b/...emetry/detectors/GCPPlatformDetector.java → ...emetry/detection/GCPPlatformDetector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 public class GCPPlatformDetector {
   public static final GCPPlatformDetector DEFAULT_INSTANCE = new GCPPlatformDetector();

diff --git a/...ntelemetry/detectors/GoogleAppEngine.java → ...ntelemetry/detection/GoogleAppEngine.java b/...ntelemetry/detectors/GoogleAppEngine.java → ...ntelemetry/detection/GoogleAppEngine.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GAE_APP_VERSION;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GAE_AVAILABILITY_ZONE;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GAE_CLOUD_REGION;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GAE_INSTANCE_ID;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GAE_MODULE_NAME;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GAE_APP_VERSION;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GAE_AVAILABILITY_ZONE;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GAE_CLOUD_REGION;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GAE_INSTANCE_ID;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GAE_MODULE_NAME;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...emetry/detectors/GoogleCloudFunction.java → ...emetry/detection/GoogleCloudFunction.java b/...emetry/detectors/GoogleCloudFunction.java → ...emetry/detection/GoogleCloudFunction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 class GoogleCloudFunction extends GoogleServerlessCompute {
   GoogleCloudFunction(EnvironmentVariables environmentVariables, GCPMetadataConfig metadataConfig) {

diff --git a/...entelemetry/detectors/GoogleCloudRun.java → ...entelemetry/detection/GoogleCloudRun.java b/...entelemetry/detectors/GoogleCloudRun.java → ...entelemetry/detection/GoogleCloudRun.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 class GoogleCloudRun extends GoogleServerlessCompute {
   GoogleCloudRun(EnvironmentVariables environmentVariables, GCPMetadataConfig metadataConfig) {

diff --git a/...emetry/detectors/GoogleComputeEngine.java → ...emetry/detection/GoogleComputeEngine.java b/...emetry/detectors/GoogleComputeEngine.java → ...emetry/detection/GoogleComputeEngine.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
-
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GCE_AVAILABILITY_ZONE;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GCE_CLOUD_REGION;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GCE_INSTANCE_HOSTNAME;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GCE_INSTANCE_ID;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GCE_INSTANCE_NAME;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GCE_MACHINE_TYPE;
+package com.google.cloud.opentelemetry.detection;
+
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GCE_AVAILABILITY_ZONE;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GCE_CLOUD_REGION;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GCE_INSTANCE_HOSTNAME;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GCE_INSTANCE_ID;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GCE_INSTANCE_NAME;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GCE_MACHINE_TYPE;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...try/detectors/GoogleKubernetesEngine.java → ...try/detection/GoogleKubernetesEngine.java b/...try/detectors/GoogleKubernetesEngine.java → ...try/detection/GoogleKubernetesEngine.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GKE_CLUSTER_LOCATION;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GKE_CLUSTER_LOCATION_TYPE;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GKE_CLUSTER_NAME;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GKE_HOST_ID;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GKE_LOCATION_TYPE_REGION;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.GKE_LOCATION_TYPE_ZONE;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GKE_CLUSTER_LOCATION;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GKE_CLUSTER_LOCATION_TYPE;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GKE_CLUSTER_NAME;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GKE_HOST_ID;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GKE_LOCATION_TYPE_REGION;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.GKE_LOCATION_TYPE_ZONE;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...ry/detectors/GoogleServerlessCompute.java → ...ry/detection/GoogleServerlessCompute.java b/...ry/detectors/GoogleServerlessCompute.java → ...ry/detection/GoogleServerlessCompute.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...ntelemetry/detectors/UnknownPlatform.java → ...ntelemetry/detection/UnknownPlatform.java b/...ntelemetry/detectors/UnknownPlatform.java → ...ntelemetry/detection/UnknownPlatform.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 import java.util.Collections;
 import java.util.Map;

diff --git a/...d/opentelemetry/detectors/EnvVarMock.java → ...d/opentelemetry/detection/EnvVarMock.java b/...d/opentelemetry/detectors/EnvVarMock.java → ...d/opentelemetry/detection/EnvVarMock.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 import java.util.Map;
 

diff --git a/...etry/detectors/GCPMetadataConfigTest.java → ...etry/detection/GCPMetadataConfigTest.java b/...etry/detectors/GCPMetadataConfigTest.java → ...etry/detection/GCPMetadataConfigTest.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
-import static com.google.cloud.opentelemetry.detectors.TestUtils.stubEndpoint;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
@@ -43,15 +42,15 @@ class GCPMetadataConfigTest {
 
   @BeforeEach
   public void setupMockMetadataConfig() {
-    stubEndpoint("/project/project-id", mockProjectId);
-    stubEndpoint("/instance/zone", mockZone);
-    stubEndpoint("/instance/region", mockRegion);
-    stubEndpoint("/instance/id", mockInstanceId);
-    stubEndpoint("/instance/name", mockInstanceName);
-    stubEndpoint("/instance/machine-type", mockInstanceType);
-    stubEndpoint("/instance/attributes/cluster-name", mockClusterName);
-    stubEndpoint("/instance/attributes/cluster-location", mockClusterLocation);
-    stubEndpoint("/instance/hostname", mockHostname);
+    TestUtils.stubEndpoint("/project/project-id", mockProjectId);
+    TestUtils.stubEndpoint("/instance/zone", mockZone);
+    TestUtils.stubEndpoint("/instance/region", mockRegion);
+    TestUtils.stubEndpoint("/instance/id", mockInstanceId);
+    TestUtils.stubEndpoint("/instance/name", mockInstanceName);
+    TestUtils.stubEndpoint("/instance/machine-type", mockInstanceType);
+    TestUtils.stubEndpoint("/instance/attributes/cluster-name", mockClusterName);
+    TestUtils.stubEndpoint("/instance/attributes/cluster-location", mockClusterLocation);
+    TestUtils.stubEndpoint("/instance/hostname", mockHostname);
   }
 
   @Test
@@ -63,7 +62,7 @@ void testGetProjectId() {
   @ParameterizedTest
   @MethodSource("provideZoneRetrievalArguments")
   void testGetZone(String stubbedMockZone, String expectedMockZone) {
-    stubEndpoint("/instance/zone", stubbedMockZone);
+    TestUtils.stubEndpoint("/instance/zone", stubbedMockZone);
     assertEquals(expectedMockZone, mockMetadataConfig.getZone());
   }
 
@@ -80,7 +79,7 @@ private static Stream<Arguments> provideZoneRetrievalArguments() {
   @ParameterizedTest
   @MethodSource("provideRegionRetrievalArguments")
   void testGetRegion(String stubbedMockRegion, String expectedMockRegion) {
-    stubEndpoint("/instance/region", stubbedMockRegion);
+    TestUtils.stubEndpoint("/instance/region", stubbedMockRegion);
     assertEquals(expectedMockRegion, mockMetadataConfig.getRegion());
   }
 
@@ -96,7 +95,7 @@ private static Stream<Arguments> provideRegionRetrievalArguments() {
   @ParameterizedTest
   @MethodSource("provideZoneArguments")
   void testGetRegionFromZone(String stubbedMockZone, String expectedRegion) {
-    stubEndpoint("/instance/zone", stubbedMockZone);
+    TestUtils.stubEndpoint("/instance/zone", stubbedMockZone);
     assertEquals(expectedRegion, mockMetadataConfig.getRegionFromZone());
   }
 
@@ -113,7 +112,7 @@ private static Stream<Arguments> provideZoneArguments() {
   @ParameterizedTest
   @MethodSource("provideMachineTypeRetrievalArguments")
   void testGetMachineType(String stubbedMockMachineType, String expectedMockMachineType) {
-    stubEndpoint("/instance/machine-type", stubbedMockMachineType);
+    TestUtils.stubEndpoint("/instance/machine-type", stubbedMockMachineType);
     assertEquals(expectedMockMachineType, mockMetadataConfig.getMachineType());
   }
 

diff --git a/...ry/detectors/GCPPlatformDetectorTest.java → ...ry/detection/GCPPlatformDetectorTest.java b/...ry/detectors/GCPPlatformDetectorTest.java → ...ry/detection/GCPPlatformDetectorTest.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.google.cloud.opentelemetry.detectors.AttributeKeys.*;
-import static com.google.cloud.opentelemetry.detectors.TestUtils.stubEndpoint;
+import static com.google.cloud.opentelemetry.detection.AttributeKeys.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -83,12 +82,12 @@ public void testGCPComputeResourceNonGCPEndpoint() {
   /** Google Compute Engine Tests * */
   @Test
   public void testGCEResourceWithGCEAttributesSucceeds() {
-    stubEndpoint("/project/project-id", "GCE-pid");
-    stubEndpoint("/instance/zone", "country-gce_region-gce_zone");
-    stubEndpoint("/instance/id", "GCE-instance-id");
-    stubEndpoint("/instance/name", "GCE-instance-name");
-    stubEndpoint("/instance/machine-type", "GCE-instance-type");
-    stubEndpoint("/instance/hostname", "GCE-instance-hostname");
+    TestUtils.stubEndpoint("/project/project-id", "GCE-pid");
+    TestUtils.stubEndpoint("/instance/zone", "country-gce_region-gce_zone");
+    TestUtils.stubEndpoint("/instance/id", "GCE-instance-id");
+    TestUtils.stubEndpoint("/instance/name", "GCE-instance-name");
+    TestUtils.stubEndpoint("/instance/machine-type", "GCE-instance-type");
+    TestUtils.stubEndpoint("/instance/hostname", "GCE-instance-hostname");
 
     GCPPlatformDetector detector =
         new GCPPlatformDetector(mockMetadataConfig, new EnvVarMock(envVars));
@@ -119,12 +118,12 @@ public void testGKEResourceWithGKEAttributesSucceedsLocationZone() {
     envVars.put("POD_NAME", "GKE-testHostName-full-1234");
     envVars.put("CONTAINER_NAME", "GKE-testContainerName");
 
-    stubEndpoint("/project/project-id", "GKE-pid");
-    stubEndpoint("/instance/id", "GKE-instance-id");
-    stubEndpoint("/instance/name", "instance-name");
-    stubEndpoint("/instance/machine-type", "instance-type");
-    stubEndpoint("/instance/attributes/cluster-name", "GKE-cluster-name");
-    stubEndpoint("/instance/attributes/cluster-location", "country-region-zone");
+    TestUtils.stubEndpoint("/project/project-id", "GKE-pid");
+    TestUtils.stubEndpoint("/instance/id", "GKE-instance-id");
+    TestUtils.stubEndpoint("/instance/name", "instance-name");
+    TestUtils.stubEndpoint("/instance/machine-type", "instance-type");
+    TestUtils.stubEndpoint("/instance/attributes/cluster-name", "GKE-cluster-name");
+    TestUtils.stubEndpoint("/instance/attributes/cluster-location", "country-region-zone");
 
     EnvironmentVariables mockEnv = new EnvVarMock(envVars);
     GCPPlatformDetector detector = new GCPPlatformDetector(mockMetadataConfig, mockEnv);
@@ -153,12 +152,12 @@ public void testGKEResourceWithGKEAttributesSucceedsLocationRegion() {
     envVars.put("POD_NAME", "GKE-testHostName-full-1234");
     envVars.put("CONTAINER_NAME", "GKE-testContainerName");
 
-    stubEndpoint("/project/project-id", "GKE-pid");
-    stubEndpoint("/instance/id", "GKE-instance-id");
-    stubEndpoint("/instance/name", "GCE-instance-name");
-    stubEndpoint("/instance/machine-type", "GKE-instance-type");
-    stubEndpoint("/instance/attributes/cluster-name", "GKE-cluster-name");
-    stubEndpoint("/instance/attributes/cluster-location", "country-region");
+    TestUtils.stubEndpoint("/project/project-id", "GKE-pid");
+    TestUtils.stubEndpoint("/instance/id", "GKE-instance-id");
+    TestUtils.stubEndpoint("/instance/name", "GCE-instance-name");
+    TestUtils.stubEndpoint("/instance/machine-type", "GKE-instance-type");
+    TestUtils.stubEndpoint("/instance/attributes/cluster-name", "GKE-cluster-name");
+    TestUtils.stubEndpoint("/instance/attributes/cluster-location", "country-region");
 
     EnvironmentVariables mockEnv = new EnvVarMock(envVars);
     GCPPlatformDetector detector = new GCPPlatformDetector(mockMetadataConfig, mockEnv);
@@ -189,12 +188,12 @@ public void testGKEResourceDetectionWithInvalidLocations(String clusterLocation)
     envVars.put("POD_NAME", "GKE-testHostName-full-1234");
     envVars.put("CONTAINER_NAME", "GKE-testContainerName");
 
-    stubEndpoint("/project/project-id", "GKE-pid");
-    stubEndpoint("/instance/id", "GKE-instance-id");
-    stubEndpoint("/instance/name", "GKE-instance-name");
-    stubEndpoint("/instance/machine-type", "GKE-instance-type");
-    stubEndpoint("/instance/attributes/cluster-name", "GKE-cluster-name");
-    stubEndpoint("/instance/attributes/cluster-location", clusterLocation);
+    TestUtils.stubEndpoint("/project/project-id", "GKE-pid");
+    TestUtils.stubEndpoint("/instance/id", "GKE-instance-id");
+    TestUtils.stubEndpoint("/instance/name", "GKE-instance-name");
+    TestUtils.stubEndpoint("/instance/machine-type", "GKE-instance-type");
+    TestUtils.stubEndpoint("/instance/attributes/cluster-name", "GKE-cluster-name");
+    TestUtils.stubEndpoint("/instance/attributes/cluster-location", clusterLocation);
 
     EnvironmentVariables mockEnv = new EnvVarMock(envVars);
     GCPPlatformDetector detector = new GCPPlatformDetector(mockMetadataConfig, mockEnv);
@@ -226,9 +225,9 @@ public void testGCFResourceWithCloudFunctionAttributesSucceeds() {
     envVars.put("K_REVISION", "cloud-function-hello.1");
     envVars.put("FUNCTION_TARGET", "cloud-function-hello");
 
-    stubEndpoint("/project/project-id", "GCF-pid");
-    stubEndpoint("/instance/zone", "country-region-zone");
-    stubEndpoint("/instance/id", "GCF-instance-id");
+    TestUtils.stubEndpoint("/project/project-id", "GCF-pid");
+    TestUtils.stubEndpoint("/instance/zone", "country-region-zone");
+    TestUtils.stubEndpoint("/instance/id", "GCF-instance-id");
 
     EnvironmentVariables mockEnv = new EnvVarMock(envVars);
     GCPPlatformDetector detector = new GCPPlatformDetector(mockMetadataConfig, mockEnv);
@@ -259,9 +258,9 @@ public void testGCFDetectionWhenGCRAttributesPresent() {
     // This should be ignored and detected platform should still be GCF
     envVars.put("K_CONFIGURATION", "cloud-run-hello");
 
-    stubEndpoint("/project/project-id", "GCF-pid");
-    stubEndpoint("/instance/zone", "country-region-zone");
-    stubEndpoint("/instance/id", "GCF-instance-id");
+    TestUtils.stubEndpoint("/project/project-id", "GCF-pid");
+    TestUtils.stubEndpoint("/instance/zone", "country-region-zone");
+    TestUtils.stubEndpoint("/instance/id", "GCF-instance-id");
 
     EnvironmentVariables mockEnv = new EnvVarMock(envVars);
     GCPPlatformDetector detector = new GCPPlatformDetector(mockMetadataConfig, mockEnv);
@@ -283,9 +282,9 @@ public void testGCFResourceWithCloudRunAttributesSucceeds() {
     envVars.put("K_REVISION", "cloud-run-hello.1");
     envVars.put("K_CONFIGURATION", "cloud-run-hello");
 
-    stubEndpoint("/project/project-id", "GCR-pid");
-    stubEndpoint("/instance/zone", "country-region-zone");
-    stubEndpoint("/instance/id", "GCR-instance-id");
+    TestUtils.stubEndpoint("/project/project-id", "GCR-pid");
+    TestUtils.stubEndpoint("/instance/zone", "country-region-zone");
+    TestUtils.stubEndpoint("/instance/id", "GCR-instance-id");
 
     EnvironmentVariables mockEnv = new EnvVarMock(envVars);
     GCPPlatformDetector detector = new GCPPlatformDetector(mockMetadataConfig, mockEnv);
@@ -316,11 +315,11 @@ public void testGAEResourceWithAppEngineAttributesSucceeds(String gaeEnvironment
     envVars.put("GAE_INSTANCE", "app-engine-hello-f236d");
     envVars.put("GAE_ENV", gaeEnvironmentVar);
 
-    stubEndpoint("/project/project-id", "GAE-pid");
+    TestUtils.stubEndpoint("/project/project-id", "GAE-pid");
     // for standard, the region should be extracted from region attribute
-    stubEndpoint("/instance/zone", "country-region-zone");
-    stubEndpoint("/instance/region", "country-region1");
-    stubEndpoint("/instance/id", "GAE-instance-id");
+    TestUtils.stubEndpoint("/instance/zone", "country-region-zone");
+    TestUtils.stubEndpoint("/instance/region", "country-region1");
+    TestUtils.stubEndpoint("/instance/id", "GAE-instance-id");
 
     EnvironmentVariables mockEnv = new EnvVarMock(envVars);
     GCPPlatformDetector detector = new GCPPlatformDetector(mockMetadataConfig, mockEnv);

diff --git a/...ud/opentelemetry/detectors/TestUtils.java → ...ud/opentelemetry/detection/TestUtils.java b/...ud/opentelemetry/detectors/TestUtils.java → ...ud/opentelemetry/detection/TestUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.opentelemetry.detectors;
+package com.google.cloud.opentelemetry.detection;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;