google-cloud-logging 3.7.0__tar.gz → 3.8.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (111) hide show
  1. {google-cloud-logging-3.7.0/google_cloud_logging.egg-info → google-cloud-logging-3.8.0}/PKG-INFO +1 -1
  2. {google-cloud-logging-3.7.0/google/cloud/logging_v2 → google-cloud-logging-3.8.0/google/cloud/logging}/gapic_version.py +1 -1
  3. {google-cloud-logging-3.7.0/google/cloud/logging → google-cloud-logging-3.8.0/google/cloud/logging_v2}/gapic_version.py +1 -1
  4. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/_monitored_resources.py +36 -5
  5. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0/google_cloud_logging.egg-info}/PKG-INFO +1 -1
  6. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/test__monitored_resources.py +34 -6
  7. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/LICENSE +0 -0
  8. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/MANIFEST.in +0 -0
  9. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/README.rst +0 -0
  10. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/__init__.py +0 -0
  11. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/__init__.py +0 -0
  12. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging/__init__.py +0 -0
  13. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging/handlers/__init__.py +0 -0
  14. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging/handlers/middleware/__init__.py +0 -0
  15. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging/handlers/transports/__init__.py +0 -0
  16. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging/py.typed +0 -0
  17. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/__init__.py +0 -0
  18. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/_gapic.py +0 -0
  19. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/_helpers.py +0 -0
  20. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/_http.py +0 -0
  21. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/_instrumentation.py +0 -0
  22. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/client.py +0 -0
  23. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/entries.py +0 -0
  24. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/gapic_metadata.json +0 -0
  25. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/__init__.py +0 -0
  26. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/_helpers.py +0 -0
  27. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/app_engine.py +0 -0
  28. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/container_engine.py +0 -0
  29. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/handlers.py +0 -0
  30. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/middleware/__init__.py +0 -0
  31. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/middleware/request.py +0 -0
  32. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/structured_log.py +0 -0
  33. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/transports/__init__.py +0 -0
  34. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/transports/background_thread.py +0 -0
  35. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/transports/base.py +0 -0
  36. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/handlers/transports/sync.py +0 -0
  37. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/logger.py +0 -0
  38. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/metric.py +0 -0
  39. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/py.typed +0 -0
  40. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/resource.py +0 -0
  41. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/__init__.py +0 -0
  42. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/__init__.py +0 -0
  43. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/async_client.py +0 -0
  44. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/client.py +0 -0
  45. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/pagers.py +0 -0
  46. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/transports/__init__.py +0 -0
  47. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/transports/base.py +0 -0
  48. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/transports/grpc.py +0 -0
  49. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/config_service_v2/transports/grpc_asyncio.py +0 -0
  50. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/__init__.py +0 -0
  51. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/async_client.py +0 -0
  52. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/client.py +0 -0
  53. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/pagers.py +0 -0
  54. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/transports/__init__.py +0 -0
  55. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/transports/base.py +0 -0
  56. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/transports/grpc.py +0 -0
  57. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/logging_service_v2/transports/grpc_asyncio.py +0 -0
  58. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/__init__.py +0 -0
  59. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/async_client.py +0 -0
  60. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/client.py +0 -0
  61. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/pagers.py +0 -0
  62. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/transports/__init__.py +0 -0
  63. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/transports/base.py +0 -0
  64. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/transports/grpc.py +0 -0
  65. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/services/metrics_service_v2/transports/grpc_asyncio.py +0 -0
  66. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/sink.py +0 -0
  67. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/types/__init__.py +0 -0
  68. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/types/log_entry.py +0 -0
  69. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/types/logging.py +0 -0
  70. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/types/logging_config.py +0 -0
  71. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google/cloud/logging_v2/types/logging_metrics.py +0 -0
  72. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google_cloud_logging.egg-info/SOURCES.txt +0 -0
  73. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google_cloud_logging.egg-info/dependency_links.txt +0 -0
  74. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google_cloud_logging.egg-info/namespace_packages.txt +0 -0
  75. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google_cloud_logging.egg-info/not-zip-safe +0 -0
  76. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google_cloud_logging.egg-info/requires.txt +0 -0
  77. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/google_cloud_logging.egg-info/top_level.txt +0 -0
  78. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/setup.cfg +0 -0
  79. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/setup.py +0 -0
  80. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/__init__.py +0 -0
  81. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/performance/noxfile.py +0 -0
  82. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/performance/test_performance.py +0 -0
  83. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/system/gapic/v2/test_system_logging_service_v2_v2.py +0 -0
  84. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/system/test_system.py +0 -0
  85. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/__init__.py +0 -0
  86. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/gapic/__init__.py +0 -0
  87. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/gapic/logging_v2/__init__.py +0 -0
  88. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/gapic/logging_v2/test_config_service_v2.py +0 -0
  89. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/gapic/logging_v2/test_logging_service_v2.py +0 -0
  90. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/gapic/logging_v2/test_metrics_service_v2.py +0 -0
  91. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/__init__.py +0 -0
  92. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/middleware/test_request.py +0 -0
  93. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/test__helpers.py +0 -0
  94. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/test_app_engine.py +0 -0
  95. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/test_container_engine.py +0 -0
  96. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/test_handlers.py +0 -0
  97. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/test_structured_log.py +0 -0
  98. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/transports/__init__.py +0 -0
  99. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/transports/test_background_thread.py +0 -0
  100. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/transports/test_base.py +0 -0
  101. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/handlers/transports/test_sync.py +0 -0
  102. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test__gapic.py +0 -0
  103. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test__helpers.py +0 -0
  104. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test__http.py +0 -0
  105. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test__instrumentation.py +0 -0
  106. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test_client.py +0 -0
  107. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test_entries.py +0 -0
  108. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test_logger.py +0 -0
  109. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test_logging_shim.py +0 -0
  110. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test_metric.py +0 -0
  111. {google-cloud-logging-3.7.0 → google-cloud-logging-3.8.0}/tests/unit/test_sink.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: google-cloud-logging
3
- Version: 3.7.0
3
+ Version: 3.8.0
4
4
  Summary: Stackdriver Logging API client library
5
5
  Home-page: https://github.com/googleapis/python-logging
6
6
  Author: Google LLC
@@ -13,4 +13,4 @@
13
13
  # See the License for the specific language governing permissions and
14
14
  # limitations under the License.
15
15
  #
16
- __version__ = "3.7.0" # {x-release-please-version}
16
+ __version__ = "3.8.0" # {x-release-please-version}
@@ -13,4 +13,4 @@
13
13
  # See the License for the specific language governing permissions and
14
14
  # limitations under the License.
15
15
  #
16
- __version__ = "3.7.0" # {x-release-please-version}
16
+ __version__ = "3.8.0" # {x-release-please-version}
@@ -26,11 +26,21 @@ _GAE_ENV_VARS = [_GAE_SERVICE_ENV, _GAE_VERSION_ENV, _GAE_INSTANCE_ENV]
26
26
  _CLOUD_RUN_SERVICE_ID = "K_SERVICE"
27
27
  _CLOUD_RUN_REVISION_ID = "K_REVISION"
28
28
  _CLOUD_RUN_CONFIGURATION_ID = "K_CONFIGURATION"
29
- _CLOUD_RUN_ENV_VARS = [
29
+ _CLOUD_RUN_SERVICE_ENV_VARS = [
30
30
  _CLOUD_RUN_SERVICE_ID,
31
31
  _CLOUD_RUN_REVISION_ID,
32
32
  _CLOUD_RUN_CONFIGURATION_ID,
33
33
  ]
34
+ _CLOUD_RUN_JOB_ID = "CLOUD_RUN_JOB"
35
+ _CLOUD_RUN_EXECUTION_ID = "CLOUD_RUN_EXECUTION"
36
+ _CLOUD_RUN_TASK_INDEX = "CLOUD_RUN_TASK_INDEX"
37
+ _CLOUD_RUN_TASK_ATTEMPT = "CLOUD_RUN_TASK_ATTEMPT"
38
+ _CLOUD_RUN_JOB_ENV_VARS = [
39
+ _CLOUD_RUN_JOB_ID,
40
+ _CLOUD_RUN_EXECUTION_ID,
41
+ _CLOUD_RUN_TASK_INDEX,
42
+ _CLOUD_RUN_TASK_ATTEMPT,
43
+ ]
34
44
  """Environment variables set in Cloud Run environment."""
35
45
 
36
46
  _FUNCTION_TARGET = "FUNCTION_TARGET"
@@ -118,8 +128,8 @@ def _create_compute_resource():
118
128
  return resource
119
129
 
120
130
 
121
- def _create_cloud_run_resource():
122
- """Create a standardized Cloud Run resource.
131
+ def _create_cloud_run_service_resource():
132
+ """Create a standardized Cloud Run service resource.
123
133
  Returns:
124
134
  google.cloud.logging.Resource
125
135
  """
@@ -138,6 +148,24 @@ def _create_cloud_run_resource():
138
148
  return resource
139
149
 
140
150
 
151
+ def _create_cloud_run_job_resource():
152
+ """Create a standardized Cloud Run job resource.
153
+ Returns:
154
+ google.cloud.logging.Resource
155
+ """
156
+ region = retrieve_metadata_server(_REGION_ID)
157
+ project = retrieve_metadata_server(_PROJECT_NAME)
158
+ resource = Resource(
159
+ type="cloud_run_job",
160
+ labels={
161
+ "project_id": project if project else "",
162
+ "job_name": os.environ.get(_CLOUD_RUN_JOB_ID, ""),
163
+ "location": region.split("/")[-1] if region else "",
164
+ },
165
+ )
166
+ return resource
167
+
168
+
141
169
  def _create_app_engine_resource():
142
170
  """Create a standardized App Engine resource.
143
171
  Returns:
@@ -190,9 +218,12 @@ def detect_resource(project=""):
190
218
  ):
191
219
  # Cloud Functions
192
220
  return _create_functions_resource()
193
- elif all([env in os.environ for env in _CLOUD_RUN_ENV_VARS]):
221
+ elif all([env in os.environ for env in _CLOUD_RUN_SERVICE_ENV_VARS]):
222
+ # Cloud Run
223
+ return _create_cloud_run_service_resource()
224
+ elif all([env in os.environ for env in _CLOUD_RUN_JOB_ENV_VARS]):
194
225
  # Cloud Run
195
- return _create_cloud_run_resource()
226
+ return _create_cloud_run_job_resource()
196
227
  elif gce_instance_name is not None:
197
228
  # Compute Engine
198
229
  return _create_compute_resource()
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: google-cloud-logging
3
- Version: 3.7.0
3
+ Version: 3.8.0
4
4
  Summary: Stackdriver Logging API client library
5
5
  Home-page: https://github.com/googleapis/python-logging
6
6
  Author: Google LLC
@@ -28,7 +28,10 @@ from google.cloud.logging_v2.handlers._monitored_resources import (
28
28
  _create_kubernetes_resource,
29
29
  )
30
30
  from google.cloud.logging_v2.handlers._monitored_resources import (
31
- _create_cloud_run_resource,
31
+ _create_cloud_run_service_resource,
32
+ )
33
+ from google.cloud.logging_v2.handlers._monitored_resources import (
34
+ _create_cloud_run_job_resource,
32
35
  )
33
36
  from google.cloud.logging_v2.handlers._monitored_resources import (
34
37
  _create_compute_resource,
@@ -160,7 +163,7 @@ class Test_Create_Resources(unittest.TestCase):
160
163
  self.assertEqual(resource.labels["instance_id"], self.NAME)
161
164
  self.assertEqual(resource.labels["zone"], self.LOCATION)
162
165
 
163
- def test_cloud_run_resource(self):
166
+ def test_cloud_run_service_resource(self):
164
167
  patch = mock.patch(
165
168
  "google.cloud.logging_v2.handlers._monitored_resources.retrieve_metadata_server",
166
169
  wraps=self._mock_metadata,
@@ -169,7 +172,7 @@ class Test_Create_Resources(unittest.TestCase):
169
172
  os.environ[_monitored_resources._CLOUD_RUN_REVISION_ID] = self.VERSION
170
173
  os.environ[_monitored_resources._CLOUD_RUN_CONFIGURATION_ID] = self.CONFIG
171
174
  with patch:
172
- resource = _create_cloud_run_resource()
175
+ resource = _create_cloud_run_service_resource()
173
176
  self.assertIsInstance(resource, Resource)
174
177
  self.assertEqual(resource.type, "cloud_run_revision")
175
178
  self.assertEqual(resource.labels["project_id"], self.PROJECT)
@@ -178,6 +181,23 @@ class Test_Create_Resources(unittest.TestCase):
178
181
  self.assertEqual(resource.labels["configuration_name"], self.CONFIG)
179
182
  self.assertEqual(resource.labels["location"], self.LOCATION)
180
183
 
184
+ def test_cloud_run_job_resource(self):
185
+ patch = mock.patch(
186
+ "google.cloud.logging_v2.handlers._monitored_resources.retrieve_metadata_server",
187
+ wraps=self._mock_metadata,
188
+ )
189
+ os.environ[_monitored_resources._CLOUD_RUN_JOB_ID] = self.NAME
190
+ os.environ[_monitored_resources._CLOUD_RUN_EXECUTION_ID] = self.VERSION
191
+ os.environ[_monitored_resources._CLOUD_RUN_TASK_INDEX] = self.CONFIG
192
+ os.environ[_monitored_resources._CLOUD_RUN_TASK_ATTEMPT] = self.CLUSTER
193
+ with patch:
194
+ resource = _create_cloud_run_job_resource()
195
+ self.assertIsInstance(resource, Resource)
196
+ self.assertEqual(resource.type, "cloud_run_job")
197
+ self.assertEqual(resource.labels["project_id"], self.PROJECT)
198
+ self.assertEqual(resource.labels["job_name"], self.NAME)
199
+ self.assertEqual(resource.labels["location"], self.LOCATION)
200
+
181
201
  def test_app_engine_resource(self):
182
202
  patch = mock.patch(
183
203
  "google.cloud.logging_v2.handlers._monitored_resources.retrieve_metadata_server",
@@ -214,7 +234,8 @@ class Test_Create_Resources(unittest.TestCase):
214
234
  resource_fns = [
215
235
  _global_resource_patched,
216
236
  _create_app_engine_resource,
217
- _create_cloud_run_resource,
237
+ _create_cloud_run_service_resource,
238
+ _create_cloud_run_job_resource,
218
239
  _create_compute_resource,
219
240
  _create_kubernetes_resource,
220
241
  _create_functions_resource,
@@ -285,13 +306,20 @@ class Test_Resource_Detection(unittest.TestCase):
285
306
  self.assertIsInstance(resource, Resource)
286
307
  self.assertEqual(resource.type, "cloud_function")
287
308
 
288
- def test_detect_cloud_run(self):
289
- for env in _monitored_resources._CLOUD_RUN_ENV_VARS:
309
+ def test_detect_cloud_run_service(self):
310
+ for env in _monitored_resources._CLOUD_RUN_SERVICE_ENV_VARS:
290
311
  os.environ[env] = "TRUE"
291
312
  resource = detect_resource(self.PROJECT)
292
313
  self.assertIsInstance(resource, Resource)
293
314
  self.assertEqual(resource.type, "cloud_run_revision")
294
315
 
316
+ def test_detect_cloud_run_job(self):
317
+ for env in _monitored_resources._CLOUD_RUN_JOB_ENV_VARS:
318
+ os.environ[env] = "TRUE"
319
+ resource = detect_resource(self.PROJECT)
320
+ self.assertIsInstance(resource, Resource)
321
+ self.assertEqual(resource.type, "cloud_run_job")
322
+
295
323
  def test_detect_compute_engine(self):
296
324
  patch = mock.patch(
297
325
  "google.cloud.logging_v2.handlers._monitored_resources.retrieve_metadata_server",