From f161a1e0396288e1cc9db0a529d65ce0174ef1c6 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Fri, 9 Aug 2024 09:55:32 -0500
Subject: [PATCH] Prepare 1.41.0 (#6635)

---
 CHANGELOG.md                                  | 43 +++++++++++++++++++
 .../sdk/common/CompletableResultCode.java     |  7 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9d27b1cd0a..fcc23780a15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,49 @@
 
 ## Unreleased
 
+### API
+
+* Move experimental suppress instrumentation context key to api internal package
+  ([#6546](https://github.com/open-telemetry/opentelemetry-java/pull/6546))
+
+#### Incubator
+
+* Fix bug in `ExtendedContextPropagators` preventing context extraction when case is incorrect.
+  ([#6569](https://github.com/open-telemetry/opentelemetry-java/pull/6569))
+
+### SDK
+
+* Extend `CompletableResultCode` with `failExceptionally(Throwable)`.
+  ([#6348](https://github.com/open-telemetry/opentelemetry-java/pull/6348))
+
+#### Metrics
+
+* Avoid allocations when experimental advice doesn't remove any attributes.
+  ([#6629](https://github.com/open-telemetry/opentelemetry-java/pull/6629))
+
+#### Exporter
+
+* Enable retry by default for OTLP exporters.
+  ([#6588](https://github.com/open-telemetry/opentelemetry-java/pull/6588))
+* Retry ConnectException, add retry logging.
+  ([#6614](https://github.com/open-telemetry/opentelemetry-java/pull/6614))
+* Extend `PrometheusHttpServer` with ability to configure default aggregation as function of
+  instrument kind, including experimental env var support.
+  ([#6541](https://github.com/open-telemetry/opentelemetry-java/pull/6541))
+* Add exporter data model impl for profiling signal type.
+  ([#6498](https://github.com/open-telemetry/opentelemetry-java/pull/6498))
+* Add Marshalers for profiling signal type.
+  ([#6565](https://github.com/open-telemetry/opentelemetry-java/pull/6565))
+* Use generateCertificates() of CertificateFactory to process certificates.
+  ([#6579](https://github.com/open-telemetry/opentelemetry-java/pull/6579))
+
+#### Extensions
+
+* Add file configuration ComponentProvider support for exporters.
+  ([#6493](https://github.com/open-telemetry/opentelemetry-java/pull/6493))
+* Remove nullable from file config Factory contract.
+  ([#6612](https://github.com/open-telemetry/opentelemetry-java/pull/6612))
+
 ## Version 1.40.0 (2024-07-05)
 
 ### API
diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/common/CompletableResultCode.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/CompletableResultCode.java
index a3646343bd5..4a52effcd90 100644
--- a/sdk/common/src/main/java/io/opentelemetry/sdk/common/CompletableResultCode.java
+++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/CompletableResultCode.java
@@ -37,6 +37,8 @@ public static CompletableResultCode ofFailure() {
   /**
    * Returns a {@link CompletableResultCode} that has been {@link #failExceptionally(Throwable)
    * failed exceptionally}.
+   *
+   * @since 1.41.0
    */
   public static CompletableResultCode ofExceptionalFailure(Throwable throwable) {
     return new CompletableResultCode().failExceptionally(throwable);
@@ -120,6 +122,8 @@ public CompletableResultCode fail() {
   /**
    * Completes this {@link CompletableResultCode} unsuccessfully if it is not already completed,
    * setting the {@link #getFailureThrowable() failure throwable} to {@code throwable}.
+   *
+   * @since 1.41.0
    */
   public CompletableResultCode failExceptionally(Throwable throwable) {
     return failInternal(throwable);
@@ -156,7 +160,8 @@ public boolean isSuccess() {
    * via the {@link #whenComplete(Runnable)} method.
    *
    * @return the throwable if failed exceptionally, or null if: {@link #fail() failed without
-   *     exception}, {@link #succeed() succeeded}, or not complete.
+   *     exception}, {@link #succeed() succeeded}, or not complete.g
+   * @since 1.41.0
    */
   @Nullable
   public Throwable getFailureThrowable() {