Upgrade proto to v0.17.0, update log data model by owent · Pull Request #1383 · open-telemetry/opentelemetry-cpp

owent · 2022-05-08T06:43:32Z

This PR fix part of #1291

Changes

Upgrade proto to v0.17.0
Optimize script to dump third_party_release
Update the logs APIs to meet current logs data model
Using tools/vcpkg in CI scripts

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

codecov · 2022-05-08T06:51:34Z

Codecov Report

Merging #1383 (e693959) into main (1e25d58) will increase coverage by 0.44%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1383      +/-   ##
==========================================
+ Coverage   85.00%   85.43%   +0.44%     
==========================================
  Files         152      152              
  Lines        4344     4350       +6     
==========================================
+ Hits         3692     3716      +24     
+ Misses        652      634      -18

Impacted Files	Coverage Δ
...k/instrumentationlibrary/instrumentation_library.h	`100.00% <100.00%> (ø)`
sdk/src/metrics/metric_reader.cc	`63.89% <0.00%> (+8.34%)`	⬆️
...metrics/export/periodic_exporting_metric_reader.cc	`77.28% <0.00%> (+34.10%)`	⬆️

lalitb

thanks for the changes. nicely done.

ThomsonTan · 2022-05-12T22:45:59Z

nit: put a link to the spec here instead of copy the text?

lalitb · 2022-05-16T16:19:37Z

@owent Can you please rebase this to enable merge. Thanks.

Signed-off-by: owent <admin@owent.net>

…onal` keyword in `proto3` Signed-off-by: owent <admin@owent.net>

Signed-off-by: owent <admin@owent.net>

Put a link to the spec here instead of copy the text. Signed-off-by: owent <admin@owent.net>

Signed-off-by: owent <admin@owent.net>

owent · 2022-05-17T03:02:50Z

@owent Can you please rebase this to enable merge. Thanks.

Done

* install sdk config (#1273) * Bump actions/cache from 2 to 3 (#1277) * Add owent as an Approver (#1276) * add owent as reviewer * fix order * Disable benchmark action failure (#1284) * metrics exemplar round 1 (#1264) * [Metrics SDK] - fix spelling (AggregationTemporarily to AggregationTemporality) (#1288) * fix compilation error with protobuf 3.5 (#1289) * Fix span SetAttribute crash (#1283) * Synchronous Metric collection (Delta , Cumulative) (#1265) * Rename `http_client_curl` to `opentelemetry_http_client_curl` (#1301) Signed-off-by: owent <admin@owent.net> * Don't show coverage annotation for pull requests (#1304) * Implement periodic exporting metric reader (#1286) * Add `async-changes` branch to pull_request of github action (#1309) Signed-off-by: owent <admin@owent.net> * Add InstrumentationInfo and Resource to the metrics data to be exported. (#1299) * Excempt should be applied on issue instead of PR (#1316) * Bump codecov/codecov-action from 2.1.0 to 3 (#1318) * Move public definitions into `opentelemetry_api`. (#1314) Signed-off-by: owent <admin@owent.net> * Add building test without RTTI (#1294) * Remove implicitly deleted default constructor (#1267) Co-authored-by: Tom Tan <Tom.Tan@microsoft.com> Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * [ETW Exporter] - ETW provider handle cleanup (#1322) * Bump actions/stale from 4 to 5 (#1323) * ostream metrics example (#1312) * Prepare v1.3.0 release (#1324) * Update yield logic for ARM processor (#1325) * Fix for #1292 (#1326) * Implement Merge and Diff operation for Histogram Aggregation (#1303) * fix metrics compiler warnings (#1328) * Replace deprecated googletest API (#1327) * Remove redundant tail / in CMake install (#1329) * dependencies image as artifact (#1333) Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * metrics histogram example (#1330) * Link `opentelemetry_ext` with `opentelemetry_api` (#1336) * ostream metrics cmake (#1344) * prometheus exporter (#1331) * remove exporter registration to meter provider (#1350) * Bump github/codeql-action from 1 to 2 (#1351) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add explicit type cast in baggage UrlDecode (#1353) * Fix scalar delete against array (#1356) * conditional include for codecvt header (#1355) * Add missing include guard (#1357) * Use latest TraceLoggingDynamic.h (#1354) * prometheus example (#1332) * Fix output time in metrics OStream exporter (#1346) * Simplify SDK Configuration: Use View with default aggregation if no matching View is configured (#1358) * Fix class member initialization order (#1360) * codecov ignore (#1364) * export opentelemetry_otlp_recordable (#1365) * Disable test on prometheus-cpp which not need (#1363) * Enable metric collection for Async Instruments - Delta and Cumulative (#1334) * fix baggage propagation for empty/invalid baggage context (#1367) * Fix empty tracestate header propagation (#1373) * Bump docker/setup-qemu-action from 1 to 2 (#1375) * Add noexcept/const qualifier at missing places for Trace API. (#1374) * fix noxcept * fix etw * Bump docker/build-push-action from 2 to 3 (#1377) * Bump docker/setup-buildx-action from 1 to 2 (#1376) * [Metrics SDK] Remove un-necessary files. (#1379) * reuse temporal metric storage for sync storage (#1369) * Prometheus exporter meters and instrument name (#1378) * Fix sharing resource in batched exported spans (#1386) Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * fix: missing link to nlohmann_json (#1390) * Getting started document using ostream exporter (#1394) Co-authored-by: Reiley Yang <reyang@microsoft.com> * Connect async storage with async instruments (#1388) * get span_id from context when Logger::Log received invalid span_id (#1398) * Alpine image (#1382) * Upgrade proto to v0.17.0, update log data model (#1383) * Prepare v1.4.0 release (#1404) * Fix vcpkg package name in doc (#1392) * Document Getting Started with Prometheus and Grafana (#1396) Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * fix OTEL_INTERNAL_LOG_INFO (#1407) * fix: WaitOnSocket select error when sockfd above FD_SETSIZE (#1410) * [BUILD] fix nlohmann_json's (third party) include dir (#1415) * [Metrics API/SDK] - Pass state to async callback function. (#1408) * Copy string_view passed to ETW exporter in PropertyVariant (#1425) * Fix ETW log exporter header inclusion (#1426) * [Metrics SDK] Only record non-negative / finite / Non-NAN histogram values (#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 (#1420) * Add attributes/dimensions to metrics ostream exporter (#1400) * Log current timestamp instead of epoch time (#1434) * install sdk-config.h (#1419) * Fix GettingStarted documentation for Jaeger HTTP exporter (#1347) (#1439) * fix histogram (#1440) * Upgrade nlohmann_json to 3.10.5 (#1438) (#1441) * Fixed broken link to OpenTelemetry.io (#1445) (#1446) Co-authored-by: Ehsan Saei <71217171+esigo@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> Co-authored-by: Tom Tan <Tom.Tan@microsoft.com> Co-authored-by: Ben Landrum <71329856+benlandrum@users.noreply.github.com> Co-authored-by: jmanjon <67091862+juandemanjon@users.noreply.github.com> Co-authored-by: Zsolt Bölöny <bolony.zsolt@gmail.com> Co-authored-by: Leo Di Donato <leodidonato@gmail.com> Co-authored-by: Reiley Yang <reyang@microsoft.com> Co-authored-by: Lalit Kumar Bhasin <labhas@microsoft.com> Co-authored-by: Hamed Mansouri <hamed0381@gmail.com> Co-authored-by: ztao <t@taozj.org> Co-authored-by: Flier Lu <flier@users.noreply.github.com> Co-authored-by: Marc Alff <marc.alff@free.fr> Co-authored-by: Marc Alff <marc.alff@oracle.com>

* install sdk config (#1273) * Bump actions/cache from 2 to 3 (#1277) * Add owent as an Approver (#1276) * add owent as reviewer * fix order * Disable benchmark action failure (#1284) * metrics exemplar round 1 (#1264) * [Metrics SDK] - fix spelling (AggregationTemporarily to AggregationTemporality) (#1288) * fix compilation error with protobuf 3.5 (#1289) * Fix span SetAttribute crash (#1283) * Synchronous Metric collection (Delta , Cumulative) (#1265) * Rename `http_client_curl` to `opentelemetry_http_client_curl` (#1301) Signed-off-by: owent <admin@owent.net> * Don't show coverage annotation for pull requests (#1304) * Implement periodic exporting metric reader (#1286) * Add `async-changes` branch to pull_request of github action (#1309) Signed-off-by: owent <admin@owent.net> * Add InstrumentationInfo and Resource to the metrics data to be exported. (#1299) * Excempt should be applied on issue instead of PR (#1316) * Bump codecov/codecov-action from 2.1.0 to 3 (#1318) * Move public definitions into `opentelemetry_api`. (#1314) Signed-off-by: owent <admin@owent.net> * Add building test without RTTI (#1294) * Remove implicitly deleted default constructor (#1267) Co-authored-by: Tom Tan <Tom.Tan@microsoft.com> Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * [ETW Exporter] - ETW provider handle cleanup (#1322) * Bump actions/stale from 4 to 5 (#1323) * ostream metrics example (#1312) * Prepare v1.3.0 release (#1324) * Update yield logic for ARM processor (#1325) * Fix for #1292 (#1326) * Implement Merge and Diff operation for Histogram Aggregation (#1303) * fix metrics compiler warnings (#1328) * Replace deprecated googletest API (#1327) * Remove redundant tail / in CMake install (#1329) * dependencies image as artifact (#1333) Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * metrics histogram example (#1330) * Link `opentelemetry_ext` with `opentelemetry_api` (#1336) * ostream metrics cmake (#1344) * prometheus exporter (#1331) * remove exporter registration to meter provider (#1350) * Bump github/codeql-action from 1 to 2 (#1351) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add explicit type cast in baggage UrlDecode (#1353) * Fix scalar delete against array (#1356) * conditional include for codecvt header (#1355) * Add missing include guard (#1357) * Use latest TraceLoggingDynamic.h (#1354) * prometheus example (#1332) * Fix output time in metrics OStream exporter (#1346) * Simplify SDK Configuration: Use View with default aggregation if no matching View is configured (#1358) * Fix class member initialization order (#1360) * codecov ignore (#1364) * export opentelemetry_otlp_recordable (#1365) * Disable test on prometheus-cpp which not need (#1363) * Enable metric collection for Async Instruments - Delta and Cumulative (#1334) * fix baggage propagation for empty/invalid baggage context (#1367) * Fix empty tracestate header propagation (#1373) * Bump docker/setup-qemu-action from 1 to 2 (#1375) * Add noexcept/const qualifier at missing places for Trace API. (#1374) * fix noxcept * fix etw * Bump docker/build-push-action from 2 to 3 (#1377) * Bump docker/setup-buildx-action from 1 to 2 (#1376) * [Metrics SDK] Remove un-necessary files. (#1379) * reuse temporal metric storage for sync storage (#1369) * Prometheus exporter meters and instrument name (#1378) * Fix sharing resource in batched exported spans (#1386) Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * fix: missing link to nlohmann_json (#1390) * Getting started document using ostream exporter (#1394) Co-authored-by: Reiley Yang <reyang@microsoft.com> * Connect async storage with async instruments (#1388) * get span_id from context when Logger::Log received invalid span_id (#1398) * Alpine image (#1382) * Upgrade proto to v0.17.0, update log data model (#1383) * Prepare v1.4.0 release (#1404) * Fix vcpkg package name in doc (#1392) * Document Getting Started with Prometheus and Grafana (#1396) Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> * fix OTEL_INTERNAL_LOG_INFO (#1407) * fix: WaitOnSocket select error when sockfd above FD_SETSIZE (#1410) * [BUILD] fix nlohmann_json's (third party) include dir (#1415) * [Metrics API/SDK] - Pass state to async callback function. (#1408) * Copy string_view passed to ETW exporter in PropertyVariant (#1425) * Fix ETW log exporter header inclusion (#1426) * [Metrics SDK] Only record non-negative / finite / Non-NAN histogram values (#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 (#1420) * Add attributes/dimensions to metrics ostream exporter (#1400) * Log current timestamp instead of epoch time (#1434) * install sdk-config.h (#1419) * Fix GettingStarted documentation for Jaeger HTTP exporter (#1347) (#1439) * fix histogram (#1440) * Upgrade nlohmann_json to 3.10.5 (#1438) (#1441) * Fixed broken link to OpenTelemetry.io (#1445) (#1446) * Fix variables inizialization (#1430) * Remove `AsyncBatch*Processor`, implement [opentelemetry-specification#2452](open-telemetry/opentelemetry-specification#2452) Signed-off-by: WenTao Ou <admin@owent.net> * Remove invalid changelog Signed-off-by: WenTao Ou <admin@owent.net> * Fix compiling problems without `ENABLE_ASYNC_EXPORT` Signed-off-by: WenTao Ou <admin@owent.net> * Always return `ExportResult::kSuccess` Signed-off-by: WenTao Ou <admin@owent.net> Co-authored-by: Ehsan Saei <71217171+esigo@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lalit Kumar Bhasin <lalit_fin@yahoo.com> Co-authored-by: Tom Tan <Tom.Tan@microsoft.com> Co-authored-by: Ben Landrum <71329856+benlandrum@users.noreply.github.com> Co-authored-by: jmanjon <67091862+juandemanjon@users.noreply.github.com> Co-authored-by: Zsolt Bölöny <bolony.zsolt@gmail.com> Co-authored-by: Leo Di Donato <leodidonato@gmail.com> Co-authored-by: Reiley Yang <reyang@microsoft.com> Co-authored-by: Lalit Kumar Bhasin <labhas@microsoft.com> Co-authored-by: Hamed Mansouri <hamed0381@gmail.com> Co-authored-by: ztao <t@taozj.org> Co-authored-by: Flier Lu <flier@users.noreply.github.com> Co-authored-by: Marc Alff <marc.alff@free.fr> Co-authored-by: Marc Alff <marc.alff@oracle.com> Co-authored-by: univisionsrl <31103417+univisionsrl@users.noreply.github.com>

owent requested a review from a team May 8, 2022 06:43

owent changed the title ~~Upgrade proto to v0.17.0~~ Upgrade proto to v0.17.0, update log data model May 8, 2022

lalitb reviewed May 9, 2022

View reviewed changes

Comment thread api/include/opentelemetry/logs/logger.h Outdated

lalitb reviewed May 9, 2022

View reviewed changes

Comment thread .gitmodules Outdated

Comment thread exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h Outdated

owent force-pushed the upgrade-proto-to-v0.17.0 branch from 7380136 to 3619762 Compare May 10, 2022 07:50

lalitb approved these changes May 11, 2022

View reviewed changes

Comment thread exporters/otlp/src/otlp_log_recordable.cc Outdated

owent force-pushed the upgrade-proto-to-v0.17.0 branch from c209115 to 809e1eb Compare May 11, 2022 09:15

ThomsonTan reviewed May 12, 2022

View reviewed changes

owent force-pushed the upgrade-proto-to-v0.17.0 branch 2 times, most recently from 8b8f0f1 to 564e8b8 Compare May 13, 2022 04:20

ThomsonTan approved these changes May 13, 2022

View reviewed changes

owent force-pushed the upgrade-proto-to-v0.17.0 branch from e80ac98 to 2ae41fd Compare May 13, 2022 11:46

owent force-pushed the upgrade-proto-to-v0.17.0 branch from 2ae41fd to 70b14f1 Compare May 16, 2022 16:27

owent added 11 commits May 17, 2022 10:30

Upgrade proto to v0.17.0 and update logs data-module

0d6c9a4

Signed-off-by: owent <admin@owent.net>

Fix style

325965e

Signed-off-by: owent <admin@owent.net>

Add changlog

e34ea0a

Signed-off-by: owent <admin@owent.net>

Add --experimental_allow_proto3_optional to protoc to support `opti…

1ddfd4d

…onal` keyword in `proto3` Signed-off-by: owent <admin@owent.net>

Restore Logger APIs with name

ede2997

Signed-off-by: owent <admin@owent.net>

Allow deprecated-declarations for logger

7ee5879

Signed-off-by: owent <admin@owent.net>

-Wdeprecated-declarations can not be changed by pragma diagnostic

7cd674a

Signed-off-by: owent <admin@owent.net>

Move likely into macros.h

a8ab87b

Signed-off-by: owent <admin@owent.net>

Update likely usage.

5ab9e96

Put a link to the spec here instead of copy the text. Signed-off-by: owent <admin@owent.net>

Fix format

607a060

Signed-off-by: owent <admin@owent.net>

Fix compatibility of OPENTELEMETRY_LIKELY_IF

e693959

Signed-off-by: owent <admin@owent.net>

owent force-pushed the upgrade-proto-to-v0.17.0 branch from 70b14f1 to e693959 Compare May 17, 2022 02:31

lalitb merged commit 280f546 into open-telemetry:main May 17, 2022

owent deleted the upgrade-proto-to-v0.17.0 branch May 17, 2022 06:26

lalitb mentioned this pull request Jun 1, 2022

Review logger Implementation for the stable log data model. #1291

Closed

owent mentioned this pull request Jun 30, 2022

Missing value for flag: --experimental_allow_proto3_optional #1442

Closed

maxgolov mentioned this pull request Jun 30, 2022

Address spec compliance issue (SetName method is deprecated and removed) open-telemetry/opentelemetry-cpp-contrib#183

Merged

owent mentioned this pull request Nov 21, 2022

New LogRecord and Recordable implementations. #1766

Merged

3 tasks

Navigation Menu

Uh oh!

Upgrade proto to v0.17.0, update log data model - #1383

Upgrade proto to v0.17.0, update log data model#1383
lalitb merged 11 commits into
open-telemetry:mainfrom
owent:upgrade-proto-to-v0.17.0

owent commented May 8, 2022 •

edited

Loading

Uh oh!

codecov Bot commented May 8, 2022 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lalitb left a comment

Uh oh!

Uh oh!

ThomsonTan May 12, 2022

Uh oh!

owent May 13, 2022

Uh oh!

lalitb commented May 16, 2022

Uh oh!

owent commented May 17, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

owent commented May 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Uh oh!

codecov Bot commented May 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lalitb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ThomsonTan May 12, 2022

Choose a reason for hiding this comment

Uh oh!

owent May 13, 2022

Choose a reason for hiding this comment

Uh oh!

lalitb commented May 16, 2022

Uh oh!

owent commented May 17, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

owent commented May 8, 2022 •

edited

Loading

codecov Bot commented May 8, 2022 •

edited

Loading