refactor(otlp-exporter): move code that will be removed to legacy directory

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/index.ts

@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 
-export * from './OTLPMetricExporter';
+// Legacy exporter kept for compatibility, scheduled for removal in 2.0
+export { OTLPMetricExporter } from './legacy/OTLPMetricExporter';

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts → experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/legacy/OTLPMetricExporter.ts

@@ -31,7 +31,7 @@ import {
   createExportMetricsServiceRequest,
   IExportMetricsServiceRequest,
 } from '@opentelemetry/otlp-transformer';
-import { VERSION } from './version';
+import { VERSION } from '../version';
 
 const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/metrics';
 const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`;

experimental/packages/otlp-exporter-base/package.json

@@ -8,10 +8,10 @@
   "types": "build/src/index.d.ts",
   "repository": "open-telemetry/opentelemetry-js",
   "browser": {
-    "./src/platform/index.ts": "./src/platform/browser/index.ts",
-    "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js",
-    "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
-    "./build/src/platform/index.js": "./build/src/platform/browser/index.js"
+    "./src/legacy/platform/index.ts": "./src/legacy/platform/browser/index.ts",
+    "./build/esm/legacy/platform/index.js": "./build/esm/legacy/platform/browser/index.js",
+    "./build/esnext/legacy/platform/index.js": "./build/esnext/legacy/platform/browser/index.js",
+    "./build/src/legacy/platform/index.js": "./build/src/legacy/platform/browser/index.js"
   },
   "scripts": {
     "prepublishOnly": "npm run compile",

experimental/packages/otlp-exporter-base/src/index.ts

@@ -13,17 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './platform';
-export { OTLPExporterBase } from './OTLPExporterBase';
-export {
-  OTLPExporterError,
-  OTLPExporterConfigBase,
-  ExportServiceError,
-} from './types';
-export {
-  parseHeaders,
-  appendResourcePathToUrl,
-  appendRootPathToUrlIfNeeded,
-  configureExporterTimeout,
-  invalidTimeout,
-} from './util';
+
+// Legacy exports scheduled for removal.
+export * from './legacy';

experimental/packages/otlp-exporter-base/src/legacy/index.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Legacy
+export * from './platform';
+export { OTLPExporterBase } from './OTLPExporterBase';
+export {
+  OTLPExporterError,
+  OTLPExporterConfigBase,
+  ExportServiceError,
+} from './types';
+export {
+  parseHeaders,
+  appendResourcePathToUrl,
+  appendRootPathToUrlIfNeeded,
+  configureExporterTimeout,
+  invalidTimeout,
+} from './util';

experimental/packages/otlp-exporter-base/test/browser/util.test.ts

@@ -15,9 +15,9 @@
  */
 
 import * as sinon from 'sinon';
-import { sendWithXhr } from '../../src/platform/browser/util';
+import { sendWithXhr } from '../../src';
 import { nextTick } from 'process';
-import { ensureHeadersContain } from '../testHelper';
+import { ensureHeadersContain } from '../common/legacy/testHelper';
 
 describe('util - browser', () => {
   let server: any;

experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts → experimental/packages/otlp-exporter-base/test/common/legacy/CollectorExporter.test.ts

@@ -17,10 +17,10 @@
 import { ExportResultCode } from '@opentelemetry/core';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { OTLPExporterBase } from '../../src/OTLPExporterBase';
-import { OTLPExporterConfigBase } from '../../src/types';
-import { ComplexTestObject, mockedComplexTestObject } from '../testHelper';
-import * as otlpTypes from '../../src/types';
+import { OTLPExporterBase } from '../../../src';
+import { OTLPExporterConfigBase } from '../../../src';
+import { ComplexTestObject, mockedComplexTestObject } from './testHelper';
+import * as otlpTypes from '../../../src/legacy/types';
 
 interface ExportRequest {
   resourceSpans: object[];

experimental/packages/otlp-exporter-base/test/common/util.test.ts → experimental/packages/otlp-exporter-base/test/common/legacy/util.test.ts

@@ -22,7 +22,7 @@ import {
   appendResourcePathToUrl,
   appendRootPathToUrlIfNeeded,
   parseRetryAfterToMills,
-} from '../../src/util';
+} from '../../../src/legacy/util';
 
 describe('utils', () => {
   afterEach(() => {

experimental/packages/otlp-exporter-base/test/node/util.test.ts → experimental/packages/otlp-exporter-base/test/node/legacy/util.test.ts

@@ -15,16 +15,19 @@
  */
 
 import * as assert from 'assert';
-import { configureExporterTimeout, invalidTimeout } from '../../src/util';
-import { sendWithHttp } from '../../src/platform/node/util';
-import { CompressionAlgorithm } from '../../src/platform/node/types';
-import { configureCompression } from '../../src/platform/node/util';
+import {
+  configureExporterTimeout,
+  invalidTimeout,
+  sendWithHttp,
+  CompressionAlgorithm,
+  configureCompression,
+  OTLPExporterNodeBase,
+  OTLPExporterNodeConfigBase,
+  OTLPExporterError,
+} from '../../../src';
 import { diag } from '@opentelemetry/api';
 import * as sinon from 'sinon';
 
-import { OTLPExporterNodeBase } from '../../src/platform/node/OTLPExporterNodeBase';
-import { OTLPExporterNodeConfigBase } from '../../src/platform/node/types';
-import { OTLPExporterError } from '../../src/types';
 import { PassThrough } from 'stream';
 import * as http from 'http';
 import * as zlib from 'zlib';

experimental/packages/otlp-proto-exporter-base/package.json

@@ -8,10 +8,10 @@
   "types": "build/src/index.d.ts",
   "repository": "open-telemetry/opentelemetry-js",
   "browser": {
-    "./src/platform/index.ts": "./src/platform/browser/index.ts",
-    "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js",
-    "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
-    "./build/src/platform/index.js": "./build/src/platform/browser/index.js"
+    "./src/legacy/platform/index.ts": "./src/legacy/platform/browser/index.ts",
+    "./build/esm/legacy/platform/index.js": "./build/esm/legacy/platform/browser/index.js",
+    "./build/esnext/legacy/platform/index.js": "./build/esnext/legacy/platform/browser/index.js",
+    "./build/src/legacy/platform/index.js": "./build/src/legacy/platform/browser/index.js"
   },
   "scripts": {
     "prepublishOnly": "npm run compile",

experimental/packages/otlp-proto-exporter-base/src/index.ts

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './platform';
+export * from './legacy/platform';

experimental/packages/otlp-proto-exporter-base/src/platform/util.ts → experimental/packages/otlp-proto-exporter-base/src/legacy/platform/util.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import * as root from '../generated/root';
+import * as root from '../../generated/root';
 import { ServiceClientType } from './types';
 import type * as protobuf from 'protobufjs';