Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync 6.x with 6.23.0 #2105

Merged
merged 23 commits into from
Aug 19, 2024
Merged

Sync 6.x with 6.23.0 #2105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
330fbd4
github-actions: use slack and aws gh secrets (#2065)
v1v Jun 13, 2024
3904400
build(deps): bump the github-actions group with 3 updates (#2066)
dependabot[bot] Jun 17, 2024
b7dd8e3
build(deps): bump urllib3 from 1.26.18 to 1.26.19 in /dev-utils (#2067)
dependabot[bot] Jun 18, 2024
0394671
ci: remove celery 4 testing (#2068)
xrmx Jun 24, 2024
6f82e45
build(deps): bump the github-actions group with 2 updates (#2069)
dependabot[bot] Jun 24, 2024
add8d73
Use elastic/oblt-actions/aws/auth action to authenticate with AWS (#2…
reakaleek Jun 25, 2024
e0a83ae
Automate collapsing ARN table in release notes (#2071)
reakaleek Jun 25, 2024
ddfd962
Add necessary permissions to use aws/auth action (#2072)
reakaleek Jun 25, 2024
1a98a8c
build(deps): bump docker/build-push-action in the github-actions grou…
dependabot[bot] Jul 1, 2024
2d041f8
build(deps): bump docker/build-push-action in the github-actions grou…
dependabot[bot] Jul 9, 2024
525c77a
build(deps): bump certifi from 2024.6.2 to 2024.7.4 in /dev-utils (#2…
dependabot[bot] Jul 9, 2024
6bfc0af
instrumentation/kafka: fix handling consumer iteration if transaction…
xrmx Jul 9, 2024
54cb877
Promote some PendingDeprecationWarning to DeprecationWarning (#2076)
xrmx Jul 9, 2024
c03702f
updatecli: use shared policy (#2077)
v1v Jul 9, 2024
a046902
feat: make published Docker images multi-platform, add linux/arm64 pl…
v1v Jul 10, 2024
e1c9608
build(deps): bump the github-actions group with 2 updates (#2081)
dependabot[bot] Jul 15, 2024
f737e00
contrib/serverless: capture_serverless is already called by the APM l…
xrmx Jul 17, 2024
94d64c3
build(deps): bump docker/build-push-action in the github-actions grou…
dependabot[bot] Jul 22, 2024
cfd4193
elasticapm/transport: specific shutdown handling for http transport (…
xrmx Jul 26, 2024
89dec98
tests: bump setuptools to latest (#2087)
xrmx Jul 29, 2024
f006089
build(deps): bump the github-actions group with 3 updates (#2089)
dependabot[bot] Jul 29, 2024
9c38a85
Drop `setup.py test` (#2090)
xrmx Jul 30, 2024
d9c62c7
update CHANGELOG and bump version to 6.23.0 (#2088)
xrmx Jul 30, 2024
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
18 changes: 0 additions & 18 deletions .ci/.matrix_exclude.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,12 @@ exclude:
FRAMEWORK: django-1.11
- VERSION: python-3.10
FRAMEWORK: django-2.0
- VERSION: python-3.10
FRAMEWORK: celery-4-django-2.0
- VERSION: python-3.10
FRAMEWORK: celery-4-django-1.11
- VERSION: python-3.11 # cannot import name 'formatargspec' from 'inspect'
FRAMEWORK: celery-4-flask-1.0
- VERSION: python-3.11 # https://github.com/celery/billiard/issues/377
FRAMEWORK: celery-5-flask-2
- VERSION: python-3.11 # https://github.com/celery/billiard/issues/377
FRAMEWORK: celery-5-django-3
- VERSION: python-3.11 # https://github.com/celery/billiard/issues/377
FRAMEWORK: celery-5-django-4
- VERSION: python-3.12 # cannot import name 'formatargspec' from 'inspect'
FRAMEWORK: celery-4-flask-1.0
- VERSION: python-3.12 # https://github.com/celery/billiard/issues/377
FRAMEWORK: celery-5-flask-2
- VERSION: python-3.12 # https://github.com/celery/billiard/issues/377
Expand All @@ -93,10 +85,6 @@ exclude:
FRAMEWORK: django-2.0
- VERSION: python-3.11
FRAMEWORK: django-2.1
- VERSION: python-3.11
FRAMEWORK: celery-4-django-2.0
- VERSION: python-3.11
FRAMEWORK: celery-4-django-1.11
- VERSION: python-3.11
FRAMEWORK: graphene-2
- VERSION: python-3.11
Expand All @@ -113,10 +101,6 @@ exclude:
FRAMEWORK: django-2.0
- VERSION: python-3.12
FRAMEWORK: django-2.1
- VERSION: python-3.12
FRAMEWORK: celery-4-django-2.0
- VERSION: python-3.12
FRAMEWORK: celery-4-django-1.11
- VERSION: python-3.12
FRAMEWORK: graphene-2
- VERSION: python-3.12
Expand Down Expand Up @@ -294,8 +278,6 @@ exclude:
FRAMEWORK: flask-1.1
- VERSION: python-3.7
FRAMEWORK: jinja2-2
- VERSION: python-3.7
FRAMEWORK: celery-4-flask-1.0
# TODO py3.12
- VERSION: python-3.12
FRAMEWORK: sanic-20.12 # no wheels available yet
Expand Down
2 changes: 0 additions & 2 deletions .ci/.matrix_framework.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ FRAMEWORK:
- opentelemetry-newest
- opentracing-newest
- twisted-newest
- celery-4-flask-1.0
- celery-4-django-2.0
- celery-5-flask-2
- celery-5-django-4
- celery-5-django-5
Expand Down
3 changes: 0 additions & 3 deletions .ci/.matrix_framework_full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ FRAMEWORK:
- flask-3.0
- jinja2-2
- jinja2-3
- celery-4-flask-1.0
- celery-4-django-1.11
- celery-4-django-2.0
- celery-5-flask-2
- celery-5-django-3
- celery-5-django-4
Expand Down
9 changes: 7 additions & 2 deletions .ci/create-arn-table.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ AWS_FOLDER=${AWS_FOLDER?:No aws folder provided}
ARN_FILE=".arn-file.md"

{
echo "### Elastic APM Python agent layer ARNs"
echo "<details>"
echo "<summary>Elastic APM Python agent layer ARNs</summary>"
echo ''
echo '|Region|ARN|'
echo '|------|---|'
Expand All @@ -22,4 +23,8 @@ for f in $(ls "${AWS_FOLDER}"); do
echo "|${f}|${LAYER_VERSION_ARN}|" >> "${ARN_FILE}"
done

echo '' >> "${ARN_FILE}"
{
echo ''
echo '</details>'
echo ''
} >> "${ARN_FILE}"
82 changes: 0 additions & 82 deletions .ci/updatecli/updatecli.d/update-gherkin-specs.yml
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions .ci/updatecli/updatecli.d/update-json-specs.yml
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions .ci/updatecli/updatecli.d/update-specs.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-data-spec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_schema_specs_path: tests/upstream/json-specs
1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-gherkin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_gherkin_specs_path: tests/bdd/features
1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-json-specs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_json_specs_path: tests/upstream/json-specs
7 changes: 7 additions & 0 deletions .ci/updatecli/values.d/scm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scm:
enabled: true
owner: elastic
repository: apm-agent-python
branch: main

signedcommit: true
14 changes: 0 additions & 14 deletions .ci/updatecli/values.yml
View file
Open in desktop

This file was deleted.

Loading
Loading