Skip to content

Commit 562177c

Browse files
authored
refactor: enable prefer-object-spread rule for all files (#7488)
Move prefer-object-spread ESLint rule from restricted section to main rules to apply it across all files. Update codebase to use object spread syntax ({ ...obj }) instead of Object.assign() calls.
1 parent dee0dd4 commit 562177c

14 files changed

Lines changed: 34 additions & 33 deletions

File tree

benchmark/sirun/get-results.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ const artifactsUrl = num =>
2323
function get (url, headers) {
2424
return new Promise((resolve, reject) => {
2525
https.get(url, {
26-
headers: Object.assign({
26+
headers: {
2727
'user-agent': 'dd-results-retriever',
2828
accept: 'application/json',
29-
}, headers),
29+
...headers,
30+
},
3031
}, async res => {
3132
if (res.statusCode >= 300 && res.statusCode < 400) {
3233
resolve(get(res.headers.location))

benchmark/sirun/run-all-variants.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ process.env.DD_INSTRUMENTATION_TELEMETRY_ENABLED = 'false'
1111
require('./squash-affinity')
1212

1313
const metaJson = require(path.join(process.cwd(), 'meta.json'))
14-
const env = Object.assign({}, process.env, { DD_TRACE_STARTUP_LOGS: 'false' })
14+
const env = { ...process.env, DD_TRACE_STARTUP_LOGS: 'false' }
1515

1616
;(async () => {
1717
if (metaJson.variants) {
1818
const variants = metaJson.variants
1919
for (const variant in variants) {
20-
const variantEnv = Object.assign({}, env, { SIRUN_VARIANT: variant })
20+
const variantEnv = { ...env, SIRUN_VARIANT: variant }
2121
await exec('sirun', ['meta-temp.json'], { env: variantEnv, stdio })
2222
}
2323
} else {

benchmark/sirun/run-one-variant.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ const { exec, stdio } = require('./run-util')
66

77
process.env.DD_INSTRUMENTATION_TELEMETRY_ENABLED = 'false'
88

9-
const env = Object.assign({}, process.env, { DD_TRACE_STARTUP_LOGS: 'false' })
9+
const env = { ...process.env, DD_TRACE_STARTUP_LOGS: 'false' }
1010

1111
exec('sirun', ['meta-temp.json'], { env, stdio })

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ export default [
394394
'no-console': 'error',
395395
'no-prototype-builtins': 'off', // Override (turned on by @eslint/js/recommended)
396396
'no-var': 'error',
397+
'prefer-object-spread': 'error',
397398
'require-await': 'error',
398399
strict: 'error',
399400
},
@@ -458,7 +459,6 @@ export default [
458459
'operator-assignment': 'error',
459460
'prefer-exponentiation-operator': 'error',
460461
'prefer-object-has-own': 'error',
461-
'prefer-object-spread': 'error',
462462

463463
// Too strict for now. Slowly migrate to this rule by using rest parameters.
464464
// 'prefer-rest-params': 'error',

packages/datadog-plugin-fs/test/index.spec.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const util = require('node:util')
77

88
const { channel } = require('dc-polyfill')
99
const { after, afterEach, before, beforeEach, describe, it } = require('mocha')
10-
const realFS = Object.assign({}, require('node:fs'))
10+
const realFS = { ...require('node:fs') }
1111

1212
const agent = require('../../dd-trace/test/plugins/agent')
1313
const { expectSomeSpan } = require('../../dd-trace/test/plugins/helpers')
@@ -1937,12 +1937,13 @@ describe('Plugin', () => {
19371937
})
19381938

19391939
function mkExpected (props) {
1940-
const meta = Object.assign({ component: 'fs', 'span.kind': 'internal' }, props.meta)
1941-
const expected = Object.assign({
1940+
const meta = { component: 'fs', 'span.kind': 'internal', ...props.meta }
1941+
const expected = {
19421942
name: 'fs.operation',
19431943
error: 0,
19441944
service: 'test',
1945-
}, props)
1945+
...props,
1946+
}
19461947
expected.meta = meta
19471948
return expected
19481949
}

packages/datadog-plugin-graphql/test/index.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,7 @@ describe('Plugin', () => {
13521352

13531353
return agent.load('graphql', {
13541354
service: 'custom',
1355-
variables: variables => Object.assign({}, variables, { who: 'REDACTED' }),
1355+
variables: variables => ({ ...variables, who: 'REDACTED' }),
13561356
source: true,
13571357
})
13581358
})

packages/datadog-plugin-grpc/test/client.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ describe('Plugin', () => {
3131
}
3232

3333
function buildGenericService (grpc, service, TestService, ClientService, currentVersion) {
34-
service = Object.assign({
34+
service = {
3535
getBidi: () => {},
3636
getServerStream: () => {},
3737
getClientStream: () => {},
3838
getUnary: () => {},
39-
}, service)
39+
...service,
40+
}
4041

4142
server = new grpc.Server()
4243

packages/datadog-plugin-grpc/test/integration-test/server.mjs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ let server
99
let port = 0
1010

1111
function buildClient (service, callback) {
12-
service = Object.assign(
13-
{
14-
getBidi: () => {},
15-
getServerStream: () => {},
16-
getClientStream: () => {},
17-
getUnary: () => {},
18-
},
19-
service
20-
)
12+
service = {
13+
getBidi: () => {},
14+
getServerStream: () => {},
15+
getClientStream: () => {},
16+
getUnary: () => {},
17+
...service,
18+
}
2119

2220
const definition = protoLoader.loadSync(`${currentDirectoryPath}/test.proto`)
2321
const TestService = grpc.loadPackageDefinition(definition).test.TestService

packages/datadog-plugin-grpc/test/server.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ describe('Plugin', () => {
2525
let call
2626

2727
function buildClient (service) {
28-
service = Object.assign({
28+
service = {
2929
getBidi: () => {},
3030
getServerStream: () => {},
3131
getClientStream: () => {},
3232
getUnary: () => {},
33-
}, service)
33+
...service,
34+
}
3435

3536
const loader = require('../../../versions/@grpc/proto-loader').get()
3637
const definition = loader.loadSync(path.join(__dirname, 'test.proto'))

packages/datadog-plugin-rhea/test/index.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ describe('Plugin', () => {
641641
})
642642
const listener = server.listen({ port: 0 })
643643
listener.on('listening', () => {
644-
connection = client.connect(Object.assign({ reconnect: false }, listener.address()))
644+
connection = client.connect({ reconnect: false, ...listener.address() })
645645
connection.open_receiver({ autoaccept: false })
646646
connection.open_sender()
647647
expectedServerPort = listener.address().port

0 commit comments

Comments
 (0)