From ec5cea63b793210fb7169a36b4598a9690b4e2b0 Mon Sep 17 00:00:00 2001
From: Yingrong Zhao <22300958+VinozzZ@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:00:31 -0400
Subject: [PATCH 1/2] doc: update changelog for
 OTEL_HTTP_CLIENT_COMPATIBILITY_MODE env variable

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6554e8f74c6..25b6b3f5610 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - The `go.opentelemetry.io/contrib/bridges/otelzap` module.
   This module provides an OpenTelemetry logging bridge for `go.uber.org/zap`. (#5191)
 - The `go.opentelemetry.io/contrib/config` package supports configuring `with_resource_constant_labels` for the prometheus exporter. (#5890)
+- Allow configuring the `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` with the `OTEL_HTTP_CLIENT_COMPATIBILITY_MODE` environment variable to receive both the current v1.20.0 and the new v1.24.0 attributes. (#5333, #5401)
 
 ### Removed
 

From ff7554e457445d1fb86db5d01dd21d55c63c038b Mon Sep 17 00:00:00 2001
From: Yingrong Zhao <22300958+VinozzZ@users.noreply.github.com>
Date: Mon, 15 Jul 2024 11:19:28 -0400
Subject: [PATCH 2/2] address feedback

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25b6b3f5610..89b3e9ff7f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - The `go.opentelemetry.io/contrib/bridges/otelzap` module.
   This module provides an OpenTelemetry logging bridge for `go.uber.org/zap`. (#5191)
 - The `go.opentelemetry.io/contrib/config` package supports configuring `with_resource_constant_labels` for the prometheus exporter. (#5890)
-- Allow configuring the `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` with the `OTEL_HTTP_CLIENT_COMPATIBILITY_MODE` environment variable to receive both the current v1.20.0 and the new v1.24.0 attributes. (#5333, #5401)
+- Support for the `OTEL_HTTP_CLIENT_COMPATIBILITY_MODE=http/dup` environment variable in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` to emit attributes for both the v1.20.0 and v1.24.0 semantic conventions. (#5401)
 
 ### Removed