refactor: merge opentelemetry-base to opentelemetry-core

They act a very similar role in the SDK.
open-telemetry · Apr 29, 2020 · 659b65b · 659b65b
1 parent e4e71b8
commit 659b65b
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 29 deletions.
diff --git a/packages/opentelemetry-core/src/ExportResult.ts b/packages/opentelemetry-core/src/ExportResult.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright 2019, 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.
+ */
+
+export enum ExportResult {
+  SUCCESS,
+  FAILED_NOT_RETRYABLE,
+  FAILED_RETRYABLE,
+}
diff --git a/packages/opentelemetry-core/src/index.ts b/packages/opentelemetry-core/src/index.ts
@@ -18,6 +18,7 @@ export * from './common/ConsoleLogger';
 export * from './common/NoopLogger';
 export * from './common/time';
 export * from './common/types';
+export * from './ExportResult';
 export * from './version';
 export * from './context/context';
 export * from './context/propagation/B3Propagator';

diff --git a/packages/opentelemetry-core/src/platform/browser/constants.ts b/packages/opentelemetry-core/src/platform/browser/constants.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2020, 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.
+ */
+
+import { VERSION } from '../../version';
+
+/** Constants describing the SDK in use */
+export const SDK_INFO = {
+  NAME: 'opentelemetry',
+  RUNTIME: 'browser',
+  LANGUAGE: 'webjs',
+  VERSION: VERSION,
+};
diff --git a/packages/opentelemetry-core/src/platform/browser/index.ts b/packages/opentelemetry-core/src/platform/browser/index.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+export * from './constants';
 export * from './id';
 export * from './performance';
 export * from './timer-util';

diff --git a/packages/opentelemetry-core/src/platform/node/constants.ts b/packages/opentelemetry-core/src/platform/node/constants.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2020, 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.
+ */
+
+import { VERSION } from '../../version';
+
+/** Constants describing the SDK in use */
+export const SDK_INFO = {
+  NAME: 'opentelemetry',
+  RUNTIME: 'node',
+  LANGUAGE: 'nodejs',
+  VERSION: VERSION,
+};
diff --git a/packages/opentelemetry-core/src/platform/node/index.ts b/packages/opentelemetry-core/src/platform/node/index.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+export * from './constants';
 export * from './id';
 export * from './performance';
 export * from './timer-util';

diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json
@@ -85,7 +85,6 @@
   "dependencies": {
     "@grpc/proto-loader": "^0.5.3",
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
     "@opentelemetry/core": "^0.7.0",
     "@opentelemetry/resources": "^0.7.0",
     "@opentelemetry/tracing": "^0.7.0",

diff --git a/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts b/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { ExportResult } from '@opentelemetry/base';
-import { NoopLogger } from '@opentelemetry/core';
+import { ExportResult, NoopLogger } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/tracing';
 import { Attributes, Logger } from '@opentelemetry/api';
 import { onInit, onShutdown, sendSpans } from './platform/index';

diff --git a/packages/opentelemetry-exporter-collector/src/transform.ts b/packages/opentelemetry-exporter-collector/src/transform.ts
@@ -21,7 +21,6 @@ import {
   TimedEvent,
   TraceState,
 } from '@opentelemetry/api';
-import { SDK_INFO } from '@opentelemetry/base';
 import * as core from '@opentelemetry/core';
 import { Resource } from '@opentelemetry/resources';
 import { ReadableSpan } from '@opentelemetry/tracing';
@@ -218,8 +217,8 @@ export function toCollectorExportTraceServiceRequest(
   const instrumentationLibrarySpans: opentelemetryProto.trace.v1.InstrumentationLibrarySpans = {
     spans: spansToBeSent,
     instrumentationLibrary: {
-      name: name || `${SDK_INFO.NAME} - ${SDK_INFO.LANGUAGE}`,
-      version: SDK_INFO.VERSION,
+      name: name || `${core.SDK_INFO.NAME} - ${core.SDK_INFO.LANGUAGE}`,
+      version: core.SDK_INFO.VERSION,
     },
   };
   const resourceSpan: opentelemetryProto.trace.v1.ResourceSpans = {

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -57,7 +57,6 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
     "@opentelemetry/core": "^0.7.0",
     "@opentelemetry/tracing": "^0.7.0",
     "jaeger-client": "^3.15.0"

diff --git a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts
@@ -15,8 +15,7 @@
  */
 
 import * as api from '@opentelemetry/api';
-import { ExportResult } from '@opentelemetry/base';
-import { NoopLogger } from '@opentelemetry/core';
+import { ExportResult, NoopLogger } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/tracing';
 import { Socket } from 'dgram';
 import { spanToThrift } from './transform';

diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json
@@ -55,7 +55,6 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
     "@opentelemetry/core": "^0.7.0",
     "@opentelemetry/metrics": "^0.7.0",
     "prom-client": "^11.5.3"

diff --git a/packages/opentelemetry-exporter-prometheus/src/prometheus.ts b/packages/opentelemetry-exporter-prometheus/src/prometheus.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { ExportResult } from '@opentelemetry/base';
-import { NoopLogger, hrTimeToMilliseconds } from '@opentelemetry/core';
+import { ExportResult, NoopLogger, hrTimeToMilliseconds } from '@opentelemetry/core';
 import {
   CounterSumAggregator,
   LastValue,

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -55,7 +55,6 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
     "@opentelemetry/core": "^0.7.0",
     "@opentelemetry/resources": "^0.7.0",
     "@opentelemetry/tracing": "^0.7.0"

diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts
@@ -18,9 +18,8 @@ import * as types from '@opentelemetry/api';
 import * as http from 'http';
 import * as https from 'https';
 import * as url from 'url';
-import { NoopLogger } from '@opentelemetry/core';
+import { ExportResult, NoopLogger } from '@opentelemetry/core';
 import { SpanExporter, ReadableSpan } from '@opentelemetry/tracing';
-import { ExportResult } from '@opentelemetry/base';
 import * as zipkinTypes from './types';
 import {
   toZipkinSpan,

diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json
@@ -58,7 +58,6 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
     "@opentelemetry/core": "^0.7.0",
     "@opentelemetry/resources": "^0.7.0"
   }

diff --git a/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts b/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts
@@ -15,7 +15,7 @@
  */
 
 import { MetricExporter, MetricRecord, Distribution, Histogram } from './types';
-import { ExportResult } from '@opentelemetry/base';
+import { ExportResult } from '@opentelemetry/core';
 
 /**
  * This is implementation of {@link MetricExporter} that prints metrics data to

diff --git a/packages/opentelemetry-metrics/src/export/Controller.ts b/packages/opentelemetry-metrics/src/export/Controller.ts
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import { unrefTimer } from '@opentelemetry/core';
+import { ExportResult, unrefTimer } from '@opentelemetry/core';
 import { Meter } from '../Meter';
 import { MetricExporter } from './types';
-import { ExportResult } from '@opentelemetry/base';
 
 const DEFAULT_EXPORT_INTERVAL = 60_000;
 

diff --git a/packages/opentelemetry-metrics/src/export/NoopExporter.ts b/packages/opentelemetry-metrics/src/export/NoopExporter.ts
@@ -15,7 +15,7 @@
  */
 
 import { MetricExporter, MetricRecord } from './types';
-import { ExportResult } from '@opentelemetry/base';
+import { ExportResult } from '@opentelemetry/core';
 
 export class NoopExporter implements MetricExporter {
   // By default does nothing

diff --git a/packages/opentelemetry-metrics/src/export/types.ts b/packages/opentelemetry-metrics/src/export/types.ts
@@ -15,7 +15,7 @@
  */
 
 import { ValueType, HrTime, Labels } from '@opentelemetry/api';
-import { ExportResult } from '@opentelemetry/base';
+import { ExportResult } from '@opentelemetry/core';
 
 /** The kind of metric. */
 export enum MetricKind {

diff --git a/packages/opentelemetry-plugin-xml-http-request/package.json b/packages/opentelemetry-plugin-xml-http-request/package.json
@@ -77,7 +77,6 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
     "@opentelemetry/core": "^0.7.0",
     "@opentelemetry/web": "^0.7.0",
     "shimmer": "^1.2.1"

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
+    "@opentelemetry/core": "^0.7.0",
     "gcp-metadata": "^3.5.0"
   }
 }
diff --git a/packages/opentelemetry-resources/src/Resource.ts b/packages/opentelemetry-resources/src/Resource.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { SDK_INFO } from '@opentelemetry/base';
+import { SDK_INFO } from '@opentelemetry/core';
 import { TELEMETRY_SDK_RESOURCE } from './constants';
 import { ResourceLabels } from './types';
 

diff --git a/packages/opentelemetry-tracing/package.json b/packages/opentelemetry-tracing/package.json
@@ -74,7 +74,6 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^0.7.0",
-    "@opentelemetry/base": "^0.7.0",
     "@opentelemetry/context-base": "^0.7.0",
     "@opentelemetry/core": "^0.7.0",
     "@opentelemetry/resources": "^0.7.0"

diff --git a/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts b/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts
@@ -16,8 +16,7 @@
 
 import { SpanExporter } from './SpanExporter';
 import { ReadableSpan } from './ReadableSpan';
-import { ExportResult } from '@opentelemetry/base';
-import { hrTimeToMicroseconds } from '@opentelemetry/core';
+import { ExportResult, hrTimeToMicroseconds } from '@opentelemetry/core';
 
 /**
  * This is implementation of {@link SpanExporter} that prints spans to the

diff --git a/packages/opentelemetry-tracing/src/export/InMemorySpanExporter.ts b/packages/opentelemetry-tracing/src/export/InMemorySpanExporter.ts
@@ -16,7 +16,7 @@
 
 import { SpanExporter } from './SpanExporter';
 import { ReadableSpan } from './ReadableSpan';
-import { ExportResult } from '@opentelemetry/base';
+import { ExportResult } from '@opentelemetry/core';
 
 /**
  * This class can be used for testing purposes. It stores the exported spans

diff --git a/packages/opentelemetry-tracing/src/export/SpanExporter.ts b/packages/opentelemetry-tracing/src/export/SpanExporter.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ExportResult } from '@opentelemetry/base';
+import { ExportResult } from '@opentelemetry/core';
 import { ReadableSpan } from './ReadableSpan';
 
 /**