chore: move trace exporters back to experimental

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "packages/exporter-trace-otlp-proto/protos"]
-	path = packages/exporter-trace-otlp-proto/protos
+	path = experimental/packages/exporter-trace-otlp-proto/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
 [submodule "packages/exporter-trace-otlp-grpc/protos"]
-	path = packages/exporter-trace-otlp-grpc/protos
+	path = experimental/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

packages/exporter-trace-otlp-grpc/.eslintrc.js → experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js

@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../eslint.config.js')
+    ...require('../../../eslint.config.js')
 }

packages/exporter-trace-otlp-grpc/package.json → experimental/packages/exporter-trace-otlp-grpc/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-grpc",
-  "version": "1.1.1",
-  "private": "true",
+  "version": "0.27.0",
   "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",
@@ -17,7 +16,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-dependencies",
     "prewatch": "npm run precompile"
@@ -50,7 +49,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.1.0",
+    "@opentelemetry/api": "^1.0.3",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -68,10 +67,10 @@
     "@opentelemetry/api": "^1.0.3"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.3.7",
-    "@grpc/proto-loader": "^0.6.4",
     "@opentelemetry/core": "1.1.1",
-    "@opentelemetry/exporter-trace-otlp-http": "1.1.1",
+    "@grpc/grpc-js": "^1.5.9",
+    "@grpc/proto-loader": "^0.6.9",
+    "@opentelemetry/exporter-trace-otlp-http": "0.27.0",
     "@opentelemetry/resources": "1.1.1",
     "@opentelemetry/sdk-trace-base": "1.1.1"
   }

packages/exporter-trace-otlp-proto/tsconfig.json → experimental/packages/exporter-trace-otlp-grpc/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -11,15 +11,6 @@
   "references": [
     {
       "path": "../exporter-trace-otlp-http"
-    },
-    {
-      "path": "../opentelemetry-core"
-    },
-    {
-      "path": "../opentelemetry-resources"
-    },
-    {
-      "path": "../opentelemetry-sdk-trace-base"
     }
   ]
 }

packages/exporter-trace-otlp-http/.eslintrc.js → experimental/packages/exporter-trace-otlp-http/.eslintrc.js

@@ -5,5 +5,5 @@ module.exports = {
         "node": true,
         "browser": true
     },
-    ...require('../../eslint.config.js')
+    ...require('../../../eslint.config.js')
 }

packages/exporter-trace-otlp-http/karma.conf.js → experimental/packages/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, {

packages/exporter-trace-otlp-http/package.json → experimental/packages/exporter-trace-otlp-http/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-http",
-  "version": "1.1.1",
-  "private": "true",
+  "version": "0.27.0",
   "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",
@@ -25,7 +24,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-dependencies",
     "prewatch": "npm run precompile"
@@ -63,7 +62,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.1.0",
+    "@opentelemetry/api": "^1.0.3",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",

packages/exporter-trace-otlp-http/tsconfig.all.json → experimental/packages/exporter-trace-otlp-http/tsconfig.all.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "files": [],
   "references": [
     { "path": "./tsconfig.json" },

packages/exporter-trace-otlp-http/tsconfig.esm.json → experimental/packages/exporter-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",

packages/exporter-trace-otlp-http/tsconfig.esnext.json → experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.esnext.json",
+  "extends": "../../../tsconfig.base.esnext.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build/esnext",

experimental/packages/exporter-trace-otlp-http/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "build"
+  },
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts"
+  ]
+}

packages/exporter-trace-otlp-proto/.eslintrc.js → experimental/packages/exporter-trace-otlp-proto/.eslintrc.js

@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "node": true,
     },
-    ...require('../../eslint.config.js')
+    ...require('../../../eslint.config.js')
 }

packages/exporter-trace-otlp-proto/package.json → experimental/packages/exporter-trace-otlp-proto/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-proto",
-  "version": "1.1.1",
-  "private": "true",
+  "version": "0.27.0",
   "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",
@@ -17,7 +16,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-dependencies",
     "prewatch": "npm run precompile"
@@ -50,7 +49,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.1.0",
+    "@opentelemetry/api": "^1.0.3",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -68,9 +67,9 @@
     "@opentelemetry/api": "^1.0.3"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.6.4",
     "@opentelemetry/core": "1.1.1",
-    "@opentelemetry/exporter-trace-otlp-http": "1.1.1",
+    "@grpc/proto-loader": "^0.6.9",
+    "@opentelemetry/exporter-trace-otlp-http": "0.27.0",
     "@opentelemetry/resources": "1.1.1",
     "@opentelemetry/sdk-trace-base": "1.1.1",
     "protobufjs": "^6.9.0"

packages/exporter-trace-otlp-grpc/tsconfig.json → experimental/packages/exporter-trace-otlp-proto/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -11,15 +11,6 @@
   "references": [
     {
       "path": "../exporter-trace-otlp-http"
-    },
-    {
-      "path": "../opentelemetry-core"
-    },
-    {
-      "path": "../opentelemetry-resources"
-    },
-    {
-      "path": "../opentelemetry-sdk-trace-base"
     }
   ]
 }

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json

@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.0.3",
+    "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/api-metrics": "0.27.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
@@ -68,8 +68,8 @@
     "@opentelemetry/api": "^1.0.3"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.4.4",
-    "@grpc/proto-loader": "^0.6.4",
+    "@grpc/grpc-js": "^1.5.9",
+    "@grpc/proto-loader": "^0.6.9",
     "@opentelemetry/core": "1.0.1",
     "@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "0.27.0",

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts

@@ -20,7 +20,7 @@ import {
   ObservableGauge,
   Histogram,
 } from '@opentelemetry/api-metrics';
-import { diag } from '@opentelemetry/api';
+import { diag, DiagLogger } from '@opentelemetry/api';
 import { otlpTypes } from '@opentelemetry/exporter-trace-otlp-http';
 import * as metrics from '@opentelemetry/sdk-metrics-base';
 import * as assert from 'assert';
@@ -164,24 +164,41 @@ const testOTLPMetricExporter = (params: TestParams) =>
     });
 
     describe('instance', () => {
+      let warnStub: sinon.SinonStub;
+
+      beforeEach(() => {
+        // Need to stub/spy on the underlying logger as the "diag" instance is global
+        warnStub = sinon.stub();
+        const nop = () => {};
+        const diagLogger: DiagLogger = {
+          debug: nop,
+          error: nop,
+          info: nop,
+          verbose: nop,
+          warn: warnStub
+        };
+        diag.setLogger(diagLogger);
+      });
+
+      afterEach(() => {
+        diag.disable();
+      });
+
       it('should warn about headers', () => {
-        // Need to stub/spy on the underlying logger as the 'diag' instance is global
-        const spyLoggerWarn = sinon.stub(diag, 'warn');
         collectorExporter = new OTLPMetricExporter({
           url: `http://${address}`,
           headers: {
             foo: 'bar',
           },
         });
-        const args = spyLoggerWarn.args[0];
+        const args = warnStub.args[0];
         assert.strictEqual(args[0], 'Headers cannot be set when using grpc');
       });
       it('should warn about path in url', () => {
-        const spyLoggerWarn = sinon.stub(diag, 'warn');
         collectorExporter = new OTLPMetricExporter({
           url: `http://${address}/v1/metrics`
         });
-        const args = spyLoggerWarn.args[0];
+        const args = warnStub.args[0];
         assert.strictEqual(
           args[0],
           'URL path should not be set when using grpc, the path part of the URL will be ignored.'

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json

@@ -9,6 +9,12 @@
     "test/**/*.ts"
   ],
   "references": [
+    {
+      "path": "../exporter-trace-otlp-grpc"
+    },
+    {
+      "path": "../exporter-trace-otlp-http"
+    },
     {
       "path": "../opentelemetry-exporter-metrics-otlp-http"
     }

experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json

@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.0.3",
+    "@opentelemetry/api": "^1.1.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",