Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove -wip suffix in metrics packages #2872

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@opentelemetry/api-metrics-wip",
"name": "@opentelemetry/api-metrics",
"version": "0.27.0",
"private": true,
"description": "Public metrics API for OpenTelemetry",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/api-metrics-wip": "0.27.0",
"@opentelemetry/api-metrics": "0.27.0",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/sdk-metrics-base-wip": "0.27.0"
"@opentelemetry/sdk-metrics-base": "0.27.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { diag } from '@opentelemetry/api';
import {
globalErrorHandler,
} from '@opentelemetry/core';
import { AggregationTemporality, MetricReader } from '@opentelemetry/sdk-metrics-base-wip';
import { AggregationTemporality, MetricReader } from '@opentelemetry/sdk-metrics-base';
import { createServer, IncomingMessage, Server, ServerResponse } from 'http';
import { ExporterConfig } from './export/types';
import { PrometheusSerializer } from './PrometheusSerializer';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {
MetricData,
DataPoint,
Histogram,
} from '@opentelemetry/sdk-metrics-base-wip';
import { Attributes } from '@opentelemetry/api-metrics-wip';
} from '@opentelemetry/sdk-metrics-base';
import { Attributes } from '@opentelemetry/api-metrics';
import { hrTimeToMilliseconds } from '@opentelemetry/core';

type PrometheusDataTypeLiteral =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
* limitations under the License.
*/

import { Meter, ObservableResult } from '@opentelemetry/api-metrics-wip';
import { Meter, ObservableResult } from '@opentelemetry/api-metrics';
import {
MeterProvider,
} from '@opentelemetry/sdk-metrics-base-wip';
} from '@opentelemetry/sdk-metrics-base';
import * as assert from 'assert';
import * as sinon from 'sinon';
import * as http from 'http';
import { PrometheusExporter } from '../src';
import { mockedHrTimeMs, mockHrTime } from './util';
import { SinonStubbedInstance } from 'sinon';
import { Counter } from '@opentelemetry/api-metrics-wip';
import { Counter } from '@opentelemetry/api-metrics';

describe('PrometheusExporter', () => {
beforeEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import * as assert from 'assert';
import { Attributes, UpDownCounter } from '@opentelemetry/api-metrics-wip';
import { Attributes, UpDownCounter } from '@opentelemetry/api-metrics';
import {
AggregationTemporality,
MeterProvider,
Expand All @@ -25,7 +25,7 @@ import {
HistogramAggregation,
SumAggregation,
Histogram,
} from '@opentelemetry/sdk-metrics-base-wip';
} from '@opentelemetry/sdk-metrics-base';
import * as sinon from 'sinon';
import { PrometheusSerializer } from '../src/PrometheusSerializer';
import { mockedHrTimeMs, mockHrTime } from './util';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@opentelemetry/sdk-metrics-base-wip",
"name": "@opentelemetry/sdk-metrics-base",
"version": "0.27.0",
"private": true,
"description": "Work in progress OpenTelemetry metrics SDK",
Expand Down Expand Up @@ -78,7 +78,7 @@
},
"todo": "Move API metrics to peer dependencies. While it is using an unpublished name, lerna doesn't properly link it if it is in peer dependencies",
"dependencies": {
"@opentelemetry/api-metrics-wip": "0.27.0",
"@opentelemetry/api-metrics": "0.27.0",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"lodash.merge": "4.6.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { MetricOptions, ValueType } from '@opentelemetry/api-metrics-wip';
import { MetricOptions, ValueType } from '@opentelemetry/api-metrics';
import { View } from './view/View';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import * as api from '@opentelemetry/api';
import * as metrics from '@opentelemetry/api-metrics-wip';
import * as metrics from '@opentelemetry/api-metrics';
import { InstrumentDescriptor } from './InstrumentDescriptor';
import { WritableMetricStorage } from './state/WritableMetricStorage';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import * as api from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';

// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#measurement

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import * as metrics from '@opentelemetry/api-metrics-wip';
import * as metrics from '@opentelemetry/api-metrics';
import { InstrumentationLibrary } from '@opentelemetry/core';
import { createInstrumentDescriptor, InstrumentDescriptor, InstrumentType } from './InstrumentDescriptor';
import { CounterInstrument, HistogramInstrument, UpDownCounterInstrument } from './Instruments';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import * as api from '@opentelemetry/api';
import * as metrics from '@opentelemetry/api-metrics-wip';
import * as metrics from '@opentelemetry/api-metrics';
import { Resource } from '@opentelemetry/resources';
import { Meter } from './Meter';
import { MetricReader } from './export/MetricReader';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import * as metrics from '@opentelemetry/api-metrics-wip';
import * as metrics from '@opentelemetry/api-metrics';
import { AttributeHashMap } from './state/HashMap';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


import { Context, HrTime } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { FixedSizeExemplarReservoirBase } from './ExemplarReservoir';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { Context, HrTime } from '@opentelemetry/api';
import { ExemplarFilter } from './ExemplarFilter';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { HrTime } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';

/**
* A representation of an exemplar, which is a sample input measurement.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { Context, HrTime } from '@opentelemetry/api';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { Context, HrTime, isSpanContextValid, trace } from '@opentelemetry/api';
import { Exemplar } from './Exemplar';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { Context, HrTime } from '@opentelemetry/api';
import { ExemplarFilter } from './ExemplarFilter';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { Context, HrTime } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { FixedSizeExemplarReservoirBase } from './ExemplarReservoir';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { Context, HrTime, isSpanContextValid, trace, TraceFlags } from '@opentelemetry/api';
import { ExemplarFilter } from './ExemplarFilter';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { HrTime } from '@opentelemetry/api';
import { ObservableCallback } from '@opentelemetry/api-metrics-wip';
import { ObservableCallback } from '@opentelemetry/api-metrics';
import { Accumulation, Aggregator } from '../aggregator/types';
import { View } from '../view/View';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { Context } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { Maybe } from '../utils';
import { Accumulation, Aggregator } from '../aggregator/types';
import { AttributeHashMap } from './HashMap';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { hashAttributes } from '../utils';

export interface Hash<ValueType, HashCodeType> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { Context } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { WritableMetricStorage } from './WritableMetricStorage';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { Context, HrTime } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { WritableMetricStorage } from './WritableMetricStorage';
import { Accumulation, Aggregator } from '../aggregator/types';
import { View } from '../view/View';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { Context } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';

/**
* Internal interface.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';

export type Maybe<T> = T | undefined;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { Context } from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';

/**
* The {@link AttributesProcessor} is responsible for customizing which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { AggregationTemporality, InstrumentDescriptor, InstrumentType, MeterProv
import { TestMetricReader } from './export/TestMetricReader';
import { assertMetricData, assertDataPoint, commonValues, commonAttributes, defaultResource, defaultInstrumentationLibrary } from './util';
import { Histogram } from '../src/aggregator/types';
import { ObservableResult, ValueType } from '@opentelemetry/api-metrics-wip';
import { ObservableResult, ValueType } from '@opentelemetry/api-metrics';

describe('Instruments', () => {
describe('Counter', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { ObservableCallback } from '@opentelemetry/api-metrics-wip';
import { ObservableCallback } from '@opentelemetry/api-metrics';
import * as assert from 'assert';
import { CounterInstrument, HistogramInstrument, UpDownCounterInstrument } from '../src/Instruments';
import { Meter } from '../src/Meter';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import * as assert from 'assert';
import { NOOP_METER } from '@opentelemetry/api-metrics-wip';
import { NOOP_METER } from '@opentelemetry/api-metrics';
import { Meter, MeterProvider, InstrumentType, DataPointType } from '../src';
import {
assertInstrumentationLibraryMetrics,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { MetricCollectorHandle } from '../../src/state/MetricCollector';
import { AsyncMetricStorage } from '../../src/state/AsyncMetricStorage';
import { NoopAttributesProcessor } from '../../src/view/AttributesProcessor';
import { assertMetricData, assertDataPoint, defaultInstrumentDescriptor } from '../util';
import { ObservableCallback } from '@opentelemetry/api-metrics-wip';
import { ObservableCallback } from '@opentelemetry/api-metrics';

const deltaCollector: MetricCollectorHandle = {
aggregatorTemporality: AggregationTemporality.DELTA,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import * as assert from 'assert';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import { HashMap } from '../../src/state/HashMap';
import { hashAttributes } from '../../src/utils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { MetricStorageRegistry } from '../../src/state/MetricStorageRegistry';
import { ValueType } from '@opentelemetry/api-metrics-wip';
import { ValueType } from '@opentelemetry/api-metrics';
import { MetricStorage } from '../../src/state/MetricStorage';
import { HrTime } from '@opentelemetry/api';
import { MetricCollectorHandle } from '../../src/state/MetricCollector';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import * as api from '@opentelemetry/api';
import { Attributes } from '@opentelemetry/api-metrics-wip';
import { Attributes } from '@opentelemetry/api-metrics';
import * as assert from 'assert';
import { Measurement } from '../../src/Measurement';
import { MultiMetricStorage } from '../../src/state/MultiWritableMetricStorage';
Expand Down