[pull] master from DataDog:master

.github/workflows/build-ddev.yml

@@ -152,8 +152,9 @@ jobs:
       with:
         python-version: ${{ env.PYTHON_VERSION }}
 
+    # Pinning virtualenv because of https://github.com/pypa/hatch/issues/2193
     - name: Install Hatch
-      run: pip install -U hatch
+      run: pip install -U hatch "virtualenv<21" 
 
     - name: Install Hatch environment collector plugin
       run: pip install -e . --no-deps

airflow/assets/logs/airflow.yaml

@@ -38,11 +38,15 @@ pipeline:
           Exception: Hello world fail!
       grok:
         supportRules: |
-          _date %{date("yyyy-MM-dd HH:mm:ss,SSS"):timestamp}
+          _date_legacy %{date("yyyy-MM-dd HH:mm:ss,SSS"):timestamp}
+          _date_iso_offset %{date("yyyy-MM-dd'T'HH:mm:ss.SSSZ"):timestamp}
+          _date_iso_zulu %{date("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"):timestamp}
+          _date (%{_date_iso_offset}|%{_date_iso_zulu}|%{_date_legacy})
+          _date_any (%{date("yyyy-MM-dd'T'HH:mm:ss.SSSZ")}|%{date("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")}|%{date("yyyy-MM-dd HH:mm:ss,SSS")})
           _file %{notSpace:filename}:%{integer:lineno}
           _base_prefix \[%{_date}\]\s+(\{\{%{_file}\}\}|\{%{_file}\})\s+%{word:level}\s+-
           # Some logs have duplicate prefixes, we only collect job_id and subtask name from first prefix if present.
-          _prefix (\[%{date("yyyy-MM-dd HH:mm:ss,SSS")}\]\s+\{\{%{notSpace}:%{integer}\}\}\s+%{word}\s+-\s+)?(Job %{integer:jobid}: Subtask %{word:subtask}\s+)?%{_base_prefix}
+          _prefix (\[%{_date_any}\]\s+(\{\{%{notSpace}:%{integer}\}\}|\{%{notSpace}:%{integer}\})\s+%{word}\s+-\s+)?(Job %{integer:jobid}: Subtask %{word:subtask}\s+)?%{_base_prefix}
 
         matchRules: |
           airflow_stacktrace %{_prefix}\s+%{data:message}\nTraceback \(most recent call last\):\n%{data:error.stack}

airflow/assets/logs/airflow_tests.yaml

@@ -214,6 +214,59 @@ tests:
     tags:
      - "source:LOGS_SOURCE"
     timestamp: 1577381689039
+ -
+  sample: "[2025-04-10T17:15:01.220Z] {logging_mixin.py:188} INFO - Running task"
+  result:
+    custom:
+      filename: "logging_mixin.py"
+      level: "INFO"
+      lineno: 188
+      timestamp: 1744305301220
+    message: "Running task"
+    status: "info"
+    tags:
+     - "source:LOGS_SOURCE"
+    timestamp: 1744305301220
+ -
+  sample: "[2025-04-10T17:15:01.220+0100] {base_task_runner.py:115} INFO - Job 12: Subtask my_task [2025-04-10T17:15:01.450+0100] {settings.py:211} INFO - Setting up DB connection pool (PID 42)"
+  result:
+    custom:
+      filename: "settings.py"
+      jobid: 12
+      level: "INFO"
+      lineno: 211
+      subtask: "my_task"
+      timestamp: 1744301701450
+    message: "Setting up DB connection pool (PID 42)"
+    status: "info"
+    tags:
+     - "source:LOGS_SOURCE"
+    timestamp: 1744301701450
+ -
+  sample: |
+    [2025-04-10T17:15:01.220+0000] {taskinstance.py:1058} ERROR - Task failed!
+    Traceback (most recent call last):
+      File "/usr/local/lib/python3.11/site-packages/airflow/operators/python.py", line 118, in execute_callable
+      return self.python_callable(*self.op_args, **self.op_kwargs)
+    Exception: Task failed!
+  result:
+    custom:
+      error:
+        kind: "Exception"
+        message: "Task failed!"
+        stack: |2-
+            File "/usr/local/lib/python3.11/site-packages/airflow/operators/python.py", line 118, in execute_callable
+            return self.python_callable(*self.op_args, **self.op_kwargs)
+          Exception: Task failed!
+      filename: "taskinstance.py"
+      level: "ERROR"
+      lineno: 1058
+      timestamp: 1744305301220
+    message: "Task failed!"
+    status: "error"
+    tags:
+     - "source:LOGS_SOURCE"
+    timestamp: 1744305301220
  -
   sample: "[2025-02-18 14:46:00,123] {{python_operator.py:105}} INFO - Task started"
   tags:

temporal_cloud/README.md

@@ -1,5 +1,7 @@
 ## Overview
 
+<div class="alert alert-warning">This legacy integration is no longer maintained. Migrate to the new <a href="https://docs.datadoghq.com/integrations/temporal-cloud-openmetrics/">Temporal Cloud OpenMetrics integration</a> for expanded metrics and improved monitoring.</div>
+
 [Temporal Cloud][1] is a scalable platform for orchestrating complex workflows which enables developers to focus on building applications, without worrying about fault tolerance and consistency.
 
 This integration gathers Temporal Cloud metrics into Datadog, offering insights into system health, workflow efficiency, task execution, and performance bottlenecks.
@@ -20,11 +22,11 @@ This integration gathers Temporal Cloud metrics into Datadog, offering insights
 ### Connect your Temporal Cloud account to Datadog
 
 1. Add your Account ID, End-entity Certificate file content, and End-entity Certificate key file content    
-    |Parameters|Description|
-    |--------------------|--------------------|
-    |Account ID|Temporal Cloud account ID to be used as part of the metrics endpoint URL: `https://<account_id>.tmprl.cloud/prometheus`.|
-    |End-entity certificate file content|Content of the end-entity certificate for secure access and communication with the Metrics endpoint.|
-    |End-entity certificate key file content|Content of the end-entity certificate key for secure access and communication with the Metrics endpoint.|
+    | Parameters                              | Description                                                                                                              |
+    | --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
+    | Account ID                              | Temporal Cloud account ID to be used as part of the metrics endpoint URL: `https://<account_id>.tmprl.cloud/prometheus`. |
+    | End-entity certificate file content     | Content of the end-entity certificate for secure access and communication with the Metrics endpoint.                     |
+    | End-entity certificate key file content | Content of the end-entity certificate key for secure access and communication with the Metrics endpoint.                 |
 
 2. Click the **Save** button to save your settings.