Merge pull request #85 from axiomhq/netlify-deploy-env-vars

debug netlify site and deploy env vars

README.md

@@ -22,6 +22,8 @@ For more information check out the [official documentation](https://axiom.co/doc
 - If you are using Vercel, make sure you have the [Axiom Vercel integration](https://www.axiom.co/vercel) 
 installed. On other platforms you must create an API token and set those environment variables:
 
+:warning: next-axiom is still experimental for non-Vercel platforms and is subject to change.
+
 ```
 AXIOM_DATASET: the dataset the logs will be ingested into
 AXIOM_TOKEN: the API token you created for ingestion to the dataset

src/platform/generic.ts

@@ -45,12 +45,12 @@ export default class GenericConfig implements Provider {
   injectPlatformMetadata(logEvent: LogEvent, source: string) {
     logEvent.platform = {
       environment: this.environment,
-      region: this.environment,
-      source: source,
+      region: this.region,
+      source: source + '-log',
     };
   }
 
-  generateRequestMeta(req: any): RequestReport {
+  generateRequestMeta(req: NextApiRequest): RequestReport {
     return {
       startTime: new Date().getTime(),
       path: req.url!,

src/platform/netlify.ts

@@ -2,18 +2,21 @@ import { LogEvent, PlatformInfo } from '../logger';
 import type Provider from './base';
 import GenericConfig from './generic';
 
+const netlifySiteId = process.env.SITE_ID;
+const netlifyBuildId = process.env.BUILD_ID;
+const netlifyContext = process.env.CONTEXT;
+const netlifyDeploymentUrl = process.env.DEPLOYMENT_URL;
+const netlifyDeploymentId = process.env.DEPLOYMENT_ID;
+
 export interface NetlifyInfo extends PlatformInfo {
   buildId?: string;
   context?: string;
   deploymentUrl?: string;
   deploymentId?: string;
+  siteId?: string;
 }
 
 export default class NetlifyConfig extends GenericConfig implements Provider {
-  netlifyBuildId = process.env.BUILD_ID;
-  netlifyContext = process.env.CONTEXT;
-  netlifyDeploymentUrl = process.env.DEPLOY_URL;
-  netlifyDeploymentId = process.env.DEPLOY_ID;
 
   wrapWebVitalsObject(metrics: any[]): any {
     return metrics.map(m => ({
@@ -22,23 +25,25 @@ export default class NetlifyConfig extends GenericConfig implements Provider {
         netlify: {
           environment: this.environment,
           source: 'web-vital',
-          buildId: this.netlifyBuildId,
-          context: this.netlifyContext,
-          deploymentUrl: this.netlifyDeploymentUrl,
-          deploymentId: this.netlifyDeploymentId,
+          siteId: netlifySiteId,
+          buildId: netlifyBuildId,
+          context: netlifyContext,
+          deploymentUrl: netlifyDeploymentUrl,
+          deploymentId: netlifyDeploymentId,
         },
     }))
   }
 
   injectPlatformMetadata(logEvent: LogEvent, source: string) {
     logEvent.netlify = {
       environment: this.environment,
-      region: this.region,
-      source: source,
-      buildId: this.netlifyBuildId,
-      context: this.netlifyContext,
-      deploymentUrl: this.netlifyDeploymentUrl,
-      deploymentId: this.netlifyDeploymentId,
+      region: source === 'edge' ? process.env.DENO_REGION : process.env.AWS_REGION,
+      source: source + '-log',
+      siteId: netlifySiteId,
+      buildId: netlifyBuildId,
+      context: netlifyContext,
+      deploymentUrl: netlifyDeploymentUrl,
+      deploymentId: source === 'edge' ? process.env.DENO_DEPLOYMENT_ID : netlifyDeploymentId,
     };
   }
 }