Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7b9d81f
added resource detection for cloud run
daniel-sanche Feb 26, 2021
add39c4
added new monitored resource tests
daniel-sanche Feb 27, 2021
2e85755
added gcf resource detection
daniel-sanche Feb 27, 2021
0e80fec
monitored resource detection for gce
daniel-sanche Feb 27, 2021
97040e8
refactored
daniel-sanche Feb 27, 2021
eb8f309
added parens
daniel-sanche Feb 27, 2021
98ca4d5
fixed env var names
daniel-sanche Feb 27, 2021
d7ddd5b
fixed env var names
daniel-sanche Feb 27, 2021
2124310
fixed variable name
daniel-sanche Feb 27, 2021
32b639f
fixed variable name
daniel-sanche Feb 27, 2021
5ed2ab0
added zone to appengine results
daniel-sanche Mar 1, 2021
8723cfa
upgraded environment test repo
daniel-sanche Mar 1, 2021
f1bb7f7
updated appengine resource creation
daniel-sanche Mar 1, 2021
3a63d84
refactored, fixed unit tests
daniel-sanche Mar 1, 2021
3436d06
ran blacken
daniel-sanche Mar 1, 2021
91aabaa
blacken env tests
daniel-sanche Mar 1, 2021
b4828e8
fixed incorrect variable name
daniel-sanche Mar 1, 2021
310b729
fixed lint issues
daniel-sanche Mar 1, 2021
3507bc6
added unit tests for _monitored_resources
daniel-sanche Mar 2, 2021
7448cf6
added unit tests
daniel-sanche Mar 2, 2021
bd90217
blacken tests
daniel-sanche Mar 2, 2021
c6dde1a
fixed failing unit tests
daniel-sanche Mar 2, 2021
93be25c
fixed app engine import path
daniel-sanche Mar 2, 2021
6c0db74
added comments
daniel-sanche Mar 2, 2021
2cca768
CloudLoggingHandler should attempt to infer resource type
daniel-sanche Mar 2, 2021
aeebe3a
use variables for magic strings
daniel-sanche Mar 2, 2021
f4da836
fixed lint issue
daniel-sanche Mar 2, 2021
2d0ff7e
pulled in go environment tests
daniel-sanche Mar 2, 2021
4e0dd3c
merged submodule into main
daniel-sanche Mar 5, 2021
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
Prev Previous commit
Next Next commit
updated appengine resource creation
  • Loading branch information
daniel-sanche committed Mar 1, 2021
commit f1bb7f7c1e7f004f6cbb351b014feaacc22e4bd0
11 changes: 2 additions & 9 deletions google/cloud/logging_v2/handlers/app_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import os

from google.cloud.logging_v2.handlers._helpers import get_request_data
from google.cloud.logging_v2.handlers._monitored_resources import create_app_engine_resource
from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport
from google.cloud.logging_v2.resource import Resource

Expand Down Expand Up @@ -75,15 +76,7 @@ def get_gae_resource(self):
Returns:
google.cloud.logging_v2.resource.Resource: Monitored resource for GAE.
"""
gae_resource = Resource(
type="gae_app",
labels={
"project_id": self.project_id,
"module_id": self.module_id,
"version_id": self.version_id,
},
)
return gae_resource
return create_app_engine_resource(self.project_id)

def get_gae_labels(self):
"""Return the labels for GAE app.
Expand Down