Merge branch 'main' into pre_release_1.8.3

open-telemetry · Mar 7, 2023 · d011e40 · d011e40
2 parents d5aa477 + 04a0751
commit d011e40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/buildscripts/pre_release.sh b/buildscripts/pre_release.sh
@@ -48,7 +48,7 @@ if [ ! -f $changelog_file ]; then
     exit 1
 fi
 
-if [ ! grep -q "^\#\# \[Unreleased\]$" $changelog_file ]; then
+if ! grep -q "^\#\# \[Unreleased\]$" "$changelog_file" ; then
     echo "Error: $changelog_file doesn't contain Unreleased information. Please update the file with changes and run this script again."
     exit 1
 fi

diff --git a/examples/http/tracer_common.h b/examples/http/tracer_common.h
@@ -26,7 +26,7 @@ template <typename T>
 class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCarrier
 {
 public:
-  HttpTextMapCarrier<T>(T &headers) : headers_(headers) {}
+  HttpTextMapCarrier(T &headers) : headers_(headers) {}
   HttpTextMapCarrier() = default;
   virtual opentelemetry::nostd::string_view Get(
       opentelemetry::nostd::string_view key) const noexcept override
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ if [ ! -f $changelog_file ]; then @@
         exit 1
     fi
-    if [ ! grep -q "^\#\# \[Unreleased\]$" $changelog_file ]; then
+    if ! grep -q "^\#\# \[Unreleased\]$" "$changelog_file" ; then
         echo "Error: $changelog_file doesn't contain Unreleased information. Please update the file with changes and run this script again."
         exit 1
     fi
@@ Expand Down @@