Skip to content

Commit 48818bc

Browse files
committed
Merge branch 'develop' into manual-sync-dev
2 parents f037e22 + f271bbb commit 48818bc

File tree

155 files changed

+1105
-821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1105
-821
lines changed

.github/workflows/create-issue-for-unreferenced-prs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ concurrency:
1919
jobs:
2020
check_for_issue_reference:
2121
runs-on: ubuntu-latest
22+
if: |
23+
!contains(github.event.pull_request.labels.*.name, 'Dev: Gitflow')
24+
&& !startsWith(github.event.pull_request.head.ref, 'external-contributor/')
25+
&& !startsWith(github.event.pull_request.head.ref, 'prepare-release/')
26+
&& !startsWith(github.event.pull_request.head.ref, 'dependabot/')
2227
steps:
2328
- name: Check PR Body and Title for Issue Reference
2429
uses: actions/github-script@v8

dev-packages/browser-integration-tests/utils/replayHelpers.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ export function collectReplayRequests(
115115
const replayEvents: ReplayEvent[] = [];
116116
const replayRecordingSnapshots: RecordingSnapshot[] = [];
117117

118-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
119118
const promise = page.waitForResponse(res => {
120119
const req = res.request();
121120

dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ app.use(cors());
2424

2525
app.get('/check', (req, res) => {
2626
const appPort = getPortAppIsRunningOn(app);
27-
// eslint-disable-next-line no-undef
27+
2828
fetch(`http://localhost:${appPort}/bounce`)
2929
.then(r => r.json())
3030
.then(bounceRes => {

dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ app.use(cors());
2323

2424
app.get('/check', (req, res) => {
2525
const appPort = getPortAppIsRunningOn(app);
26-
// eslint-disable-next-line no-undef
26+
2727
fetch(`http://localhost:${appPort}/bounce`)
2828
.then(r => r.json())
2929
.then(bounceRes => {

dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ app.use(cors());
2424

2525
app.get('/check', (req, res) => {
2626
const appPort = getPortAppIsRunningOn(app);
27-
// eslint-disable-next-line no-undef
27+
2828
fetch(`http://localhost:${appPort}/bounce`)
2929
.then(r => r.json())
3030
.then(bounceRes => {

dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ app.use(cors());
2424

2525
app.get('/check', (req, res) => {
2626
const appPort = getPortAppIsRunningOn(app);
27-
// eslint-disable-next-line no-undef
27+
2828
fetch(`http://localhost:${appPort}/bounce`)
2929
.then(r => r.json())
3030
.then(bounceRes => {

dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler-with-otel-http-instrumentation/server.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ app.get('/check', (req, res) => {
3030
Sentry.startSpan({ name: 'check-endpoint' }, async () => {
3131
const appPort = getPortAppIsRunningOn(app);
3232
try {
33-
// eslint-disable-next-line no-undef
3433
const response = await fetch(`http://localhost:${appPort}/bounce`);
3534
const bounceRes = await response.json();
3635
// eslint-disable-next-line no-console

dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-disable no-unused-vars */
2-
31
const Sentry = require('@sentry/node');
42
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
53

dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-disable no-unused-vars */
2-
31
const Sentry = require('@sentry/node');
42
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
53

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,4 @@ async function run() {
3939
);
4040
}
4141

42-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
4342
run();

0 commit comments

Comments
 (0)