update CHANGELOG and bump version to 6.16.1 (#1846)

* One more contributing.md fix

* update CHANGELOG and bump version to 6.16.1

* Fix CHANGELOG section id

Author: basepi

CHANGELOG.asciidoc

@@ -32,6 +32,14 @@ endif::[]
 [[release-notes-6.x]]
 === Python Agent version 6.x
 
+[[release-notes-6.16.1]]
+==== 6.16.1 - 2023-06-06
+
+[float]
+===== Bug fixes
+
+* Fix release process for docker and the lambda layer {pull}1845[#1845]
+
 [[release-notes-6.16.0]]
 ==== 6.16.0 - 2023-06-05
 

CONTRIBUTING.md

@@ -37,10 +37,10 @@ Once your changes are ready to submit for review:
 
     This project uses several tools to maintain a consistent code style:
 
-    - the automatic code formatter [black](https://black.readthedocs.io/en/stable/)
-    - sorting of imports via [isort](https://isort.readthedocs.io/en/latest/)
-    - [flake8](http://flake8.pycqa.org/en/latest/)
-    - License header check via custom script
+    -   the automatic code formatter [black](https://black.readthedocs.io/en/stable/)
+    -   sorting of imports via [isort](https://isort.readthedocs.io/en/latest/)
+    -   [flake8](http://flake8.pycqa.org/en/latest/)
+    -   License header check via custom script
 
     The easiest way to make sure your pull request adheres to the code style
     is to install [pre-commit](https://pre-commit.com/).
@@ -161,8 +161,8 @@ In this example, we will create an instrumentation for the "foo" database, by in
 
 1.  OPTIONAL: If your instrumented package does not support all Python versions we test with, you can exclude certain combinations by adding them to `.ci/matrix_exclude.yml`:
 
-    - PYTHON_VERSION: python-3.5 # foo doesn't support Python 3.5
-      FRAMEWORK: foo-newest
+    -   PYTHON_VERSION: python-3.5 # foo doesn't support Python 3.5
+        FRAMEWORK: foo-newest
 
 ### Workflow
 
@@ -184,7 +184,7 @@ If you have commit access, the process is as follows:
    where `X.Y.Z` is the version in `elasticapm/version.py`
 1. Open a PR against `main` with these changes
 1. Once the PR is merged, fetch and checkout `upstream/main`
-1. Tag the commit with `git tag -a vX.Y.Z`, for example `git tag -a v1.2.3`.
+1. Tag the commit with `git tag -s vX.Y.Z`, for example `git tag -s v1.2.3`.
    Copy the changelog for the release to the tag message, removing any leading `#`.
 1. Reset the current major branch (`1.x`, `2.x` etc) to point to the current main, e.g. `git branch -f 1.x main`
 1. Push tag upstream with `git push upstream --tags` (and optionally to your own fork as well)

elasticapm/version.py

@@ -28,5 +28,5 @@
 #  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = (6, 16, 0)
+__version__ = (6, 16, 1)
 VERSION = ".".join(map(str, __version__))