pyrox.dev
opentelemetry-cpp: update versions. 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>
+26
-20
pkgs/by-name/op/opentelemetry-cpp/0001-Disable-tests-requiring-network-access.patch
+26
-20
pkgs/by-name/op/opentelemetry-cpp/0001-Disable-tests-requiring-network-access.patch
···
1
diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
2
-
index 7c66d98b..62d40f49 100644
3
--- a/ext/test/http/curl_http_test.cc
4
+++ b/ext/test/http/curl_http_test.cc
5
-
@@ -229,7 +229,7 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
6
ASSERT_EQ(count, 4);
7
}
8
···
11
{
12
received_requests_.clear();
13
auto session_manager = http_client::HttpClientFactory::Create();
14
-
@@ -246,7 +246,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequest)
15
-
ASSERT_TRUE(handler->got_response_);
16
}
17
18
-TEST_F(BasicCurlHttpTests, SendPostRequest)
···
20
{
21
received_requests_.clear();
22
auto session_manager = http_client::HttpClientFactory::Create();
23
-
@@ -325,7 +325,7 @@ TEST_F(BasicCurlHttpTests, CurlHttpOperations)
24
-
delete handler;
25
}
26
27
-
-TEST_F(BasicCurlHttpTests, SendGetRequestSync)
28
-
+TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestSync)
29
{
30
received_requests_.clear();
31
-
curl::HttpClientSync http_client;
32
-
@@ -336,7 +336,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSync)
33
-
EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
34
}
35
36
-
-TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
37
-
+TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestSyncTimeout)
38
{
39
received_requests_.clear();
40
curl::HttpClientSync http_client;
41
-
@@ -350,7 +350,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
42
result.GetSessionState() == http_client::SessionState::SendFailed);
43
}
44
···
47
{
48
received_requests_.clear();
49
curl::HttpClientSync http_client;
50
-
@@ -378,7 +378,7 @@ TEST_F(BasicCurlHttpTests, GetBaseUri)
51
"http://127.0.0.1:31339/");
52
}
53
···
56
{
57
curl::HttpClient http_client;
58
59
-
@@ -452,7 +452,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
60
}
61
}
62
···
65
{
66
curl::HttpClient http_client;
67
68
-
@@ -491,7 +491,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
69
}
70
}
71
···
74
{
75
curl::HttpClient http_client;
76
77
-
--
78
-
2.40.1
79
-
···
1
diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
2
+
index e8299202..19dbd7b1 100644
3
--- a/ext/test/http/curl_http_test.cc
4
+++ b/ext/test/http/curl_http_test.cc
5
+
@@ -270,7 +270,7 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
6
ASSERT_EQ(count, 4);
7
}
8
···
11
{
12
received_requests_.clear();
13
auto session_manager = http_client::HttpClientFactory::Create();
14
+
@@ -287,7 +287,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequest)
15
+
ASSERT_TRUE(handler->got_response_.load(std::memory_order_acquire));
16
}
17
18
-TEST_F(BasicCurlHttpTests, SendPostRequest)
···
20
{
21
received_requests_.clear();
22
auto session_manager = http_client::HttpClientFactory::Create();
23
+
@@ -313,7 +313,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequest)
24
+
session_manager->FinishAllSessions();
25
}
26
27
+
-TEST_F(BasicCurlHttpTests, RequestTimeout)
28
+
+TEST_F(BasicCurlHttpTests, DISABLED_RequestTimeout)
29
{
30
received_requests_.clear();
31
+
auto session_manager = http_client::HttpClientFactory::Create();
32
+
@@ -442,7 +442,7 @@ TEST_F(BasicCurlHttpTests, ExponentialBackoffRetry)
33
}
34
+
#endif // ENABLE_OTLP_RETRY_PREVIEW
35
36
+
-TEST_F(BasicCurlHttpTests, SendGetRequestSync)
37
+
+TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestSync)
38
{
39
received_requests_.clear();
40
curl::HttpClientSync http_client;
41
+
@@ -467,7 +467,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
42
result.GetSessionState() == http_client::SessionState::SendFailed);
43
}
44
···
47
{
48
received_requests_.clear();
49
curl::HttpClientSync http_client;
50
+
@@ -495,7 +495,7 @@ TEST_F(BasicCurlHttpTests, GetBaseUri)
51
"http://127.0.0.1:31339/");
52
}
53
···
56
{
57
curl::HttpClient http_client;
58
59
+
@@ -570,7 +570,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
60
}
61
}
62
···
65
{
66
curl::HttpClient http_client;
67
68
+
@@ -609,7 +609,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
69
}
70
}
71
···
74
{
75
curl::HttpClient http_client;
76
77
+
@@ -647,7 +647,7 @@ TEST_F(BasicCurlHttpTests, FinishInAsyncCallback)
78
+
}
79
+
}
80
+
81
+
-TEST_F(BasicCurlHttpTests, ElegantQuitQuick)
82
+
+TEST_F(BasicCurlHttpTests, DISABLED_ElegantQuitQuick)
83
+
{
84
+
auto http_client = http_client::HttpClientFactory::Create();
85
+
std::static_pointer_cast<curl::HttpClient>(http_client)->MaybeSpawnBackgroundThread();
+6
-9
pkgs/by-name/op/opentelemetry-cpp/package.nix
+6
-9
pkgs/by-name/op/opentelemetry-cpp/package.nix
···
2
lib,
3
stdenv,
4
fetchFromGitHub,
5
-
abseil-cpp,
6
cmake,
7
gtest,
8
protobuf,
···
22
opentelemetry-proto = fetchFromGitHub {
23
owner = "open-telemetry";
24
repo = "opentelemetry-proto";
25
-
rev = "v1.3.2";
26
-
hash = "sha256-bkVqPSVhyMHrmFvlI9DTAloZzDozj3sefIEwfW7OVrI=";
27
};
28
in
29
stdenv.mkDerivation (finalAttrs: {
30
pname = "opentelemetry-cpp";
31
-
version = "1.16.1";
32
33
src = fetchFromGitHub {
34
owner = "open-telemetry";
35
repo = "opentelemetry-cpp";
36
rev = "v${finalAttrs.version}";
37
-
hash = "sha256-31zwIZ4oehhfn+oCyg8VQTurPOmdgp72plH1Pf/9UKQ=";
38
};
39
40
patches = [
···
49
];
50
51
propagatedBuildInputs =
52
-
[ abseil-cpp ]
53
-
++
54
lib.optionals (enableGrpc || enableHttp) [ protobuf ]
55
++ lib.optionals enableGrpc [
56
grpc
···
89
];
90
91
postInstall = ''
92
-
substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-target.cmake \
93
-
--replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include"
94
'';
95
96
passthru.updateScript = nix-update-script { };
···
2
lib,
3
stdenv,
4
fetchFromGitHub,
5
cmake,
6
gtest,
7
protobuf,
···
21
opentelemetry-proto = fetchFromGitHub {
22
owner = "open-telemetry";
23
repo = "opentelemetry-proto";
24
+
rev = "v1.5.0";
25
+
hash = "sha256-PkG0npG3nKQwq6SxWdIliIQ/wrYAOG9qVb26IeVkBfc=";
26
};
27
in
28
stdenv.mkDerivation (finalAttrs: {
29
pname = "opentelemetry-cpp";
30
+
version = "1.20.0";
31
32
src = fetchFromGitHub {
33
owner = "open-telemetry";
34
repo = "opentelemetry-cpp";
35
rev = "v${finalAttrs.version}";
36
+
hash = "sha256-ibLuHIg01wGYPhLRz+LVYA34WaWzlUlNtg7DSONLe9g=";
37
};
38
39
patches = [
···
48
];
49
50
propagatedBuildInputs =
51
lib.optionals (enableGrpc || enableHttp) [ protobuf ]
52
++ lib.optionals enableGrpc [
53
grpc
···
86
];
87
88
postInstall = ''
89
+
substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp*-target.cmake \
90
+
--replace-quiet "\''${_IMPORT_PREFIX}/include" "$dev/include"
91
'';
92
93
passthru.updateScript = nix-update-script { };