Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set geo.country_iso_code to user country #916

Merged
merged 17 commits into from
Sep 26, 2023
Merged

set geo.country_iso_code to user country #916

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
22a33ee
set geo.country_iso_code to user country
Sep 25, 2023
617cb39
initialize datadog after lantern starts
parallaxv Sep 25, 2023
6d4a836
Update flashlight to v7.6.8
parallaxv Sep 25, 2023
c4f3b6b
run go mod tidy
parallaxv Sep 25, 2023
86a31de
Use go1.21
parallaxv Sep 25, 2023
50cc0c0
run go mod tidy
parallaxv Sep 25, 2023
d3250bc
run go mod tidy
parallaxv Sep 25, 2023
4fab7f7
continue using go 1.19
parallaxv Sep 25, 2023
b1a2027
update checksum
parallaxv Sep 25, 2023
bd1e59f
Add back deleted file
parallaxv Sep 25, 2023
798f399
Update Datadog country every time country changes
oxtoacart Sep 25, 2023
c27a845
run ktlint, remove unused imports
parallaxv Sep 25, 2023
9da7e40
use http address from session instead of settings
parallaxv Sep 26, 2023
cc14d0f
use http address from session instead of settings
parallaxv Sep 26, 2023
0337c3a
use http address from session instead of settings
parallaxv Sep 26, 2023
f80b688
rename attribute to lantern_country_code
parallaxv Sep 26, 2023
7610f32
Added started action to Datadog RUM
oxtoacart Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions android/app/src/main/kotlin/org/getlantern/lantern/datadog/Datadog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.datadog.android.rum.RumErrorSource
import com.datadog.android.rum.RumMonitor
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
import org.getlantern.lantern.LanternApp
import org.getlantern.lantern.BuildConfig
import org.getlantern.mobilesdk.Logger
import java.net.InetSocketAddress
import java.net.Proxy
Expand Down Expand Up @@ -52,8 +53,12 @@ object Datadog {
id = LanternApp.getSession().userId().toString(),
)

val monitor = RumMonitor.Builder().build()
GlobalRum.registerIfAbsent(monitor)
GlobalRum.registerIfAbsent {
RumMonitor.Builder().build()
}
val session = LanternApp.getSession()
val country = session.getCountryCode()
GlobalRum.addAttribute(GEO_COUNTRY_CODE, country)
atavism marked this conversation as resolved.
Show resolved Hide resolved
atavism marked this conversation as resolved.
Show resolved Hide resolved
initialized.set(true)
}

Expand Down Expand Up @@ -114,6 +119,7 @@ object Datadog {
.sampleRumSessions(100f)
.setUploadFrequency(UploadFrequency.FREQUENT)
.useSite(DatadogSite.EU1)
.trackBackgroundRumEvents(true)
.trackInteractions()
.trackLongTasks()
.setFirstPartyHosts(tracedHosts)
Expand All @@ -127,4 +133,5 @@ object Datadog {
}

private val TAG = Datadog::class.java.name
private const val GEO_COUNTRY_CODE = "geo.country_iso_code"
}