Remove pagesDir and add isSrcDir to anonymous meta

vercel · Oct 14, 2019 · 6851de8 · 6851de8
1 parent 5b318e9
commit 6851de8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -91,22 +91,20 @@ export default async function build(dir: string, conf = null): Promise<void> {
   const { target } = config
   const buildId = await generateBuildId(config.generateBuildId, nanoid)
   const distDir = path.join(dir, config.distDir)
-
-  const telemetry = new Telemetry({ distDir })
-
   const publicDir = path.join(dir, 'public')
   const pagesDir = findPagesDir(dir)
+
+  const telemetry = new Telemetry({
+    distDir,
+    isSrcDir: pagesDir.startsWith('src'),
+  })
+
   let publicFiles: string[] = []
   let hasPublicDir = false
 
   let backgroundWork: (Promise<any> | undefined)[] = []
   backgroundWork.push(
-    telemetry.record(
-      eventVersion({
-        cliCommand: 'build',
-        pagesDir: path.relative(dir, pagesDir),
-      })
-    ),
+    telemetry.record(eventVersion({ cliCommand: 'build' })),
     eventNextPlugins(path.resolve(dir)).then(events => telemetry.record(events))
   )
 

diff --git a/packages/next/server/next-dev-server.ts b/packages/next/server/next-dev-server.ts
@@ -206,13 +206,11 @@ export default class DevServer extends Server {
     await this.startWatcher()
     this.setDevReady!()
 
-    const telemetry = new Telemetry({ distDir: this.distDir })
-    telemetry.record(
-      eventVersion({
-        cliCommand: 'dev',
-        pagesDir: relative(this.dir, this.pagesDir!),
-      })
-    )
+    const telemetry = new Telemetry({
+      distDir: this.distDir,
+      isSrcDir: this.pagesDir!.startsWith('src'),
+    })
+    telemetry.record(eventVersion({ cliCommand: 'dev' }))
   }
 
   protected async close() {

diff --git a/packages/next/telemetry/anonymous-meta.ts b/packages/next/telemetry/anonymous-meta.ts
@@ -14,19 +14,25 @@ type AnonymousMeta = {
   isDocker: boolean
   isNowDev: boolean
   isCI: boolean
+  isSrcDir?: boolean
   ciName: string | null
 }
 
 let traits: AnonymousMeta | undefined
 
-export function getAnonymousMeta(): AnonymousMeta {
+export function getAnonymousMeta({
+  isSrcDir,
+}: {
+  isSrcDir?: boolean
+}): AnonymousMeta {
   if (traits) {
     return traits
   }
 
   const cpus = os.cpus() || []
   const { NOW_REGION } = process.env
   traits = {
+    isSrcDir,
     // Software information
     systemPlatform: os.platform(),
     systemRelease: os.release(),

diff --git a/packages/next/telemetry/events/version.ts b/packages/next/telemetry/events/version.ts
@@ -4,7 +4,6 @@ type EventCliSessionStarted = {
   nextVersion: string
   nodeVersion: string
   cliCommand: string
-  pagesDir?: string
 }
 
 export function eventVersion(
@@ -22,7 +21,6 @@ export function eventVersion(
         nextVersion: process.env.__NEXT_VERSION,
         nodeVersion: process.version,
         cliCommand: event.cliCommand,
-        pagesDir: event.pagesDir,
       } as EventCliSessionStarted,
     },
   ]

diff --git a/packages/next/telemetry/storage.ts b/packages/next/telemetry/storage.ts
@@ -44,13 +44,15 @@ export class Telemetry {
   private conf: Conf<any>
   private sessionId: string
   private rawProjectId: string
+  private isSrcDir?: boolean
 
-  constructor({ distDir }: { distDir: string }) {
+  constructor({ distDir, isSrcDir }: { distDir: string; isSrcDir?: boolean }) {
     const storageDirectory = getStorageDirectory(distDir)
 
     this.conf = new Conf({ projectName: 'nextjs', cwd: storageDirectory })
     this.sessionId = randomBytes(32).toString('hex')
     this.rawProjectId = getRawProjectId()
+    this.isSrcDir = isSrcDir
 
     this.notify()
   }
@@ -202,7 +204,8 @@ export class Telemetry {
       projectId: this.projectId,
       sessionId: this.sessionId,
     }
-    const meta: EventMeta = getAnonymousMeta()
+    const meta: EventMeta = getAnonymousMeta({ isSrcDir: this.isSrcDir })
+
     return _postPayload(`https://telemetry.nextjs.org/api/v1/record`, {
       context,
       meta,