From c137a810b91e8f4d88cc7778a8fee42f78f4e828 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 22 Aug 2023 18:44:47 -0400 Subject: [PATCH 1/2] opentelemetry-cpp 1.11.0 - opentelemetry-cpp: unversioned grpc and protobuf - opentelemetry-cpp: depend on abseil; remove noop WITH_LOGS_PREVIEW=ON - opentemetry-cpp: define `HAVE_ABSEIL` in test Co-authored-by: Alexander Bayandin Co-authored-by: Ruoyu Zhong --- Formula/o/opentelemetry-cpp.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Formula/o/opentelemetry-cpp.rb b/Formula/o/opentelemetry-cpp.rb index 10218adbcac0b..4f57b89e9f0f4 100644 --- a/Formula/o/opentelemetry-cpp.rb +++ b/Formula/o/opentelemetry-cpp.rb @@ -1,9 +1,8 @@ class OpentelemetryCpp < Formula desc "OpenTelemetry C++ Client" homepage "https://opentelemetry.io/" - # TODO: Check if we can use unversioned `grpc` and `protobuf` at version bump. - url "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.10.0.tar.gz" - sha256 "19e8ade04a674c8cf7f0dc6da1f7b0583a27d2cf4dbc03df87894a16a4547834" + url "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.11.0.tar.gz" + sha256 "f30cd88bf898a5726d245eba882b8e81012021eb00df34109f4dfb203f005cea" license "Apache-2.0" head "https://github.com/open-telemetry/opentelemetry-cpp.git", branch: "main" @@ -18,11 +17,12 @@ class OpentelemetryCpp < Formula end depends_on "cmake" => :build + depends_on "abseil" depends_on "boost" - depends_on "grpc@1.54" + depends_on "grpc" depends_on "nlohmann-json" depends_on "prometheus-cpp" - depends_on "protobuf@21" + depends_on "protobuf" uses_from_macos "curl" def install @@ -34,10 +34,10 @@ def install "-DWITH_ELASTICSEARCH=ON", "-DWITH_EXAMPLES=OFF", "-DWITH_JAEGER=OFF", # deprecated, needs older `thrift` - "-DWITH_LOGS_PREVIEW=ON", "-DWITH_METRICS_PREVIEW=ON", "-DWITH_OTLP_GRPC=ON", "-DWITH_OTLP_HTTP=ON", + "-DWITH_ABSEIL=ON", "-DWITH_PROMETHEUS=ON", *std_cmake_args system "cmake", "--build", "build" @@ -72,10 +72,9 @@ def install auto scoped_span = trace_api::Scope(tracer->StartSpan("test")); } EOS - # Manual `protobuf` include can be removed when we depend on unversioned protobuf. system ENV.cxx, "test.cc", "-std=c++17", + "-DHAVE_ABSEIL", "-I#{include}", "-L#{lib}", - "-I#{Formula["protobuf@21"].opt_include}", "-lopentelemetry_resources", "-lopentelemetry_exporter_ostream_span", "-lopentelemetry_trace", From ea26d0e9c27e56207aefcaae2e3640621655b09d Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:02:05 +0000 Subject: [PATCH 2/2] opentelemetry-cpp: update 1.11.0 bottle. --- Formula/o/opentelemetry-cpp.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Formula/o/opentelemetry-cpp.rb b/Formula/o/opentelemetry-cpp.rb index 4f57b89e9f0f4..450539134dc76 100644 --- a/Formula/o/opentelemetry-cpp.rb +++ b/Formula/o/opentelemetry-cpp.rb @@ -7,13 +7,13 @@ class OpentelemetryCpp < Formula head "https://github.com/open-telemetry/opentelemetry-cpp.git", branch: "main" bottle do - sha256 cellar: :any, arm64_ventura: "de744b63cdd56736dc5009b45226b95d1b92777746c1694e2074ef3d296be357" - sha256 cellar: :any, arm64_monterey: "ce39b15daeaa4d969237e6cebc8a08e7db522132b2a37f845253b407363910eb" - sha256 cellar: :any, arm64_big_sur: "01e3bbe7ddb28bb37c8eb63c062e7e4e14511cffeb6e7eacc03a574389d91b19" - sha256 cellar: :any, ventura: "c774edb06f689c87c3234ec83fd207d04c3ba548604c0ecdda07ec94d1d99189" - sha256 cellar: :any, monterey: "8b348e4c0f7b23200c1e95609152c91f5abcff35dcff53f4575026ddb24d3793" - sha256 cellar: :any, big_sur: "0abfc2f525e2494e29389b6d497a830388334d41803df822c5c1515631c6a26d" - sha256 cellar: :any_skip_relocation, x86_64_linux: "71b52bdb1602500dd947ce4d6361cf6805e9f3d691bd4f8b2214ece5d1b2b053" + sha256 cellar: :any, arm64_ventura: "dc435c9bbd4583ff08854554b6245215b40b661c082b3c5c0f230b3dafc4558c" + sha256 cellar: :any, arm64_monterey: "63a9671fe464528d5a2af730be778f3e450b73da7db83002f79d0ba8439cd7f9" + sha256 cellar: :any, arm64_big_sur: "78fb3c8763298a483faa8f859fc26034d158ad47d99b49965c8f36b9e174851f" + sha256 cellar: :any, ventura: "fcb2d59c60d166704c55cc5b3c627859c65f1a7d26460b74f7d7aba7b39d1bd4" + sha256 cellar: :any, monterey: "b23369a0e70c2c5c362823908cd3ca7f1f93d32f7f266afa614f3c8d35320962" + sha256 cellar: :any, big_sur: "8b8e872513015404238581246fa1e5d3e4280f02594732a155de4e4f7c7094fc" + sha256 cellar: :any_skip_relocation, x86_64_linux: "3fdd9ba8444929984984567e99efa1999259bc7d6236e62ba0e68377d716733d" end depends_on "cmake" => :build