Merge branch 'main' into gh-oblt/add-dependabot-pre-commit

xrmx · web-flow · commit a0b422a86745 · 2026-04-08T16:42:54.000+02:00
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Login to ghcr.io
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -1,20 +1,15 @@
 name: docs-build
-
 on:
+  pull_request:
+    types: [opened, synchronize, reopened]
   push:
-    branches:
-      - main
-  pull_request_target: ~
+    branches: [main]
   merge_group: ~
-
+permissions:
+  contents: read
+  pull-requests: read
 jobs:
-  docs-preview:
-    uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
+  build:
+    uses: elastic/docs-actions/.github/workflows/docs-build.yml@v1
     with:
       enable-vale-linting: true
-      path-pattern: docs/**
-    permissions:
-      deployments: write
-      id-token: write
-      contents: read
-      pull-requests: write
diff --git a/.github/workflows/docs-cleanup.yml b/.github/workflows/docs-cleanup.yml
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
@@ -0,0 +1,16 @@
+name: docs-deploy
+on:
+  workflow_run:
+    workflows: [docs-build]
+    types: [completed]
+permissions:
+  contents: read
+  deployments: write
+  id-token: write
+  pull-requests: write
+  actions: read
+jobs:
+  deploy:
+    uses: elastic/docs-actions/.github/workflows/docs-deploy.yml@v1
+    with:
+      enable-vale-linting: true
diff --git a/.github/workflows/docs-preview-cleanup.yml b/.github/workflows/docs-preview-cleanup.yml
@@ -0,0 +1,11 @@
+name: docs-preview-cleanup
+on:
+  pull_request_target:
+    types: [closed]
+permissions:
+  contents: none
+  deployments: write
+  id-token: write
+jobs:
+  cleanup:
+    uses: elastic/docs-actions/.github/workflows/docs-preview-cleanup.yml@v1
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - name: Get token
       id: get_token
-      uses: actions/create-github-app-token@v2
+      uses: actions/create-github-app-token@v3
       with:
         app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
         private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -124,12 +124,12 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
         with:
           cache-binary: false
 
       - name: Log in to the Elastic Container registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
           username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -231,6 +231,6 @@ jobs:
         with:
           name: html-coverage-report
           path: htmlcov
-      - uses: geekyeggo/delete-artifact@f275313e70c08f6120db482d7a6b98377786765b # 5.1.0
+      - uses: geekyeggo/delete-artifact@176a747ab7e287e3ff4787bf8a148716375ca118 # 6.0.0
         with:
           name: coverage-reports-*
diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml
@@ -19,14 +19,14 @@ jobs:
 
       - name: Get token
         id: get_token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
           private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
           permission-contents: write
           permission-pull-requests: write
 
-      - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+      - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-updatecli v0.114.0
+updatecli v0.115.0
diff --git a/docs/docset.yml b/docs/docset.yml
@@ -9,6 +9,7 @@ cross_links:
   - ecs
   - ecs-logging
   - ecs-logging-python
+  - elastic-otel-python
   - elasticsearch
   - logstash-docs-md
 toc:
diff --git a/docs/reference/index.md b/docs/reference/index.md
@@ -14,6 +14,9 @@ applies_to:
 
 The Elastic APM Python agent sends performance metrics and error logs to the APM Server. It has built-in support for Django and Flask performance metrics and error logging, as well as generic support of other WSGI frameworks for error logging.
 
+:::::{note}
+Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of the [supported technologies](/reference/supported-technologies.md) below. Consider using the [EDOT Python SDK](elastic-otel-python://reference/edot-python/index.md) for observability data so you continue to get the full power of Elastic's platform.
+:::::
 
 ## How does the Agent work? [how-it-works]
 
diff --git a/docs/reference/supported-technologies.md b/docs/reference/supported-technologies.md
@@ -11,6 +11,10 @@ applies_to:
 
 # Supported technologies [supported-technologies]
 
+The Elastic APM Python Agent supports the technologies listed below.
+
+Elastic supports OpenTelemetry, which allows logs, metrics, and trace signal collection for many of these technologies. Consider using the [EDOT Python SDK](elastic-otel-python://reference/edot-python/index.md) for observability data so you continue to get the full power of Elastic's platform.
+
 $$$framework-support$$$
 The Elastic APM Python Agent comes with support for the following frameworks:
 
diff --git a/tests/contrib/django/django_tests.py b/tests/contrib/django/django_tests.py
@@ -172,7 +172,7 @@ def test_view_exception_elasticapm_debug(django_elasticapm_client, client):
 @pytest.mark.django_db
 def test_user_info(django_elasticapm_client, client):
     user = User(username="admin", email="admin@example.com")
-    user.set_password("admin")
+    user.set_password("longer_password_for_admin")
     user.save()
 
     with pytest.raises(Exception):
@@ -187,7 +187,7 @@ def test_user_info(django_elasticapm_client, client):
     assert user_info["username"] == ""
     assert "email" not in user_info
 
-    assert client.login(username="admin", password="admin")
+    assert client.login(username="admin", password="longer_password_for_admin")
 
     with pytest.raises(Exception):
         client.get(reverse("elasticapm-raise-exc"))
@@ -207,10 +207,10 @@ def test_user_info(django_elasticapm_client, client):
 @pytest.mark.django_db
 def test_user_info_raises_database_error(django_elasticapm_client, client):
     user = User(username="admin", email="admin@example.com")
-    user.set_password("admin")
+    user.set_password("longer_password_for_admin")
     user.save()
 
-    assert client.login(username="admin", password="admin")
+    assert client.login(username="admin", password="longer_password_for_admin")
 
     with mock.patch("django.contrib.auth.models.User.is_authenticated") as is_authenticated:
         is_authenticated.side_effect = DatabaseError("Test Exception")
@@ -231,9 +231,9 @@ def test_user_info_with_custom_user(django_elasticapm_client, client):
 
         MyUser = get_user_model()
         user = MyUser(my_username="admin")
-        user.set_password("admin")
+        user.set_password("longer_password_for_admin")
         user.save()
-        assert client.login(username="admin", password="admin")
+        assert client.login(username="admin", password="longer_password_for_admin")
         with pytest.raises(Exception):
             client.get(reverse("elasticapm-raise-exc"))
 
@@ -255,9 +255,9 @@ def test_user_info_with_custom_user_non_string_username(django_elasticapm_client
 
         MyIntUser = get_user_model()
         user = MyIntUser(my_username=1)
-        user.set_password("admin")
+        user.set_password("longer_password_for_admin")
         user.save()
-        assert client.login(username=1, password="admin")
+        assert client.login(username=1, password="longer_password_for_admin")
         with pytest.raises(Exception):
             client.get(reverse("elasticapm-raise-exc"))
 
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -123,7 +123,7 @@ services:
       - mysqldata:/var/lib/mysql
 
   localstack:
-    image: localstack/localstack
+    image: localstack/localstack:4
     ports:
       - "4566:4566"
       - "4571:4571"
diff --git a/tests/requirements/reqs-starlette-newest.txt b/tests/requirements/reqs-starlette-newest.txt
@@ -1,4 +1,4 @@
-starlette>=0.15
+starlette>0.15,<1
 aiofiles
 httpx
 flask

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-updatecli v0.114.0`
	`1`	`+updatecli v0.115.0`