Merge 73d4cbd into dccd906

open-telemetry · Jul 5, 2023 · 17c5493 · 17c5493
2 parents dccd906 + 73d4cbd
commit 17c5493
Show file tree

Hide file tree

Showing 45 changed files with 44 additions and 44 deletions.
diff --git a/api/.eslintrc.js b/api/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "shared-node-browser": true
     },
-    ...require('../eslint.config.js')
+    ...require('../eslint.base.js')
 }
diff --git a/eslint.config.js → eslint.base.js b/eslint.config.js → eslint.base.js
diff --git a/experimental/examples/.eslintrc.js b/experimental/examples/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
       "mocha": true,
       "node": true
   },
-  ...require('../../eslint.config.js')
+  ...require('../../eslint.base.js')
 }
diff --git a/experimental/packages/api-events/.eslintrc.js b/experimental/packages/api-events/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
       "commonjs": true,
       "shared-node-browser": true
   },
-  ...require('../../../eslint.config.js')
+  ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/api-logs/.eslintrc.js b/experimental/packages/api-logs/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
       "commonjs": true,
       "shared-node-browser": true
   },
-  ...require('../../../eslint.config.js')
+  ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js b/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-logs-otlp-http/.eslintrc.js b/experimental/packages/exporter-logs-otlp-http/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
     node: true,
     browser: true,
   },
-  ...require('../../../eslint.config.js'),
+  ...require('../../../eslint.base.js'),
 };
diff --git a/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js b/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js b/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-trace-otlp-http/.eslintrc.js b/experimental/packages/exporter-trace-otlp-http/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js b/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-browser-detector/.eslintrc.js b/experimental/packages/opentelemetry-browser-detector/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js b/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "browser": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-instrumentation/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/opentelemetry-sdk-node/.eslintrc.js b/experimental/packages/opentelemetry-sdk-node/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/otlp-exporter-base/.eslintrc.js b/experimental/packages/otlp-exporter-base/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/otlp-grpc-exporter-base/.eslintrc.js b/experimental/packages/otlp-grpc-exporter-base/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/otlp-proto-exporter-base/.eslintrc.js b/experimental/packages/otlp-proto-exporter-base/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/otlp-transformer/.eslintrc.js b/experimental/packages/otlp-transformer/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "shared-node-browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/experimental/packages/sdk-logs/.eslintrc.js b/experimental/packages/sdk-logs/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
     mocha: true,
     node: true,
   },
-  ...require('../../../eslint.config.js'),
+  ...require('../../../eslint.base.js'),
 };
diff --git a/experimental/packages/shim-opencensus/.eslintrc.js b/experimental/packages/shim-opencensus/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../../eslint.base.js')
 }
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "5.59.11",
     "@typescript-eslint/parser": "5.59.11",
-    "eslint": "8.22.0",
+    "eslint": "8.43.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-node": "11.1.0",

diff --git a/packages/opentelemetry-context-async-hooks/.eslintrc.js b/packages/opentelemetry-context-async-hooks/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js b/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js
@@ -7,5 +7,5 @@ module.exports = {
     "globals": {
         "Zone": "readonly"
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-context-zone/.eslintrc.js b/packages/opentelemetry-context-zone/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "browser": true,
         "commonjs": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-core/.eslintrc.js b/packages/opentelemetry-core/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-exporter-jaeger/.eslintrc.js b/packages/opentelemetry-exporter-jaeger/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-exporter-zipkin/.eslintrc.js b/packages/opentelemetry-exporter-zipkin/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-propagator-b3/.eslintrc.js b/packages/opentelemetry-propagator-b3/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-propagator-jaeger/.eslintrc.js b/packages/opentelemetry-propagator-jaeger/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "browser": true,
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-resources/.eslintrc.js b/packages/opentelemetry-resources/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-sdk-trace-base/.eslintrc.js b/packages/opentelemetry-sdk-trace-base/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-sdk-trace-node/.eslintrc.js b/packages/opentelemetry-sdk-trace-node/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-sdk-trace-web/.eslintrc.js b/packages/opentelemetry-sdk-trace-web/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "browser": true,
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-semantic-conventions/.eslintrc.js b/packages/opentelemetry-semantic-conventions/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/opentelemetry-shim-opentracing/.eslintrc.js b/packages/opentelemetry-shim-opentracing/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/sdk-metrics/.eslintrc.js b/packages/sdk-metrics/.eslintrc.js
@@ -3,5 +3,5 @@ module.exports = {
         "mocha": true,
         "node": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }
diff --git a/packages/template/.eslintrc.js b/packages/template/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../eslint.base.js')
 }