File: remove-tracing.patch

package info (click to toggle)
rust-quinn 0.11.9-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 676 kB
  • sloc: makefile: 2
file content (319 lines) | stat: -rw-r--r-- 8,745 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -225,21 +225,20 @@
     "macros",
 ]
 
-[dev-dependencies.tracing-futures]
-version = "0.2.0"
-features = ["std-future"]
-default-features = false
-
-[dev-dependencies.tracing-subscriber]
-version = "0.3.0"
-features = [
-    "env-filter",
-    "fmt",
-    "ansi",
-    "time",
-    "local-time",
-]
-default-features = false
+#[dev-dependencies.tracing-futures]
+#version = "0.2.0"
+#features = ["std-future"]
+#default-features = false
+#
+#[dev-dependencies.tracing-subscriber]
+#version = "0.3.0"
+#features = [
+#    "fmt",
+#    "ansi",
+#    "time",
+#    "local-time",
+#]
+#default-features = false
 
 [dev-dependencies.url]
 version = "2"
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -7,8 +7,8 @@
 use bencher::{Bencher, benchmark_group, benchmark_main};
 use rustls::pki_types::{CertificateDer, PrivatePkcs8KeyDer};
 use tokio::runtime::{Builder, Runtime};
-use tracing::error_span;
-use tracing_futures::Instrument as _;
+//use tracing::error_span;
+//use tracing_futures::Instrument as _;
 
 use quinn::{Endpoint, TokioRuntime};
 
@@ -38,7 +38,7 @@
 }
 
 fn send_data(bench: &mut Bencher, data: &'static [u8], concurrent_streams: usize) {
-    let _ = tracing_subscriber::fmt::try_init();
+    //let _ = tracing_subscriber::fmt::try_init();
 
     let ctx = Context::new();
     let (addr, thread) = ctx.spawn_server();
@@ -132,7 +132,7 @@
                         });
                     }
                 }
-                .instrument(error_span!("server")),
+                //.instrument(error_span!("server")),
             );
             runtime.block_on(handle).unwrap();
         });
@@ -153,7 +153,7 @@
                 endpoint
                     .connect_with(self.client_config.clone(), server_addr, "localhost")
                     .unwrap()
-                    .instrument(error_span!("client"))
+                    //.instrument(error_span!("client"))
                     .await
             })
             .unwrap();
--- a/examples/client.rs
+++ b/examples/client.rs
@@ -48,12 +48,12 @@
 }
 
 fn main() {
-    tracing::subscriber::set_global_default(
+    /*tracing::subscriber::set_global_default(
         tracing_subscriber::FmtSubscriber::builder()
             .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
             .finish(),
     )
-    .unwrap();
+    .unwrap();*/
     let opt = Opt::parse();
     let code = {
         if let Err(e) = run(opt) {
--- a/examples/server.rs
+++ b/examples/server.rs
@@ -15,7 +15,7 @@
 use proto::crypto::rustls::QuicServerConfig;
 use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
 use tracing::{error, info, info_span};
-use tracing_futures::Instrument as _;
+//use tracing_futures::Instrument as _;
 
 mod common;
 
@@ -48,12 +48,12 @@
 }
 
 fn main() {
-    tracing::subscriber::set_global_default(
+    /*tracing::subscriber::set_global_default(
         tracing_subscriber::FmtSubscriber::builder()
             .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
             .finish(),
     )
-    .unwrap();
+    .unwrap();*/
     let opt = Opt::parse();
     let code = {
         if let Err(e) = run(opt) {
@@ -199,11 +199,11 @@
                         error!("failed: {reason}", reason = e.to_string());
                     }
                 }
-                .instrument(info_span!("request")),
+                //.instrument(info_span!("request")),
             );
         }
     }
-    .instrument(span)
+    //.instrument(span)
     .await?;
     Ok(())
 }
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -24,14 +24,14 @@
 };
 use tokio::runtime::{Builder, Runtime};
 use tracing::{error_span, info};
-use tracing_futures::Instrument as _;
-use tracing_subscriber::EnvFilter;
+// use tracing_futures::Instrument as _;
+// use tracing_subscriber::EnvFilter;
 
 use super::{ClientConfig, Endpoint, EndpointConfig, RecvStream, SendStream, TransportConfig};
 
 #[test]
 fn handshake_timeout() {
-    let _guard = subscribe();
+    // let _guard = subscribe();
     let runtime = rt_threaded();
     let client = {
         let _guard = runtime.enter();
@@ -73,7 +73,7 @@
 
 #[tokio::test]
 async fn close_endpoint() {
-    let _guard = subscribe();
+    // let _guard = subscribe();
 
     // Avoid NoRootAnchors error
     let cert = rcgen::generate_simple_self_signed(vec!["localhost".into()]).unwrap();
@@ -130,7 +130,7 @@
 
 #[test]
 fn read_after_close() {
-    let _guard = subscribe();
+    //let _guard = subscribe();
     let runtime = rt_basic();
     let endpoint = {
         let _guard = runtime.enter();
@@ -167,7 +167,7 @@
 
 #[test]
 fn export_keying_material() {
-    let _guard = subscribe();
+    //let _guard = subscribe();
     let runtime = rt_basic();
     let endpoint = {
         let _guard = runtime.enter();
@@ -212,7 +212,7 @@
 
 #[tokio::test]
 async fn ip_blocking() {
-    let _guard = subscribe();
+    // let _guard = subscribe();
     let endpoint_factory = EndpointFactory::new();
     let client_1 = endpoint_factory.endpoint();
     let client_1_addr = client_1.local_addr().unwrap();
@@ -307,7 +307,7 @@
 
 #[tokio::test]
 async fn zero_rtt() {
-    let _guard = subscribe();
+    //let _guard = subscribe();
     let endpoint = endpoint();
 
     const MSG0: &[u8] = b"zero";
@@ -471,7 +471,7 @@
 }
 
 fn run_echo(args: EchoArgs) {
-    let _guard = subscribe();
+    //let _guard = subscribe();
     let runtime = rt_basic();
     let handle = {
         // Use small receive windows
@@ -589,7 +589,7 @@
                 new_conn.close(0u32.into(), b"done");
                 client.wait_idle().await;
             }
-            .instrument(error_span!("client")),
+            // .instrument(error_span!("client")),
         );
         handle
     };
@@ -640,13 +640,13 @@
     buf
 }
 
-fn subscribe() -> tracing::subscriber::DefaultGuard {
+/*fn subscribe() -> tracing::subscriber::DefaultGuard {
     let sub = tracing_subscriber::FmtSubscriber::builder()
         .with_env_filter(EnvFilter::from_default_env())
         .with_writer(|| TestWriter)
         .finish();
     tracing::subscriber::set_default(sub)
-}
+}*/
 
 struct TestWriter;
 
@@ -673,7 +673,7 @@
 
 #[tokio::test]
 async fn rebind_recv() {
-    let _guard = subscribe();
+    //let _guard = subscribe();
 
     let cert = rcgen::generate_simple_self_signed(vec!["localhost".into()]).unwrap();
     let key = PrivatePkcs8KeyDer::from(cert.signing_key.serialize_der());
@@ -743,7 +743,7 @@
 
 #[tokio::test]
 async fn stream_id_flow_control() {
-    let _guard = subscribe();
+    //let _guard = subscribe();
     let mut cfg = TransportConfig::default();
     cfg.max_concurrent_uni_streams(1u32.into());
     let endpoint = endpoint_with_config(cfg);
@@ -777,7 +777,7 @@
 
 #[tokio::test]
 async fn two_datagram_readers() {
-    let _guard = subscribe();
+    //let _guard = subscribe();
     let endpoint = endpoint();
 
     let (client, server) = tokio::join!(
@@ -813,7 +813,7 @@
 
 #[tokio::test]
 async fn multiple_conns_with_zero_length_cids() {
-    let _guard = subscribe();
+    // let _guard = subscribe();
     let mut factory = EndpointFactory::new();
     factory
         .endpoint_config
@@ -840,8 +840,8 @@
             .await
             .unwrap();
         conn.closed().await;
-    }
-    .instrument(error_span!("client1"));
+    };
+    // .instrument(error_span!("client1"));
     let client2 = async move {
         let conn = client2
             .connect(server_addr, "localhost")
@@ -849,16 +849,16 @@
             .await
             .unwrap();
         conn.closed().await;
-    }
-    .instrument(error_span!("client2"));
+    };
+    // .instrument(error_span!("client2"));
     let server = async move {
         let client1 = server.accept().await.unwrap().await.unwrap();
         let client2 = server.accept().await.unwrap().await.unwrap();
         // Both connections are now concurrently live.
         client1.close(42u32.into(), &[]);
         client2.close(42u32.into(), &[]);
-    }
-    .instrument(error_span!("server"));
+    };
+    // .instrument(error_span!("server"));
     tokio::join!(client1, client2, server);
 }
 
--- a/tests/many_connections.rs
+++ b/tests/many_connections.rs
@@ -19,12 +19,11 @@
 #[test]
 #[ignore]
 fn connect_n_nodes_to_1_and_send_1mb_data() {
-    tracing::subscriber::set_global_default(
+    /*tracing::subscriber::set_global_default(
         tracing_subscriber::FmtSubscriber::builder()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
             .finish(),
     )
-    .unwrap();
+    .unwrap();*/
 
     let runtime = Builder::new_current_thread().enable_all().build().unwrap();
     let _guard = runtime.enter();