Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[opentelemetry-cpp] Update to 1.13.0 #35996

Merged

Conversation

waywardmonkeys
Copy link
Contributor

The patch to add a dependency of opentelemetry-proto on gRPC should not be needed after the upstream changes in:

open-telemetry/opentelemetry-cpp#2268

Additionally, the "zpages" feature is removed as it is no longer present upstream after having been deprecated in a previous release.

Fixes #35992.

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

Might be best to have this reviewed by someone that uses this more or who knows more about the upstream.

@jimwang118 jimwang118 added the category:port-update The issue is with a library, which is requesting update new revision label Jan 3, 2024
@jimwang118
Copy link
Contributor

I used the following command locally: .\vcpkg.exe install opentelemetry-cpp[*] when testing the feature installation, the following error occurred.

F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(61): error C2589: '(': illegal token on right side of '::'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(61): error C2059: syntax error: ')'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(70): warning C4003: not enough arguments for function-like macro invocation 'max'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(70): error C2589: '(': illegal token on right side of '::'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(70): error C2059: syntax error: ')'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(61): error C2062: type 'unknown-type' unexpected
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(61): error C2059: syntax error: ')'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(70): error C2059: syntax error: 'default argument'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(70): error C2059: syntax error: ')'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(89): error C2059: syntax error: 'member initializer'
F:\opentelemetry-cpp\buildtrees\opentelemetry-cpp\src\v1.13.0-18976a2470.clean\exporters\otlp\include\opentelemetry/exporters/otlp/otlp_grpc_exporter.h(92): error C2059: syntax error: 

install-x64-windows-dbg-out.log

@jimwang118 jimwang118 marked this pull request as draft January 3, 2024 02:53
@jimwang118
Copy link
Contributor

Note: I will be converting your PR to draft status. The above suggested changes are only recommendations. If you are willing to adopt them, please click "ready for review" after making the modifications. If you do not wish to make any changes, please click "ready for review" directly. That way, I can be aware that you've responded since you can't modify the tags.

@waywardmonkeys waywardmonkeys force-pushed the update-opentelemetry-cpp branch from 3d28760 to 49c6e13 Compare January 4, 2024 18:15
@waywardmonkeys waywardmonkeys marked this pull request as ready for review January 4, 2024 18:15
@waywardmonkeys
Copy link
Contributor Author

@jimwang118 This error was because of a change in opentelemetry-cpp 1.13 that stopped defining NOMINMAX on Windows and the fixes to Open Telemetry included in 1.13 were insufficient. There was a PR submitted and I've included that patch here which should fix the problem that you identified.

The patch to add a dependency of opentelemetry-proto on gRPC should
not be needed after the upstream changes in:

open-telemetry/opentelemetry-cpp#2268

Additionally, the "zpages" feature is removed as it is no longer
present upstream after having been deprecated in a previous release.

A patch is added extracted from open-telemetry/opentelemetry-cpp#2475
and open-telemetry/opentelemetry-cpp#2449
which fix problems that arose after `NOMINMAX` was no longer
defined within opentelemetry-cpp on Windows.

Fixes microsoft#35992.
@waywardmonkeys waywardmonkeys force-pushed the update-opentelemetry-cpp branch from 49c6e13 to a3937b6 Compare January 4, 2024 19:14
@waywardmonkeys
Copy link
Contributor Author

Updated again to include open-telemetry/opentelemetry-cpp#2449 to fix one more NOMINMAX problem.

@jimwang118
Copy link
Contributor

All features passed with following triplets:

x86-windows
x64-windows

@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Jan 5, 2024
@BillyONeal
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@BillyONeal
Copy link
Member

The android build lab appears to be broken and I only made whitespace changes so I'll merge this if all other platforms come back OK

@BillyONeal BillyONeal merged commit ce46ba8 into microsoft:master Jan 5, 2024
10 of 15 checks passed
@waywardmonkeys waywardmonkeys deleted the update-opentelemetry-cpp branch January 6, 2024 11:55
Osyotr pushed a commit to Osyotr/vcpkg that referenced this pull request Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[opentelemetry-cpp] update to 1.13.0
3 participants