Merge pull request pichlermarc-sample-organization#15 from pichlermar…

…c-sample-organization/revert-14-jamie.push-test-branch Revert "pushing test branch from otel-js"
marcpichler · Aug 14, 2024 · b31b1b6 · b31b1b6
2 parents 1821353 + 6ea85fd
commit b31b1b6
Show file tree

Hide file tree

Showing 214 changed files with 8,595 additions and 5,369 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,20 +29,6 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/op
 ### :house: (Internal)
 
 * refactor: Simplify the code for the `getEnv` function [#4799](https://github.com/open-telemetry/opentelemetry-js/pull/4799) @danstarns
-* refactor: remove "export *" in favor of explicit named exports [#4880](https://github.com/open-telemetry/opentelemetry-js/pull/4880) @robbkidd
- * Packages updated:
- * opentelemetry-context-zone
- * opentelemetry-core
- * opentelemetry-exporter-jaeger
- * opentelemetry-exporter-zipkin
- * opentelemetry-propagator-b3
- * opentelemetry-propagator-jaeger
- * opentelemetry-sdk-trace-base
- * opentelemetry-sdk-trace-node
- * opentelemetry-sdk-trace-web
- * propagator-aws-xray
- * sdk-metrics
-* deps(sdk-metrics): remove unused lodash.merge dependency [#4905](https://github.com/open-telemetry/opentelemetry-js/pull/4905) @pichlermarc
 
 ## 1.25.1
 

diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md
@@ -15,8 +15,6 @@ All notable changes to this project will be documented in this file.
 
 ### :house: (Internal)
 
-* refactor(api): remove "export *" in favor of explicit named exports [#4880](https://github.com/open-telemetry/opentelemetry-js/pull/4880) @robbkidd
-
 ## 1.9.0
 
 ### :rocket: (Enhancement)

diff --git a/api/package.json b/api/package.json
@@ -98,7 +98,7 @@
  "karma-webpack": "5.0.1",
  "lerna": "6.6.2",
  "memfs": "3.5.3",
- "mocha": "10.7.3",
+ "mocha": "10.2.0",
  "nyc": "15.1.0",
  "sinon": "15.1.2",
  "ts-loader": "9.5.1",

diff --git a/api/src/api/context.ts b/api/src/api/context.ts
@@ -28,8 +28,6 @@ const NOOP_CONTEXT_MANAGER = new NoopContextManager();
 
 /**
  * Singleton object which represents the entry point to the OpenTelemetry Context API
- *
- * @since 1.0.0
  */
 export class ContextAPI {
  private static _instance?: ContextAPI;

diff --git a/api/src/api/diag.ts b/api/src/api/diag.ts
@@ -34,8 +34,6 @@ const API_NAME = 'diag';
 /**
  * Singleton object which represents the entry point to the OpenTelemetry internal
  * diagnostic API
- *
- * @since 1.0.0
  */
 export class DiagAPI implements DiagLogger, DiagLoggerApi {
  private static _instance?: DiagAPI;

diff --git a/api/src/api/propagation.ts b/api/src/api/propagation.ts
@@ -42,8 +42,6 @@ const NOOP_TEXT_MAP_PROPAGATOR = new NoopTextMapPropagator();
 
 /**
  * Singleton object which represents the entry point to the OpenTelemetry Propagation API
- *
- * @since 1.0.0
  */
 export class PropagationAPI {
  private static _instance?: PropagationAPI;

diff --git a/api/src/api/trace.ts b/api/src/api/trace.ts
@@ -40,8 +40,6 @@ const API_NAME = 'trace';
 
 /**
  * Singleton object which represents the entry point to the OpenTelemetry Tracing API
- *
- * @since 1.0.0
  */
 export class TraceAPI {
  private static _instance?: TraceAPI;

diff --git a/api/src/baggage/types.ts b/api/src/baggage/types.ts
@@ -32,9 +32,6 @@ import { baggageEntryMetadataSymbol } from './internal/symbol';
  * limitations under the License.
  */
 
-/**
- * @since 1.0.0
- */
 export interface BaggageEntry {
  /** `String` value of the `BaggageEntry`. */
  value: string;
@@ -48,8 +45,6 @@ export interface BaggageEntry {
 /**
  * Serializable Metadata defined by the W3C baggage specification.
  * It currently has no special meaning defined by the OpenTelemetry or W3C.
- *
- * @since 1.0.0
  */
 export type BaggageEntryMetadata = { toString(): string } & {
  __TYPE__: typeof baggageEntryMetadataSymbol;
@@ -59,8 +54,6 @@ export type BaggageEntryMetadata = { toString(): string } & {
  * Baggage represents collection of key-value pairs with optional metadata.
  * Each key of Baggage is associated with exactly one value.
  * Baggage may be used to annotate and enrich telemetry data.
- *
- * @since 1.0.0
  */
 export interface Baggage {
  /**

diff --git a/api/src/baggage/utils.ts b/api/src/baggage/utils.ts
@@ -37,7 +37,6 @@ export function createBaggage(
  *
  * @param str string metadata. Format is currently not defined by the spec and has no special meaning.
  *
- * @since 1.0.0
  */
 export function baggageEntryMetadataFromString(
  str: string

diff --git a/api/src/common/Attributes.ts b/api/src/common/Attributes.ts
@@ -18,8 +18,6 @@
  * Attributes is a map from string to attribute values.
  *
  * Note: only the own enumerable keys are counted as valid attribute keys.
- *
- * @since 1.3.0
  */
 export interface Attributes {
  [attributeKey: string]: AttributeValue | undefined;
@@ -29,8 +27,6 @@ export interface Attributes {
  * Attribute values may be any non-nullish primitive value except an object.
  *
  * null or undefined attribute values are invalid and will result in undefined behavior.
- *
- * @since 1.3.0
  */
 export type AttributeValue =
  | string

diff --git a/api/src/common/Exception.ts b/api/src/common/Exception.ts
@@ -39,8 +39,6 @@ interface ExceptionWithName {
  * Defines Exception.
  *
  * string or an object with one of (message or name or code) and optional stack
- *
- * @since 1.0.0
  */
 export type Exception =
  | ExceptionWithCode

diff --git a/api/src/common/Time.ts b/api/src/common/Time.ts
@@ -24,16 +24,12 @@
  * The second number is calculated by converting the digits after the decimal point of the subtraction, (1609504210150 / 1000) - HrTime[0], to nanoseconds:
  * HrTime[1] = Number((1609504210.150 - HrTime[0]).toFixed(9)) * 1e9 = 150000000.
  * This is represented in HrTime format as [1609504210, 150000000].
- *
- * @since 1.0.0
  */
 export type HrTime = [number, number];
 
 /**
  * Defines TimeInput.
  *
  * hrtime, epoch milliseconds, performance.now() or Date
- *
- * @since 1.0.0
  */
 export type TimeInput = HrTime | number | Date;
diff --git a/api/src/context-api.ts b/api/src/context-api.ts
@@ -17,8 +17,5 @@
 // Split module-level variable definition into separate files to allow
 // tree-shaking on each api instance.
 import { ContextAPI } from './api/context';
-/**
- * Entrypoint for context API
- * @since 1.0.0
- */
+/** Entrypoint for context API */
 export const context = ContextAPI.getInstance();
diff --git a/api/src/context/context.ts b/api/src/context/context.ts
@@ -16,11 +16,7 @@
 
 import { Context } from './types';
 
-/**
- * Get a key to uniquely identify a context value
- *
- * @since 1.0.0
- */
+/** Get a key to uniquely identify a context value */
 export function createContextKey(description: string) {
  // The specification states that for the same input, multiple calls should
  // return different keys. Due to the nature of the JS dependency management
@@ -85,9 +81,5 @@ class BaseContext implements Context {
  public deleteValue!: (key: symbol) => Context;
 }
 
-/**
- * The root context is used as the default parent context when there is no active context
- *
- * @since 1.0.0
- */
+/** The root context is used as the default parent context when there is no active context */
 export const ROOT_CONTEXT: Context = new BaseContext();
diff --git a/api/src/context/types.ts b/api/src/context/types.ts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @since 1.0.0
- */
 export interface Context {
  /**
  * Get a value from the context.
@@ -43,9 +40,6 @@ export interface Context {
  deleteValue(key: symbol): Context;
 }
 
-/**
- * @since 1.0.0
- */
 export interface ContextManager {
  /**
  * Get the current active context

diff --git a/api/src/diag-api.ts b/api/src/diag-api.ts
@@ -22,7 +22,5 @@ import { DiagAPI } from './api/diag';
  * Defines Diagnostic handler used for internal diagnostic logging operations.
  * The default provides a Noop DiagLogger implementation which may be changed via the
  * diag.setLogger(logger: DiagLogger) function.
- *
- * @since 1.0.0
  */
 export const diag = DiagAPI.instance();
diff --git a/api/src/diag/consoleLogger.ts b/api/src/diag/consoleLogger.ts
@@ -29,8 +29,6 @@ const consoleMap: { n: keyof DiagLogger; c: ConsoleMapKeys }[] = [
  * A simple Immutable Console based diagnostic logger which will output any messages to the Console.
  * If you want to limit the amount of logging to a specific level or lower use the
  * {@link createLogLevelDiagLogger}
- *
- * @since 1.0.0
  */
 export class DiagConsoleLogger implements DiagLogger {
  constructor() {

diff --git a/api/src/diag/types.ts b/api/src/diag/types.ts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @since 1.0.0
- */
 export type DiagLogFunction = (message: string, ...args: unknown[]) => void;
 
 /**
@@ -26,8 +23,6 @@ export type DiagLogFunction = (message: string, ...args: unknown[]) => void;
  * - a No-Op {@link createNoopDiagLogger}
  * - a {@link DiagLogLevel} filtering wrapper {@link createLogLevelDiagLogger}
  * - a general Console {@link DiagConsoleLogger} version.
- *
- * @since 1.0.0
  */
 export interface DiagLogger {
  /** Log an error scenario that was not expected and caused the requested operation to fail. */
@@ -97,16 +92,11 @@ export enum DiagLogLevel {
 
 /**
  * Defines options for ComponentLogger
- *
- * @since 1.0.0
  */
 export interface ComponentLoggerOptions {
  namespace: string;
 }
 
-/**
- * @since 1.4.1
- */
 export interface DiagLoggerOptions {
  /**
  * The {@link DiagLogLevel} used to filter logs sent to the logger.

diff --git a/api/src/metrics-api.ts b/api/src/metrics-api.ts
@@ -17,9 +17,5 @@
 // Split module-level variable definition into separate files to allow
 // tree-shaking on each api instance.
 import { MetricsAPI } from './api/metrics';
-/**
- * Entrypoint for metrics API
- *
- * @since 1.3.0
- */
+/** Entrypoint for metrics API */
 export const metrics = MetricsAPI.getInstance();
diff --git a/api/src/metrics/Meter.ts b/api/src/metrics/Meter.ts
@@ -30,8 +30,6 @@ import {
 
 /**
  * An interface describes additional metadata of a meter.
- *
- * @since 1.3.0
  */
 export interface MeterOptions {
  /**
@@ -46,8 +44,6 @@ export interface MeterOptions {
  * {@link Metric}s are used for recording pre-defined aggregation (`Counter`),
  * or raw values (`Histogram`) in which the aggregation and attributes
  * for the exported metric are deferred.
- *
- * @since 1.3.0
  */
 export interface Meter {
  /**

diff --git a/api/src/metrics/MeterProvider.ts b/api/src/metrics/MeterProvider.ts
@@ -18,8 +18,6 @@ import { Meter, MeterOptions } from './Meter';
 
 /**
  * A registry for creating named {@link Meter}s.
- *
- * @since 1.3.0
  */
 export interface MeterProvider {
  /**