From 24113716e532becb1fb5c39ea34130aa817c4e3a Mon Sep 17 00:00:00 2001
From: Joao Grassi <5938087+joaopgrassi@users.noreply.github.com>
Date: Fri, 24 May 2024 10:23:52 +0200
Subject: [PATCH] Prepare v0.6.0 changelog

---
 .chloggen/summary.tmpl |  6 +++---
 CHANGELOG.md           | 28 ++++++++++++++++++++++++++++
 manifest.yaml          |  2 +-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/.chloggen/summary.tmpl b/.chloggen/summary.tmpl
index fb476cfe..3df509e0 100644
--- a/.chloggen/summary.tmpl
+++ b/.chloggen/summary.tmpl
@@ -21,9 +21,9 @@ https://github.com/open-telemetry/opentelemetry-collector/releases/tag/vXX.YY.ZZ
 https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/vXX.YY.ZZ
 
 <details>
-<summary>Highlights from the above changelog</summary>
-
-- 
+<summary>Highlights from the upstream Collector changelog</summary>
+</br>
+-
 
 </details>
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0d77793..ea2a1f7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,3 +3,31 @@
 # Changelog
 
 <!-- next version -->
+
+## v0.6.1
+
+This release includes version 0.101.0 of the upstream Collector components.
+
+The individual changelogs can be found here:
+
+v0.101.0:
+https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.101.0
+https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.101.0
+
+<details>
+
+<summary>Highlights from the upstream Collector changelog</summary>
+</br>
+
+🛑 Breaking changes 🛑
+
+- `filelog, journald, tcp, udp, syslog, windowseventlog receivers`: The internal logger has been changed from zap.SugaredLogger to zap.Logger. ([#32177](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32177))
+This should not have any meaningful impact on most users but the logging format for some logs may have changed.
+
+💡 Enhancements 💡
+
+- `filelogreceiver`: Add container operator parser ([#31959](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31959))
+- `resourcedetectionprocessor`: Support GCP Bare Metal Solution in resource detection processor. ([#32985](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32985))
+- `processor/transform`: Allow common where clause ([#27830](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27830))
+
+</details>
diff --git a/manifest.yaml b/manifest.yaml
index 62751868..c3ff250a 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -3,7 +3,7 @@ dist:
   name: dynatrace-otel-collector
   description: Dynatrace distribution of the OpenTelemetry Collector
   output_path: ./build
-  version: 0.5.0
+  version: 0.6.0
 
 receivers:
   - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0