From d41fa7bdeab017dc4b2a51b631835468dc013f3d Mon Sep 17 00:00:00 2001
From: Siim Kallas <siimkallas@gmail.com>
Date: Mon, 27 Sep 2021 23:16:01 +0300
Subject: [PATCH 1/5] feat: HTTP instrumentation: add the option to capture
 headers as span attributes (#2492)

---
 .../README.md                                 |  1 +
 .../src/http.ts                               | 26 ++++++
 .../src/types.ts                              |  5 ++
 .../src/utils.ts                              | 24 ++++++
 .../test/functionals/http-enable.test.ts      | 83 +++++++++++++++++++
 .../test/functionals/utils.test.ts            | 61 ++++++++++++++
 6 files changed, 200 insertions(+)

diff --git a/experimental/packages/opentelemetry-instrumentation-http/README.md b/experimental/packages/opentelemetry-instrumentation-http/README.md
index 139014304f3..6d5fb9a073b 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/README.md
+++ b/experimental/packages/opentelemetry-instrumentation-http/README.md
@@ -57,6 +57,7 @@ Http instrumentation has few options available to choose from. You can set the f
 | [`serverName`](https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L101) | `string` | The primary server name of the matched virtual host. |
 | [`requireParentforOutgoingSpans`](https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L103) | Boolean | Require that is a parent span to create new span for outgoing requests. |
 | [`requireParentforIncomingSpans`](https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L105) | Boolean | Require that is a parent span to create new span for incoming requests. |
+| [`headersToSpanAttributes`](https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L107) | `object` | List of case insensitive HTTP headers to convert to span attributes. Client (outgoing requests, incoming responses) and server (incoming requests, outgoing responses) headers will be converted to span attributes in the form of `http.{request\|response}.header.header_name`, e.g. `http.response.header.content_length` |
 
 ## Useful links
 
diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts
index 2229ae92c7e..b6cba079fc0 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts
+++ b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts
@@ -58,6 +58,7 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
   /** keep track on spans not ended */
   private readonly _spanNotEnded: WeakSet<Span> = new WeakSet<Span>();
   private readonly _version = process.versions.node;
+  private _headerCapture;
 
   constructor(config: HttpInstrumentationConfig & InstrumentationConfig = {}) {
     super(
@@ -65,6 +66,8 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
       VERSION,
       Object.assign({}, config)
     );
+
+    this._headerCapture = this._createHeaderCapture();
   }
 
   private _getConfig(): HttpInstrumentationConfig {
@@ -73,6 +76,7 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
 
   override setConfig(config: HttpInstrumentationConfig & InstrumentationConfig = {}): void {
     this._config = Object.assign({}, config);
+    this._headerCapture = this._createHeaderCapture();
   }
 
   init(): [InstrumentationNodeModuleDefinition<Https>, InstrumentationNodeModuleDefinition<Http>] {
@@ -296,6 +300,9 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
           this._callResponseHook(span, response);
         }
 
+        this._headerCapture.client.captureRequestHeaders(span, header => request.getHeader(header));
+        this._headerCapture.client.captureResponseHeaders(span, header => response.headers[header]);
+
         context.bind(context.active(), response);
         this._diag.debug('outgoingRequest on response()');
         response.on('end', () => {
@@ -424,6 +431,8 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
             instrumentation._callResponseHook(span, response);
           }
 
+          instrumentation._headerCapture.server.captureRequestHeaders(span, header => request.headers[header]);
+
           // Wraps end (inspired by:
           // https://github.com/GoogleCloudPlatform/cloud-trace-nodejs/blob/master/src/instrumentations/instrumentation-connect.ts#L75)
           const originalEnd = response.end;
@@ -449,6 +458,8 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
               response
             );
 
+            instrumentation._headerCapture.server.captureResponseHeaders(span, header => response.getHeader(header));
+
             span
               .setAttributes(attributes)
               .setStatus(utils.parseResponseStatus(response.statusCode));
@@ -662,4 +673,19 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
       );
     }
   }
+
+  private _createHeaderCapture() {
+    const config = this._getConfig();
+
+    return {
+      client: {
+        captureRequestHeaders: utils.headerCapture('request', config.headersToSpanAttributes?.client?.requestHeaders ?? []),
+        captureResponseHeaders: utils.headerCapture('response', config.headersToSpanAttributes?.client?.responseHeaders ?? [])
+      },
+      server: {
+        captureRequestHeaders: utils.headerCapture('request', config.headersToSpanAttributes?.server?.requestHeaders ?? []),
+        captureResponseHeaders: utils.headerCapture('response', config.headersToSpanAttributes?.server?.responseHeaders ?? []),
+      }
+    }
+  }
 }
diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts
index 7be9999d8b6..79f4e844cd2 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts
+++ b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts
@@ -103,6 +103,11 @@ export interface HttpInstrumentationConfig extends InstrumentationConfig {
   requireParentforOutgoingSpans?: boolean;
   /** Require parent to create span for incoming requests */
   requireParentforIncomingSpans?: boolean;
+  /** Map the following HTTP headers to span attributes. */
+  headersToSpanAttributes?: {
+    client?: { requestHeaders?: string[]; responseHeaders?: string[]; },
+    server?: { requestHeaders?: string[]; responseHeaders?: string[]; },
+  }
 }
 
 export interface Err extends Error {
diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
index a24ff6f12a9..d7c3ff83763 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
+++ b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
@@ -495,3 +495,27 @@ export const getIncomingRequestAttributesOnResponse = (
   }
   return attributes;
 };
+
+export function headerCapture(type: 'request' | 'response', headers: string[]) {
+  const normalizedHeaders = new Map(headers.map(header => [header.toLowerCase(), header.toLowerCase().replace(/-/g, '_')]));
+
+  return (span: Span, getHeader: (key: string) => undefined | string | string[] | number) => {
+    for (const [capturedHeader, normalizedHeader] of normalizedHeaders) {
+      const value = getHeader(capturedHeader);
+      
+      if (value === undefined) {
+        continue;
+      }
+
+      const key = `http.${type}.header.${normalizedHeader}`;
+
+      if (typeof value === 'string') {
+        span.setAttribute(key, [value]);
+      } else if (Array.isArray(value)) {
+        span.setAttribute(key, value);
+      } else {
+        span.setAttribute(key, [value]);
+      }
+    }
+  };
+}
diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
index 9f62d807b1c..7658bfa65b9 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
+++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
@@ -908,4 +908,87 @@ describe('HttpInstrumentation', () => {
       });
     });
   });
+
+  describe('capturing headers as span attributes', () => {
+    beforeEach(() => {
+      memoryExporter.reset();
+    });
+
+    before(() => {
+      instrumentation.setConfig({
+        headersToSpanAttributes: {
+          client: { requestHeaders: ['X-Client-Header1'], responseHeaders: ['X-Server-Header1'] },
+          server: { requestHeaders: ['X-Client-Header2'], responseHeaders: ['X-Server-Header2'] },
+        }
+      });
+      instrumentation.enable();
+      server = http.createServer((request, response) => {
+        response.setHeader('X-ServeR-header1', 'server123');
+        response.setHeader('X-Server-header2', '123server');
+        response.end('Test Server Response');
+      });
+
+      server.listen(serverPort);
+    });
+
+    after(() => {
+      server.close();
+      instrumentation.disable();
+    });
+
+    it('should convert headers to span attributes', async () => {
+      await httpRequest.get(
+        `${protocol}://${hostname}:${serverPort}${pathname}`,
+        {
+          headers: {
+            'X-client-header1': 'client123',
+            'X-CLIENT-HEADER2': '123client',
+          }
+        }
+      );
+      const spans = memoryExporter.getFinishedSpans();
+      const [incomingSpan, outgoingSpan] = spans;
+
+      assert.strictEqual(spans.length, 2);
+
+      assert.deepStrictEqual(
+        incomingSpan.attributes['http.request.header.x_client_header2'],
+        ['123client']
+      );
+
+      assert.deepStrictEqual(
+        incomingSpan.attributes['http.response.header.x_server_header2'],
+        ['123server']
+      );
+
+      assert.strictEqual(
+        incomingSpan.attributes['http.request.header.x_client_header1'],
+        undefined
+      );
+
+      assert.strictEqual(
+        incomingSpan.attributes['http.response.header.x_server_header1'],
+        undefined
+      );
+
+      assert.deepStrictEqual(
+        outgoingSpan.attributes['http.request.header.x_client_header1'],
+        ['client123']
+      );
+      assert.deepStrictEqual(
+        outgoingSpan.attributes['http.response.header.x_server_header1'],
+        ['server123']
+      );
+
+      assert.strictEqual(
+        outgoingSpan.attributes['http.request.header.x_client_header2'],
+        undefined
+      );
+
+      assert.strictEqual(
+        outgoingSpan.attributes['http.response.header.x_server_header2'],
+        undefined
+      );
+    });
+  });
 });
diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts
index d530fac61ca..cde1aafdc7d 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts
+++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts
@@ -465,4 +465,65 @@ describe('Utility', () => {
       verifyValueInAttributes(attributes, undefined, 1200);
     });
   });
+
+  describe('headers to span attributes capture', () => {
+    let span: Span;
+
+    beforeEach(() => {
+      span = new Span(
+        new BasicTracerProvider().getTracer('default'),
+        ROOT_CONTEXT,
+        'test',
+        { spanId: '', traceId: '', traceFlags: TraceFlags.SAMPLED },
+        SpanKind.INTERNAL
+      );
+    });
+
+    it('should set attributes for request and response keys', () => {
+      utils.headerCapture('request', ['Origin'])(span, () => 'localhost');
+      utils.headerCapture('response', ['Cookie'])(span, () => 'token=123');
+      assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost']);
+      assert.deepStrictEqual(span.attributes['http.response.header.cookie'], ['token=123']);
+    });
+
+    it('should set attributes for multiple values', () => {
+      utils.headerCapture('request', ['Origin'])(span, () => ['localhost', 'www.example.com']);
+      assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost', 'www.example.com']);
+    });
+
+    it('sets attributes for multiple headers', () => {
+      utils.headerCapture('request', ['Origin', 'Foo'])(span, header => {
+        if (header === 'origin') {
+          return 'localhost';
+        }
+
+        if (header === 'foo') {
+          return 42;
+        }
+
+        return undefined;
+      });
+
+      assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost']);
+      assert.deepStrictEqual(span.attributes['http.request.header.foo'], [42]);
+    });
+
+    it('should normalize header names', () => {
+      utils.headerCapture('request', ['X-Forwarded-For'])(span, () => 'foo');
+      assert.deepStrictEqual(span.attributes['http.request.header.x_forwarded_for'], ['foo']);
+    });
+
+    it('ignores non-existent headers', () => {
+      utils.headerCapture('request', ['Origin', 'Accept'])(span, header => {
+        if (header === 'origin') {
+          return 'localhost';
+        }
+
+        return undefined;
+      });
+
+      assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost']);
+      assert.deepStrictEqual(span.attributes['http.request.header.accept'], undefined);
+    })
+  });
 });

From f0dc893b79ae7268f7fc80b7e133d0cdbb5a294c Mon Sep 17 00:00:00 2001
From: Daniel Dyla <dyladan@users.noreply.github.com>
Date: Mon, 27 Sep 2021 16:30:07 -0400
Subject: [PATCH 2/5] chore: mark otlp exporters experimental (#2490)

---
 .gitmodules                                   |  8 +++----
 examples/otlp-exporter-node/README.md         |  4 ++--
 .../.eslintignore                             |  0
 .../.eslintrc.js                              |  2 +-
 .../.npmignore                                |  0
 .../opentelemetry-exporter-otlp-grpc/LICENSE  |  0
 .../README.md                                 |  0
 .../package.json                              |  2 +-
 .../opentelemetry-exporter-otlp-grpc/protos   |  0
 .../src/OTLPExporterNodeBase.ts               |  0
 .../src/OTLPMetricExporter.ts                 |  0
 .../src/OTLPTraceExporter.ts                  |  0
 .../src/index.ts                              |  0
 .../src/types.ts                              |  0
 .../src/util.ts                               |  0
 .../submodule.md                              |  0
 .../test/OTLPExporterNodeBase.test.ts         |  0
 .../test/OTLPMetricExporter.test.ts           |  0
 .../test/OTLPTraceExporter.test.ts            |  0
 .../test/certs/ca.crt                         |  0
 .../test/certs/ca.key                         |  0
 .../test/certs/client.crt                     |  0
 .../test/certs/client.csr                     |  0
 .../test/certs/client.key                     |  0
 .../test/certs/regenerate.sh                  |  0
 .../test/certs/server.crt                     |  0
 .../test/certs/server.csr                     |  0
 .../test/certs/server.key                     |  0
 .../test/helper.ts                            |  0
 .../test/util.test.ts                         |  0
 .../tsconfig.json                             |  9 +++-----
 .../.eslintignore                             |  0
 .../.eslintrc.js                              |  2 +-
 .../.npmignore                                |  0
 .../opentelemetry-exporter-otlp-http/LICENSE  |  0
 .../README.md                                 |  0
 .../karma.conf.js                             |  4 ++--
 .../package.json                              |  2 +-
 .../src/OTLPExporterBase.ts                   |  0
 .../src/index.ts                              |  0
 .../browser/OTLPExporterBrowserBase.ts        |  0
 .../platform/browser/OTLPMetricExporter.ts    |  0
 .../src/platform/browser/OTLPTraceExporter.ts |  0
 .../src/platform/browser/index.ts             |  0
 .../src/platform/browser/util.ts              |  0
 .../src/platform/index.ts                     |  0
 .../src/platform/node/OTLPExporterNodeBase.ts |  0
 .../src/platform/node/OTLPMetricExporter.ts   |  0
 .../src/platform/node/OTLPTraceExporter.ts    |  0
 .../src/platform/node/index.ts                |  0
 .../src/platform/node/types.ts                |  0
 .../src/platform/node/util.ts                 |  0
 .../src/transform.ts                          |  0
 .../src/transformMetrics.ts                   |  0
 .../src/types.ts                              |  0
 .../src/util.ts                               |  0
 .../browser/CollectorMetricExporter.test.ts   |  0
 .../browser/CollectorTraceExporter.test.ts    |  0
 .../test/browser/index-webpack.ts             |  0
 .../test/browser/util.test.ts                 |  0
 .../test/certs/ca.crt                         |  0
 .../test/certs/ca.key                         |  0
 .../test/certs/client.crt                     |  0
 .../test/certs/client.csr                     |  0
 .../test/certs/client.key                     |  0
 .../test/certs/regenerate.sh                  |  0
 .../test/certs/server.crt                     |  0
 .../test/certs/server.csr                     |  0
 .../test/certs/server.key                     |  0
 .../common/CollectorMetricExporter.test.ts    |  0
 .../common/CollectorTraceExporter.test.ts     |  0
 .../test/common/transform.test.ts             |  0
 .../test/common/transformMetrics.test.ts      |  0
 .../test/common/utils.test.ts                 |  0
 .../test/helper.ts                            |  0
 .../test/node/CollectorMetricExporter.test.ts |  0
 .../test/node/CollectorTraceExporter.test.ts  |  0
 .../test/node/nodeHelpers.ts                  |  0
 .../tsconfig.esm.json                         | 19 ++++++++++++++++
 .../tsconfig.json                             | 19 ++++++++++++++++
 .../.eslintignore                             |  0
 .../.eslintrc.js                              |  2 +-
 .../.npmignore                                |  0
 .../opentelemetry-exporter-otlp-proto/LICENSE |  0
 .../README.md                                 |  0
 .../package.json                              |  2 +-
 .../opentelemetry-exporter-otlp-proto/protos  |  0
 .../src/OTLPExporterNodeBase.ts               |  0
 .../src/OTLPMetricExporter.ts                 |  0
 .../src/OTLPTraceExporter.ts                  |  0
 .../src/index.ts                              |  0
 .../src/types.ts                              |  0
 .../src/util.ts                               |  0
 .../submodule.md                              |  0
 .../test/OTLPMetricExporter.test.ts           |  0
 .../test/OTLPTraceExporter.test.ts            |  0
 .../test/certs/ca.crt                         |  0
 .../test/certs/ca.key                         |  0
 .../test/certs/client.crt                     |  0
 .../test/certs/client.csr                     |  0
 .../test/certs/client.key                     |  0
 .../test/certs/regenerate.sh                  |  0
 .../test/certs/server.crt                     |  0
 .../test/certs/server.csr                     |  0
 .../test/certs/server.key                     |  0
 .../test/helper.ts                            |  0
 .../tsconfig.json                             |  9 +++-----
 .../tsconfig.json                             |  3 +++
 experimental/tsconfig.esm.json                | 12 ++++++++++
 experimental/tsconfig.json                    | 12 ++++++++++
 .../tsconfig.esm.json                         | 22 -------------------
 .../tsconfig.json                             | 22 -------------------
 tsconfig.esm.json                             |  9 --------
 tsconfig.json                                 | 15 +++----------
 114 files changed, 88 insertions(+), 91 deletions(-)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/.eslintignore (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/.eslintrc.js (71%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/.npmignore (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/LICENSE (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/README.md (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/package.json (97%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/protos (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/index.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/types.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/util.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/submodule.md (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/ca.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/client.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/client.csr (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/client.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/server.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/server.csr (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/server.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/helper.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/util.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/tsconfig.json (57%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/.eslintignore (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/.eslintrc.js (75%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/.npmignore (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/LICENSE (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/README.md (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/karma.conf.js (87%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/package.json (98%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/index.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/index.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/index.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/types.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/util.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/transform.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/transformMetrics.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/types.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/util.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/util.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/ca.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/ca.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/client.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/client.csr (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/client.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/server.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/server.csr (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/server.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/transform.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/utils.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/helper.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts (100%)
 create mode 100644 experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json
 create mode 100644 experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/.eslintignore (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/.eslintrc.js (71%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/.npmignore (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/LICENSE (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/README.md (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/package.json (97%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/protos (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/index.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/types.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/util.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/submodule.md (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/ca.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/ca.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/client.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/client.csr (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/client.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/server.crt (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/server.csr (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/server.key (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/helper.ts (100%)
 rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/tsconfig.json (57%)
 delete mode 100644 packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json
 delete mode 100644 packages/opentelemetry-exporter-otlp-http/tsconfig.json

diff --git a/.gitmodules b/.gitmodules
index f66e08a1b88..ac506a776f9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "packages/opentelemetry-exporter-otlp-grpc/protos"]
-	path = packages/opentelemetry-exporter-otlp-grpc/protos
+[submodule "experimental/packages/opentelemetry-exporter-otlp-proto/protos"]
+	path = experimental/packages/opentelemetry-exporter-otlp-proto/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
-[submodule "packages/opentelemetry-exporter-otlp-proto/protos"]
-	path = packages/opentelemetry-exporter-otlp-proto/protos
+[submodule "experimental/packages/opentelemetry-exporter-otlp-grpc/protos"]
+	path = experimental/packages/opentelemetry-exporter-otlp-grpc/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
diff --git a/examples/otlp-exporter-node/README.md b/examples/otlp-exporter-node/README.md
index abfa241965c..21fea5422f0 100644
--- a/examples/otlp-exporter-node/README.md
+++ b/examples/otlp-exporter-node/README.md
@@ -1,8 +1,8 @@
 # Overview
 
-This example shows how to use [@opentelemetry/exporter-otlp-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application.
+This example shows how to use [@opentelemetry/exporter-otlp-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application.
 
-This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](https://github.com/open-telemetry/opentelemetry-proto).
+This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](https://github.com/open-telemetry/opentelemetry-proto).
 
 ## Installation
 
diff --git a/packages/opentelemetry-exporter-otlp-grpc/.eslintignore b/experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintignore
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/.eslintignore
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintignore
diff --git a/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js
similarity index 71%
rename from packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js
index fc4d0381204..3ed0fbeba38 100644
--- a/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js
+++ b/experimental/packages/opentelemetry-exporter-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/packages/opentelemetry-exporter-otlp-grpc/.npmignore b/experimental/packages/opentelemetry-exporter-otlp-grpc/.npmignore
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/.npmignore
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/.npmignore
diff --git a/packages/opentelemetry-exporter-otlp-grpc/LICENSE b/experimental/packages/opentelemetry-exporter-otlp-grpc/LICENSE
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/LICENSE
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/LICENSE
diff --git a/packages/opentelemetry-exporter-otlp-grpc/README.md b/experimental/packages/opentelemetry-exporter-otlp-grpc/README.md
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/README.md
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/README.md
diff --git a/packages/opentelemetry-exporter-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-otlp-grpc/package.json
similarity index 97%
rename from packages/opentelemetry-exporter-otlp-grpc/package.json
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/package.json
index e4a7e9411b6..5a2f4c86fea 100644
--- a/packages/opentelemetry-exporter-otlp-grpc/package.json
+++ b/experimental/packages/opentelemetry-exporter-otlp-grpc/package.json
@@ -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/packages/opentelemetry-exporter-otlp-grpc/protos b/experimental/packages/opentelemetry-exporter-otlp-grpc/protos
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/protos
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/protos
diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/index.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/index.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/src/index.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/index.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/types.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/types.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/src/types.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/types.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/util.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/util.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/src/util.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/util.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/submodule.md b/experimental/packages/opentelemetry-exporter-otlp-grpc/submodule.md
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/submodule.md
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/submodule.md
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/helper.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/helper.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/helper.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/helper.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json b/experimental/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json
similarity index 57%
rename from packages/opentelemetry-exporter-otlp-grpc/tsconfig.json
rename to experimental/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json
index cfc7b73a484..caced6b4e8b 100644
--- a/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -10,16 +10,13 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-core"
+      "path": "../opentelemetry-api-metrics"
     },
     {
       "path": "../opentelemetry-exporter-otlp-http"
     },
     {
-      "path": "../opentelemetry-resources"
-    },
-    {
-      "path": "../opentelemetry-sdk-trace-base"
+      "path": "../opentelemetry-sdk-metrics-base"
     }
   ]
 }
diff --git a/packages/opentelemetry-exporter-otlp-http/.eslintignore b/experimental/packages/opentelemetry-exporter-otlp-http/.eslintignore
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/.eslintignore
rename to experimental/packages/opentelemetry-exporter-otlp-http/.eslintignore
diff --git a/packages/opentelemetry-exporter-otlp-http/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js
similarity index 75%
rename from packages/opentelemetry-exporter-otlp-http/.eslintrc.js
rename to experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js
index 9dfe62f9b8c..e41d9a9299b 100644
--- a/packages/opentelemetry-exporter-otlp-http/.eslintrc.js
+++ b/experimental/packages/opentelemetry-exporter-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/packages/opentelemetry-exporter-otlp-http/.npmignore b/experimental/packages/opentelemetry-exporter-otlp-http/.npmignore
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/.npmignore
rename to experimental/packages/opentelemetry-exporter-otlp-http/.npmignore
diff --git a/packages/opentelemetry-exporter-otlp-http/LICENSE b/experimental/packages/opentelemetry-exporter-otlp-http/LICENSE
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/LICENSE
rename to experimental/packages/opentelemetry-exporter-otlp-http/LICENSE
diff --git a/packages/opentelemetry-exporter-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-otlp-http/README.md
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/README.md
rename to experimental/packages/opentelemetry-exporter-otlp-http/README.md
diff --git a/packages/opentelemetry-exporter-otlp-http/karma.conf.js b/experimental/packages/opentelemetry-exporter-otlp-http/karma.conf.js
similarity index 87%
rename from packages/opentelemetry-exporter-otlp-http/karma.conf.js
rename to experimental/packages/opentelemetry-exporter-otlp-http/karma.conf.js
index 455b1437c87..4c60b54edba 100644
--- a/packages/opentelemetry-exporter-otlp-http/karma.conf.js
+++ b/experimental/packages/opentelemetry-exporter-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/packages/opentelemetry-exporter-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-otlp-http/package.json
similarity index 98%
rename from packages/opentelemetry-exporter-otlp-http/package.json
rename to experimental/packages/opentelemetry-exporter-otlp-http/package.json
index 3a03727c437..00e2bcdf767 100644
--- a/packages/opentelemetry-exporter-otlp-http/package.json
+++ b/experimental/packages/opentelemetry-exporter-otlp-http/package.json
@@ -21,7 +21,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.json tsconfig.esm.json",
     "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
     "prewatch": "npm run precompile"
diff --git a/packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/index.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/index.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/index.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/index.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/index.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/index.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/transform.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/transform.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/transform.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/transform.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/types.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/types.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/types.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/types.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/src/util.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/util.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/src/util.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/src/util.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/ca.key b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/ca.key
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.key
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/client.crt b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/client.crt
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.crt
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/client.csr b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.csr
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/client.csr
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.csr
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/client.key b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/client.key
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.key
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/server.crt b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/server.crt
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.crt
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/server.csr b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.csr
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/server.csr
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.csr
diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/server.key b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/certs/server.key
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.key
diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/helper.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/helper.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/helper.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/helper.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts
rename to experimental/packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts
diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json
new file mode 100644
index 00000000000..7b09613481b
--- /dev/null
+++ b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../../tsconfig.base.esm.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "build/esm",
+    "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
+  },
+  "include": [
+    "src/**/*.ts"
+  ],
+  "references": [
+    {
+      "path": "../opentelemetry-api-metrics/tsconfig.esm.json"
+    },
+    {
+      "path": "../opentelemetry-sdk-metrics-base/tsconfig.esm.json"
+    }
+  ]
+}
diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json
new file mode 100644
index 00000000000..3c062d3feb2
--- /dev/null
+++ b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "build"
+  },
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts"
+  ],
+  "references": [
+    {
+      "path": "../opentelemetry-api-metrics"
+    },
+    {
+      "path": "../opentelemetry-sdk-metrics-base"
+    }
+  ]
+}
diff --git a/packages/opentelemetry-exporter-otlp-proto/.eslintignore b/experimental/packages/opentelemetry-exporter-otlp-proto/.eslintignore
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/.eslintignore
rename to experimental/packages/opentelemetry-exporter-otlp-proto/.eslintignore
diff --git a/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js
similarity index 71%
rename from packages/opentelemetry-exporter-otlp-proto/.eslintrc.js
rename to experimental/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js
index fc4d0381204..3ed0fbeba38 100644
--- a/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js
+++ b/experimental/packages/opentelemetry-exporter-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/packages/opentelemetry-exporter-otlp-proto/.npmignore b/experimental/packages/opentelemetry-exporter-otlp-proto/.npmignore
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/.npmignore
rename to experimental/packages/opentelemetry-exporter-otlp-proto/.npmignore
diff --git a/packages/opentelemetry-exporter-otlp-proto/LICENSE b/experimental/packages/opentelemetry-exporter-otlp-proto/LICENSE
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/LICENSE
rename to experimental/packages/opentelemetry-exporter-otlp-proto/LICENSE
diff --git a/packages/opentelemetry-exporter-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-otlp-proto/README.md
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/README.md
rename to experimental/packages/opentelemetry-exporter-otlp-proto/README.md
diff --git a/packages/opentelemetry-exporter-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-otlp-proto/package.json
similarity index 97%
rename from packages/opentelemetry-exporter-otlp-proto/package.json
rename to experimental/packages/opentelemetry-exporter-otlp-proto/package.json
index b890fd32d9b..f8fb5c5e078 100644
--- a/packages/opentelemetry-exporter-otlp-proto/package.json
+++ b/experimental/packages/opentelemetry-exporter-otlp-proto/package.json
@@ -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/packages/opentelemetry-exporter-otlp-proto/protos b/experimental/packages/opentelemetry-exporter-otlp-proto/protos
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/protos
rename to experimental/packages/opentelemetry-exporter-otlp-proto/protos
diff --git a/packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/src/index.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/index.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/src/index.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/index.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/src/types.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/types.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/src/types.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/types.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/src/util.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/util.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/src/util.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/util.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/submodule.md b/experimental/packages/opentelemetry-exporter-otlp-proto/submodule.md
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/submodule.md
rename to experimental/packages/opentelemetry-exporter-otlp-proto/submodule.md
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/client.key b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/client.key
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.key
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/server.key b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.key
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/certs/server.key
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.key
diff --git a/packages/opentelemetry-exporter-otlp-proto/test/helper.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/test/helper.ts
similarity index 100%
rename from packages/opentelemetry-exporter-otlp-proto/test/helper.ts
rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/helper.ts
diff --git a/packages/opentelemetry-exporter-otlp-proto/tsconfig.json b/experimental/packages/opentelemetry-exporter-otlp-proto/tsconfig.json
similarity index 57%
rename from packages/opentelemetry-exporter-otlp-proto/tsconfig.json
rename to experimental/packages/opentelemetry-exporter-otlp-proto/tsconfig.json
index cfc7b73a484..caced6b4e8b 100644
--- a/packages/opentelemetry-exporter-otlp-proto/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-otlp-proto/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -10,16 +10,13 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-core"
+      "path": "../opentelemetry-api-metrics"
     },
     {
       "path": "../opentelemetry-exporter-otlp-http"
     },
     {
-      "path": "../opentelemetry-resources"
-    },
-    {
-      "path": "../opentelemetry-sdk-trace-base"
+      "path": "../opentelemetry-sdk-metrics-base"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json
index 948abef3ceb..3c062d3feb2 100644
--- a/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json
@@ -11,6 +11,9 @@
   "references": [
     {
       "path": "../opentelemetry-api-metrics"
+    },
+    {
+      "path": "../opentelemetry-sdk-metrics-base"
     }
   ]
 }
diff --git a/experimental/tsconfig.esm.json b/experimental/tsconfig.esm.json
index cd3052ad278..c37493f8e74 100644
--- a/experimental/tsconfig.esm.json
+++ b/experimental/tsconfig.esm.json
@@ -5,6 +5,18 @@
     {
       "path": "packages/opentelemetry-api-metrics/tsconfig.esm.json"
     },
+    {
+      "path": "packages/opentelemetry-exporter-otlp-grpc"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-otlp-proto"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-prometheus"
+    },
     {
       "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json"
     },
diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json
index a4220672a87..6571f7fa7c9 100644
--- a/experimental/tsconfig.json
+++ b/experimental/tsconfig.json
@@ -5,6 +5,18 @@
     {
       "path": "packages/opentelemetry-api-metrics"
     },
+    {
+      "path": "packages/opentelemetry-exporter-otlp-grpc"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-otlp-http"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-otlp-proto"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-prometheus"
+    },
     {
       "path": "packages/opentelemetry-instrumentation-fetch"
     },
diff --git a/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json b/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json
deleted file mode 100644
index 7a9bb54ea7d..00000000000
--- a/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "extends": "../../tsconfig.base.esm.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "build/esm",
-    "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
-  },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-core/tsconfig.esm.json"
-    },
-    {
-      "path": "../opentelemetry-resources/tsconfig.esm.json"
-    },
-    {
-      "path": "../opentelemetry-sdk-trace-base/tsconfig.esm.json"
-    }
-  ]
-}
diff --git a/packages/opentelemetry-exporter-otlp-http/tsconfig.json b/packages/opentelemetry-exporter-otlp-http/tsconfig.json
deleted file mode 100644
index 1d7ba827ac5..00000000000
--- a/packages/opentelemetry-exporter-otlp-http/tsconfig.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": ".",
-    "outDir": "build"
-  },
-  "include": [
-    "src/**/*.ts",
-    "test/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-core"
-    },
-    {
-      "path": "../opentelemetry-resources"
-    },
-    {
-      "path": "../opentelemetry-sdk-trace-base"
-    }
-  ]
-}
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index 57f33c032a0..528d200ba51 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -26,15 +26,6 @@
     {
       "path": "packages/opentelemetry-exporter-jaeger"
     },
-    {
-      "path": "packages/opentelemetry-exporter-otlp-grpc"
-    },
-    {
-      "path": "packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json"
-    },
-    {
-      "path": "packages/opentelemetry-exporter-otlp-proto"
-    },
     {
       "path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json"
     },
diff --git a/tsconfig.json b/tsconfig.json
index 8c9f7c196ae..be14fd46434 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,9 @@
   "typedocOptions": {
     "packages": [
       "experimental/packages/opentelemetry-api-metrics",
+      "experimental/packages/opentelemetry-exporter-otlp-grpc",
+      "experimental/packages/opentelemetry-exporter-otlp-http",
+      "experimental/packages/opentelemetry-exporter-otlp-proto",
       "experimental/packages/opentelemetry-exporter-prometheus",
       "experimental/packages/opentelemetry-instrumentation-fetch",
       "experimental/packages/opentelemetry-instrumentation-grpc",
@@ -16,9 +19,6 @@
       "packages/opentelemetry-context-zone",
       "packages/opentelemetry-core",
       "packages/opentelemetry-exporter-jaeger",
-      "packages/opentelemetry-exporter-otlp-grpc",
-      "packages/opentelemetry-exporter-otlp-http",
-      "packages/opentelemetry-exporter-otlp-proto",
       "packages/opentelemetry-exporter-zipkin",
       "packages/opentelemetry-propagator-b3",
       "packages/opentelemetry-propagator-jaeger",
@@ -65,15 +65,6 @@
     {
       "path": "packages/opentelemetry-exporter-jaeger"
     },
-    {
-      "path": "packages/opentelemetry-exporter-otlp-grpc"
-    },
-    {
-      "path": "packages/opentelemetry-exporter-otlp-http"
-    },
-    {
-      "path": "packages/opentelemetry-exporter-otlp-proto"
-    },
     {
       "path": "packages/opentelemetry-exporter-zipkin"
     },

From be52259d736d6762f83d89682dc528c2db0ffeaa Mon Sep 17 00:00:00 2001
From: Mustafain Ali Khan <mustalik@amazon.com>
Date: Tue, 28 Sep 2021 13:49:47 -0400
Subject: [PATCH 3/5] fix: remove setting http.route in http span attributes
 (#2494)

---
 .../src/utils.ts                                  |  1 -
 .../test/functionals/utils.test.ts                | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
index d7c3ff83763..4f8a03c7af8 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
+++ b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
@@ -453,7 +453,6 @@ export const getIncomingRequestAttributes = (
   }
 
   if (requestUrl) {
-    attributes[SemanticAttributes.HTTP_ROUTE] = requestUrl.pathname || '/';
     attributes[SemanticAttributes.HTTP_TARGET] = requestUrl.pathname || '/';
   }
 
diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts
index cde1aafdc7d..7b8a2e8d1ef 100644
--- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts
+++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts
@@ -466,6 +466,21 @@ describe('Utility', () => {
     });
   });
 
+  describe('getIncomingRequestAttributes()', () => {
+    it('should not set http.route in http span attributes', () => {
+      const request = {
+        url: 'http://hostname/user/:id',
+        method: 'GET'
+      } as IncomingMessage;
+      request.headers = {
+        'user-agent': 'chrome',
+        'x-forwarded-for': '<client>, <proxy1>, <proxy2>'
+      }
+      const attributes = utils.getIncomingRequestAttributes(request, { component: 'http'})
+      assert.strictEqual(attributes[SemanticAttributes.HTTP_ROUTE], undefined)
+    });
+  });
+  
   describe('headers to span attributes capture', () => {
     let span: Span;
 

From 7287dcb042ff0af40d9a5d7f06c0efc4c11a9e04 Mon Sep 17 00:00:00 2001
From: Mustafain Ali Khan <mustalik@amazon.com>
Date: Wed, 29 Sep 2021 09:07:28 -0400
Subject: [PATCH 4/5] fix: update typescript getting-started tracing example
 and docs (#2504)

---
 getting-started/ts-example/README.md          | 34 +++++++++----------
 .../ts-example/traced-example/tracing.ts      | 19 ++++++-----
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/getting-started/ts-example/README.md b/getting-started/ts-example/README.md
index 49da9bc4a51..a1ccd6a1cb6 100644
--- a/getting-started/ts-example/README.md
+++ b/getting-started/ts-example/README.md
@@ -54,15 +54,17 @@ This guide uses the example application provided in the [example directory](exam
 
 ([link to JavaScript version](../README.md#install-the-required-opentelemetry-libraries))
 
-To create traces on NodeJS, you will need `@opentelemetry/sdk-trace-node`, `@opentelemetry/core`, and any plugins required by your application such as gRPC, or HTTP. If you are using the example application, you will need to install `@opentelemetry/plugin-http`.
+To create traces on NodeJS, you will need `@opentelemetry/sdk-trace-node`, `@opentelemetry/api`, and any plugins required by your application such as gRPC, or HTTP. If you are using the example application, you will need to install `@opentelemetry/instrumentation-http` and `@opentelemetry/instrumentation-express`.
 
 ```sh
 $ npm install \
-  @opentelemetry/core \
+  @opentelemetry/api \
   @opentelemetry/sdk-trace-node \
   @opentelemetry/instrumentation \
   @opentelemetry/instrumentation-http \
-  @opentelemetry/instrumentation-express
+  @opentelemetry/instrumentation-express \
+  @@opentelemetry/resources \
+  @opentelemetry/semantic-conventions
 ```
 
 #### Initialize a global tracer
@@ -74,16 +76,16 @@ All tracing initialization should happen before your application’s code runs.
 Create a file named `tracing.ts` and add the following code:
 
 ```typescript
-import { LogLevel } from '@opentelemetry/core';
+import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 
 
-const provider: NodeTracerProvider = new NodeTracerProvider({
-  logLevel: LogLevel.ERROR,
-});
+const provider: NodeTracerProvider = new NodeTracerProvider();
+
+diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ALL);
 
 provider.register();
 
@@ -120,26 +122,26 @@ $ # npm install @opentelemetry/exporter-jaeger
 After these dependencies are installed, we will need to initialize and register them. Modify `tracing.ts` so that it matches the following code snippet, replacing the service name `"getting-started"` with your own service name if you wish.
 
 ```typescript
-import { LogLevel } from '@opentelemetry/core';
+import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
-
+import { registerInstrumentations } from '@opentelemetry/instrumentation';
+import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
+import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { Resource } from '@opentelemetry/resources'
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
 // For Jaeger, use the following line instead:
 // import { JaegerExporter } from '@opentelemetry/exporter-jaeger';
 
-import { registerInstrumentations } from '@opentelemetry/instrumentation';
-import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
-import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-
 const provider: NodeTracerProvider = new NodeTracerProvider({
-  logLevel: LogLevel.ERROR,
   resource: new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: 'getting-started',
   }),
 });
 
+diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ALL);
+
 provider.addSpanProcessor(
   new SimpleSpanProcessor(
     new ZipkinExporter({
@@ -151,7 +153,6 @@ provider.addSpanProcessor(
     }),
   ),
 );
-
 provider.register();
 
 registerInstrumentations({
@@ -161,7 +162,6 @@ registerInstrumentations({
   ],
 });
 
-
 console.log('tracing initialized');
 ```
 
diff --git a/getting-started/ts-example/traced-example/tracing.ts b/getting-started/ts-example/traced-example/tracing.ts
index 4426da25f98..8d4628a06e9 100644
--- a/getting-started/ts-example/traced-example/tracing.ts
+++ b/getting-started/ts-example/traced-example/tracing.ts
@@ -1,22 +1,23 @@
+import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
-
+import { registerInstrumentations } from '@opentelemetry/instrumentation';
+import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
+import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { Resource } from '@opentelemetry/resources'
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
-
-const { Resource } = require('@opentelemetry/resources');
-const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 // For Jaeger, use the following line instead:
 // import { JaegerExporter } from '@opentelemetry/exporter-jaeger';
 
-const { registerInstrumentations } = require('@opentelemetry/instrumentation');
-const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
-const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
-
 const provider: NodeTracerProvider = new NodeTracerProvider({
   resource: new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: 'getting-started',
   }),
 });
+
+diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ALL);
+
 provider.addSpanProcessor(
   new SimpleSpanProcessor(
     new ZipkinExporter({
@@ -37,4 +38,4 @@ registerInstrumentations({
   ],
 });
 
-console.log('tracing initialized');
+console.log('tracing initialized');
\ No newline at end of file

From b66c650849ed4da78ab7d9acbbb50df6f8d58e37 Mon Sep 17 00:00:00 2001
From: Daniel Dyla <dyladan@users.noreply.github.com>
Date: Wed, 29 Sep 2021 10:53:40 -0400
Subject: [PATCH 5/5] chore: move backwards compatibility to experimental
 (#2508)

---
 .../backwards-compatability}/node10/index.ts             | 0
 .../backwards-compatability}/node10/package.json         | 0
 .../backwards-compatability}/node10/tsconfig.json        | 4 ++--
 .../backwards-compatability}/node12/index.ts             | 0
 .../backwards-compatability}/node12/package.json         | 0
 .../backwards-compatability}/node12/tsconfig.json        | 4 ++--
 .../backwards-compatability}/node8/index.ts              | 0
 .../backwards-compatability}/node8/package.json          | 0
 .../backwards-compatability}/node8/tsconfig.json         | 4 ++--
 experimental/lerna.json                                  | 3 ++-
 experimental/tsconfig.esm.json                           | 9 +++++++++
 experimental/tsconfig.json                               | 9 +++++++++
 lerna.json                                               | 1 -
 tsconfig.esm.json                                        | 9 ---------
 tsconfig.json                                            | 9 ---------
 15 files changed, 26 insertions(+), 26 deletions(-)
 rename {backwards-compatability => experimental/backwards-compatability}/node10/index.ts (100%)
 rename {backwards-compatability => experimental/backwards-compatability}/node10/package.json (100%)
 rename {backwards-compatability => experimental/backwards-compatability}/node10/tsconfig.json (58%)
 rename {backwards-compatability => experimental/backwards-compatability}/node12/index.ts (100%)
 rename {backwards-compatability => experimental/backwards-compatability}/node12/package.json (100%)
 rename {backwards-compatability => experimental/backwards-compatability}/node12/tsconfig.json (58%)
 rename {backwards-compatability => experimental/backwards-compatability}/node8/index.ts (100%)
 rename {backwards-compatability => experimental/backwards-compatability}/node8/package.json (100%)
 rename {backwards-compatability => experimental/backwards-compatability}/node8/tsconfig.json (58%)

diff --git a/backwards-compatability/node10/index.ts b/experimental/backwards-compatability/node10/index.ts
similarity index 100%
rename from backwards-compatability/node10/index.ts
rename to experimental/backwards-compatability/node10/index.ts
diff --git a/backwards-compatability/node10/package.json b/experimental/backwards-compatability/node10/package.json
similarity index 100%
rename from backwards-compatability/node10/package.json
rename to experimental/backwards-compatability/node10/package.json
diff --git a/backwards-compatability/node10/tsconfig.json b/experimental/backwards-compatability/node10/tsconfig.json
similarity index 58%
rename from backwards-compatability/node10/tsconfig.json
rename to experimental/backwards-compatability/node10/tsconfig.json
index 557ca620428..049617e92fe 100644
--- a/backwards-compatability/node10/tsconfig.json
+++ b/experimental/backwards-compatability/node10/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.es5.json",
+  "extends": "../../../tsconfig.es5.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -9,7 +9,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/opentelemetry-sdk-trace-base"
+      "path": "../../packages/opentelemetry-sdk-node"
     }
   ]
 }
diff --git a/backwards-compatability/node12/index.ts b/experimental/backwards-compatability/node12/index.ts
similarity index 100%
rename from backwards-compatability/node12/index.ts
rename to experimental/backwards-compatability/node12/index.ts
diff --git a/backwards-compatability/node12/package.json b/experimental/backwards-compatability/node12/package.json
similarity index 100%
rename from backwards-compatability/node12/package.json
rename to experimental/backwards-compatability/node12/package.json
diff --git a/backwards-compatability/node12/tsconfig.json b/experimental/backwards-compatability/node12/tsconfig.json
similarity index 58%
rename from backwards-compatability/node12/tsconfig.json
rename to experimental/backwards-compatability/node12/tsconfig.json
index 557ca620428..049617e92fe 100644
--- a/backwards-compatability/node12/tsconfig.json
+++ b/experimental/backwards-compatability/node12/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.es5.json",
+  "extends": "../../../tsconfig.es5.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -9,7 +9,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/opentelemetry-sdk-trace-base"
+      "path": "../../packages/opentelemetry-sdk-node"
     }
   ]
 }
diff --git a/backwards-compatability/node8/index.ts b/experimental/backwards-compatability/node8/index.ts
similarity index 100%
rename from backwards-compatability/node8/index.ts
rename to experimental/backwards-compatability/node8/index.ts
diff --git a/backwards-compatability/node8/package.json b/experimental/backwards-compatability/node8/package.json
similarity index 100%
rename from backwards-compatability/node8/package.json
rename to experimental/backwards-compatability/node8/package.json
diff --git a/backwards-compatability/node8/tsconfig.json b/experimental/backwards-compatability/node8/tsconfig.json
similarity index 58%
rename from backwards-compatability/node8/tsconfig.json
rename to experimental/backwards-compatability/node8/tsconfig.json
index 557ca620428..049617e92fe 100644
--- a/backwards-compatability/node8/tsconfig.json
+++ b/experimental/backwards-compatability/node8/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.es5.json",
+  "extends": "../../../tsconfig.es5.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -9,7 +9,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/opentelemetry-sdk-trace-base"
+      "path": "../../packages/opentelemetry-sdk-node"
     }
   ]
 }
diff --git a/experimental/lerna.json b/experimental/lerna.json
index 99276cc155d..c8010cca0c9 100644
--- a/experimental/lerna.json
+++ b/experimental/lerna.json
@@ -3,6 +3,7 @@
   "version": "0.25.0",
   "npmClient": "npm",
   "packages": [
-    "packages/*"
+    "packages/*",
+    "backwards-compatability/*"
   ]
 }
diff --git a/experimental/tsconfig.esm.json b/experimental/tsconfig.esm.json
index c37493f8e74..a233a3b76d1 100644
--- a/experimental/tsconfig.esm.json
+++ b/experimental/tsconfig.esm.json
@@ -37,6 +37,15 @@
     },
     {
       "path": "packages/opentelemetry-sdk-node"
+    },
+    {
+      "path": "backwards-compatability/node10"
+    },
+    {
+      "path": "backwards-compatability/node12"
+    },
+    {
+      "path": "backwards-compatability/node8"
     }
   ]
 }
diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json
index 6571f7fa7c9..3ae14512e28 100644
--- a/experimental/tsconfig.json
+++ b/experimental/tsconfig.json
@@ -37,6 +37,15 @@
     },
     {
       "path": "packages/opentelemetry-sdk-node"
+    },
+    {
+      "path": "backwards-compatability/node10"
+    },
+    {
+      "path": "backwards-compatability/node12"
+    },
+    {
+      "path": "backwards-compatability/node8"
     }
   ]
 }
diff --git a/lerna.json b/lerna.json
index 5f3df4e8bd0..deedbc87c7b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,7 +4,6 @@
   "npmClient": "npm",
   "packages": [
     "benchmark/*",
-    "backwards-compatability/*",
     "packages/*",
     "integration-tests/*"
   ]
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index 528d200ba51..4bbf108bfcf 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -2,15 +2,6 @@
   "extends": "./tsconfig.base.esm.json",
   "files": [],
   "references": [
-    {
-      "path": "backwards-compatability/node10"
-    },
-    {
-      "path": "backwards-compatability/node12"
-    },
-    {
-      "path": "backwards-compatability/node8"
-    },
     {
       "path": "packages/opentelemetry-context-async-hooks"
     },
diff --git a/tsconfig.json b/tsconfig.json
index be14fd46434..17cfa102617 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -41,15 +41,6 @@
     "excludePrivate": true
   },
   "references": [
-    {
-      "path": "backwards-compatability/node10"
-    },
-    {
-      "path": "backwards-compatability/node12"
-    },
-    {
-      "path": "backwards-compatability/node8"
-    },
     {
       "path": "packages/opentelemetry-context-async-hooks"
     },