Merge main into async changes #1472

owent · 2022-07-01T07:03:45Z

Changes

Merge main into async-changes
Add some comments for better understanding to async-changes of curl::HttpClient .

For significant contributions please make sure you have completed the following items:

CHANGELOG.md updated for non-trivial changes
Unit tests have been added
Changes in public API reviewed

* add owent as reviewer * fix order

…mporality) (open-telemetry#1288)

…elemetry#1301) Signed-off-by: owent <[email protected]>

…emetry#1309) Signed-off-by: owent <[email protected]>

…ed. (open-telemetry#1299)

Signed-off-by: owent <[email protected]>

Co-authored-by: Tom Tan <[email protected]> Co-authored-by: Lalit Kumar Bhasin <[email protected]>

…lemetry#1303)

Co-authored-by: Lalit Kumar Bhasin <[email protected]>

…metry#1425)

…alues (open-telemetry#1427) * validate histogram value * handle Nan * add changelog * divide by 0 error on windows * fix markdown lint

…#1400)

…etry#1347) (open-telemetry#1439)

…#1441)

…emetry#1446)

Signed-off-by: WenTao Ou <[email protected]>

Signed-off-by: WenTao Ou <[email protected]> # Conflicts: # .github/workflows/stale.yml # CHANGELOG.md # CMakeLists.txt # api/CMakeLists.txt # api/include/opentelemetry/common/spin_lock_mutex.h # api/include/opentelemetry/version.h # ci/do_ci.ps1 # ci/do_ci.sh # docs/public/conf.py # examples/common/metrics_foo_library/foo_library.cc # examples/prometheus/prometheus.yml # exporters/otlp/test/otlp_http_log_exporter_test.cc # ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h # ext/src/http/client/curl/CMakeLists.txt # sdk/include/opentelemetry/sdk/version/version.h # sdk/src/version/version.cc

…o_async-changes

Signed-off-by: owent <[email protected]>

…elemetry#1469)

…o_async-changes

Signed-off-by: owentou <[email protected]>

owent · 2022-07-01T07:05:33Z

@lalitb Can we enable rebase and merge for this branch. Or there will be conflicts every time I merge main into async-changes.

codecov · 2022-07-01T07:12:00Z

Codecov Report

❗ No coverage uploaded for pull request base (async-changes@daf5091). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             async-changes    #1472   +/-   ##
================================================
  Coverage                 ?   84.72%           
================================================
  Files                    ?      155           
  Lines                    ?     4784           
  Branches                 ?        0           
================================================
  Hits                     ?     4053           
  Misses                   ?      731           
  Partials                 ?        0

lalitb · 2022-07-01T17:36:19Z

@lalitb Can we enable rebase and merge for this branch. Or there will be conflicts every time I merge main into async-changes.

Have now removed all restrictions to this branch async-changes. Let me know if you see any issues.

owent · 2022-07-02T09:56:24Z

@lalitb Can we enable rebase and merge for this branch. Or there will be conflicts every time I merge main into async-changes.

Have now removed all restrictions to this branch async-changes. Let me know if you see any issues.

I will update #1413 every time after main is merged into async-changes. The squash and merge will drop the merge history, if I rebase to entelemetry/async-changes and merge it to main, it will show conflicts again.

Is there any suggestion?

esigo and others added 30 commits March 21, 2022 07:02

install sdk config (open-telemetry#1273)

e072daa

Bump actions/cache from 2 to 3 (open-telemetry#1277)

6ec1b59

Add owent as an Approver (open-telemetry#1276)

b5155a5

* add owent as reviewer * fix order

Disable benchmark action failure (open-telemetry#1284)

0c9aece

metrics exemplar round 1 (open-telemetry#1264)

3c7b44b

[Metrics SDK] - fix spelling (AggregationTemporarily to AggregationTe…

2c9ce39

…mporality) (open-telemetry#1288)

fix compilation error with protobuf 3.5 (open-telemetry#1289)

91b0572

Fix span SetAttribute crash (open-telemetry#1283)

c1b9590

Synchronous Metric collection (Delta , Cumulative) (open-telemetry#1265)

a7e814a

Rename http_client_curl to opentelemetry_http_client_curl (open-t…

76c664a

…elemetry#1301) Signed-off-by: owent <[email protected]>

Don't show coverage annotation for pull requests (open-telemetry#1304)

2034c9b

Implement periodic exporting metric reader (open-telemetry#1286)

33d9c62

Add async-changes branch to pull_request of github action (open-tel…

48a4060

…emetry#1309) Signed-off-by: owent <[email protected]>

Add InstrumentationInfo and Resource to the metrics data to be export…

be75bbc

…ed. (open-telemetry#1299)

Excempt should be applied on issue instead of PR (open-telemetry#1316)

237a0b2

Bump codecov/codecov-action from 2.1.0 to 3 (open-telemetry#1318)

fd338cc

Move public definitions into opentelemetry_api. (open-telemetry#1314)

74ec691

Signed-off-by: owent <[email protected]>

Add building test without RTTI (open-telemetry#1294)

6b87300

Remove implicitly deleted default constructor (open-telemetry#1267)

3122254

Co-authored-by: Tom Tan <[email protected]> Co-authored-by: Lalit Kumar Bhasin <[email protected]>

[ETW Exporter] - ETW provider handle cleanup (open-telemetry#1322)

d72dcb6

Bump actions/stale from 4 to 5 (open-telemetry#1323)

e200c1f

ostream metrics example (open-telemetry#1312)

755f109

Prepare v1.3.0 release (open-telemetry#1324)

da2911c

Update yield logic for ARM processor (open-telemetry#1325)

75c2a8f

Fix for open-telemetry#1292 (open-telemetry#1326)

e7f051e

Implement Merge and Diff operation for Histogram Aggregation (open-te…

29d68f1

…lemetry#1303)

fix metrics compiler warnings (open-telemetry#1328)

e3304d7

Replace deprecated googletest API (open-telemetry#1327)

defdfd2

Remove redundant tail / in CMake install (open-telemetry#1329)

2e9b7a1

dependencies image as artifact (open-telemetry#1333)

1d2cd42

Co-authored-by: Lalit Kumar Bhasin <[email protected]>

ThomsonTan and others added 24 commits June 2, 2022 19:24

Copy string_view passed to ETW exporter in PropertyVariant (open-tele…

93ef013

…metry#1425)

Fix ETW log exporter header inclusion (open-telemetry#1426)

81df64b

[Metrics SDK] Only record non-negative / finite / Non-NAN histogram v…

62b65fa

…alues (open-telemetry#1427) * validate histogram value * handle Nan * add changelog * divide by 0 error on windows * fix markdown lint

Fix global log handle symbols when using dlopen (open-telemetry#1420)

7e90dae

Add attributes/dimensions to metrics ostream exporter (open-telemetry…

18991a6

…#1400)

Log current timestamp instead of epoch time (open-telemetry#1434)

473c931

install sdk-config.h (open-telemetry#1419)

4c657a1

Fix GettingStarted documentation for Jaeger HTTP exporter (open-telem…

6ee70a7

…etry#1347) (open-telemetry#1439)

fix histogram (open-telemetry#1440)

423a1a2

Upgrade nlohmann_json to 3.10.5 (open-telemetry#1438) (open-telemetry…

33567b9

…#1441)

Fixed broken link to OpenTelemetry.io (open-telemetry#1445) (open-tel…

2f0a3d6

…emetry#1446)

Fix variables inizialization (open-telemetry#1430)

2d78a56

Don't close inactive issues by the stable bot (open-telemetry#1453)

9f3a8ee

Prepare v1.4.1 patch release (open-telemetry#1458)

96534a7

Fix comments and cleanup unused codes of http client

9c7ed0d

Signed-off-by: WenTao Ou <[email protected]>

Fix invalid comment in otlp::ResponseHandler

fe8c822

fix prometheus exporter failure type (open-telemetry#1460)

5ccca49

OTLP gRPC Metrics Exporter (open-telemetry#1454)

b285874

Merge remote-tracking branch 'opentelemetry/main' into merge_main_int…

158279d

…o_async-changes

Fix spell mistake, and unused header.

56c8e9d

Signed-off-by: owent <[email protected]>

Remove reference to deprecated InstrumentationLibrary in OTLP (open-t…

45fdbf2

…elemetry#1469)

Merge remote-tracking branch 'opentelemetry/main' into merge_main_int…

7679338

…o_async-changes

Add more comments for async-changes

8af0b5b

Signed-off-by: owentou <[email protected]>

owent requested a review from a team July 1, 2022 07:03

lalitb merged commit 5e7ff72 into open-telemetry:async-changes Jul 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into async changes #1472

Merge main into async changes #1472

owent commented Jul 1, 2022

owent commented Jul 1, 2022

codecov bot commented Jul 1, 2022

lalitb commented Jul 1, 2022

owent commented Jul 2, 2022

Merge main into async changes #1472

Merge main into async changes #1472

Conversation

owent commented Jul 1, 2022

Changes

owent commented Jul 1, 2022

codecov bot commented Jul 1, 2022

Codecov Report

lalitb commented Jul 1, 2022

owent commented Jul 2, 2022