Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: resource detection for 2nd gen of Cloud Functions works incorrectly #1045

Merged
merged 2 commits into from
Aug 25, 2022
Merged

fix: resource detection for 2nd gen of Cloud Functions works incorrectly #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10e7a76
fix: resource detection for 2nd gen of Cloud Functions works incorrectly
losalex Aug 24, 2022
49b2862
Add a test
losalex Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
}
Expand Down
4 changes: 4 additions & 0 deletions google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down