re-enable codecov (#1256)

DataDog · Mar 4, 2021 · a431ac2 · a431ac2
1 parent 1d2e50a
commit a431ac2
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,8 +33,15 @@ node-core-base: &node-core-base
       run:
         name: Unit tests
         command: yarn test:core:ci
+    - run:
+        name: Merge coverage report
+        command: yarn cover:merge
     - store_artifacts:
-        path: ./coverage/lcov-report
+        path: ./coverage
+    - persist_to_workspace:
+        root: ~/dd-trace-js
+        paths:
+          - .nyc_merge/*
 
 node-bench-base: &node-bench-base
   resource_class: small
@@ -111,8 +118,15 @@ node-plugin-base: &node-plugin-base
     - run:
         name: Unit tests
         command: yarn test:plugins:ci
+    - run:
+        name: Merge coverage report
+        command: yarn cover:merge
     - store_artifacts:
-        path: ./coverage/lcov-report
+        path: ./coverage
+    - persist_to_workspace:
+        root: ~/dd-trace-js
+        paths:
+          - .nyc_merge/*
 
 prebuild-linux-base: &prebuild-linux-base
   docker:
@@ -774,6 +788,28 @@ jobs:
       - store_artifacts:
           path: ./docs/out
 
+  # Code coverage
+
+  codecov:
+    docker:
+      - image: node
+    working_directory: ~/dd-trace-js
+    resource_class: small
+    steps:
+      - checkout
+      - *yarn-versions
+      - *restore-yarn-cache
+      - *yarn-install
+      - *save-yarn-cache
+      - attach_workspace:
+          at: ~/dd-trace-js
+      - run:
+          name: Build code coverage report
+          command: yarn cover:report
+      - run:
+          name: Submit code coverage report
+          command: yarn codecov
+
   # Prebuilds (linux x64)
 
   linux-x64-15:
@@ -1105,6 +1141,63 @@ workflows:
       - node-tedious
       - node-when
       - node-winston
+      - codecov:
+          requires:
+            - node-core-8
+            - node-core-10
+            - node-core-12
+            - node-core-14
+            - node-core-15
+            - node-core-latest
+            - node-amqplib
+            - node-amqp10
+            - node-aws-sdk
+            - node-bluebird
+            - node-bunyan
+            - node-cassandra
+            - node-connect
+            - node-couchbase
+            - node-dns
+            - node-elasticsearch
+            - node-express
+            - node-fastify
+            - node-fs-8
+            - node-fs-10
+            - node-fs-12
+            - node-fs-14
+            - node-fs-15
+            - node-fs-latest
+            - node-generic-pool
+            - node-google-cloud-pubsub
+            - node-graphql
+            - node-grpc
+            - node-hapi
+            - node-http
+            - node-http2
+            - node-jest
+            - node-kafkajs
+            - node-knex
+            - node-koa
+            # - node-limitd-client
+            - node-memcached
+            - node-microgateway-core
+            - node-mocha
+            - node-mongodb-core
+            - node-mongoose
+            - node-mysql
+            - node-net
+            - node-paperplane
+            - node-pino
+            - node-postgres
+            - node-promise-js
+            - node-promise
+            - node-q
+            - node-redis
+            - node-restify
+            - node-router
+            - node-tedious
+            - node-when
+            - node-winston
   prebuild:
     jobs:
       # Linux x64

diff --git a/package.json b/package.json
@@ -28,6 +28,8 @@
     "test:integration": "mocha --timeout 30000 \"integration-tests/**/*.spec.js\"",
     "leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",
     "leak:plugins": "yarn services && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape \"packages/datadog-plugin-@($(echo $PLUGINS))/test/leak.js\"",
+    "cover:merge": "nyc merge ./.nyc_output ./.nyc_merge/$CIRCLE_JOB.json",
+    "cover:report": "nyc report -t ./.nyc_merge -n 'packages/**/*.js'",
     "codecov": "codecov"
   },
   "repository": {
@@ -85,7 +87,7 @@
     "body-parser": "^1.18.2",
     "chai": "^4.2.0",
     "checksum": "^0.1.1",
-    "codecov": "3.5.0",
+    "codecov": "^3.8.1",
     "dotenv": "^8.2.0",
     "eslint": "^4.15.0",
     "eslint-config-standard": "^11.0.0-beta.0",