fix: code improvements

ory · Sep 14, 2023 · 2f44f73 · 2f44f73
1 parent 47c8114
commit 2f44f73
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/httpx/client_info.go b/httpx/client_info.go
@@ -43,18 +43,10 @@ func ClientIP(r *http.Request) string {
  }
 }
 
-func ClientGeoLocation(r *http.Request) GeoLocation {
- var clientGeoLocation GeoLocation
-
- if r.Header.Get("Cf-Ipcity") != "" {
- clientGeoLocation.City = r.Header.Get("Cf-Ipcity")
- }
- if r.Header.Get("Cf-Region-Code") != "" {
- clientGeoLocation.Region = r.Header.Get("Cf-Region-Code")
+func ClientGeoLocation(r *http.Request) *GeoLocation {
+ return &GeoLocation{
+ City: r.Header.Get("Cf-Ipcity"),
+ Region: r.Header.Get("Cf-Region-Code"),
+ Country: r.Header.Get("Cf-Ipcountry"),
  }
- if r.Header.Get("Cf-Ipcountry") != "" {
- clientGeoLocation.Country = r.Header.Get("Cf-Ipcountry")
- }
-
- return clientGeoLocation
 }
diff --git a/otelx/semconv/context.go b/otelx/semconv/context.go
@@ -36,10 +36,9 @@ func AttributesFromContext(ctx context.Context) []attribute.KeyValue {
 }
 
 func Middleware(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
-
  ctx := ContextWithAttributes(r.Context(),
  append(
- AttrGeoLocation(httpx.ClientGeoLocation(r)),
+ AttrGeoLocation(*httpx.ClientGeoLocation(r)),
  AttrClientIP(httpx.ClientIP(r)),
  )...,
  )

diff --git a/otelx/semconv/events.go b/otelx/semconv/events.go
@@ -45,7 +45,7 @@ func AttrClientIP(val string) otelattr.KeyValue {
 }
 
 func AttrGeoLocation(val httpx.GeoLocation) []otelattr.KeyValue {
- var geoLocationAttributes []otelattr.KeyValue
+ geoLocationAttributes := make([]otelattr.KeyValue, 0, 3)
 
  if val.City != "" {
  geoLocationAttributes = append(geoLocationAttributes, otelattr.String(AttributeKeyGeoLocationCity.String(), val.City))