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) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 3c81ec8431..3efa2f42e4 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -320,15 +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 \ - //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 //...