From 8c7d252b657b331e2ba9c0d0c42126f2fef303b1 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Fri, 22 Aug 2025 10:31:28 +0200
Subject: [PATCH] update CHANGELOG and bump version to 1.6.0

---
 CHANGELOG.md                      | 11 +++++++++++
 docs/release-notes/index.md       | 19 +++++++++++++++++++
 src/elasticotel/distro/version.py |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5a321..72913b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Elastic Distribution of OpenTelemetry Python Changelog
 
+## v1.6.0
+
+- Prepend our own User agent to the OpenTelemetry SDK one (#363)
+- Enable containerid resource detector (#361)
+- Silence harmless warning about trace sampler rate not set (#356)
+- Bump to OTel 1.35.0 (#360)
+
+  Upstream changes:
+  * https://github.com/open-telemetry/opentelemetry-python/discussions/4682
+  * https://github.com/open-telemetry/opentelemetry-python-contrib/discussions/3634
+
 ## v1.5.0
 
 - Switch default sampler to `parentbased_traceidratio` (#351)
diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md
index b1625c5..8c0e060 100644
--- a/docs/release-notes/index.md
+++ b/docs/release-notes/index.md
@@ -27,6 +27,25 @@ To check for security updates, go to [Security announcements for the Elastic sta
 % ### Fixes [edot-python-X.X.X-fixes]
 % *
 
+## 1.6.0 [edot-python-1.6.0-release-notes]
+
+### Features and enhancements [edot-python-1.6.0-features-enhancements]
+
+- Prepend our own User agent to the OpenTelemetry SDK one ([#363](https://github.com/elastic/elastic-otel-python/pull/363))
+
+  For the GRPC exported they will look like `elastic-otlp-grpc-python/1.6.0 OTel-OTLP-Exporter-Python/1.35.0 grpc-python/1.74.0 grpc-c/49.0.0 (linux; chttp2)` and for the http exporter like `elastic-otlp-http-python/1.6.0 OTel-OTLP-Exporter-Python/1.35.0`.
+- Enable containerid resource detector to set the `container.id` attribute when running under a container using Linux cgroups ([#361](https://github.com/elastic/elastic-otel-python/pull/361))
+- Bump to OTel 1.35.0: better handling of exporters timeout ([#360](https://github.com/elastic/elastic-otel-python/pull/360))
+
+  Upstream changes:
+  * [opentelemetry-python](https://github.com/open-telemetry/opentelemetry-python/discussions/4682)
+  * [opentelemetry-python-contrib](https://github.com/open-telemetry/opentelemetry-python-contrib/discussions/3634)
+
+
+### Fixes [edot-python-1.6.0-fixes]
+
+- Silence harmless warning about trace sampler rate not set ([#356](https://github.com/elastic/elastic-otel-python/pull/356))
+
 ## 1.5.0 [edot-python-1.5.0-release-notes]
 
 ### Features and enhancements [edot-python-1.5.0-features-enhancements]
diff --git a/src/elasticotel/distro/version.py b/src/elasticotel/distro/version.py
index 23d2b33..7c3c793 100644
--- a/src/elasticotel/distro/version.py
+++ b/src/elasticotel/distro/version.py
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.5.0"
+__version__ = "1.6.0"