Merge branch 'master' into feat/move-hub

Author: AbhiPrasad

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Ask a question
-    url: https://github.com/getsentry/sentry-javascript/issues
+    url: https://github.com/getsentry/sentry-javascript/discussions
     about: Ask questions and discuss with other community members

.github/workflows/build.yml

@@ -613,3 +613,35 @@ jobs:
         run: |
           cd packages/remix
           yarn test:integration:ci
+
+  job_e2e_tests:
+    name: E2E Tests
+    needs: [job_get_metadata, job_build]
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    continue-on-error: true
+    steps:
+      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ env.HEAD_COMMIT }}
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.DEFAULT_NODE_VERSION }}
+      - name: Check dependency cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
+          key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check build cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_BUILD_PATHS }}
+          key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Run E2E tests
+        env:
+          E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ env.DEFAULT_NODE_VERSION }}
+        run: |
+          cd packages/e2e-tests
+          yarn test:e2e

CHANGELOG.md

@@ -4,6 +4,30 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.14.0
+
+- feat(nextjs): Add status to data-fetcher spans (#5777)
+- feat(nextjs): Auto-wrap API routes (#5778)
+- feat(nextjs): Promote option to automatically wrap data fetchers and API routes to non-experimental (#5793)
+- feat(utils): Modern implementation of `getGlobalObject` (#5809)
+- fix(gatsby): Include app-* entrypoints as they may include user source code (#5685)
+- fix(nextjs): Handle `pathname` being passed in object in `instrumentServer` (#5782)
+- fix(nextjs): Pass request in sampling context of data fetchers wrapper transaction (#5784)
+- fix(nextjs): Reverse order of checks for instrumenting server (#5828)
+- fix(nextjs): Rename `nextjs.data.server` ops (#5830) 
+- fix(remix): Do not skip error handling if tracing is not enabled. (#5811)
+- fix(remix): Use import() to get `react-router-dom` in Express wrapper. (#5810)
+- fix(tracing): Remove `connection.downlink` measurement (#5794)
+- ref(browser): Use configured transport as fallback for client reports (#5797)
+- ref(nextjs): Use flush code from `withSentry` in all backend wrappers (#5814)
+- ref(nextjs): Use integration to add request data to transaction events (#5703)
+- ref(nextjs): Use`RequestData` integration for errors (#5729)
+- ref(node): Move request data functions back to `@sentry/node` (#5759)
+- ref(tracing): Don't track transaction sampling method (#5775)
+- ref(types): Use intersections instead of extend in envelope types (#5788)
+
+Work in this release contributed by @Auspicus and @dagroe. Thank you for your contributions!
+
 ## 7.13.0
 
 - feat(browser): Use fetch `keepalive` flag (#5697)

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

package.json

@@ -34,6 +34,7 @@
     "packages/angular",
     "packages/browser",
     "packages/core",
+    "packages/e2e-tests",
     "packages/ember",
     "packages/eslint-config-sdk",
     "packages/eslint-plugin-sdk",
@@ -90,8 +91,8 @@
     "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.67.1",
+    "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-license": "^2.6.1",
-    "rollup-plugin-re": "^1.0.7",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.31.2",
     "sinon": "^7.3.2",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.13.0",
-    "@sentry/types": "7.13.0",
-    "@sentry/utils": "7.13.0",
+    "@sentry/browser": "7.14.0",
+    "@sentry/types": "7.14.0",
+    "@sentry/utils": "7.14.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "7.13.0",
-    "@sentry/types": "7.13.0",
-    "@sentry/utils": "7.13.0",
+    "@sentry/core": "7.14.0",
+    "@sentry/types": "7.14.0",
+    "@sentry/utils": "7.14.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "7.13.0",
-    "@sentry/utils": "7.13.0",
+    "@sentry/types": "7.14.0",
+    "@sentry/utils": "7.14.0",
     "tslib": "^1.9.3"
   },
   "scripts": {

packages/core/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = '7.13.0';
+export const SDK_VERSION = '7.14.0';

packages/e2e-tests/.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  env: {
+    node: true,
+  },
+  extends: ['../../.eslintrc.js'],
+  ignorePatterns: ['test-applications/**'],
+  parserOptions: {
+    sourceType: 'module',
+  },
+};

packages/e2e-tests/Dockerfile.publish-packages

@@ -0,0 +1,6 @@
+# This Dockerfile exists for the purpose of using a specific node/npm version (ie. the same we use in CI) to run npm publish with
+ARG NODE_VERSION=16.15.1
+FROM node:${NODE_VERSION}
+
+WORKDIR /sentry-javascript/packages/e2e-tests
+CMD [ "yarn", "ts-node", "publish-packages.ts" ]

packages/e2e-tests/LICENSE

@@ -0,0 +1,29 @@
+MIT License
+
+Copyright (c) 2022, Sentry
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

packages/e2e-tests/README.md

@@ -0,0 +1,99 @@
+# E2E Tests
+
+E2E tests enable us to verify the behavior of the packages in this repository as if they were to be published in their
+current state.
+
+## How to run
+
+Prerequisites: Docker
+
+```bash
+yarn test:e2e
+```
+
+## How they work
+
+Before running any tests we launch a fake test registry (in our case [Verdaccio](https://verdaccio.org/docs/e2e/)), we
+build our packages, pack them, and publish them to the fake registry. The fake registry is hosted in a Docker container,
+and the script to publish the packages is also run from within a container to ensure that the fake publishing happens
+with the same Node.js and npm versions as we're using in CI.
+
+After publishing our freshly built packages to the fake registry, the E2E test script will look for `test-recipe.json`
+files in test applications located in the `test-applications` folder. In this folder, we keep standalone test
+applications, that use our SDKs and can be used to verify their behavior. The `test-recipe.json` recipe files contain
+information on how to build the test applications and how to run tests on these applications.
+
+## How to set up a new test
+
+Test applications are completely standalone applications that can be used to verify our SDKs. To set one up, follow
+these commands:
+
+```sh
+cd packages/e2e-tests
+
+# Create a new test application folder
+mkdir test-applications/my-new-test-application # Name of the new folder doesn't technically matter but choose something meaningful
+
+# Create an npm configuration file that uses the fake test registry
+cat > test-applications/my-new-test-application/.npmrc << EOF
+@sentry:registry=http://localhost:4873
+@sentry-internal:registry=http://localhost:4873
+EOF
+
+# Add a gitignore that ignores lockfiles
+cat > test-applications/my-new-test-application/.gitignore << EOF
+yarn.lock
+package-lock.json
+EOF
+
+# Add a test recipe file to the test application
+touch test-applications/my-new-test-application/test-recipe.json
+```
+
+To get you started with the recipe, you can copy the following into `test-recipe.json`:
+
+```json
+{
+  "$schema": "../../test-recipe-schema.json",
+  "testApplicationName": "My New Test Application",
+  "buildCommand": "yarn install --no-lockfile",
+  "tests": [
+    {
+      "testName": "My new test",
+      "testCommand": "yarn test",
+      "timeoutSeconds": 60
+    }
+  ]
+}
+```
+
+The `test-recipe.json` files follow a schema (`e2e-tests/test-recipe-schema.json`). Here is a basic explanation of the
+fields:
+
+- The `buildCommand` command runs only once before any of the tests and is supposed to build the test application. If
+  this command returns a non-zero exit code, it counts as a failed test and the test application's tests are not run.
+- The `testCommand` command is supposed to run tests on the test application. If the configured command returns a
+  non-zero exit code, it counts as a failed test.
+- A test timeout can be configured via `timeoutSeconds`, it defaults to `60`.
+
+**An important thing to note:** In the context of the `buildCommand` the fake test registry is available at
+`http://localhost:4873`. It hosts all of our packages as if they were to be published with the state of the current
+branch. This means we can install the packages from this registry via the `.npmrc` configuration as seen above. If you
+add Sentry dependencies to your test application, you should set the dependency versions set to `*`:
+
+```jsonc
+// package.json
+{
+  "name": "my-new-test-application",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "test": "echo \"Hello world!\""
+  },
+  "dependencies": {
+    "@sentry/node": "*"
+  }
+}
+```
+
+All that is left for you to do now is to create a test app and run `yarn test:e2e`.

packages/e2e-tests/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@sentry-internal/e2e-tests",
+  "version": "7.14.0",
+  "license": "MIT",
+  "engines": {
+    "node": ">=10"
+  },
+  "private": true,
+  "scripts": {
+    "fix": "run-s fix:eslint fix:prettier",
+    "fix:eslint": "eslint . --format stylish --fix",
+    "fix:prettier": "prettier --config ../../.prettierrc.json --write . ",
+    "lint": "run-s lint:prettier lint:eslint",
+    "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
+    "lint:prettier": "prettier --config ../../.prettierrc.json --check .",
+    "test:e2e": "run-s test:validate-configuration test:test-app-setups test:run",
+    "test:run": "ts-node run.ts",
+    "test:validate-configuration": "ts-node validate-verdaccio-configuration.ts",
+    "test:test-app-setups": "ts-node validate-test-app-setups.ts"
+  },
+  "devDependencies": {
+    "@types/glob": "8.0.0",
+    "glob": "8.0.3",
+    "ts-node": "10.9.1",
+    "typescript": "3.8.3",
+    "yaml": "2.1.1"
+  }
+}

packages/e2e-tests/publish-packages.ts

@@ -0,0 +1,25 @@
+/* eslint-disable no-console */
+import * as childProcess from 'child_process';
+import * as glob from 'glob';
+import * as path from 'path';
+
+const repositoryRoot = path.resolve(__dirname, '../..');
+
+// Create tarballs
+childProcess.execSync('yarn build:npm', { encoding: 'utf8', cwd: repositoryRoot, stdio: 'inherit' });
+
+// Get absolute paths of all the packages we want to publish to the fake registry
+const packageTarballPaths = glob.sync('packages/*/sentry-*.tgz', {
+  cwd: repositoryRoot,
+  absolute: true,
+});
+
+// Publish built packages to the fake registry
+packageTarballPaths.forEach(tarballPath => {
+  // `--userconfig` flag needs to be before `publish`
+  childProcess.execSync(`npm --userconfig ${__dirname}/test-registry.npmrc publish ${tarballPath}`, {
+    cwd: repositoryRoot, // Can't use __dirname here because npm would try to publish `@sentry-internal/e2e-tests`
+    encoding: 'utf8',
+    stdio: 'inherit',
+  });
+});