Skip to content

Commit d24038a

Browse files
lucemanslucemans
committed
Update tracing & url handling
1 parent ed29bd0 commit d24038a

File tree

14 files changed

+39
-63
lines changed

14 files changed

+39
-63
lines changed

‎engine/compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
services:
22
postgres:
33
image: postgres:17
4-
restart: always
54
environment:
65
POSTGRES_USER: postgres
76
POSTGRES_PASSWORD: postgres

‎engine/src/middlewares/tracing.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
use std::sync::Arc;
22

33
use opentelemetry::{
4-
global,
5-
trace::{Span, SpanKind, Tracer, TraceContextExt},
4+
trace::{Span, SpanKind, Tracer},
65
Context, Key, KeyValue,
76
};
8-
use opentelemetry_http::HeaderExtractor;
97
use opentelemetry_semantic_conventions::{attribute, resource};
108
use poem::{
119
http::HeaderValue,
@@ -16,6 +14,8 @@ use poem::{
1614
},
1715
Endpoint, FromRequest, IntoResponse, PathPattern, Request, Response, Result,
1816
};
17+
use tracing::{info_span, Instrument};
18+
1919

2020
/// Middleware that injects the OpenTelemetry trace ID into the response headers.
2121
#[derive(Default)]
@@ -103,6 +103,12 @@ where
103103
.with_kind(SpanKind::Server)
104104
.with_attributes(attributes)
105105
.start_with_context(&*self.tracer, &Context::new()); // Use a new blank context
106+
107+
// Luc testing tracing compat
108+
let uri = req.uri().to_string();
109+
let tracing_span = info_span!("request", method = method, uri = uri);
110+
// tracing_span.set_parent(span.span_context());
111+
let _guard = tracing_span.enter();
106112

107113
// Record request start event
108114
span.add_event("request.started".to_string(), vec![]);

‎engine/src/models/deployment/mod.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ impl Deployment {
6262
context: Option<String>,
6363
) -> Result<Self, sqlx::Error> {
6464
let span = info_span!("Deployment::new");
65-
span.set_parent(Context::current());
6665
let _guard = span.enter();
6766

6867
let deployment_id: String = generate_id(IdType::DEPLOYMENT);
@@ -91,7 +90,6 @@ impl Deployment {
9190
#[tracing::instrument(name = "upload_files", skip(self, state, file))]
9291
pub async fn upload_files(&self, state: &State, file: Vec<u8>) -> Result<(), sqlx::Error> {
9392
let span = info_span!("Deployment::upload_files");
94-
span.set_parent(Context::current());
9593
let _guard = span.enter();
9694

9795
// TODO: Read file stream, extract zip file (contains multiple files), upload each file to s3 at the correct relevant path relative to deployment.deployment_id + '/'
@@ -168,7 +166,6 @@ impl Deployment {
168166
cutoff_date: DateTime<Utc>,
169167
) -> Result<Vec<File>, sqlx::Error> {
170168
let span = info_span!("Deployment::cleanup_old_files");
171-
span.set_parent(Context::current());
172169
let _guard = span.enter();
173170

174171
tracing::info!("Checking for unused files before: {:?}", cutoff_date);
@@ -214,7 +211,6 @@ impl Deployment {
214211

215212
pub async fn get_by_id(db: &Database, deployment_id: &str) -> Result<Self, sqlx::Error> {
216213
let span = info_span!("Deployment::get_by_id");
217-
span.set_parent(Context::current());
218214
let _guard = span.enter();
219215

220216
query_as!(
@@ -263,7 +259,6 @@ impl Deployment {
263259

264260
pub async fn get_last_by_site_id(db: &Database, site_id: &str) -> Result<Self, sqlx::Error> {
265261
let span = info_span!("Deployment::get_last_by_site_id");
266-
span.set_parent(Context::current());
267262
let _guard = span.enter();
268263

269264
query_as!(
@@ -288,7 +283,6 @@ impl DeploymentFile {
288283
deployment_id: &str,
289284
) -> Result<Vec<DeploymentFileEntry>, sqlx::Error> {
290285
let span = info_span!("DeploymentFile::get_deployment_files");
291-
span.set_parent(Context::current());
292286
let _guard = span.enter();
293287

294288
query_as!(
@@ -314,7 +308,6 @@ impl DeploymentFile {
314308

315309
pub async fn get_file_by_path(db: &Database, deployment_id: &str, path: &str) -> Result<DeploymentFileEntry, sqlx::Error> {
316310
let span = info_span!("DeploymentFile::get_file_by_path");
317-
span.set_parent(Context::current());
318311
let _guard = span.enter();
319312

320313
query_as!(

‎engine/src/models/deployment/preview.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub struct DeploymentPreview {
2121
impl DeploymentPreview {
2222
pub async fn get_by_deployment_id(db: &Database, site_id: &str, deployment_id: &str) -> Result<Vec<Self>, sqlx::Error> {
2323
let span = info_span!("DeploymentPreview::get_by_deployment_id");
24-
span.set_parent(Context::current());
24+
// span.set_parent(Context::current());
2525
let _guard = span.enter();
2626

2727
let rows = sqlx::query_as!(
@@ -38,7 +38,7 @@ impl DeploymentPreview {
3838

3939
pub async fn get_by_deployment_id_public(state: &State, site_id: &str, deployment_id: &str) -> Result<Vec<Self>, sqlx::Error> {
4040
let span = info_span!("DeploymentPreview::get_by_deployment_id_public");
41-
span.set_parent(Context::current());
41+
// span.set_parent(Context::current());
4242
let _guard = span.enter();
4343

4444
let mut rows = DeploymentPreview::get_by_deployment_id(&state.database, site_id, deployment_id).await?;

‎engine/src/models/domain/mod.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ impl Domain {
2323
state: &State,
2424
) -> Result<Vec<Domain>, Error> {
2525
let span = info_span!("Domain::get_soft_overlap");
26-
span.set_parent(Context::current());
2726
let _guard = span.enter();
2827

2928
let overlap = if domain.starts_with("*.") {
@@ -51,7 +50,6 @@ impl Domain {
5150
state: &State,
5251
) -> Result<Vec<DomainSubmission>, Error> {
5352
let span = info_span!("Domain::get_by_site_id");
54-
span.set_parent(Context::current());
5553
let _guard = span.enter();
5654

5755
let mut domains: Vec<Domain> =
@@ -84,7 +82,6 @@ impl Domain {
8482
state: &State,
8583
) -> Result<Option<Domain>, Error> {
8684
let span = info_span!("Domain::get_by_site_id_and_domain");
87-
span.set_parent(Context::current());
8885
let _guard = span.enter();
8986

9087
let domain = sqlx::query_as!(
@@ -105,7 +102,6 @@ impl Domain {
105102
state: &State,
106103
) -> Result<(), Error> {
107104
let span = info_span!("Domain::delete_by_site_id_and_domain");
108-
span.set_parent(Context::current());
109105
let _guard = span.enter();
110106

111107
sqlx::query!(
@@ -125,7 +121,6 @@ impl Domain {
125121
state: &State,
126122
) -> Result<DomainSubmission, Error> {
127123
let span = info_span!("Domain::create_for_site");
128-
span.set_parent(Context::current());
129124
let _guard = span.enter();
130125

131126
// check if domain exist by name, the domains from initial overlap are to be overwritten if this gets validated
@@ -185,7 +180,6 @@ impl Domain {
185180
state: &State,
186181
) -> Result<Domain, Error> {
187182
let span = info_span!("Domain::create_for_site_superceded");
188-
span.set_parent(Context::current());
189183
let _guard = span.enter();
190184

191185
let domain = sqlx::query_as!(Domain, "INSERT INTO domains (site_id, domain) VALUES ($1, $2) RETURNING *", site_id, domain)
@@ -200,7 +194,6 @@ impl Domain {
200194
state: &State,
201195
) -> Result<Option<Domain>, Error> {
202196
let span = info_span!("Domain::existing_domain_by_name");
203-
span.set_parent(Context::current());
204197
let _guard = span.enter();
205198

206199
let domain = sqlx::query_as!(Domain, "SELECT * FROM domains WHERE domain = $1", domain)
@@ -218,7 +211,6 @@ impl Domain {
218211
state: &State,
219212
) -> Result<Vec<Domain>, Error> {
220213
let span = info_span!("Domain::existing_wildcard_overlap_by_name");
221-
span.set_parent(Context::current());
222214
let _guard = span.enter();
223215

224216
// require that the domain starts with `*.`
@@ -249,7 +241,6 @@ impl Domain {
249241
state: &State,
250242
) -> Result<Vec<Domain>, Error> {
251243
let span = info_span!("Domain::overlap_upwards_wildcard");
252-
span.set_parent(Context::current());
253244
let _guard = span.enter();
254245

255246
let domain = domain[2..].to_string();
@@ -285,7 +276,6 @@ impl DomainPending {
285276
state: &State,
286277
) -> Result<DomainPending, Error> {
287278
let span = info_span!("DomainPending::create");
288-
span.set_parent(Context::current());
289279
let _guard = span.enter();
290280

291281
let challenge = uuid::Uuid::new_v4().to_string();
@@ -311,7 +301,6 @@ impl DomainPending {
311301
state: &State,
312302
) -> Result<Option<DomainPending>, Error> {
313303
let span = info_span!("DomainPending::get_by_site_id_and_domain");
314-
span.set_parent(Context::current());
315304
let _guard = span.enter();
316305

317306
let domain_pending = sqlx::query_as!(
@@ -332,7 +321,6 @@ impl DomainPending {
332321
state: &State,
333322
) -> Result<(), Error> {
334323
let span = info_span!("DomainPending::delete_by_site_id_and_domain");
335-
span.set_parent(Context::current());
336324
let _guard = span.enter();
337325

338326
sqlx::query!(
@@ -347,7 +335,6 @@ impl DomainPending {
347335
}
348336
pub async fn do_challenge(&self, state: &State) -> Result<(), Error> {
349337
let span = info_span!("DomainPending::do_challenge");
350-
span.set_parent(Context::current());
351338
let _guard = span.enter();
352339

353340
// get the dns txt record `_edgeserver-challenge` and if its equal to the challenge, update the status to verified

‎engine/src/models/site.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl Site {
3131
team_id: impl AsRef<str>,
3232
) -> Result<Self, sqlx::Error> {
3333
let span = info_span!("Site::new");
34-
span.set_parent(Context::current());
34+
// span.set_parent(Context::current());
3535
let _guard = span.enter();
3636

3737
let site_id = generate_id(IdType::SITE);
@@ -49,7 +49,7 @@ impl Site {
4949

5050
pub async fn get_by_id(db: &Database, site_id: impl AsRef<str>) -> Result<Self, sqlx::Error> {
5151
let span = info_span!("Site::get_by_id");
52-
span.set_parent(Context::current());
52+
// span.set_parent(Context::current());
5353
let _guard = span.enter();
5454

5555
query_as!(
@@ -66,7 +66,7 @@ impl Site {
6666
team_id: impl AsRef<str>,
6767
) -> Result<Vec<Self>, sqlx::Error> {
6868
let span = info_span!("Site::get_by_team_id");
69-
span.set_parent(Context::current());
69+
// span.set_parent(Context::current());
7070
let _guard = span.enter();
7171

7272
query_as!(
@@ -91,7 +91,7 @@ impl Site {
9191
user_id: impl AsRef<str>,
9292
) -> Result<Vec<Self>, sqlx::Error> {
9393
let span = info_span!("Site::get_by_user_id");
94-
span.set_parent(Context::current());
94+
// span.set_parent(Context::current());
9595
let _guard = span.enter();
9696

9797
query_as!(
@@ -116,7 +116,7 @@ impl Site {
116116
site_id: impl AsRef<str>,
117117
) -> Result<Vec<Deployment>, sqlx::Error> {
118118
let span = info_span!("Site::get_deployments");
119-
span.set_parent(Context::current());
119+
// span.set_parent(Context::current());
120120
let _guard = span.enter();
121121

122122
query_as!(
@@ -134,7 +134,7 @@ impl Site {
134134
team_id: impl AsRef<str>,
135135
) -> Result<(), sqlx::Error> {
136136
let span = info_span!("Site::update_team");
137-
span.set_parent(Context::current());
137+
// span.set_parent(Context::current());
138138
let _guard = span.enter();
139139

140140
query!(

‎engine/src/models/team/invite.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl UserTeamInvite {
2929
sender_id: impl AsRef<str>,
3030
) -> Result<Self, sqlx::Error> {
3131
let span = info_span!("UserTeamInvite::new");
32-
span.set_parent(Context::current());
32+
// span.set_parent(Context::current());
3333
let _guard = span.enter();
3434

3535
let invite_id = generate_id(IdType::TEAM_INVITE);
@@ -51,7 +51,7 @@ impl UserTeamInvite {
5151
invite_id: impl AsRef<str>,
5252
) -> Result<Self, sqlx::Error> {
5353
let span = info_span!("UserTeamInvite::get_by_invite_id");
54-
span.set_parent(Context::current());
54+
// span.set_parent(Context::current());
5555
let _guard = span.enter();
5656

5757
sqlx::query_as!(
@@ -68,7 +68,7 @@ impl UserTeamInvite {
6868
team_id: impl AsRef<str>,
6969
) -> Result<Vec<Self>, sqlx::Error> {
7070
let span = info_span!("UserTeamInvite::get_by_team_id");
71-
span.set_parent(Context::current());
71+
// span.set_parent(Context::current());
7272
let _guard = span.enter();
7373

7474
sqlx::query_as!(
@@ -86,7 +86,7 @@ impl UserTeamInvite {
8686
user_id: impl AsRef<str>,
8787
) -> Result<Self, sqlx::Error> {
8888
let span = info_span!("UserTeamInvite::get_by_team_and_user");
89-
span.set_parent(Context::current());
89+
// span.set_parent(Context::current());
9090
let _guard = span.enter();
9191

9292
sqlx::query_as!(
@@ -104,7 +104,7 @@ impl UserTeamInvite {
104104
invite_id: impl AsRef<str>,
105105
) -> Result<(), sqlx::Error> {
106106
let span = info_span!("UserTeamInvite::delete_by_id");
107-
span.set_parent(Context::current());
107+
// span.set_parent(Context::current());
108108
let _guard = span.enter();
109109

110110
sqlx::query!(
@@ -123,7 +123,7 @@ impl UserTeamInvite {
123123
user_id: impl AsRef<str>,
124124
) -> Result<(), sqlx::Error> {
125125
let span = info_span!("UserTeamInvite::accept_invite");
126-
span.set_parent(Context::current());
126+
// span.set_parent(Context::current());
127127
let _guard = span.enter();
128128

129129
// Mark invite as accepted and mark user as a member of the team

0 commit comments

Comments
 (0)