Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
plugins: [
"@typescript-eslint",
"header",
"license-header",
"node",
"prettier"
],
Expand All @@ -19,11 +19,32 @@
"prefer-rest-params": "off",
"no-shadow": "off",
"node/no-deprecated-api": ["warn"],
"header/header": ["error", "block", [{
pattern: / \* Copyright The OpenTelemetry Authors(, .+)*[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \* https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an \"AS IS\" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\./gm,
template:
`\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n `
}]]
"license-header/header": [
"error",
[
"/*",
" * Copyright The OpenTelemetry Authors",
" *",
" * Licensed under the Apache License, Version 2.0 (the \"License\");",
" * you may not use this file except in compliance with the License.",
" * You may obtain a copy of the License at",
" *",
" * https://www.apache.org/licenses/LICENSE-2.0",
" *",
" * Unless required by applicable law or agreed to in writing, software",
" * distributed under the License is distributed on an \"AS IS\" BASIS,",
" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
" * See the License for the specific language governing permissions and",
" * limitations under the License.",
" */",
],
{
"allowedHeaderPatterns": [
// Allow additional copyrights on the first line.
/^\/\*\r?\n \* Copyright The OpenTelemetry Authors(, .+)*\r?\n \*\r?\n \* Licensed under the Apache License, Version 2.0 \(the "License"\);\r?\n \* you may not use this file except in compliance with the License.\r?\n \* You may obtain a copy of the License at\r?\n \*\r?\n \* https:\/\/www.apache.org\/licenses\/LICENSE-2.0\r?\n \*\r?\n \* Unless required by applicable law or agreed to in writing, software\r?\n \* distributed under the License is distributed on an "AS IS" BASIS,\r?\n \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r?\n \* See the License for the specific language governing permissions and\r?\n \* limitations under the License.\r?\n \*\/$/,

Check failure

Code scanning / CodeQL

Inefficient regular expression High

This part of the regular expression may cause exponential backtracking on strings starting with '/*\n * Copyright The OpenTelemetry Authors, ' and containing many repetitions of 'a, '.
]
}
]
},
overrides: [
{
Expand Down
37 changes: 36 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"eslint": "8.7.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-license-header": "^0.8.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.2.1",
"glob": "^10.4.5",
Expand Down
1 change: 1 addition & 0 deletions packages/host-metrics/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

declare module 'systeminformation/lib/network' {
export { networkStats } from 'systeminformation';
}
1 change: 1 addition & 0 deletions packages/instrumentation-kafkajs/src/propagator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { TextMapGetter } from '@opentelemetry/api';

/*
Expand Down
1 change: 1 addition & 0 deletions packages/instrumentation-kafkajs/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { Span } from '@opentelemetry/api';
import { InstrumentationConfig } from '@opentelemetry/instrumentation';

Expand Down
Loading