From 96ce8786574a1cc1f0fbcf8570a5b9025cdabca9 Mon Sep 17 00:00:00 2001
From: Florian Engelhardt <florian.engelhardt@datadoghq.com>
Date: Tue, 19 Dec 2023 10:26:52 +0100
Subject: [PATCH] Bump versions for `0.96.0` release (#2429)

Co-authored-by: Alexandre Choura <42672104+PROFeNoM@users.noreply.github.com>
---
 Cargo.lock                      |  2 +-
 appsec/CMakeLists.txt           |  2 +-
 ext/version.h                   |  2 +-
 github-actions-helpers/Build.cs |  2 +-
 package.xml                     | 37 +++++++++++++--------------------
 profiling/Cargo.toml            |  2 +-
 src/DDTrace/Tracer.php          |  2 +-
 7 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9635d9e8d5..09b79fb174 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -678,7 +678,7 @@ dependencies = [
 
 [[package]]
 name = "datadog-php-profiling"
-version = "0.95.0"
+version = "0.96.0"
 dependencies = [
  "ahash 0.8.3",
  "anyhow",
diff --git a/appsec/CMakeLists.txt b/appsec/CMakeLists.txt
index 5c7d8485c0..24864fc48f 100644
--- a/appsec/CMakeLists.txt
+++ b/appsec/CMakeLists.txt
@@ -11,7 +11,7 @@ HunterGate(
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hunter-cache.id.in ${CMAKE_CURRENT_SOURCE_DIR}/hunter-cache.id)
 
-project(ddappsec VERSION 0.95.0)
+project(ddappsec VERSION 0.96.0)
 
 include(CheckCXXCompilerFlag)
 
diff --git a/ext/version.h b/ext/version.h
index 2553efeefe..4b93a2fd65 100644
--- a/ext/version.h
+++ b/ext/version.h
@@ -1,4 +1,4 @@
 #ifndef PHP_DDTRACE_VERSION
 // Must begin with a number for Debian packaging requirements
-#define PHP_DDTRACE_VERSION "0.95.0"
+#define PHP_DDTRACE_VERSION "0.96.0"
 #endif
diff --git a/github-actions-helpers/Build.cs b/github-actions-helpers/Build.cs
index c00c7432e6..4e7455ec38 100644
--- a/github-actions-helpers/Build.cs
+++ b/github-actions-helpers/Build.cs
@@ -25,7 +25,7 @@ partial class Build : NukeBuild
     readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
     [Parameter("The current version of the source and build")]
-    readonly string Version = "0.94.0";
+    readonly string Version = "0.96.0";
 
     Target Clean => _ => _
         .Before(Restore)
diff --git a/package.xml b/package.xml
index 3991619231..eeaca3179c 100644
--- a/package.xml
+++ b/package.xml
@@ -62,40 +62,31 @@
     <license uri="https://github.com/DataDog/dd-trace-php/blob/master/LICENSE">BSD 3-Clause</license>
     <notes>
         <![CDATA[
-
-This release introduces support for arm64 and PHP 8.3 for appsec. Additionally, it adds schema extraction and classification to appsec, which forms the foundation for API security. Finally, the appsec extension has been officially incorporated into the dd-trace-php repository and will adhere to the same versioning scheme as the tracer and profiler.
+Exception profiling is now enabled by default. You can manage it using the `DD_PROFILING_EXCEPTION_ENABLED` environment variable or the `datadog.profiling.exception_enabled` setting in the INI file. Although the `DD_PROFILING_EXPERIMENTAL_EXCEPTION_ENABLED` environment variable and `datadog.profiling.experimental_exception_enabled` INI setting still work, the new ones take precedence.
 
 ## Tracer
+
 ### Added
-- Add http.route to CodeIgniter #2379
+- Implement extended sampling #2384
 
 ### Fixed
-- Use http_code instead of connect_time to detect curl errors #2391
-- Fix handling of invalid persistent JSON #2381
-- Zero pad the tid and exclude it from OTel tracestate #2386
+- Add PHP 8.3 to supported versions #2417 (thank you @markwalet)
+- OTel: Fix analytics.event override (#2409)
+- Fix dddbs service mapping #2413
+- WordPress: Avoid Setting User ID When Unauthenticated #2424
 
-### Internal changes
-- Update CI images to use PHP 8.3.0rc6, pin mongodb for PHP 7.2-7.3 #2382
-- Update CI images to 8.1.26, 8.2.13 and 8.3.0 and XDedug to 3.3.0 #2400 #2405
-- Add macrobenchmark runs #2408
+### Internal Changes
+- CI: Handle latest Alpine 3.19 image #2418
+- CI: Complements PHP 8.3 test suites #2419
 
 ## Profiling
-### Internal changes
-- add allocation and exception count to event.json #2392
 
-## Application Security Management
 ### Added
-- Implement sampler and processor trigger DataDog/dd-appsec-php#308
-- Zip long schemas DataDog/dd-appsec-php#315
-- Add compression library to helper DataDog/dd-appsec-php#316
-- Always serialize schemas when available #2406
-- Upgrade libddwaf to v1.15.1 #2377
-### Internal changes
-- Fix fuzzer build & increase RSS limit DataDog/dd-appsec-php#313
-- Build AppSec extension & helper in CI with support for Arm64 and PHP 8.3 #2344
-- AppSec extension & helper unit tests in CI #2349
-- Package appsec using new builds #2369
+- GA exception profiling #2403
+- allow enabling all experimental features using `datadog.profiling.experimental_features_enabled` #2385
 
+### Internal Changes
+- run prof-correctness nightly in `master` branch #2420
 ]]></notes>
     <contents>
         <dir name="/">
diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml
index 983fce030c..f39a09c6d3 100644
--- a/profiling/Cargo.toml
+++ b/profiling/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datadog-php-profiling"
-version = "0.95.0"
+version = "0.96.0"
 edition = "2021"
 license = "Apache-2.0"
 rust-version = "1.64"
diff --git a/src/DDTrace/Tracer.php b/src/DDTrace/Tracer.php
index 3e782b12e9..7e7e9828c6 100644
--- a/src/DDTrace/Tracer.php
+++ b/src/DDTrace/Tracer.php
@@ -24,7 +24,7 @@ final class Tracer implements TracerInterface
      * Must begin with a number for Debian packaging requirements
      * Must use single-quotes for packaging script to work
      */
-    const VERSION = '0.95.0';
+    const VERSION = '0.96.0';
 
     /**
      * @var Span[][]