serverest 2.26.25-beta.1 → 2.26.25-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverest",
-  "version": "2.26.25-beta.1",
+  "version": "2.26.25-beta.2",
   "description": "Servidor REST local de forma rápida e simples para estudo de testes de API",
   "author": "Paulo Gonçalves <author@serverest.dev> (https://www.linkedin.com/in/paulo-goncalves/)",
   "license": "GPL-3.0",
@@ -50,6 +50,7 @@
     "colors": "^1.4.0",
     "connect-timeout": "^1.9.0",
     "cors": "^2.8.5",
+    "dd-trace": "^4.14.0",
     "debug": "^4.3.4",
     "dotenv": "^16.3.1",
     "express": "^4.17.1",

package/src/app.js

@@ -9,8 +9,14 @@ const queryParser = require('express-query-int')
 const timeout = require('connect-timeout')
 const { join } = require('path')
 const swaggerUi = require('swagger-ui-express')
-
-const { aplicacaoExecutandoLocalmente, formaDeExecucao, urlDocumentacao } = require('./utils/ambiente')
+const ddTrace = require('dd-trace')
+
+const {
+  aplicacaoExecutandoLocalmente,
+  formaDeExecucao,
+  urlDocumentacao,
+  ehAmbienteDeTestes
+} = require('./utils/ambiente')
 const { conf } = require('./utils/conf')
 const errorHandler = require('./middlewares/error-handler')
 const logger = require('./utils/logger')
@@ -19,10 +25,14 @@ const swaggerDocument = require('../docs/swagger.json')
 const rateLimiter = require('./middlewares/rate-limiter')
 const packageJson = require('../package.json')
 
-const ehAmbienteDeTestes = process.env.NODE_ENV === 'serverest-test'
-
 const app = express()
 
+/* istanbul ignore next */
+if (formaDeExecucao() !== 'npm') {
+  ddTrace.init()
+  ddTrace.use('express')
+}
+
 app.set('json spaces', 4)
 app.use(express.json())
 app.use(express.urlencoded({ extended: false }))

package/src/utils/ambiente.js

@@ -3,17 +3,20 @@
 const { conf } = require('./conf')
 
 function formaDeExecucao () {
-  if (process.env.USERNAME === 'docker' ||
-      process.env.USERNAME === 'serverest.dev' ||
-      process.env.USERNAME === 'staging.serverest.dev' ||
-      process.env.USERNAME === 'agilizei' ||
-      process.env.USERNAME === 'cesarschool' ||
-      process.env.USERNAME === 'compassuol') {
-    return process.env.USERNAME
+  if (process.env.ENVIRONMENT === 'docker' ||
+      process.env.ENVIRONMENT === 'serverest.dev' ||
+      process.env.ENVIRONMENT === 'staging.serverest.dev' ||
+      process.env.ENVIRONMENT === 'agilizei' ||
+      process.env.ENVIRONMENT === 'cesarschool' ||
+      process.env.ENVIRONMENT === 'compassuol') {
+    return process.env.ENVIRONMENT
   }
   return 'npm'
 }
 
+const ehAmbienteDeTestes = process.env.NODE_ENV === 'serverest-test'
+const ehAmbienteDeDesenvolvimento = process.env.NODE_ENV === 'serverest-development'
+
 const aplicacaoExecutandoLocalmente = () => {
   return (formaDeExecucao() === 'npm' || formaDeExecucao() === 'docker')
 }
@@ -38,5 +41,7 @@ function urlDocumentacao () {
 module.exports = {
   aplicacaoExecutandoLocalmente,
   formaDeExecucao,
-  urlDocumentacao
+  urlDocumentacao,
+  ehAmbienteDeDesenvolvimento,
+  ehAmbienteDeTestes
 }

package/src/utils/logger.js

@@ -10,10 +10,11 @@ Esse arquivo está marcado para ser ignorado no arquivo stryker.conf.js
 const moesif = require('moesif-nodejs')
 
 const { version } = require('../../package.json')
-const { formaDeExecucao } = require('./ambiente')
-
-const ehAmbienteDeDesenvolvimento = process.env.NODE_ENV === 'serverest-development'
-const ehAmbienteDeTestes = process.env.NODE_ENV === 'serverest-test'
+const {
+  formaDeExecucao,
+  ehAmbienteDeDesenvolvimento,
+  ehAmbienteDeTestes
+} = require('./ambiente')
 
 module.exports = async app => {
   if (ehAmbienteDeDesenvolvimento || ehAmbienteDeTestes) {