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.

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 release #2009

Merged
merged 39 commits into from
Mar 20, 2024
Merged

Sync 6.x with release #2009

merged 39 commits into from
Mar 20, 2024

Conversation

xrmx
Copy link
Member

@xrmx xrmx commented Mar 19, 2024

No description provided.

someshwaranM and others added 30 commits January 18, 2024 15:52
* Add ability to run full matrix manually and on releases

* Fix typo

* Run full matrix on push instead in the release

* Re-add workflow_call trigger again
* Add notification if scheduled job fails

* Update .github/workflows/test.yml
* Add PR review comment command

* Add to README.md

* Update .github/workflows/README.md

Co-authored-by: Victor Martinez <[email protected]>

* Update .github/workflows/test.yml

---------

Co-authored-by: Victor Martinez <[email protected]>
Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.11.17 to 2024.2.2.
- [Commits](certifi/python-certifi@2023.11.17...2024.02.02)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…bled (#1967)

* Fix gprc support with streaming requests (#1966)

* Update version.py
Create the transaction always before the body is read to avoid
discrepancies between cases where the capture_body config on or off.

Fix #1948
…1969)

When mocking os.environ pass clear=True to avoid getting host
configurations.

Fix #1968
* Bump the github-actions group with 9 updates

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `3` | `4` |
| [actions/setup-python](https://github.com/actions/setup-python) | `3` | `5` |
| [actions/upload-artifact](https://github.com/actions/upload-artifact) | `3` | `4` |
| [elastic/get-user-teams-membership](https://github.com/elastic/get-user-teams-membership) | `1.0.4` | `1.1.0` |
| [pre-commit/action](https://github.com/pre-commit/action) | `3.0.0` | `3.0.1` |
| [actions/download-artifact](https://github.com/actions/download-artifact) | `3` | `4` |
| [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) | `1.8.7` | `1.8.11` |
| [hashicorp/vault-action](https://github.com/hashicorp/vault-action) | `2.7.2` | `2.8.0` |
| [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact) | `2.0.0` | `4.1.0` |
* Update starlette.asciidoc

Fix typo

* Update starlette.asciidoc

---------

Co-authored-by: Colton Myers <[email protected]>
…ore correct (#1976)

Dollar quotes follow the same rules as SQL identifiers so:

SQL identifiers and key words must begin with a letter (a-z, but also
letters with diacritical marks and non-Latin letters) or an underscore (_).
Subsequent characters in an identifier or key word can be letters,
underscores, digits (0-9), or dollar signs ($).

Given we are not going to write a compliant SQL parser at least handle
query parameters that are simple to catch since they have a digit right
after the opening $.

Refs #1851.
Remove python2 vestiges
We have already pre-commit running on CI and it doesn't look to be
running at the moment.
If the event has been generated from elb or api gateway and is in the
v1 format normalize headers even if they already should per
https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html

Event discrimination logic courtesy of nodejs apm client.

Fix #1980
…#1990)

Should fix the following error when tagging a release:

The workflow is not valid. .github/workflows/release.yml (Line: 13, Col: 11):
 Input full-matrix is required, but not provided while calling.
…ow (#1993)

It looks like since v4 only one upload for the same dir will work.
See:
actions/upload-artifact#478 (comment)

In the meantime we sort this out revert to v3.

Should fix:
https://github.com/elastic/apm-agent-python/actions/runs/8191161913/job/22399752533
Since v4 can't find them if uploaded with uploadArtifact v3.
In c1dd69e we changed the logic of
update_headers taking into account a new body arg before the one for
headers.
The problem is that HTTPConnectionPool.urlopen did not change at all,
only HTTPConnectionPool.request did so the old login update_headers was
fine.

Fix #1928
Make it possible to add a post version (per PEP-440) to the current agent
version at build time. This will be useful because we want to continuously
build the agent on CI and avoid version conflicts when publishing to test pypi.
So when returning the agent version add anything that has been passed
in ELASTIC_CI_POST_VERSION environment variable as post version.

Refs #1994
* docs: remove Python < 3.2 specific documentation

* handlers/logging: deprecate Python<3.2 LoggingFilter

Since we don't support Python < 3.6 there's not reason to keep code for
Python versions older than that.

* Update elasticapm/handlers/logging.py

Co-authored-by: Colton Myers <[email protected]>

---------

Co-authored-by: Colton Myers <[email protected]>
v1v and others added 9 commits March 13, 2024 18:08
* ci: run the release when merges to main

* avoid wrong docker-tag name

* use the opposite

* fix yaml

* enable test, slack message conditional and fix names

* Update .github/workflows/release.yml

* skip test for branches in the release workflow

* workaround

* fix

* Update .github/workflows/release.yml

* support releases in test.pypi for commits on main

* set environment variable in the reusable workflow instead

env propagation between reusable workflow is not supported

* setup: take a post version from environment variable

* Update .github/workflows/release.yml

---------

Co-authored-by: Riccardo Magliocchetti <[email protected]>
Bumps the github-actions group with 2 updates: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) and [hashicorp/vault-action](https://github.com/hashicorp/vault-action).


Updates `pypa/gh-action-pypi-publish` from 1.8.11 to 1.8.14
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@2f6f737...81e9d93)

Updates `hashicorp/vault-action` from 2.8.0 to 3.0.0
- [Release notes](https://github.com/hashicorp/vault-action/releases)
- [Changelog](https://github.com/hashicorp/vault-action/blob/main/CHANGELOG.md)
- [Commits](hashicorp/vault-action@v2.8.0...v3.0.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: hashicorp/vault-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* ci: update issue labeler workflow

Stop using the apm group and custom github action to check if issues are
from internal members or not.
While at it remove posting internal pull requests on the old APM agent board.

Fixes #2001

* Update .github/workflows/labeler.yml

Co-authored-by: Jan Calanog <[email protected]>

---------

Co-authored-by: Jan Calanog <[email protected]>
* security: add permissions block to workflows

* Update .github/workflows/test-reporter.yml

Co-authored-by: Victor Martinez <[email protected]>

* Update .github/workflows/labeler.yml

* Remove permissions

This will be removed in another PR

---------

Co-authored-by: Victor Martinez <[email protected]>
* ci: add Django 4.2 LTS and Django 5.0 to test matrix

Closes #1946

* tests: remove django tests for old and not tested versions
@xrmx xrmx requested a review from basepi March 19, 2024 16:54
@github-actions github-actions bot added agent-python community Issues opened by the community triage Issues awaiting triage labels Mar 19, 2024
@xrmx xrmx merged commit 5289beb into 6.x Mar 20, 2024
1679 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
agent-python community Issues opened by the community triage Issues awaiting triage
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants