fix: resource detection for 2nd gen of Cloud Functions works incorrec…

…tly (#1045) * fix: resource detection for 2nd gen of Cloud Functions works incorrectly * Add a test
googleapis · Aug 25, 2022 · dda1d0a · dda1d0a
1 parent 9b82109
commit dda1d0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
@@ -169,6 +169,10 @@ private static Resource detectResourceType() {
  return Resource.Global;
  }
 
+ if (getter.getEnv("FUNCTION_SIGNATURE_TYPE") != null
+ && getter.getEnv("FUNCTION_TARGET") != null) {
+ return Resource.CloudFunction;
+ }
  if (getter.getEnv("K_SERVICE") != null
  && getter.getEnv("K_REVISION") != null
  && getter.getEnv("K_CONFIGURATION") != null) {
@@ -179,10 +183,6 @@ private static Resource detectResourceType() {
  && getter.getEnv("GAE_VERSION") != null) {
  return Resource.AppEngine;
  }
- if (getter.getEnv("FUNCTION_SIGNATURE_TYPE") != null
- && getter.getEnv("FUNCTION_TARGET") != null) {
- return Resource.CloudFunction;
- }
  if (getter.getAttribute("instance/attributes/cluster-name") != null) {
  return Resource.K8sContainer;
  }

diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java
@@ -243,6 +243,10 @@ public void testResourceTypeCloudFunction() {
  expect(getterMock.getEnv("FUNCTION_SIGNATURE_TYPE")).andReturn(MOCKED_NON_EMPTY).once();
  expect(getterMock.getEnv("FUNCTION_TARGET")).andReturn(MOCKED_NON_EMPTY).once();
  expect(getterMock.getEnv("K_SERVICE")).andReturn(MockedFunctionName).anyTimes();
+ expect(getterMock.getEnv("K_REVISION")).andReturn(MockedFunctionName + ".1").anyTimes();
+ expect(getterMock.getEnv("K_CONFIGURATION"))
+ .andReturn(MockedFunctionName + "-config")
+ .anyTimes();
  expect(getterMock.getEnv(anyString())).andReturn(null).anyTimes();
  replay(getterMock);
  // exercise