Merge main into async-changes

[owent]

Changes

Do nothing but merge main into async-changes and use main version for all conflicts, so we can enable CI checks for async-changes.

[codecov]

Codecov Report

Merging #1320 (0321848) into main (fd338cc) will decrease coverage by 0.63%.
The diff coverage is 75.19%.

@@            Coverage Diff             @@
##             main    #1320      +/-   ##
==========================================
- Coverage   91.70%   91.08%   -0.62%     
==========================================
  Files         217      217              
  Lines        7842     7909      +67     
==========================================
+ Hits         7191     7203      +12     
- Misses        651      706      +55     

Impacted Files	Coverage Δ
api/include/opentelemetry/common/spin_lock_mutex.h	25.00% <0.00%> (-4.41%)	⬇️
...lemetry/exporters/memory/in_memory_span_exporter.h	91.31% <ø> (ø)
...de/opentelemetry/exporters/ostream/span_exporter.h	100.00% <ø> (ø)
exporters/ostream/src/span_exporter.cc	90.82% <ø> (ø)
...nclude/opentelemetry/ext/http/client/http_client.h	93.34% <ø> (ø)
sdk/include/opentelemetry/sdk/trace/exporter.h	100.00% <ø> (ø)
sdk/test/trace/simple_processor_test.cc	85.72% <ø> (ø)
sdk/test/trace/batch_span_processor_test.cc	95.84% <16.67%> (-4.16%)	⬇️
api/include/opentelemetry/common/timestamp.h	81.25% <25.00%> (-18.75%)	⬇️
...ntelemetry/ext/http/client/curl/http_client_curl.h	87.81% <35.72%> (-4.50%)	⬇️
... and 7 more

[lalitb]

This seems to be merging async-changes into main, not the other way around?

[owent]

This seems to be merging async-changes into main, not the other way around?

Sorry, my mistake, I have raised another PR (#1321 )