Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collab: Include geoip_country_code in initial span (#15819)

Browse source 
This PR changes how we report the `geoip_country_code` in the tracing
spans.

I wasn't seeing it come through in the logs, and I think it was because
we didn't declare the field on the initial span.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-08-05 12:24:47 -04:00 • committed by GitHub
parent 04ad088eb8
commit 705f7e7a03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/collab/src/rpc.rs
View file

@ -998,9 +998,13 @@ impl Server {
user_id=field::Empty, user_id=field::Empty,
login=field::Empty, login=field::Empty,
impersonator=field::Empty, impersonator=field::Empty,
dev_server_id=field::Empty dev_server_id=field::Empty,
geoip_country_code=field::Empty
); );
principal.update_span(&span); principal.update_span(&span);
if let Some(country_code) = geoip_country_code.as_ref() {
span.record("geoip_country_code", country_code);
}
let mut teardown = self.teardown.subscribe(); let mut teardown = self.teardown.subscribe();
async move { async move {
@ -1014,9 +1018,7 @@ impl Server {
let executor = executor.clone(); let executor = executor.clone();
move |duration| executor.sleep(duration) move |duration| executor.sleep(duration)
}); });
tracing::Span::current() tracing::Span::current().record("connection_id", format!("{}", connection_id));
.record("connection_id", format!("{}", connection_id))
.record("geoip_country_code", geoip_country_code.clone());
tracing::info!("connection opened"); tracing::info!("connection opened");