From 6617bc932aa16840977b53435718de6d2a5a5397 Mon Sep 17 00:00:00 2001
From: Tom Tan <Tom.Tan@microsoft.com>
Date: Wed, 8 Mar 2023 09:40:04 -0800
Subject: [PATCH 1/3] Remove separate run of metrics ostream sample

---
 ci/do_ci.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index 3c81ec8431..fa30fb2202 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -321,14 +321,12 @@ elif [[ "$1" == "bazel.nortti" ]]; then
 elif [[ "$1" == "bazel.asan" ]]; then
   bazel $BAZEL_STARTUP_OPTIONS test --config=asan $BAZEL_TEST_OPTIONS_ASYNC //...
   bazel $BAZEL_STARTUP_OPTIONS run --config=asan $BAZEL_TEST_OPTIONS_ASYNC \
-  //examples/metrics_simple:metrics_ostream_example > /dev/null
   exit 0
 elif [[ "$1" == "bazel.tsan" ]]; then
 # TODO - potential race condition in Civetweb server used by prometheus-cpp during shutdown
 # https://github.com/civetweb/civetweb/issues/861, so removing prometheus from the test
   bazel $BAZEL_STARTUP_OPTIONS test --config=tsan $BAZEL_TEST_OPTIONS_ASYNC  -- //... -//exporters/prometheus/...
   bazel $BAZEL_STARTUP_OPTIONS run --config=tsan $BAZEL_TEST_OPTIONS_ASYNC \
-  //examples/metrics_simple:metrics_ostream_example > /dev/null
   exit 0
 elif [[ "$1" == "bazel.valgrind" ]]; then
   bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC //...

From 0102aca33d8fc8344026deaebce83649ca694d49 Mon Sep 17 00:00:00 2001
From: Tom Tan <Tom.Tan@microsoft.com>
Date: Wed, 8 Mar 2023 09:44:20 -0800
Subject: [PATCH 2/3] Fix changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d95b4a5f0..c0317fb452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,7 +35,7 @@ Increment the:
   [#1992](https://github.com/open-telemetry/opentelemetry-cpp/pull/1992)
 * [ETW Exporter] Support serialize span/log attributes into JSON
   [#1991](https://github.com/open-telemetry/opentelemetry-cpp/pull/1991)
-* ETW Exporter]Do not overwrite ParentId when setting attribute on Span
+* [ETW Exporter]Do not overwrite ParentId when setting attribute on Span
   [#1989](https://github.com/open-telemetry/opentelemetry-cpp/pull/1989)
 * Upgrade prometheus-cpp to v1.1.0
   [#1954](https://github.com/open-telemetry/opentelemetry-cpp/pull/1954)

From 7a4768ca40b2cd4c87c04d3010c9421c49ddfaeb Mon Sep 17 00:00:00 2001
From: Tom Tan <Tom.Tan@microsoft.com>
Date: Wed, 8 Mar 2023 10:13:14 -0800
Subject: [PATCH 3/3] Remove the full command

---
 ci/do_ci.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index fa30fb2202..3efa2f42e4 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -320,13 +320,11 @@ elif [[ "$1" == "bazel.nortti" ]]; then
   exit 0
 elif [[ "$1" == "bazel.asan" ]]; then
   bazel $BAZEL_STARTUP_OPTIONS test --config=asan $BAZEL_TEST_OPTIONS_ASYNC //...
-  bazel $BAZEL_STARTUP_OPTIONS run --config=asan $BAZEL_TEST_OPTIONS_ASYNC \
   exit 0
 elif [[ "$1" == "bazel.tsan" ]]; then
 # TODO - potential race condition in Civetweb server used by prometheus-cpp during shutdown
 # https://github.com/civetweb/civetweb/issues/861, so removing prometheus from the test
   bazel $BAZEL_STARTUP_OPTIONS test --config=tsan $BAZEL_TEST_OPTIONS_ASYNC  -- //... -//exporters/prometheus/...
-  bazel $BAZEL_STARTUP_OPTIONS run --config=tsan $BAZEL_TEST_OPTIONS_ASYNC \
   exit 0
 elif [[ "$1" == "bazel.valgrind" ]]; then
   bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC //...