Merge branch 'main' into metric-reader

open-telemetry · Dec 22, 2021 · 90a7581 · 90a7581
2 parents 4cb0574 + 89f862b
commit 90a7581
Show file tree

Hide file tree

Showing 110 changed files with 46 additions and 73 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
-[submodule "experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos"]
-	path = experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos
+[submodule "packages/exporter-trace-otlp-proto/protos"]
+	path = packages/exporter-trace-otlp-proto/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
-[submodule "experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos"]
-	path = experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos
+[submodule "packages/exporter-trace-otlp-grpc/protos"]
+	path = packages/exporter-trace-otlp-grpc/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
 [submodule "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos"]
 	path = experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos

diff --git a/examples/tracer-web/examples/fetchXhr/index.js b/examples/tracer-web/examples/fetchXhr/index.js
@@ -68,7 +68,7 @@ const prepareClickEvent = () => {
   const element1 = document.getElementById('button1');
   const element2 = document.getElementById('button2');
 
-  const clickHandler = (fetchFn) => () => {
+  const clickHandler = (fetchFn) => {
     const singleSpan = webTracerWithZone.startSpan('files-series-info');
     context.with(trace.setSpan(context.active(), singleSpan), () => {
       fetchFn(url).then((_data) => {

diff --git a/examples/tracer-web/examples/fetchXhrB3/index.js b/examples/tracer-web/examples/fetchXhrB3/index.js
@@ -70,7 +70,7 @@ const prepareClickEvent = () => {
   const element1 = document.getElementById('button1');
   const element2 = document.getElementById('button2');
 
-  const clickHandler = (fetchFn) => () => {
+  const clickHandler = (fetchFn) => {
     const singleSpan = webTracerWithZone.startSpan('files-series-info');
     context.with(trace.setSpan(context.active(), singleSpan), () => {
       fetchFn(url).then((_data) => {

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md
@@ -68,4 +68,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-metrics-otlp-grpc.svg
 [opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
 [semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
-[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-grpc
+[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-grpc
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -67,7 +67,7 @@
     "@opentelemetry/api": "^1.0.3"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.3.7",
+    "@grpc/grpc-js": "1.4.4",
     "@grpc/proto-loader": "^0.6.4",
     "@opentelemetry/core": "1.0.1",
     "@opentelemetry/exporter-metrics-otlp-http": "0.27.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json
@@ -11,12 +11,6 @@
   "references": [
     {
       "path": "../opentelemetry-exporter-metrics-otlp-http"
-    },
-    {
-      "path": "../opentelemetry-exporter-trace-otlp-grpc"
-    },
-    {
-      "path": "../opentelemetry-exporter-trace-otlp-http"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md
@@ -122,4 +122,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
 [opentelemetry-spec-protocol-exporter]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options
 [semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
-[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-http
+[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-http
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json
@@ -7,10 +7,5 @@
   },
   "include": [
     "src/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json"
-    }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json
@@ -7,10 +7,5 @@
   },
   "include": [
     "src/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-exporter-trace-otlp-http/tsconfig.esm2015.json"
-    }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json
@@ -7,10 +7,5 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-exporter-trace-otlp-http"
-    }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md
@@ -62,4 +62,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-metrics-otlp-proto.svg
 [opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
 [semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
-[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-http
+[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-http
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json
@@ -11,12 +11,6 @@
   "references": [
     {
       "path": "../opentelemetry-exporter-metrics-otlp-http"
-    },
-    {
-      "path": "../opentelemetry-exporter-trace-otlp-http"
-    },
-    {
-      "path": "../opentelemetry-exporter-trace-otlp-proto"
     }
   ]
 }
diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json
@@ -17,15 +17,6 @@
     {
       "path": "packages/opentelemetry-exporter-prometheus"
     },
-    {
-      "path": "packages/opentelemetry-exporter-trace-otlp-grpc"
-    },
-    {
-      "path": "packages/opentelemetry-exporter-trace-otlp-http/tsconfig.all.json"
-    },
-    {
-      "path": "packages/opentelemetry-exporter-trace-otlp-proto"
-    },
     {
       "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.all.json"
     },

diff --git a/...ry-exporter-trace-otlp-grpc/.eslintignore → ...es/exporter-trace-otlp-grpc/.eslintignore b/...ry-exporter-trace-otlp-grpc/.eslintignore → ...es/exporter-trace-otlp-grpc/.eslintignore
diff --git a/...try-exporter-trace-otlp-grpc/.eslintrc.js → ...ges/exporter-trace-otlp-grpc/.eslintrc.js b/...try-exporter-trace-otlp-grpc/.eslintrc.js → ...ges/exporter-trace-otlp-grpc/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../eslint.config.js')
 }
diff --git a/...metry-exporter-trace-otlp-grpc/.npmignore → packages/exporter-trace-otlp-grpc/.npmignore b/...metry-exporter-trace-otlp-grpc/.npmignore → packages/exporter-trace-otlp-grpc/.npmignore
diff --git a/...elemetry-exporter-trace-otlp-grpc/LICENSE → packages/exporter-trace-otlp-grpc/LICENSE b/...elemetry-exporter-trace-otlp-grpc/LICENSE → packages/exporter-trace-otlp-grpc/LICENSE
diff --git a/...emetry-exporter-trace-otlp-grpc/README.md → packages/exporter-trace-otlp-grpc/README.md b/...emetry-exporter-trace-otlp-grpc/README.md → packages/exporter-trace-otlp-grpc/README.md
diff --git a/...try-exporter-trace-otlp-grpc/package.json → ...ges/exporter-trace-otlp-grpc/package.json b/...try-exporter-trace-otlp-grpc/package.json → ...ges/exporter-trace-otlp-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-grpc",
-  "version": "0.27.0",
+  "version": "1.0.1",
   "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -15,7 +15,7 @@
     "submodule": "git submodule sync --recursive && git submodule update --init --recursive",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
-    "version": "node ../../../scripts/version-update.js",
+    "version": "node ../../scripts/version-update.js",
     "watch": "npm run protos:copy && tsc -w",
     "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
     "prewatch": "npm run precompile"

diff --git a/...telemetry-exporter-trace-otlp-grpc/protos → packages/exporter-trace-otlp-grpc/protos b/...telemetry-exporter-trace-otlp-grpc/protos → packages/exporter-trace-otlp-grpc/protos
diff --git a/...ace-otlp-grpc/src/OTLPExporterNodeBase.ts → ...ace-otlp-grpc/src/OTLPExporterNodeBase.ts b/...ace-otlp-grpc/src/OTLPExporterNodeBase.ts → ...ace-otlp-grpc/src/OTLPExporterNodeBase.ts
diff --git a/...-trace-otlp-grpc/src/OTLPTraceExporter.ts → ...-trace-otlp-grpc/src/OTLPTraceExporter.ts b/...-trace-otlp-grpc/src/OTLPTraceExporter.ts → ...-trace-otlp-grpc/src/OTLPTraceExporter.ts
diff --git a/...try-exporter-trace-otlp-grpc/src/index.ts → ...ges/exporter-trace-otlp-grpc/src/index.ts b/...try-exporter-trace-otlp-grpc/src/index.ts → ...ges/exporter-trace-otlp-grpc/src/index.ts
diff --git a/...try-exporter-trace-otlp-grpc/src/types.ts → ...ges/exporter-trace-otlp-grpc/src/types.ts b/...try-exporter-trace-otlp-grpc/src/types.ts → ...ges/exporter-trace-otlp-grpc/src/types.ts
diff --git a/...etry-exporter-trace-otlp-grpc/src/util.ts → ...ages/exporter-trace-otlp-grpc/src/util.ts b/...etry-exporter-trace-otlp-grpc/src/util.ts → ...ages/exporter-trace-otlp-grpc/src/util.ts
diff --git a/...try-exporter-trace-otlp-grpc/submodule.md → ...ges/exporter-trace-otlp-grpc/submodule.md b/...try-exporter-trace-otlp-grpc/submodule.md → ...ges/exporter-trace-otlp-grpc/submodule.md
diff --git a/...lp-grpc/test/OTLPExporterNodeBase.test.ts → ...lp-grpc/test/OTLPExporterNodeBase.test.ts b/...lp-grpc/test/OTLPExporterNodeBase.test.ts → ...lp-grpc/test/OTLPExporterNodeBase.test.ts
diff --git a/...-otlp-grpc/test/OTLPTraceExporter.test.ts → ...-otlp-grpc/test/OTLPTraceExporter.test.ts b/...-otlp-grpc/test/OTLPTraceExporter.test.ts → ...-otlp-grpc/test/OTLPTraceExporter.test.ts
diff --git a/...xporter-trace-otlp-grpc/test/certs/ca.crt → ...xporter-trace-otlp-grpc/test/certs/ca.crt b/...xporter-trace-otlp-grpc/test/certs/ca.crt → ...xporter-trace-otlp-grpc/test/certs/ca.crt
diff --git a/...xporter-trace-otlp-grpc/test/certs/ca.key → ...xporter-trace-otlp-grpc/test/certs/ca.key b/...xporter-trace-otlp-grpc/test/certs/ca.key → ...xporter-trace-otlp-grpc/test/certs/ca.key
diff --git a/...ter-trace-otlp-grpc/test/certs/client.crt → ...ter-trace-otlp-grpc/test/certs/client.crt b/...ter-trace-otlp-grpc/test/certs/client.crt → ...ter-trace-otlp-grpc/test/certs/client.crt
diff --git a/...ter-trace-otlp-grpc/test/certs/client.csr → ...ter-trace-otlp-grpc/test/certs/client.csr b/...ter-trace-otlp-grpc/test/certs/client.csr → ...ter-trace-otlp-grpc/test/certs/client.csr
diff --git a/...ter-trace-otlp-grpc/test/certs/client.key → ...ter-trace-otlp-grpc/test/certs/client.key b/...ter-trace-otlp-grpc/test/certs/client.key → ...ter-trace-otlp-grpc/test/certs/client.key
diff --git a/...-trace-otlp-grpc/test/certs/regenerate.sh → ...-trace-otlp-grpc/test/certs/regenerate.sh b/...-trace-otlp-grpc/test/certs/regenerate.sh → ...-trace-otlp-grpc/test/certs/regenerate.sh
diff --git a/...ter-trace-otlp-grpc/test/certs/server.crt → ...ter-trace-otlp-grpc/test/certs/server.crt b/...ter-trace-otlp-grpc/test/certs/server.crt → ...ter-trace-otlp-grpc/test/certs/server.crt
diff --git a/...ter-trace-otlp-grpc/test/certs/server.csr → ...ter-trace-otlp-grpc/test/certs/server.csr b/...ter-trace-otlp-grpc/test/certs/server.csr → ...ter-trace-otlp-grpc/test/certs/server.csr
diff --git a/...ter-trace-otlp-grpc/test/certs/server.key → ...ter-trace-otlp-grpc/test/certs/server.key b/...ter-trace-otlp-grpc/test/certs/server.key → ...ter-trace-otlp-grpc/test/certs/server.key
diff --git a/...orter-trace-otlp-grpc/test/traceHelper.ts → ...orter-trace-otlp-grpc/test/traceHelper.ts b/...orter-trace-otlp-grpc/test/traceHelper.ts → ...orter-trace-otlp-grpc/test/traceHelper.ts
diff --git a/...xporter-trace-otlp-grpc/test/util.test.ts → ...xporter-trace-otlp-grpc/test/util.test.ts b/...xporter-trace-otlp-grpc/test/util.test.ts → ...xporter-trace-otlp-grpc/test/util.test.ts
diff --git a/...y-exporter-trace-otlp-proto/tsconfig.json → ...es/exporter-trace-otlp-grpc/tsconfig.json b/...y-exporter-trace-otlp-proto/tsconfig.json → ...es/exporter-trace-otlp-grpc/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-exporter-trace-otlp-http"
+      "path": "../exporter-trace-otlp-http"
     }
   ]
 }
diff --git a/...ry-exporter-trace-otlp-http/.eslintignore → ...es/exporter-trace-otlp-http/.eslintignore b/...ry-exporter-trace-otlp-http/.eslintignore → ...es/exporter-trace-otlp-http/.eslintignore
diff --git a/...try-exporter-trace-otlp-http/.eslintrc.js → ...ges/exporter-trace-otlp-http/.eslintrc.js b/...try-exporter-trace-otlp-http/.eslintrc.js → ...ges/exporter-trace-otlp-http/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../eslint.config.js')
 }
diff --git a/...metry-exporter-trace-otlp-http/.npmignore → packages/exporter-trace-otlp-http/.npmignore b/...metry-exporter-trace-otlp-http/.npmignore → packages/exporter-trace-otlp-http/.npmignore
diff --git a/...elemetry-exporter-trace-otlp-http/LICENSE → packages/exporter-trace-otlp-http/LICENSE b/...elemetry-exporter-trace-otlp-http/LICENSE → packages/exporter-trace-otlp-http/LICENSE
diff --git a/...emetry-exporter-trace-otlp-http/README.md → packages/exporter-trace-otlp-http/README.md b/...emetry-exporter-trace-otlp-http/README.md → packages/exporter-trace-otlp-http/README.md
diff --git a/...ry-exporter-trace-otlp-http/karma.conf.js → ...es/exporter-trace-otlp-http/karma.conf.js b/...ry-exporter-trace-otlp-http/karma.conf.js → ...es/exporter-trace-otlp-http/karma.conf.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-const karmaWebpackConfig = require('../../../karma.webpack');
-const karmaBaseConfig = require('../../../karma.base');
+const karmaWebpackConfig = require('../../karma.webpack');
+const karmaBaseConfig = require('../../karma.base');
 
 module.exports = (config) => {
   config.set(Object.assign({}, karmaBaseConfig, {

diff --git a/...try-exporter-trace-otlp-http/package.json → ...ges/exporter-trace-otlp-http/package.json b/...try-exporter-trace-otlp-http/package.json → ...ges/exporter-trace-otlp-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-http",
-  "version": "0.27.0",
+  "version": "1.0.1",
   "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -23,7 +23,7 @@
     "tdd:browser": "karma start",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
     "test:browser": "nyc karma start --single-run",
-    "version": "node ../../../scripts/version-update.js",
+    "version": "node ../../scripts/version-update.js",
     "watch": "tsc --build --watch tsconfig.all.json",
     "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
     "prewatch": "npm run precompile"

diff --git a/...r-trace-otlp-http/src/OTLPExporterBase.ts → ...r-trace-otlp-http/src/OTLPExporterBase.ts b/...r-trace-otlp-http/src/OTLPExporterBase.ts → ...r-trace-otlp-http/src/OTLPExporterBase.ts
diff --git a/...try-exporter-trace-otlp-http/src/index.ts → ...ges/exporter-trace-otlp-http/src/index.ts b/...try-exporter-trace-otlp-http/src/index.ts → ...ges/exporter-trace-otlp-http/src/index.ts
diff --git a/...atform/browser/OTLPExporterBrowserBase.ts → ...atform/browser/OTLPExporterBrowserBase.ts b/...atform/browser/OTLPExporterBrowserBase.ts → ...atform/browser/OTLPExporterBrowserBase.ts
diff --git a/...src/platform/browser/OTLPTraceExporter.ts → ...src/platform/browser/OTLPTraceExporter.ts b/...src/platform/browser/OTLPTraceExporter.ts → ...src/platform/browser/OTLPTraceExporter.ts
diff --git a/...e-otlp-http/src/platform/browser/index.ts → ...e-otlp-http/src/platform/browser/index.ts b/...e-otlp-http/src/platform/browser/index.ts → ...e-otlp-http/src/platform/browser/index.ts
diff --git a/...ce-otlp-http/src/platform/browser/util.ts → ...ce-otlp-http/src/platform/browser/util.ts b/...ce-otlp-http/src/platform/browser/util.ts → ...ce-otlp-http/src/platform/browser/util.ts
diff --git a/...ter-trace-otlp-http/src/platform/index.ts → ...ter-trace-otlp-http/src/platform/index.ts b/...ter-trace-otlp-http/src/platform/index.ts → ...ter-trace-otlp-http/src/platform/index.ts
diff --git a/...src/platform/node/OTLPExporterNodeBase.ts → ...src/platform/node/OTLPExporterNodeBase.ts b/...src/platform/node/OTLPExporterNodeBase.ts → ...src/platform/node/OTLPExporterNodeBase.ts
diff --git a/...tp/src/platform/node/OTLPTraceExporter.ts → ...tp/src/platform/node/OTLPTraceExporter.ts b/...tp/src/platform/node/OTLPTraceExporter.ts → ...tp/src/platform/node/OTLPTraceExporter.ts
diff --git a/...race-otlp-http/src/platform/node/index.ts → ...race-otlp-http/src/platform/node/index.ts b/...race-otlp-http/src/platform/node/index.ts → ...race-otlp-http/src/platform/node/index.ts
diff --git a/...race-otlp-http/src/platform/node/types.ts → ...race-otlp-http/src/platform/node/types.ts b/...race-otlp-http/src/platform/node/types.ts → ...race-otlp-http/src/platform/node/types.ts
diff --git a/...trace-otlp-http/src/platform/node/util.ts → ...trace-otlp-http/src/platform/node/util.ts b/...trace-otlp-http/src/platform/node/util.ts → ...trace-otlp-http/src/platform/node/util.ts
diff --git a/...exporter-trace-otlp-http/src/transform.ts → ...exporter-trace-otlp-http/src/transform.ts b/...exporter-trace-otlp-http/src/transform.ts → ...exporter-trace-otlp-http/src/transform.ts
diff --git a/...try-exporter-trace-otlp-http/src/types.ts → ...ges/exporter-trace-otlp-http/src/types.ts b/...try-exporter-trace-otlp-http/src/types.ts → ...ges/exporter-trace-otlp-http/src/types.ts
diff --git a/...etry-exporter-trace-otlp-http/src/util.ts → ...ages/exporter-trace-otlp-http/src/util.ts b/...etry-exporter-trace-otlp-http/src/util.ts → ...ages/exporter-trace-otlp-http/src/util.ts
diff --git a/...st/browser/CollectorTraceExporter.test.ts → ...st/browser/CollectorTraceExporter.test.ts b/...st/browser/CollectorTraceExporter.test.ts → ...st/browser/CollectorTraceExporter.test.ts
diff --git a/...e-otlp-http/test/browser/index-webpack.ts → ...e-otlp-http/test/browser/index-webpack.ts b/...e-otlp-http/test/browser/index-webpack.ts → ...e-otlp-http/test/browser/index-webpack.ts
diff --git a/...trace-otlp-http/test/browser/util.test.ts → ...trace-otlp-http/test/browser/util.test.ts b/...trace-otlp-http/test/browser/util.test.ts → ...trace-otlp-http/test/browser/util.test.ts
diff --git a/...xporter-trace-otlp-http/test/certs/ca.crt → ...xporter-trace-otlp-http/test/certs/ca.crt b/...xporter-trace-otlp-http/test/certs/ca.crt → ...xporter-trace-otlp-http/test/certs/ca.crt
diff --git a/...xporter-trace-otlp-http/test/certs/ca.key → ...xporter-trace-otlp-http/test/certs/ca.key b/...xporter-trace-otlp-http/test/certs/ca.key → ...xporter-trace-otlp-http/test/certs/ca.key
diff --git a/...ter-trace-otlp-http/test/certs/client.crt → ...ter-trace-otlp-http/test/certs/client.crt b/...ter-trace-otlp-http/test/certs/client.crt → ...ter-trace-otlp-http/test/certs/client.crt
diff --git a/...ter-trace-otlp-http/test/certs/client.csr → ...ter-trace-otlp-http/test/certs/client.csr b/...ter-trace-otlp-http/test/certs/client.csr → ...ter-trace-otlp-http/test/certs/client.csr
diff --git a/...ter-trace-otlp-http/test/certs/client.key → ...ter-trace-otlp-http/test/certs/client.key b/...ter-trace-otlp-http/test/certs/client.key → ...ter-trace-otlp-http/test/certs/client.key
diff --git a/...-trace-otlp-http/test/certs/regenerate.sh → ...-trace-otlp-http/test/certs/regenerate.sh b/...-trace-otlp-http/test/certs/regenerate.sh → ...-trace-otlp-http/test/certs/regenerate.sh
diff --git a/...ter-trace-otlp-http/test/certs/server.crt → ...ter-trace-otlp-http/test/certs/server.crt b/...ter-trace-otlp-http/test/certs/server.crt → ...ter-trace-otlp-http/test/certs/server.crt
diff --git a/...ter-trace-otlp-http/test/certs/server.csr → ...ter-trace-otlp-http/test/certs/server.csr b/...ter-trace-otlp-http/test/certs/server.csr → ...ter-trace-otlp-http/test/certs/server.csr
diff --git a/...ter-trace-otlp-http/test/certs/server.key → ...ter-trace-otlp-http/test/certs/server.key b/...ter-trace-otlp-http/test/certs/server.key → ...ter-trace-otlp-http/test/certs/server.key
diff --git a/...est/common/CollectorTraceExporter.test.ts → ...est/common/CollectorTraceExporter.test.ts b/...est/common/CollectorTraceExporter.test.ts → ...est/common/CollectorTraceExporter.test.ts
diff --git a/...e-otlp-http/test/common/transform.test.ts → ...e-otlp-http/test/common/transform.test.ts b/...e-otlp-http/test/common/transform.test.ts → ...e-otlp-http/test/common/transform.test.ts
diff --git a/...trace-otlp-http/test/common/utils.test.ts → ...trace-otlp-http/test/common/utils.test.ts b/...trace-otlp-http/test/common/utils.test.ts → ...trace-otlp-http/test/common/utils.test.ts
diff --git a/.../test/node/CollectorTraceExporter.test.ts → .../test/node/CollectorTraceExporter.test.ts b/.../test/node/CollectorTraceExporter.test.ts → .../test/node/CollectorTraceExporter.test.ts
diff --git a/...-trace-otlp-http/test/node/nodeHelpers.ts → ...-trace-otlp-http/test/node/nodeHelpers.ts b/...-trace-otlp-http/test/node/nodeHelpers.ts → ...-trace-otlp-http/test/node/nodeHelpers.ts
diff --git a/...orter-trace-otlp-http/test/traceHelper.ts → ...orter-trace-otlp-http/test/traceHelper.ts b/...orter-trace-otlp-http/test/traceHelper.ts → ...orter-trace-otlp-http/test/traceHelper.ts
diff --git a/...xporter-trace-otlp-http/tsconfig.all.json → ...xporter-trace-otlp-http/tsconfig.all.json b/...xporter-trace-otlp-http/tsconfig.all.json → ...xporter-trace-otlp-http/tsconfig.all.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "files": [],
   "references": [
     { "path": "./tsconfig.json" },

diff --git a/...xporter-trace-otlp-http/tsconfig.esm.json → ...xporter-trace-otlp-http/tsconfig.esm.json b/...xporter-trace-otlp-http/tsconfig.esm.json → ...xporter-trace-otlp-http/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.esm.json",
+  "extends": "../../tsconfig.base.esm.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build/esm",

diff --git a/...ter-trace-otlp-http/tsconfig.esm2015.json → ...ter-trace-otlp-http/tsconfig.esm2015.json b/...ter-trace-otlp-http/tsconfig.esm2015.json → ...ter-trace-otlp-http/tsconfig.esm2015.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.esm2015.json",
+  "extends": "../../tsconfig.base.esm2015.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build/esm2015",

diff --git a/...ry-exporter-trace-otlp-http/tsconfig.json → ...es/exporter-trace-otlp-http/tsconfig.json b/...ry-exporter-trace-otlp-http/tsconfig.json → ...es/exporter-trace-otlp-http/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"

diff --git a/...y-exporter-trace-otlp-proto/.eslintignore → ...s/exporter-trace-otlp-proto/.eslintignore b/...y-exporter-trace-otlp-proto/.eslintignore → ...s/exporter-trace-otlp-proto/.eslintignore
diff --git a/...ry-exporter-trace-otlp-proto/.eslintrc.js → ...es/exporter-trace-otlp-proto/.eslintrc.js b/...ry-exporter-trace-otlp-proto/.eslintrc.js → ...es/exporter-trace-otlp-proto/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../../eslint.config.js')
+    ...require('../../eslint.config.js')
 }
diff --git a/...etry-exporter-trace-otlp-proto/.npmignore → ...ages/exporter-trace-otlp-proto/.npmignore b/...etry-exporter-trace-otlp-proto/.npmignore → ...ages/exporter-trace-otlp-proto/.npmignore
diff --git a/...lemetry-exporter-trace-otlp-proto/LICENSE → packages/exporter-trace-otlp-proto/LICENSE b/...lemetry-exporter-trace-otlp-proto/LICENSE → packages/exporter-trace-otlp-proto/LICENSE
diff --git a/...metry-exporter-trace-otlp-proto/README.md → packages/exporter-trace-otlp-proto/README.md b/...metry-exporter-trace-otlp-proto/README.md → packages/exporter-trace-otlp-proto/README.md
diff --git a/...ry-exporter-trace-otlp-proto/package.json → ...es/exporter-trace-otlp-proto/package.json b/...ry-exporter-trace-otlp-proto/package.json → ...es/exporter-trace-otlp-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-proto",
-  "version": "0.27.0",
+  "version": "1.0.1",
   "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -15,7 +15,7 @@
     "submodule": "git submodule sync --recursive && git submodule update --init --recursive",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
-    "version": "node ../../../scripts/version-update.js",
+    "version": "node ../../scripts/version-update.js",
     "watch": "npm run protos:copy && tsc -w",
     "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
     "prewatch": "npm run precompile"

diff --git a/...elemetry-exporter-trace-otlp-proto/protos → packages/exporter-trace-otlp-proto/protos b/...elemetry-exporter-trace-otlp-proto/protos → packages/exporter-trace-otlp-proto/protos
diff --git a/...ce-otlp-proto/src/OTLPExporterNodeBase.ts → ...ce-otlp-proto/src/OTLPExporterNodeBase.ts b/...ce-otlp-proto/src/OTLPExporterNodeBase.ts → ...ce-otlp-proto/src/OTLPExporterNodeBase.ts
diff --git a/...trace-otlp-proto/src/OTLPTraceExporter.ts → ...trace-otlp-proto/src/OTLPTraceExporter.ts b/...trace-otlp-proto/src/OTLPTraceExporter.ts → ...trace-otlp-proto/src/OTLPTraceExporter.ts
diff --git a/...ry-exporter-trace-otlp-proto/src/index.ts → ...es/exporter-trace-otlp-proto/src/index.ts b/...ry-exporter-trace-otlp-proto/src/index.ts → ...es/exporter-trace-otlp-proto/src/index.ts
diff --git a/...ry-exporter-trace-otlp-proto/src/types.ts → ...es/exporter-trace-otlp-proto/src/types.ts b/...ry-exporter-trace-otlp-proto/src/types.ts → ...es/exporter-trace-otlp-proto/src/types.ts
diff --git a/...try-exporter-trace-otlp-proto/src/util.ts → ...ges/exporter-trace-otlp-proto/src/util.ts b/...try-exporter-trace-otlp-proto/src/util.ts → ...ges/exporter-trace-otlp-proto/src/util.ts
diff --git a/...ry-exporter-trace-otlp-proto/submodule.md → ...es/exporter-trace-otlp-proto/submodule.md b/...ry-exporter-trace-otlp-proto/submodule.md → ...es/exporter-trace-otlp-proto/submodule.md
diff --git a/...otlp-proto/test/OTLPTraceExporter.test.ts → ...otlp-proto/test/OTLPTraceExporter.test.ts b/...otlp-proto/test/OTLPTraceExporter.test.ts → ...otlp-proto/test/OTLPTraceExporter.test.ts
diff --git a/...porter-trace-otlp-proto/test/certs/ca.crt → ...porter-trace-otlp-proto/test/certs/ca.crt b/...porter-trace-otlp-proto/test/certs/ca.crt → ...porter-trace-otlp-proto/test/certs/ca.crt
diff --git a/...porter-trace-otlp-proto/test/certs/ca.key → ...porter-trace-otlp-proto/test/certs/ca.key b/...porter-trace-otlp-proto/test/certs/ca.key → ...porter-trace-otlp-proto/test/certs/ca.key
diff --git a/...er-trace-otlp-proto/test/certs/client.crt → ...er-trace-otlp-proto/test/certs/client.crt b/...er-trace-otlp-proto/test/certs/client.crt → ...er-trace-otlp-proto/test/certs/client.crt
diff --git a/...er-trace-otlp-proto/test/certs/client.csr → ...er-trace-otlp-proto/test/certs/client.csr b/...er-trace-otlp-proto/test/certs/client.csr → ...er-trace-otlp-proto/test/certs/client.csr
diff --git a/...er-trace-otlp-proto/test/certs/client.key → ...er-trace-otlp-proto/test/certs/client.key b/...er-trace-otlp-proto/test/certs/client.key → ...er-trace-otlp-proto/test/certs/client.key
diff --git a/...trace-otlp-proto/test/certs/regenerate.sh → ...trace-otlp-proto/test/certs/regenerate.sh b/...trace-otlp-proto/test/certs/regenerate.sh → ...trace-otlp-proto/test/certs/regenerate.sh
diff --git a/...er-trace-otlp-proto/test/certs/server.crt → ...er-trace-otlp-proto/test/certs/server.crt b/...er-trace-otlp-proto/test/certs/server.crt → ...er-trace-otlp-proto/test/certs/server.crt
diff --git a/...er-trace-otlp-proto/test/certs/server.csr → ...er-trace-otlp-proto/test/certs/server.csr b/...er-trace-otlp-proto/test/certs/server.csr → ...er-trace-otlp-proto/test/certs/server.csr
diff --git a/...er-trace-otlp-proto/test/certs/server.key → ...er-trace-otlp-proto/test/certs/server.key b/...er-trace-otlp-proto/test/certs/server.key → ...er-trace-otlp-proto/test/certs/server.key
diff --git a/...rter-trace-otlp-proto/test/traceHelper.ts → ...rter-trace-otlp-proto/test/traceHelper.ts b/...rter-trace-otlp-proto/test/traceHelper.ts → ...rter-trace-otlp-proto/test/traceHelper.ts
diff --git a/...ry-exporter-trace-otlp-grpc/tsconfig.json → ...s/exporter-trace-otlp-proto/tsconfig.json b/...ry-exporter-trace-otlp-grpc/tsconfig.json → ...s/exporter-trace-otlp-proto/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-exporter-trace-otlp-http"
+      "path": "../exporter-trace-otlp-http"
     }
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,22 +4,22 @@
   "typedocOptions": {
     "packages": [
       "experimental/packages/opentelemetry-api-metrics",
-      "experimental/packages/opentelemetry-exporter-trace-otlp-grpc",
-      "experimental/packages/opentelemetry-exporter-trace-otlp-http",
-      "experimental/packages/opentelemetry-exporter-trace-otlp-proto",
+      "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc",
+      "experimental/packages/opentelemetry-exporter-metrics-otlp-http",
+      "experimental/packages/opentelemetry-exporter-metrics-otlp-proto",
       "experimental/packages/opentelemetry-exporter-prometheus",
+      "experimental/packages/opentelemetry-instrumentation",
       "experimental/packages/opentelemetry-instrumentation-fetch",
       "experimental/packages/opentelemetry-instrumentation-grpc",
       "experimental/packages/opentelemetry-instrumentation-http",
       "experimental/packages/opentelemetry-instrumentation-xml-http-request",
-      "experimental/packages/opentelemetry-instrumentation",
       "experimental/packages/opentelemetry-sdk-node",
-      "experimental/packages/opentelemetry-exporter-metrics-otlp-http",
-      "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc",
-      "experimental/packages/opentelemetry-exporter-metrics-otlp-proto",
+      "packages/exporter-trace-otlp-grpc",
+      "packages/exporter-trace-otlp-http",
+      "packages/exporter-trace-otlp-proto",
       "packages/opentelemetry-context-async-hooks",
-      "packages/opentelemetry-context-zone-peer-dep",
       "packages/opentelemetry-context-zone",
+      "packages/opentelemetry-context-zone-peer-dep",
       "packages/opentelemetry-core",
       "packages/opentelemetry-exporter-jaeger",
       "packages/opentelemetry-exporter-zipkin",
@@ -44,6 +44,15 @@
     "excludePrivate": true
   },
   "references": [
+    {
+      "path": "packages/exporter-trace-otlp-grpc"
+    },
+    {
+      "path": "packages/exporter-trace-otlp-http/tsconfig.all.json"
+    },
+    {
+      "path": "packages/exporter-trace-otlp-proto"
+    },
     {
       "path": "packages/opentelemetry-context-async-hooks"
     },