Skip to content

Commit 19e9abb

Browse files
authored
fix: do not use GAE_RUNTIME for GAE environment detection (#891)
Stops using GAE_RUNTIME envvar to detect AppEngine environment.
1 parent fa8b41d commit 19e9abb

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

‎google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ private static Resource detectResourceType() {
175175
return Resource.CloudRun;
176176
}
177177
if (getter.getEnv("GAE_INSTANCE") != null
178-
&& getter.getEnv("GAE_RUNTIME") != null
179178
&& getter.getEnv("GAE_SERVICE") != null
180179
&& getter.getEnv("GAE_VERSION") != null) {
181180
return Resource.AppEngine;

‎google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ public void testResourceTypeK8sContainer() {
155155
private void setupCommonGAEMocks(String mockedModuleId, String mockedVersionId) {
156156
expect(getterMock.getAttribute("instance/zone")).andReturn(MOCKED_QUALIFIED_ZONE).once();
157157
expect(getterMock.getEnv("GAE_INSTANCE")).andReturn(MOCKED_NON_EMPTY).once();
158-
expect(getterMock.getEnv("GAE_RUNTIME")).andReturn(MOCKED_NON_EMPTY).once();
159158
expect(getterMock.getEnv("GAE_SERVICE")).andReturn(mockedModuleId).times(2);
160159
expect(getterMock.getEnv("GAE_VERSION")).andReturn(mockedVersionId).times(2);
161160
expect(getterMock.getEnv(anyString())).andReturn(null).anyTimes();

0 commit comments

Comments
 (0)