fix: do not use GAE_RUNTIME for GAE environment detection (googleapis#891)

minherz · web-flow · commit ec8d2c435a68 · 2022-03-02T19:47:22.000+02:00
Stops using GAE_RUNTIME envvar to detect AppEngine environment.
diff --git a/java-logging/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/java-logging/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
@@ -175,7 +175,6 @@ private static Resource detectResourceType() {
       return Resource.CloudRun;
     }
     if (getter.getEnv("GAE_INSTANCE") != null
-        && getter.getEnv("GAE_RUNTIME") != null
         && getter.getEnv("GAE_SERVICE") != null
         && getter.getEnv("GAE_VERSION") != null) {
       return Resource.AppEngine;
diff --git a/java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java b/java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java
@@ -155,7 +155,6 @@ public void testResourceTypeK8sContainer() {
   private void setupCommonGAEMocks(String mockedModuleId, String mockedVersionId) {
     expect(getterMock.getAttribute("instance/zone")).andReturn(MOCKED_QUALIFIED_ZONE).once();
     expect(getterMock.getEnv("GAE_INSTANCE")).andReturn(MOCKED_NON_EMPTY).once();
-    expect(getterMock.getEnv("GAE_RUNTIME")).andReturn(MOCKED_NON_EMPTY).once();
     expect(getterMock.getEnv("GAE_SERVICE")).andReturn(mockedModuleId).times(2);
     expect(getterMock.getEnv("GAE_VERSION")).andReturn(mockedVersionId).times(2);
     expect(getterMock.getEnv(anyString())).andReturn(null).anyTimes();

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,6 @@ private static Resource detectResourceType() {`
`175`	`175`	`return Resource.CloudRun;`
`176`	`176`	`}`
`177`	`177`	`if (getter.getEnv("GAE_INSTANCE") != null`
`178`		`- && getter.getEnv("GAE_RUNTIME") != null`
`179`	`178`	`&& getter.getEnv("GAE_SERVICE") != null`
`180`	`179`	`&& getter.getEnv("GAE_VERSION") != null) {`
`181`	`180`	`return Resource.AppEngine;`