serverless-plugin-datadog 3.3.0 → 3.4.0

package/dist/env.d.ts

@@ -0,0 +1,17 @@
+import Service from "serverless/classes/Service";
+export interface Configuration {
+    addLayers: boolean;
+    apiKey?: string;
+    apiKMSKey?: string;
+    site: string;
+    logLevel: string;
+    flushMetricsToLogs: boolean;
+    enableXrayTracing: boolean;
+    enableDDTracing: boolean;
+    forwarder?: string;
+    enableTags: boolean;
+}
+export declare const defaultConfiguration: Configuration;
+export declare function setEnvConfiguration(config: Configuration, service: Service): void;
+export declare function getConfig(service: Service): Configuration;
+//# sourceMappingURL=env.d.ts.map

package/dist/env.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAQA,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,MAAM,WAAW,aAAa;IAE5B,SAAS,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,CAAC;IAEjB,kBAAkB,EAAE,OAAO,CAAC;IAE5B,iBAAiB,EAAE,OAAO,CAAC;IAE3B,eAAe,EAAE,OAAO,CAAC;IAGzB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,UAAU,EAAE,OAAO,CAAC;CACrB;AASD,eAAO,MAAM,oBAAoB,EAAE,aAQlC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,QAyB1E;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAczD"}

package/dist/env.js

@@ -0,0 +1,63 @@
+"use strict";
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed
+ * under the Apache License Version 2.0.
+ *
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019 Datadog, Inc.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const apiKeyEnvVar = "DD_API_KEY";
+const apiKeyKMSEnvVar = "DD_KMS_API_KEY";
+const siteURLEnvVar = "DD_SITE";
+const logLevelEnvVar = "DD_LOG_LEVEL";
+const logForwardingEnvVar = "DD_FLUSH_TO_LOG";
+const ddTracingEnabledEnvVar = "DD_TRACE_ENABLED";
+exports.defaultConfiguration = {
+    addLayers: true,
+    flushMetricsToLogs: true,
+    logLevel: "info",
+    site: "datadoghq.com",
+    enableXrayTracing: false,
+    enableDDTracing: true,
+    enableTags: true,
+};
+function setEnvConfiguration(config, service) {
+    const provider = service.provider;
+    if (provider.environment === undefined) {
+        provider.environment = {};
+    }
+    const environment = provider.environment;
+    if (config.apiKey !== undefined && environment[apiKeyEnvVar] === undefined) {
+        environment[apiKeyEnvVar] = config.apiKey;
+    }
+    if (config.apiKMSKey !== undefined && environment[apiKeyKMSEnvVar] === undefined) {
+        environment[apiKeyKMSEnvVar] = config.apiKMSKey;
+    }
+    if (environment[siteURLEnvVar] === undefined) {
+        environment[siteURLEnvVar] = config.site;
+    }
+    if (environment[logLevelEnvVar] === undefined) {
+        environment[logLevelEnvVar] = config.logLevel;
+    }
+    if (environment[logForwardingEnvVar] === undefined) {
+        environment[logForwardingEnvVar] = config.flushMetricsToLogs;
+    }
+    if (config.enableDDTracing !== undefined && environment[ddTracingEnabledEnvVar] === undefined) {
+        environment[ddTracingEnabledEnvVar] = config.enableDDTracing;
+    }
+}
+exports.setEnvConfiguration = setEnvConfiguration;
+function getConfig(service) {
+    let custom = service.custom;
+    if (custom === undefined) {
+        custom = {};
+    }
+    let datadog = custom.datadog;
+    if (datadog === undefined) {
+        datadog = {};
+    }
+    return Object.assign(Object.assign({}, exports.defaultConfiguration), datadog);
+}
+exports.getConfig = getConfig;
+//# sourceMappingURL=env.js.map

package/dist/env.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA8BH,MAAM,YAAY,GAAG,YAAY,CAAC;AAClC,MAAM,eAAe,GAAG,gBAAgB,CAAC;AACzC,MAAM,aAAa,GAAG,SAAS,CAAC;AAChC,MAAM,cAAc,GAAG,cAAc,CAAC;AACtC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAC9C,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AAErC,QAAA,oBAAoB,GAAkB;IACjD,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,IAAI;IACxB,QAAQ,EAAE,MAAM;IAChB,IAAI,EAAE,eAAe;IACrB,iBAAiB,EAAE,KAAK;IACxB,eAAe,EAAE,IAAI;IACrB,UAAU,EAAE,IAAI;CACjB,CAAC;AAEF,SAAgB,mBAAmB,CAAC,MAAqB,EAAE,OAAgB;IACzE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAe,CAAC;IAEzC,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,EAAE;QACtC,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC;KAC3B;IACD,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAkB,CAAC;IAChD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,WAAW,CAAC,YAAY,CAAC,KAAK,SAAS,EAAE;QAC1E,WAAW,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;KAC3C;IACD,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,WAAW,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAChF,WAAW,CAAC,eAAe,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;KACjD;IACD,IAAI,WAAW,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE;QAC5C,WAAW,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;KAC1C;IACD,IAAI,WAAW,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE;QAC7C,WAAW,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;KAC/C;IACD,IAAI,WAAW,CAAC,mBAAmB,CAAC,KAAK,SAAS,EAAE;QAClD,WAAW,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC;KAC9D;IACD,IAAI,MAAM,CAAC,eAAe,KAAK,SAAS,IAAI,WAAW,CAAC,sBAAsB,CAAC,KAAK,SAAS,EAAE;QAC7F,WAAW,CAAC,sBAAsB,CAAC,GAAG,MAAM,CAAC,eAAe,CAAC;KAC9D;AACH,CAAC;AAzBD,kDAyBC;AAED,SAAgB,SAAS,CAAC,OAAgB;IACxC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAa,CAAC;IACnC,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,MAAM,GAAG,EAAE,CAAC;KACb;IAED,IAAI,OAAO,GAAG,MAAM,CAAC,OAA6C,CAAC;IACnE,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,GAAG,EAAE,CAAC;KACd;IACD,uCACK,4BAAoB,GACpB,OAAO,EACV;AACJ,CAAC;AAdD,8BAcC"}

package/dist/forwarder.d.ts

@@ -0,0 +1,14 @@
+import Service from "serverless/classes/Service";
+import Aws = require("serverless/plugins/aws/provider/awsProvider");
+export declare function addCloudWatchForwarderSubscriptions(service: Service, aws: Aws, functionArn: string): Promise<string[]>;
+export declare function canSubscribeLogGroup(aws: Aws, logGroupName: string, expectedSubName: string): Promise<boolean>;
+export declare function describeSubscriptionFilters(aws: Aws, logGroupName: string): Promise<{
+    creationTime: number;
+    destinationArn: string;
+    distribution: string;
+    filterName: string;
+    filterPattern: string;
+    logGroupName: string;
+    roleArn: string;
+}[]>;
+//# sourceMappingURL=forwarder.d.ts.map

package/dist/forwarder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"forwarder.d.ts","sourceRoot":"","sources":["../src/forwarder.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,4BAA4B,CAAC;AACjD,OAAO,GAAG,GAAG,QAAQ,6CAA6C,CAAC,CAAC;AA4BpE,wBAAsB,mCAAmC,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,qBAuCxG;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,oBAejG;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM;;;;;;;;KAc/E"}

package/dist/forwarder.js

@@ -0,0 +1,87 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const logGroupKey = "AWS::Logs::LogGroup";
+const logGroupSubscriptionKey = "AWS::Logs::SubscriptionFilter";
+function isLogGroup(value) {
+    return value.Type === logGroupKey;
+}
+function addCloudWatchForwarderSubscriptions(service, aws, functionArn) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const resources = (_a = service.provider.compiledCloudFormationTemplate) === null || _a === void 0 ? void 0 : _a.Resources;
+        if (resources === undefined) {
+            return ["No cloudformation stack available. Skipping subscribing Datadog forwarder."];
+        }
+        const errors = [];
+        for (const [name, resource] of Object.entries(resources)) {
+            if (!isLogGroup(resource) || !resource.Properties.LogGroupName.startsWith("/aws/lambda/")) {
+                continue;
+            }
+            const logGroupName = resource.Properties.LogGroupName;
+            const scopedSubName = `${name}Subscription`;
+            let expectedSubName = `${service.getServiceName()}-${aws.getStage()}-${scopedSubName}-`;
+            const stackName = aws.naming.getStackName();
+            if (stackName) {
+                expectedSubName = `${stackName}-${scopedSubName}-`;
+            }
+            const canSub = yield canSubscribeLogGroup(aws, logGroupName, expectedSubName);
+            if (!canSub) {
+                errors.push(`Subscription already exists for log group ${logGroupName}. Skipping subscribing Datadog forwarder.`);
+                continue;
+            }
+            const subscription = {
+                Type: logGroupSubscriptionKey,
+                Properties: {
+                    DestinationArn: functionArn,
+                    FilterPattern: "",
+                    LogGroupName: { Ref: name },
+                },
+            };
+            resources[scopedSubName] = subscription;
+        }
+        return errors;
+    });
+}
+exports.addCloudWatchForwarderSubscriptions = addCloudWatchForwarderSubscriptions;
+function canSubscribeLogGroup(aws, logGroupName, expectedSubName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const subscriptionFilters = yield describeSubscriptionFilters(aws, logGroupName);
+        let hasUnknownSubscriptions = false;
+        for (const subscription of subscriptionFilters) {
+            const filterName = subscription.filterName;
+            if (filterName.startsWith(expectedSubName)) {
+                return true;
+            }
+            // We don't own this log group. It might not be possible to set a forwarder
+            hasUnknownSubscriptions = true;
+        }
+        // No log groups, so it's possible to subscribe.
+        return !hasUnknownSubscriptions;
+    });
+}
+exports.canSubscribeLogGroup = canSubscribeLogGroup;
+function describeSubscriptionFilters(aws, logGroupName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const result = yield aws.request("CloudWatchLogs", "describeSubscriptionFilters", {
+                logGroupName,
+            });
+            return result.subscriptionFilters;
+        }
+        catch (err) {
+            // An error will occur if the log group doesn't exist, so we swallow this and return an empty list.
+            return [];
+        }
+    });
+}
+exports.describeSubscriptionFilters = describeSubscriptionFilters;
+//# sourceMappingURL=forwarder.js.map

package/dist/forwarder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"forwarder.js","sourceRoot":"","sources":["../src/forwarder.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,uBAAuB,GAAG,+BAA+B,CAAC;AAqBhE,SAAS,UAAU,CAAC,KAAU;IAC5B,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;AACpC,CAAC;AAED,SAAsB,mCAAmC,CAAC,OAAgB,EAAE,GAAQ,EAAE,WAAmB;;;QACvG,MAAM,SAAS,SAAG,OAAO,CAAC,QAAQ,CAAC,8BAA8B,0CAAE,SAAS,CAAC;QAC7E,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,OAAO,CAAC,4EAA4E,CAAC,CAAC;SACvF;QACD,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACxD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;gBACzF,SAAS;aACV;YAED,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;YACtD,MAAM,aAAa,GAAG,GAAG,IAAI,cAAc,CAAC;YAE5C,IAAI,eAAe,GAAG,GAAG,OAAO,CAAC,cAAc,EAAE,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,aAAa,GAAG,CAAC;YAExF,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,SAAS,EAAE;gBACb,eAAe,GAAG,GAAG,SAAS,IAAI,aAAa,GAAG,CAAC;aACpD;YAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;YAC9E,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,CAAC,IAAI,CAAC,6CAA6C,YAAY,2CAA2C,CAAC,CAAC;gBAClH,SAAS;aACV;YAED,MAAM,YAAY,GAAG;gBACnB,IAAI,EAAE,uBAAuB;gBAC7B,UAAU,EAAE;oBACV,cAAc,EAAE,WAAW;oBAC3B,aAAa,EAAE,EAAE;oBACjB,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBAC5B;aACF,CAAC;YACF,SAAS,CAAC,aAAa,CAAC,GAAG,YAAY,CAAC;SACzC;QACD,OAAO,MAAM,CAAC;;CACf;AAvCD,kFAuCC;AAED,SAAsB,oBAAoB,CAAC,GAAQ,EAAE,YAAoB,EAAE,eAAuB;;QAChG,MAAM,mBAAmB,GAAG,MAAM,2BAA2B,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAEjF,IAAI,uBAAuB,GAAG,KAAK,CAAC;QAEpC,KAAK,MAAM,YAAY,IAAI,mBAAmB,EAAE;YAC9C,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;YAC3C,IAAI,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACb;YACD,2EAA2E;YAC3E,uBAAuB,GAAG,IAAI,CAAC;SAChC;QACD,gDAAgD;QAChD,OAAO,CAAC,uBAAuB,CAAC;IAClC,CAAC;CAAA;AAfD,oDAeC;AAED,SAAsB,2BAA2B,CAAC,GAAQ,EAAE,YAAoB;;QAC9E,IAAI;YACF,MAAM,MAAM,GAAwC,MAAM,GAAG,CAAC,OAAO,CACnE,gBAAgB,EAChB,6BAA6B,EAC7B;gBACE,YAAY;aACb,CACF,CAAC;YACF,OAAO,MAAM,CAAC,mBAAmB,CAAC;SACnC;QAAC,OAAO,GAAG,EAAE;YACZ,mGAAmG;YACnG,OAAO,EAAE,CAAC;SACX;IACH,CAAC;CAAA;AAdD,kEAcC"}

package/dist/index.d.ts

@@ -0,0 +1,10 @@
+import { FunctionDefinition } from "serverless";
+export interface ExtendedFunctionDefinition extends FunctionDefinition {
+    tags?: {
+        [key: string]: string;
+    };
+    environment?: {
+        [key: string]: string;
+    };
+}
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGhD,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACjC,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACzC"}

package/dist/index.js

@@ -0,0 +1,161 @@
+"use strict";
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed
+ * under the Apache License Version 2.0.
+ *
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019 Datadog, Inc.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const layers = __importStar(require("./layers.json"));
+const env_1 = require("./env");
+const layer_1 = require("./layer");
+const tracing_1 = require("./tracing");
+const wrapper_1 = require("./wrapper");
+const forwarder_1 = require("./forwarder");
+var TagKeys;
+(function (TagKeys) {
+    TagKeys["Service"] = "service";
+    TagKeys["Env"] = "env";
+})(TagKeys || (TagKeys = {}));
+module.exports = class ServerlessPlugin {
+    constructor(serverless, _) {
+        this.serverless = serverless;
+        this.hooks = {
+            "after:datadog:clean:init": this.afterPackageFunction.bind(this),
+            "after:datadog:generate:init": this.beforePackageFunction.bind(this),
+            "after:deploy:function:packageFunction": this.afterPackageFunction.bind(this),
+            "after:package:createDeploymentArtifacts": this.afterPackageFunction.bind(this),
+            "after:package:initialize": this.beforePackageFunction.bind(this),
+            "before:deploy:function:packageFunction": this.beforePackageFunction.bind(this),
+            "before:offline:start:init": this.beforePackageFunction.bind(this),
+            "before:step-functions-offline:start": this.beforePackageFunction.bind(this),
+        };
+        this.commands = {
+            datadog: {
+                commands: {
+                    clean: {
+                        lifecycleEvents: ["init"],
+                        usage: "Cleans up wrapper handler functions for DataDog, not necessary in most cases",
+                    },
+                    generate: {
+                        lifecycleEvents: ["init"],
+                        usage: "Generates wrapper handler functions for DataDog, not necessary in most cases",
+                    },
+                },
+                lifecycleEvents: ["clean", "generate"],
+                usage: "Automatically instruments your lambdas with DataDog",
+            },
+        };
+    }
+    beforePackageFunction() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.serverless.cli.log("Auto instrumenting functions with Datadog");
+            const config = env_1.getConfig(this.serverless.service);
+            env_1.setEnvConfiguration(config, this.serverless.service);
+            const defaultRuntime = this.serverless.service.provider.runtime;
+            const handlers = layer_1.findHandlers(this.serverless.service, defaultRuntime);
+            if (config.addLayers) {
+                this.serverless.cli.log("Adding Lambda Layers to functions");
+                this.debugLogHandlers(handlers);
+                layer_1.applyLayers(this.serverless.service.provider.region, handlers, layers);
+            }
+            else {
+                this.serverless.cli.log("Skipping adding Lambda Layers, make sure you are packaging them yourself");
+            }
+            let tracingMode = tracing_1.TracingMode.NONE;
+            if (config.enableXrayTracing && config.enableDDTracing) {
+                tracingMode = tracing_1.TracingMode.HYBRID;
+            }
+            else if (config.enableDDTracing) {
+                tracingMode = tracing_1.TracingMode.DD_TRACE;
+            }
+            else if (config.enableXrayTracing) {
+                tracingMode = tracing_1.TracingMode.XRAY;
+            }
+            tracing_1.enableTracing(this.serverless.service, tracingMode);
+        });
+    }
+    afterPackageFunction() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = env_1.getConfig(this.serverless.service);
+            if (config.forwarder) {
+                const aws = this.serverless.getProvider("aws");
+                const errors = yield forwarder_1.addCloudWatchForwarderSubscriptions(this.serverless.service, aws, config.forwarder);
+                for (const error of errors) {
+                    this.serverless.cli.log(error);
+                }
+            }
+            if (config.enableTags) {
+                this.serverless.cli.log("Adding service and environment tags to functions");
+                this.addServiceAndEnvTags();
+            }
+            const defaultRuntime = this.serverless.service.provider.runtime;
+            const handlers = layer_1.findHandlers(this.serverless.service, defaultRuntime);
+            wrapper_1.redirectHandlers(handlers, config.addLayers);
+        });
+    }
+    debugLogHandlers(handlers) {
+        for (const handler of handlers) {
+            if (handler.type === layer_1.RuntimeType.UNSUPPORTED) {
+                if (handler.runtime === undefined) {
+                    this.serverless.cli.log(`Unable to determine runtime for function ${handler.name}`);
+                }
+                else {
+                    this.serverless.cli.log(`Unable to add Lambda Layers to function ${handler.name} with runtime ${handler.runtime}`);
+                }
+            }
+        }
+    }
+    /**
+     * Check for service and env tags on provider level (under tags and stackTags),
+     * as well as function level. Automatically create tags for service and env with
+     * properties from deployment configurations if needed; does not override any existing values.
+     */
+    addServiceAndEnvTags() {
+        let providerServiceTagExists = false;
+        let providerEnvTagExists = false;
+        const provider = this.serverless.service.provider;
+        const providerTags = provider.tags;
+        if (providerTags !== undefined) {
+            providerServiceTagExists = providerTags[TagKeys.Service] !== undefined;
+            providerEnvTagExists = providerTags[TagKeys.Env] !== undefined;
+        }
+        const providerStackTags = provider.stackTags;
+        if (providerStackTags !== undefined) {
+            providerServiceTagExists = providerServiceTagExists || providerStackTags[TagKeys.Service] !== undefined;
+            providerEnvTagExists = providerEnvTagExists || providerStackTags[TagKeys.Env] !== undefined;
+        }
+        if (!providerServiceTagExists || !providerEnvTagExists) {
+            this.serverless.service.getAllFunctions().forEach((functionName) => {
+                const functionDefintion = this.serverless.service.getFunction(functionName);
+                if (!functionDefintion.tags) {
+                    functionDefintion.tags = {};
+                }
+                if (!providerServiceTagExists && !functionDefintion.tags[TagKeys.Service]) {
+                    functionDefintion.tags[TagKeys.Service] = this.serverless.service.getServiceName();
+                }
+                if (!providerEnvTagExists && !functionDefintion.tags[TagKeys.Env]) {
+                    functionDefintion.tags[TagKeys.Env] = this.serverless.getProvider("aws").getStage();
+                }
+            });
+        }
+    }
+};
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/layer.d.ts

@@ -0,0 +1,26 @@
+import { FunctionDefinition } from "serverless";
+import Service from "serverless/classes/Service";
+export declare enum RuntimeType {
+    NODE = 0,
+    PYTHON = 1,
+    UNSUPPORTED = 2
+}
+export interface FunctionInfo {
+    name: string;
+    type: RuntimeType;
+    handler: FunctionDefinition;
+    runtime?: string;
+}
+export interface LayerJSON {
+    regions: {
+        [region: string]: {
+            [runtime: string]: string | undefined;
+        } | undefined;
+    };
+}
+export declare const runtimeLookup: {
+    [key: string]: RuntimeType;
+};
+export declare function findHandlers(service: Service, defaultRuntime?: string): FunctionInfo[];
+export declare function applyLayers(region: string, handlers: FunctionInfo[], layers: LayerJSON): void;
+//# sourceMappingURL=layer.d.ts.map

package/dist/layer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../src/layer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,WAAW,IAAA;CACZ;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE;QACP,CAAC,MAAM,EAAE,MAAM,GACX;YACE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACvC,GACD,SAAS,CAAC;KACf,CAAC;CACH;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAQvD,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAetF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,QAqBtF"}

package/dist/layer.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var RuntimeType;
+(function (RuntimeType) {
+    RuntimeType[RuntimeType["NODE"] = 0] = "NODE";
+    RuntimeType[RuntimeType["PYTHON"] = 1] = "PYTHON";
+    RuntimeType[RuntimeType["UNSUPPORTED"] = 2] = "UNSUPPORTED";
+})(RuntimeType = exports.RuntimeType || (exports.RuntimeType = {}));
+exports.runtimeLookup = {
+    "nodejs10.x": RuntimeType.NODE,
+    "nodejs12.x": RuntimeType.NODE,
+    "nodejs8.10": RuntimeType.NODE,
+    "python2.7": RuntimeType.PYTHON,
+    "python3.6": RuntimeType.PYTHON,
+    "python3.7": RuntimeType.PYTHON,
+    "python3.8": RuntimeType.PYTHON,
+};
+function findHandlers(service, defaultRuntime) {
+    const funcs = service.functions;
+    return Object.entries(funcs)
+        .map(([name, handler]) => {
+        let { runtime } = handler;
+        if (runtime === undefined) {
+            runtime = defaultRuntime;
+        }
+        if (runtime !== undefined && runtime in exports.runtimeLookup) {
+            return { type: exports.runtimeLookup[runtime], runtime, name, handler };
+        }
+        return { type: RuntimeType.UNSUPPORTED, runtime, name, handler };
+    })
+        .filter((result) => result !== undefined);
+}
+exports.findHandlers = findHandlers;
+function applyLayers(region, handlers, layers) {
+    const regionRuntimes = layers.regions[region];
+    if (regionRuntimes === undefined) {
+        return;
+    }
+    for (const handler of handlers) {
+        if (handler.type === RuntimeType.UNSUPPORTED) {
+            continue;
+        }
+        const { runtime } = handler;
+        const layerARN = runtime !== undefined ? regionRuntimes[runtime] : undefined;
+        if (layerARN !== undefined) {
+            const currentLayers = getLayers(handler);
+            if (!new Set(currentLayers).has(layerARN)) {
+                currentLayers.push(layerARN);
+            }
+            setLayers(handler, currentLayers);
+        }
+    }
+}
+exports.applyLayers = applyLayers;
+function getLayers(handler) {
+    const layersList = handler.handler.layers;
+    if (layersList === undefined) {
+        return [];
+    }
+    return layersList;
+}
+function setLayers(handler, layers) {
+    handler.handler.layers = layers;
+}
+//# sourceMappingURL=layer.js.map

package/dist/layer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer.js","sourceRoot":"","sources":["../src/layer.ts"],"names":[],"mappings":";;AAUA,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,6CAAI,CAAA;IACJ,iDAAM,CAAA;IACN,2DAAW,CAAA;AACb,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB;AAmBY,QAAA,aAAa,GAAmC;IAC3D,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,YAAY,EAAE,WAAW,CAAC,IAAI;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;IAC/B,WAAW,EAAE,WAAW,CAAC,MAAM;CAChC,CAAC;AAEF,SAAgB,YAAY,CAAC,OAAgB,EAAE,cAAuB;IACpE,MAAM,KAAK,GAAI,OAAe,CAAC,SAAkD,CAAC;IAElF,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;QACvB,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC1B,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,OAAO,GAAG,cAAc,CAAC;SAC1B;QACD,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,qBAAa,EAAE;YACrD,OAAO,EAAE,IAAI,EAAE,qBAAa,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAkB,CAAC;SACjF;QACD,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAkB,CAAC;IACnF,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAmB,CAAC;AAChE,CAAC;AAfD,oCAeC;AAED,SAAgB,WAAW,CAAC,MAAc,EAAE,QAAwB,EAAE,MAAiB;IACrF,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO;KACR;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,WAAW,EAAE;YAC5C,SAAS;SACV;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,QAAQ,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7E,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;YACzC,IAAI,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACzC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC9B;YACD,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;SACnC;KACF;AACH,CAAC;AArBD,kCAqBC;AAED,SAAS,SAAS,CAAC,OAAqB;IACtC,MAAM,UAAU,GAAI,OAAO,CAAC,OAAe,CAAC,MAA8B,CAAC;IAC3E,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,OAAO,EAAE,CAAC;KACX;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,SAAS,CAAC,OAAqB,EAAE,MAAgB;IACvD,OAAO,CAAC,OAAe,CAAC,MAAM,GAAG,MAAM,CAAC;AAC3C,CAAC"}