Merge branch 'main' into dependabot/npm_and_yarn/frontend/development-dependencies-ff8b8db279

Author: austenstone

backend/.env.example

@@ -19,3 +19,10 @@ MONGODB_URI=mongodb://localhost:27017/github-value
 # Webhook proxy URL (optional)
 # This is only needed if you don't want to use smee.io
 # WEBHOOK_PROXY_URL=https://5950-2601-589-4885-e850-b1eb-a754-b856-6038.ngrok-free.app
+#
+
+# Log rotation settings
+# In observing organizations with large amounts of activity, the debug logs can
+# grow quite large, so having flexibility about how long to store those helps.
+# LOG_ROTATION_PERIOD=1d
+# LOG_ROTATION_COUNT=14

backend/src/app.ts

@@ -3,8 +3,7 @@ import express, { Express } from 'express';
 import rateLimit from 'express-rate-limit';
 import bodyParser from 'body-parser';
 import cors from 'cors';
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import path from 'path';
 import * as http from 'http';
 import Database from './database.js';
 import logger, { expressLoggerMiddleware } from './services/logger.js';
@@ -133,7 +132,7 @@ class App {
     this.e.get('*', (_, res) => res.sendFile(path.join(frontendPath, 'index.html')));
 
     this.eListener = this.e.listen(this.port, '0.0.0.0');
-    logger.info(`eListener on port ${this.port}`);
+    logger.info(`eListener on port ${this.port} (http://localhost:${this.port})`);
   }
 
   private initializeSettings() {

backend/src/controllers/usage.controller.ts

@@ -60,28 +60,6 @@ class Database {
       name: String,
       value: {}
     }));
-    mongoose.model('Usage', new mongoose.Schema({
-      org: String,
-      team: String,
-      day: Date,
-      total_suggestions_count: Number,
-      total_acceptances_count: Number,
-      total_lines_suggested: Number,
-      total_lines_accepted: Number,
-      total_active_users: Number,
-      total_chat_acceptances: Number,
-      total_chat_turns: Number,
-      total_active_chat_users: Number,
-      breakdown: [{
-        language: String,
-        editor: String,
-        suggestions_count: Number,
-        acceptances_count: Number,
-        lines_suggested: Number,
-        lines_accepted: Number,
-        active_users: Number
-      }]
-    }));
 
     // Language Schema 📝
     const LanguageSchema = new mongoose.Schema({

backend/src/database.ts

@@ -1,6 +1,5 @@
 import { Router, Request, Response } from 'express';
 import surveyController from '../controllers/survey.controller.js';
-import usageController from '../controllers/usage.controller.js';
 import settingsController from '../controllers/settings.controller.js';
 import setupController from '../controllers/setup.controller.js';
 import SeatsController from '../controllers/seats.controller.js';
@@ -12,7 +11,7 @@ import adoptionController from '../controllers/adoption.controller.js';
 const router = Router();
 
 router.get('/', (req: Request, res: Response) => {
-  res.send('Hello World!');
+  res.send('Hello github-value!');
 });
 
 router.get('/survey', surveyController.getAllSurveys);
@@ -22,8 +21,6 @@ router.put('/survey/:id', surveyController.updateSurvey); // put github survey l
 router.delete('/survey/:id', surveyController.deleteSurvey);
 router.post('/survey/:id/github', surveyController.updateSurveyGitHub);
 
-router.get('/usage', usageController.getUsage);
-
 router.get('/metrics', metricsController.getMetrics);
 router.get('/metrics/totals', metricsController.getMetricsTotals);
 

backend/src/models/usage.model.ts

@@ -16,6 +16,9 @@ const packageJsonPath = path.resolve(__dirname, '../../package.json');
 const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
 export const appName = packageJson.name || 'GitHub Value';
 
+const period = process.env.LOG_ROTATION_PERIOD || '1d';
+const count = process.env.LOG_ROTATION_COUNT ? parseInt(process.env.LOG_ROTATION_COUNT) : 14;
+
 const logger = bunyan.createLogger({
   name: appName,
   level: 'debug',
@@ -42,14 +45,16 @@ const logger = bunyan.createLogger({
     },
     {
       path: `${logsDir}/error.json`,
-      period: '1d',
-      count: 14,
+      type: 'rotating-file',
+      period,
+      count,
       level: 'error'
     },
     {
       path: `${logsDir}/debug.json`,
-      period: '1d',
-      count: 14,
+      type: 'rotating-file',
+      period,
+      count,
       level: 'debug'
     }
   ]

backend/src/routes/index.ts

@@ -1,6 +1,5 @@
 import { CronJob, CronJobParams, CronTime } from 'cron';
 import logger from './logger.js';
-import { insertUsage } from '../models/usage.model.js';
 import SeatService, { SeatEntry } from './seats.service.js';
 import { App, Octokit } from 'octokit';
 import { MetricDailyResponseType } from '../models/metrics.model.js';
@@ -80,6 +79,7 @@ class QueryService {
     }
 
     await adoptionService.createAdoption(enterpriseAdoptionData);
+    logger.info(`Task finished. Last ran at `, this.cronJob.lastDate());
   }
 
   private async orgTask(octokit: Octokit, queryAt: Date, org: string) {
@@ -98,11 +98,7 @@ class QueryService {
       }
 
       const queries = [
-        this.queryCopilotUsageMetrics(octokit, org).then(result => {
-          this.status.usage = true;
-          return result;
-        }),
-        this.queryCopilotUsageMetricsNew(octokit, org).then(result => {
+        this.queryCopilotMetrics(octokit, org).then(result => {
           this.status.metrics = true;
           return result;
         }),
@@ -112,12 +108,11 @@ class QueryService {
         }),
       ];
 
-      const [usageMetrics, usageMetricsNew, copilotSeatAssignments] = await Promise.all(queries);
+      const [copilotMetrics, copilotSeatAssignments] = await Promise.all(queries);
       this.status.dbInitialized = true;
 
       return {
-        usageMetrics,
-        usageMetricsNew,
+        copilotMetrics,
         copilotSeatAssignments,
         teamsAndMembers
       }
@@ -127,7 +122,7 @@ class QueryService {
     logger.info(`${org} finished task`);
   }
 
-  public async queryCopilotUsageMetricsNew(octokit: Octokit, org: string, team?: string) {
+  public async queryCopilotMetrics(octokit: Octokit, org: string, team?: string) {
     try {
       const metricsArray = await octokit.paginate<MetricDailyResponseType>(
         'GET /orgs/{org}/copilot/metrics',
@@ -142,19 +137,6 @@ class QueryService {
     }
   }
 
-  public async queryCopilotUsageMetrics(octokit: Octokit, org: string) {
-    try {
-      const rsp = await octokit.rest.copilot.usageMetricsForOrg({
-        org
-      });
-
-      insertUsage(org, rsp.data);
-      logger.info(`${org} usage metrics updated`);
-    } catch (error) {
-      logger.error(`Error updating ${org} usage metrics`, error);
-    }
-  }
-
   public async queryCopilotSeatAssignments(octokit: Octokit, org: string, queryAt: Date) {
     try {
       const rsp = await octokit.paginate(octokit.rest.copilot.listCopilotSeats, {

backend/src/services/logger.ts

@@ -0,0 +1,6 @@
+<highcharts-chart
+  *ngIf="options"
+  [Highcharts]="Highcharts"
+  [options]="options"
+  style="width: 100%; height: 400px; display: block;">
+</highcharts-chart>