remove support for axiom and pirsch

kjk · Jun 25, 2024 · 1cee67b · 1cee67b
1 parent 459d021
commit 1cee67b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 183 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
 			"type": "chrome",
 			"request": "launch",
 			"name": "Launch Browser",
-			"url": "http://127.0.0.1:9301/wc/",
+			"url": "http://127.0.0.1:9301/",
 			"webRoot": "${workspaceFolder}/frontend/src"
 		},
     {

diff --git a/server/axiom.go b/server/axiom.go
diff --git a/server/deploy.go b/server/deploy.go
@@ -21,7 +21,7 @@ var (
 	domain            = "tools.arslexis.io"
 	httpPort          = 9301
 	frontEndBuildDir  = filepath.Join("server", "dist")
-	wantedProdSecrets = []string{"AXIOM_TOKEN", "PIRSCH_SECRET", "GITHUB_SECRET_TOOLS_ARSLEXIS", "GITHUB_SECRET_LOCAL", "MAILGUN_DOMAIN", "MAILGUN_API_KEY"}
+	wantedProdSecrets = []string{"GITHUB_SECRET_TOOLS_ARSLEXIS", "GITHUB_SECRET_LOCAL", "MAILGUN_DOMAIN", "MAILGUN_API_KEY"}
 )
 
 // stuff that is derived from the above

diff --git a/server/main.go b/server/main.go
@@ -26,8 +26,6 @@ var (
 const secretsDev = `# secrets for dev mode
 # COOKIE_AUTH_KEY=baa18ad1db89a7e9fbb50638815be63150a4494ac465779ee2f30bc980f1a55e
 # COOKIE_ENCR_KEY=2780ffc17eec2d85960473c407ee37c0249db93e4586ec52e3ef9e153ba61e72
-AXIOM_TOKEN=
-PIRSCH_SECRET=
 GITHUB_SECRET_TOOLS_ARSLEXIS=
 GITHUB_SECRET_LOCAL=
 MAILGUN_DOMAIN=
@@ -80,19 +78,12 @@ func loadSecrets() {
 
 	// those are only required in prod
 	must = flgRunProd
-	getEnv("AXIOM_TOKEN", &axiomApiToken, 40, must)
-	getEnv("PIRSCH_SECRET", &pirschClientSecret, 64, must)
 	getEnv("GITHUB_SECRET_TOOLS_ARSLEXIS", &secretGitHubToolsArslexis, 40, must)
 	getEnv("GITHUB_SECRET_LOCAL", &secretGitHubLocal, 40, must)
 	getEnv("MAILGUN_DOMAIN", &mailgunDomain, 4, must)
 	getEnv("MAILGUN_API_KEY", &mailgunAPIKey, 32, must)
 	getEnv("LOGTASTIC_API_KEY", &logtastic.ApiKey, 30, must)
 
-	// when running locally we shouldn't send axiom / pirsch
-	if isDev() || flgRunProdLocal {
-		axiomApiToken = ""
-		pirschClientSecret = ""
-	}
 }
 
 func getDataDirMust() string {

diff --git a/server/pirsch.go b/server/pirsch.go
diff --git a/server/server.go b/server/server.go
@@ -85,7 +85,9 @@ func logLogin(ctx context.Context, r *http.Request, token *oauth2.Token) {
 		return
 	}
 	logf("logged in as GitHub user: %s\n", *user.Login)
-	m := map[string]string{}
+	m := map[string]any{
+		"name": "github_login",
+	}
 	if user.Login != nil {
 		m["user"] = *user.Login
 	}
@@ -95,7 +97,7 @@ func logLogin(ctx context.Context, r *http.Request, token *oauth2.Token) {
 	if user.Name != nil {
 		m["name"] = *user.Name
 	}
-	pirschSendEvent(r, "github_login", 0, m)
+	logtastic.LogEvent(r, m)
 }
 
 // /auth/ghlogin
@@ -226,10 +228,6 @@ func makeHTTPServer(serveOpts *hutil.ServeFileOptions, proxyHandler *httputil.Re
 			}
 			logtastic.LogHit(r, m.Code, m.Written, m.Duration)
 			logHTTPReq(r, m.Code, m.Written, m.Duration)
-			if m.Code == 200 {
-				pirschSendHit(r)
-			}
-			axiomLogHTTPReq(ctx(), r, m.Code, int(m.Written), m.Duration)
 		}()
 	})