feat: use metrics api from toolkit library(#32)

* clean invalid code

* use metrics api from toolkit library

* clean invalid code

* change code style

* delete library

* chore(release): 0.0.12

Co-authored-by: yugasun <[email protected]>

Author: syzh

example/src/sls.js

@@ -7,10 +7,38 @@ app.get(`/`, (req, res) => {
   res.sendFile(path.join(__dirname, 'index.html'))
 })
 
+app.get('/user', (req, res) => {
+  res.send([
+    {
+      title: 'serverless framework',
+      link: 'https://serverless.com'
+    }
+  ])
+})
+
+app.get('/user/:id', (req, res) => {
+  const id = req.params.id
+  res.send({
+    id: id,
+    title: 'serverless framework',
+    link: 'https://serverless.com'
+  })
+})
+
+app.get('/404', (req, res) => {
+  res.status(404).send('Not found')
+})
+
+app.get('/500', (req, res) => {
+  res.status(500).send('Server Error')
+})
+
 // Error handler
 app.use(function(err, req, res, next) {
   console.error(err)
   res.status(500).send('Internal Serverless Error')
 })
 
+app.listen(8080)
+
 module.exports = app

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless/express",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "main": "src/serverless.js",
   "publishConfig": {
     "access": "public"

serverless.component.yml

@@ -1,5 +1,5 @@
 name: express
-version: 0.0.11
+version: 0.0.12
 author: Tencent Cloud Inc.
 org: Tencent Cloud Inc.
 description: Deploys a serverless Express.js application onto Tencent SCF and Tencent APIGateway.

src/_shims/package.json

@@ -11,7 +11,7 @@
   "author": "Serverless, Inc.",
   "license": "Apache",
   "dependencies": {
-    "tencent-component-monitor": "^1.0.4",
+    "tencent-component-monitor": "^1.0.5",
     "tencent-serverless-http": "^1.2.0"
   }
 }

src/package.json

@@ -13,7 +13,6 @@
   "dependencies": {
     "download": "^8.0.0",
     "fs-extra": "^8.1.0",
-    "moment": "^2.24.0",
     "tencent-cloud-sdk": "^0.1.4",
     "tencent-component-toolkit": "^1.5.5",
     "type": "^2.0.0"

src/serverless.js

@@ -1,17 +1,6 @@
 const { Component } = require('@serverless/core')
-const { MultiApigw, Scf, Apigw, Cos, Cns, Cam } = require('tencent-component-toolkit')
-const moment = require('moment')
-const util = require('util')
-const { slsMonitor } = require('tencent-cloud-sdk')
-
-const {
-  packageCode,
-  getDefaultProtocol,
-  deleteRecord,
-  prepareInputs,
-  buildMetrics,
-  buildCustomMetrics
-} = require('./utils')
+const { MultiApigw, Scf, Apigw, Cos, Cns, Cam, Metrics } = require('tencent-component-toolkit')
+const { packageCode, getDefaultProtocol, deleteRecord, prepareInputs } = require('./utils')
 const CONFIGS = require('./config')
 
 class ServerlessComponent extends Component {
@@ -305,102 +294,23 @@ class ServerlessComponent extends Component {
     if (!inputs.rangeStart || !inputs.rangeEnd) {
       throw new Error('rangeStart and rangeEnd are require inputs')
     }
-    inputs.rangeStart = moment(inputs.rangeStart)
-    inputs.rangeEnd = moment(inputs.rangeEnd)
-
-    if (inputs.rangeStart.isAfter(inputs.rangeEnd)) {
-      throw new Error(`The rangeStart provided is after the rangeEnd`)
-    }
-
-    // Validate: End is not longer than 30 days
-    if (inputs.rangeStart.diff(inputs.rangeEnd, 'days') >= 31) {
-      throw new Error(
-        `The range cannot be longer than 30 days.  The supplied range is: ${inputs.rangeStart.diff(
-          inputs.rangeEnd,
-          'days'
-        )}`
-      )
-    }
-
-    const diffMinutes = (inputs.rangeEnd - inputs.rangeStart) / 1000 / 60
-    let period
-    if (diffMinutes <= 16) {
-      // 16 mins
-      period = 60 // 1 min
-    } else if (diffMinutes <= 61) {
-      // 1 hour
-      period = 300 // 5 mins
-    } else if (diffMinutes <= 1500) {
-      // 24 hours
-      period = 3600 // hour
-    } else {
-      period = 86400 // day
-    }
-
-    const credentials = this.getCredentials()
-    const slsClient = new slsMonitor(credentials)
-
-    let timeFormat = 'YYYY-MM-DDTHH:mm:ssZ'
-    if (inputs.tz) {
-      timeFormat = 'YYYY-MM-DDTHH:mm:ss' + inputs.tz
-    }
-
-    const rangeTime = {
-      rangeStart: inputs.rangeStart.format(timeFormat),
-      rangeEnd: inputs.rangeEnd.format(timeFormat)
-    }
-
     let functionName, namespace, functionVersion
     if (this.state[this.state.region] && this.state[this.state.region].functionName) {
       ;({ functionName, namespace, functionVersion } = this.state[this.state.region])
     } else {
       throw new Error('function name not define')
     }
 
-    console.log(
-      'getScfMetrics params>>',
-      this.state.region,
-      rangeTime,
-      period,
-      functionName,
-      namespace
-    )
-    const responses = await slsClient.getScfMetrics(
-      this.state.region,
-      rangeTime,
-      period,
-      functionName,
-      namespace || 'default'
-    )
-    console.log('getScf>>>', JSON.stringify(responses))
-    const metricResults = buildMetrics(responses, period)
-
-    const reqCustomTime = {
-      rangeStart: inputs.rangeStart.format('YYYY-MM-DD HH:mm:ss'),
-      rangeEnd: inputs.rangeEnd.format('YYYY-MM-DD HH:mm:ss')
-    }
-
-    const instances = [
-      util.format('%s|%s|%s', namespace || 'default', functionName, functionVersion || '$LATEST')
-    ]
-    console.log('customMetrics params>>', this.state.region, instances, reqCustomTime, period)
-    const customMetrics = await slsClient.getCustomMetrics(
-      this.state.region,
-      instances,
-      reqCustomTime,
-      period
-    )
-    console.log('customMetrics>>>', JSON.stringify(customMetrics))
-
-    const customResults = buildCustomMetrics(customMetrics)
-    metricResults.metrics = metricResults.metrics.concat(customResults)
-
-    if (!metricResults.rangeStart) {
-      metricResults.rangeStart = reqCustomTime.rangeStart
-    }
-    if (!metricResults.rangeEnd) {
-      metricResults.rangeEnd = reqCustomTime.rangeEnd
+    const options = {
+      funcName: functionName,
+      namespace: namespace,
+      version: functionVersion,
+      region: this.state.region,
+      timezone: inputs.tz
     }
+    const credentials = this.getCredentials()
+    const mertics = new Metrics(credentials, options)
+    const metricResults = await mertics.getDatas(inputs.rangeStart, inputs.rangeEnd)
     return metricResults
   }
 }