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.

Sign up for GitHub

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

Jump to bottom

[opentelemetry-cpp] remove curl as dependency to core feature #36463

Merged
merged 4 commits into from
Feb 1, 2024
Merged

[opentelemetry-cpp] remove curl as dependency to core feature #36463

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
562455b
[opentelemetry-cpp] remove curl as dependency to core feature
ThomsonTan Jan 30, 2024
5721b01
Pick up fix from contrib repo
ThomsonTan Jan 31, 2024
6454a43
Merge branch 'master' into remove_curl_for_geneva
ThomsonTan Feb 1, 2024
d4b381c
Update commit hash
ThomsonTan Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/opentelemetry-cpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if(WITH_GENEVA)
vcpkg_from_github(
OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
REPO open-telemetry/opentelemetry-cpp-contrib
REF bf3e3833498d45865f85423764f0d98372fe5646
REF d3ccb2a1ac0e539a147e2bcd8d1c9183e90aa98e
JonLiu1993 marked this conversation as resolved.
Show resolved Hide resolved
HEAD_REF main
SHA512 d8468997f8d2545d3bb230fd6c8072d70f6842020e9b6ac9cd7725d4c9e728f307618943c96af9cf9116ea2952c1e225e5dd3d4cf829644ad4f1f4c74dd14a0c
)
Expand Down
3 changes: 1 addition & 2 deletions ports/opentelemetry-cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "opentelemetry-cpp",
"version-semver": "1.13.0",
"port-version": 2,
"port-version": 4,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"port-version": 4,
"port-version": 3,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant to merge this after after below PR which updates the same port.

#36378

"description": [
"OpenTelemetry is a collection of tools, APIs, and SDKs.",
"You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior."
Expand All @@ -11,7 +11,6 @@
"license": "Apache-2.0",
"dependencies": [
"abseil",
"curl",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And could you explain why you deleted this dependency?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This dependency is not required for opentelemetry[core], and I aim to avoid building curl, as it is unnecessary and consumes build time.

"nlohmann-json",
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6418,7 +6418,7 @@
},
"opentelemetry-cpp": {
"baseline": "1.13.0",
"port-version": 2
"port-version": 4
},
"opentelemetry-fluentd": {
"baseline": "2.0.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opentelemetry-cpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1929ee572ae9a5381516b2408275d91b9145c512",
"version-semver": "1.13.0",
"port-version": 4
},
{
"git-tree": "34b7683811362c31ff5e3742dd47ee8a721817f0",
"version-semver": "1.13.0",
Expand Down
Loading