[pull] master from DataDog:master

.builders/promote.py

@@ -6,6 +6,7 @@
 """
 from __future__ import annotations
 
+import os
 import re
 import sys
 from pathlib import Path, PurePosixPath
@@ -54,13 +55,15 @@ def url_to_blob_path(url: str) -> str | None:
 
 def collect_relative_paths() -> list[str]:
     """Read all lockfiles and return relative wheel paths from ${INTEGRATIONS_WHEELS_STORAGE} entries."""
-    if not LOCK_FILE_DIR.is_dir():
-        print(f"No lockfile directory found at {LOCK_FILE_DIR}", file=sys.stderr)
+    lockfile_dir = Path(os.environ.get("PROMOTE_LOCKFILE_DIR", LOCK_FILE_DIR))
+
+    if not lockfile_dir.is_dir():
+        print(f"No lockfile directory found at {lockfile_dir}", file=sys.stderr)
         sys.exit(1)
 
-    lockfiles = list(LOCK_FILE_DIR.glob("*.txt"))
+    lockfiles = list(lockfile_dir.glob("*.txt"))
     if not lockfiles:
-        print(f"No lockfiles found in {LOCK_FILE_DIR}", file=sys.stderr)
+        print(f"No lockfiles found in {lockfile_dir}", file=sys.stderr)
         sys.exit(1)
 
     rel_paths: list[str] = []

.codecov.yml

@@ -54,6 +54,10 @@ coverage:
         target: 75
         flags:
         - apache
+      Apache_NiFi:
+        target: 75
+        flags:
+        - nifi
       Appgate_SDP:
         target: 75
         flags:
@@ -1514,6 +1518,11 @@ flags:
     paths:
     - nginx_ingress_controller/datadog_checks/nginx_ingress_controller
     - nginx_ingress_controller/tests
+  nifi:
+    carryforward: true
+    paths:
+    - nifi/datadog_checks/nifi
+    - nifi/tests
   nutanix:
     carryforward: true
     paths:

.ddev/config.toml

@@ -43,13 +43,15 @@ lustre = "Lustre"
 prefect = "Prefect"
 n8n = "n8n"
 control_m = "Control-M"
+nifi = "Apache NiFi"
 
 [overrides.metrics-prefix]
 krakend = "krakend.api."
 lustre = "lustre."
 prefect = "prefect.server."
 n8n = "n8n."
 control_m = "control_m."
+nifi = "nifi."
 
 [overrides.ci.ddev]
 platforms = ["linux", "windows"]
@@ -196,6 +198,7 @@ unsorted = [
 [overrides.validate.metadata.integration]
 ecs_fargate = "amazon_fargate"
 kube_scheduler = "kube_scheduler"
+nifi = "nifi"
 nginx_ingress_controller = "nginx-ingress-controller"
 
 
@@ -240,10 +243,12 @@ __pycache__ = false
 # removed.
 # This is a temporary fix while we implement a metadata.json file that we can add to each integration
 # that replaces the manifest.
+# Used here: https://github.com/DataDog/datadog-agent/blob/main/tasks/agent.py
 # Use manifest-like platforms
 [overrides.manifest.platforms]
 krakend = ["linux", "windows", "mac_os"]
 lustre = ["linux", "windows", "mac_os"]
 prefect = ["linux", "windows", "mac_os"]
 n8n = ["linux", "windows", "mac_os"]
 control_m = ["linux", "windows", "mac_os"]
+nifi = ["linux", "windows", "mac_os"]

.github/actions/setup-test-target-scripts/src/run-e2e-tests.sh

@@ -21,8 +21,10 @@ else
   export DDEV_TEST_ENABLE_TRACING="0"
 fi
 
-# Set E2E flags based on repo (latest always uses --base --new-env)
-if [[ "$INPUT_REPO" == 'core' || "$INPUT_IS_LATEST" == 'true' ]]; then
+# Set E2E flags based on context and repo
+if [[ "$INPUT_CONTEXT" == test-agent* ]]; then
+  E2E_FLAGS="--new-env"
+elif [[ "$INPUT_REPO" == 'core' || "$INPUT_IS_LATEST" == 'true' ]]; then
   E2E_FLAGS="--base --new-env"
 else
   E2E_FLAGS="--dev"

.github/actions/setup-test-target-scripts/src/setup-test-env.sh

@@ -115,6 +115,7 @@ fi
   echo "INPUT_MINIMUM_BASE_PACKAGE=${INPUT_MINIMUM_BASE_PACKAGE:-false}"
   echo "INPUT_PYTEST_ARGS=${INPUT_PYTEST_ARGS:-}"
   echo "INPUT_IS_FORK=${INPUT_IS_FORK:-false}"
+  echo "INPUT_CONTEXT=${INPUT_CONTEXT:-standard}"
 } >> "$GITHUB_ENV"
 
 # Override with custom vars if provided

.github/workflows/build-ddev.yml

@@ -437,7 +437,7 @@ jobs:
 
   macos-packaging:
     name: Build macOS installer and sign/notarize artifacts
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
+    if: github.event_name == 'push'
     needs:
     - define-tags
     - binaries

.github/workflows/config/labeler.yml

@@ -998,6 +998,10 @@ integration/nagios:
 - changed-files:
   - any-glob-to-any-file:
     - nagios/**/*
+integration/nifi:
+- changed-files:
+  - any-glob-to-any-file:
+    - nifi/**/*
 integration/network:
 - changed-files:
   - any-glob-to-any-file:

.github/workflows/dependency-wheel-promotion.yaml

@@ -23,10 +23,17 @@ jobs:
       pull-requests: write
 
     steps:
-    - name: Checkout code
+    - name: Checkout trusted code
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+    - name: Checkout PR lockfiles only
       uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         ref: ${{ inputs.head_sha }}
+        path: pr
+        sparse-checkout: |
+          .deps/resolved
+        sparse-checkout-cone-mode: false
 
     - name: Set up Python
       uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -44,6 +51,8 @@ jobs:
         workload_identity_provider: projects/574011472402/locations/global/workloadIdentityPools/github/providers/integrations-core
 
     - name: Promote wheels
+      env:
+        PROMOTE_LOCKFILE_DIR: pr/.deps/resolved
       run: python .builders/promote.py
 
     - name: Clean up credentials

.github/workflows/test-all.yml

@@ -2840,6 +2840,26 @@ jobs:
       minimum-base-package: ${{ inputs.minimum-base-package }}
       pytest-args: ${{ inputs.pytest-args }}
     secrets: inherit
+  j71c1491:
+    uses: ./.github/workflows/test-target.yml
+    with:
+      job-name: Apache NiFi
+      target: nifi
+      platform: linux
+      runner: '["ubuntu-22.04"]'
+      repo: "${{ inputs.repo }}"
+      context: ${{ inputs.context }}
+      python-version: "${{ inputs.python-version }}"
+      latest: ${{ inputs.latest }}
+      agent-image: "${{ inputs.agent-image }}"
+      agent-image-py2: "${{ inputs.agent-image-py2 }}"
+      agent-image-windows: "${{ inputs.agent-image-windows }}"
+      agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
+      test-py2: ${{ inputs.test-py2 }}
+      test-py3: ${{ inputs.test-py3 }}
+      minimum-base-package: ${{ inputs.minimum-base-package }}
+      pytest-args: ${{ inputs.pytest-args }}
+    secrets: inherit
   jcc7e1d2:
     uses: ./.github/workflows/test-target.yml
     with: