gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opentelemetry-cpp: update versions.

Browse Source 
opentelemetry-proto 1.3.2 -> 1.5.0 https://github.com/open-telemetry/opentelemetry-proto/compare/v1.3.2...v1.5.0
opentelemetry 1.16.1 -> 1.20.0 https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.16.1...v1.20.0

Co-authored-by: panicgh <79252025+panicgh@users.noreply.github.com>
This commit is contained in:
Kimberly Swanson
2025-06-23 22:06:08 +01:00
co-authored by panicgh
parent bffdfc2327
commit 58f9fdb692
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/op/opentelemetry-cpp/0001-Disable-tests-requiring-network-access.patch
+28 -22
View File
@@ -1,8 +1,8 @@
diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
index 7c66d98b..62d40f49 100644
index e8299202..19dbd7b1 100644
--- a/ext/test/http/curl_http_test.cc
+++ b/ext/test/http/curl_http_test.cc
@@ -229,7 +229,7 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
@@ -270,7 +270,7 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
ASSERT_EQ(count, 4);
}
@@ -11,8 +11,8 @@ index 7c66d98b..62d40f49 100644
{
received_requests_.clear();
auto session_manager = http_client::HttpClientFactory::Create();
@@ -246,7 +246,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequest)
ASSERT_TRUE(handler->got_response_);
@@ -287,7 +287,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequest)
ASSERT_TRUE(handler->got_response_.load(std::memory_order_acquire));
}
-TEST_F(BasicCurlHttpTests, SendPostRequest)
@@ -20,25 +20,25 @@ index 7c66d98b..62d40f49 100644
{
received_requests_.clear();
auto session_manager = http_client::HttpClientFactory::Create();
@@ -325,7 +325,7 @@ TEST_F(BasicCurlHttpTests, CurlHttpOperations)
delete handler;
@@ -313,7 +313,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequest)
session_manager->FinishAllSessions();
}
-TEST_F(BasicCurlHttpTests, RequestTimeout)
+TEST_F(BasicCurlHttpTests, DISABLED_RequestTimeout)
{
received_requests_.clear();
auto session_manager = http_client::HttpClientFactory::Create();
@@ -442,7 +442,7 @@ TEST_F(BasicCurlHttpTests, ExponentialBackoffRetry)
}
#endif // ENABLE_OTLP_RETRY_PREVIEW
-TEST_F(BasicCurlHttpTests, SendGetRequestSync)
+TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestSync)
{
received_requests_.clear();
curl::HttpClientSync http_client;
@@ -336,7 +336,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSync)
EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
}
-TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
+TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestSyncTimeout)
{
received_requests_.clear();
curl::HttpClientSync http_client;
@@ -350,7 +350,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
@@ -467,7 +467,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
result.GetSessionState() == http_client::SessionState::SendFailed);
}
@@ -47,7 +47,7 @@ index 7c66d98b..62d40f49 100644
{
received_requests_.clear();
curl::HttpClientSync http_client;
@@ -378,7 +378,7 @@ TEST_F(BasicCurlHttpTests, GetBaseUri)
@@ -495,7 +495,7 @@ TEST_F(BasicCurlHttpTests, GetBaseUri)
"http://127.0.0.1:31339/");
}
@@ -56,7 +56,7 @@ index 7c66d98b..62d40f49 100644
{
curl::HttpClient http_client;
@@ -452,7 +452,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
@@ -570,7 +570,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
}
}
@@ -65,7 +65,7 @@ index 7c66d98b..62d40f49 100644
{
curl::HttpClient http_client;
@@ -491,7 +491,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
@@ -609,7 +609,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
}
}
@@ -74,6 +74,12 @@ index 7c66d98b..62d40f49 100644
{
curl::HttpClient http_client;
--
2.40.1
@@ -647,7 +647,7 @@ TEST_F(BasicCurlHttpTests, FinishInAsyncCallback)
}
}
-TEST_F(BasicCurlHttpTests, ElegantQuitQuick)
+TEST_F(BasicCurlHttpTests, DISABLED_ElegantQuitQuick)
{
auto http_client = http_client::HttpClientFactory::Create();
std::static_pointer_cast<curl::HttpClient>(http_client)->MaybeSpawnBackgroundThread();
pkgs/by-name/op/opentelemetry-cpp/package.nix
+6 -9
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
abseil-cpp,
cmake,
gtest,
protobuf,
@@ -22,19 +21,19 @@ let
opentelemetry-proto = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-proto";
rev = "v1.3.2";
hash = "sha256-bkVqPSVhyMHrmFvlI9DTAloZzDozj3sefIEwfW7OVrI=";
rev = "v1.5.0";
hash = "sha256-PkG0npG3nKQwq6SxWdIliIQ/wrYAOG9qVb26IeVkBfc=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "opentelemetry-cpp";
version = "1.16.1";
version = "1.20.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-cpp";
rev = "v${finalAttrs.version}";
hash = "sha256-31zwIZ4oehhfn+oCyg8VQTurPOmdgp72plH1Pf/9UKQ=";
hash = "sha256-ibLuHIg01wGYPhLRz+LVYA34WaWzlUlNtg7DSONLe9g=";
};
patches = [
@@ -49,8 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
];
propagatedBuildInputs =
[ abseil-cpp ]
++
lib.optionals (enableGrpc || enableHttp) [ protobuf ]
++ lib.optionals enableGrpc [
grpc
@@ -89,8 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
];
postInstall = ''
substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-target.cmake \
--replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include"
substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp*-target.cmake \
--replace-quiet "\''${_IMPORT_PREFIX}/include" "$dev/include"
'';
passthru.updateScript = nix-update-script { };