From 91c3114b7cedbdd0f9fe22f3fef22e545c892c04 Mon Sep 17 00:00:00 2001
From: Joe McGinley <116890464+jomcgi@users.noreply.github.com>
Date: Wed, 26 Feb 2025 15:57:25 +0000
Subject: [PATCH] fix: update tracecontext integration test gitref

Update gitref to latest from https://github.com/w3c/trace-context
Skip changed test that is incompatible with our implementation
Add fixme comment to track setting flags for the test suite when
they are available
---
 CHANGELOG.md                             |  2 ++
 scripts/tracecontext-integration-test.sh | 11 +++++++++--
 tox.ini                                  |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ca494a2e4d..f97d53c20da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4444](https://github.com/open-telemetry/opentelemetry-python/pull/4444))
 - opentelemetry-exporter-opencensus: better dependency version range for Python 3.13
   ([#4444](https://github.com/open-telemetry/opentelemetry-python/pull/4444))
+- Updated `tracecontext-integration-test` gitref to `d782773b2cf2fa4afd6a80a93b289d8a74ca894d`
+  ([#4448](https://github.com/open-telemetry/opentelemetry-python/pull/4448))
 
 ## Version 1.30.0/0.51b0 (2025-02-03)
 
diff --git a/scripts/tracecontext-integration-test.sh b/scripts/tracecontext-integration-test.sh
index 4d482ddafe5..1195e7facfc 100755
--- a/scripts/tracecontext-integration-test.sh
+++ b/scripts/tracecontext-integration-test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e 
 # hard-coding the git tag to ensure stable builds.
-TRACECONTEXT_GIT_TAG="98f210efd89c63593dce90e2bae0a1bdcb986f51"
+TRACECONTEXT_GIT_TAG="d782773b2cf2fa4afd6a80a93b289d8a74ca894d"
 # clone w3c tracecontext tests
 mkdir -p target
 rm -rf ./target/trace-context
@@ -24,4 +24,11 @@ onshutdown()
 }
 trap onshutdown EXIT
 cd ./target/trace-context/test
-python test.py http://127.0.0.1:5000/verify-tracecontext
+
+# The disabled test is not compatible with an optional part of the W3C 
+# spec that we have implemented (dropping duplicated keys from tracestate).
+# W3C are planning to include flags for optional features in the test suite.
+# https://github.com/w3c/trace-context/issues/529
+# FIXME: update test to use flags for optional features when available.
+export SERVICE_ENDPOINT=http://127.0.0.1:5000/verify-tracecontext
+pytest test.py -k "not test_tracestate_duplicated_keys"
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 84c9420494e..c8a6e28b7d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -271,6 +271,7 @@ basepython: python3
 deps =
   # needed for tracecontext
   aiohttp~=3.6
+  pytest==7.4.4
   # needed for example trace integration
   flask~=2.3
   requests~=2.7