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: fix visibility of protobuf and gRPC headers #19793

Closed
wants to merge 1 commit into from
Closed

opentelemetry-cpp: fix visibility of protobuf and gRPC headers #19793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions recipes/opentelemetry-cpp/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,28 +96,28 @@
self.requires("abseil/20220623.0", transitive_headers=True)

if self.options.with_otlp:
self.requires("protobuf/3.21.9")
self.requires("protobuf/3.21.9", transitive_headers=True)
if Version(self.version) <= "1.4.1":
self.requires("opentelemetry-proto/0.11.0")
else:
self.requires("opentelemetry-proto/0.20.0")

if self.options.get_safe("with_otlp_grpc"):
self.requires("grpc/1.50.1")
self.requires("grpc/1.50.1", transitive_headers=True)

if (self.options.with_zipkin or
self.options.with_elasticsearch or
self.options.get_safe("with_otlp_http") or
self.options.with_etw
):
self.requires("nlohmann_json/3.11.2")

Check warning on line 113 in recipes/opentelemetry-cpp/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Bad indentation. Found 11 spaces, expected 12
self.requires("openssl/[>=1.1 <4]")

Check warning on line 114 in recipes/opentelemetry-cpp/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Bad indentation. Found 11 spaces, expected 12

if (self.options.with_zipkin or
self.options.with_elasticsearch or
self.options.get_safe("with_otlp_http")
):
self.requires("libcurl/8.1.1")

Check warning on line 120 in recipes/opentelemetry-cpp/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Bad indentation. Found 11 spaces, expected 12

if self.options.with_prometheus:
self.requires("prometheus-cpp/1.1.0")
Expand Down