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

Release metrics API as 1.0 #3348

Merged
merged 9 commits into from
Oct 27, 2022
Merged
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ All notable changes to this project will be documented in this file.

* ci: run browser tests without circle [#3328](https://github.com/open-telemetry/opentelemetry-js/pull/3328) @dyladan

## Metrics API 1.0.0

Metrics API is now stable and generally available.
There are no changes between 1.0.0 and the previous 0.33.0 version.

## 1.7.0

### :bug: (Bug Fix)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
"commonjs": true,
"shared-node-browser": true
},
...require('../../../eslint.config.js')
...require('../eslint.config.js')
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-metrics",
"version": "0.33.0",
"version": "1.0.0",
"description": "Public metrics API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand All @@ -19,15 +19,15 @@
"clean": "tsc --build --clean tsconfig.all.json",
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
"test:browser": "nyc karma start --single-run",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
"build": "npm run compile",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"version": "node ../../../scripts/version-update.js",
"version": "node ../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.all.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
"prewatch": "node ../../../scripts/version-update.js"
"prewatch": "node ../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const api2 = require('../../src') as typeof import('../../src');

// This will need to be changed manually on major version changes.
// It is intentionally not autogenerated to ensure the author of the change is aware of what they are doing.
const GLOBAL_METRICS_API_SYMBOL_KEY = 'opentelemetry.js.api.metrics.0';
const GLOBAL_METRICS_API_SYMBOL_KEY = 'opentelemetry.js.api.metrics.1';

const getMockLogger = () => ({
verbose: sinon.spy(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.json",
"extends": "../tsconfig.base.json",
"files": [],
"references": [
{ "path": "./tsconfig.json" },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.esm.json",
"extends": "../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"extends": "../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand All @@ -10,7 +10,7 @@
],
"references": [
{
"path": "../../../api"
"path": "../api"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"path": "../../../api"
},
{
"path": "../../../packages/opentelemetry-core"
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-resources"
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../opentelemetry-api-metrics"
"path": "../../../packages/opentelemetry-resources"
},
{
"path": "../opentelemetry-exporter-metrics-otlp-http"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"path": "../../../api"
},
{
"path": "../../../packages/opentelemetry-core"
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-resources"
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../opentelemetry-api-metrics"
"path": "../../../packages/opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-metrics"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"path": "../../../api"
},
{
"path": "../../../packages/opentelemetry-core"
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-resources"
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../opentelemetry-api-metrics"
"path": "../../../packages/opentelemetry-resources"
},
{
"path": "../opentelemetry-exporter-metrics-otlp-http"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"path": "../../../api"
},
{
"path": "../../../packages/opentelemetry-core"
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-resources"
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../opentelemetry-api-metrics"
"path": "../../../packages/opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-metrics"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
{
"path": "../../../api"
},
{
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-context-async-hooks"
},
Expand All @@ -27,9 +30,6 @@
{
"path": "../../../packages/opentelemetry-semantic-conventions"
},
{
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-instrumentation"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
{
"path": "../../../api"
},
{
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-context-async-hooks"
},
Expand All @@ -27,9 +30,6 @@
{
"path": "../../../packages/opentelemetry-semantic-conventions"
},
{
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-instrumentation"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"references": [
{
"path": "../opentelemetry-api-metrics/tsconfig.esnext.json"
"path": "../../../api-metrics/tsconfig.esnext.json"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"path": "../../../api"
},
{
"path": "../opentelemetry-api-metrics"
"path": "../../../api-metrics"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"references": [
{
"path": "../opentelemetry-api-metrics/tsconfig.esm.json"
"path": "../../../api-metrics/tsconfig.esnext.json"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"references": [
{
"path": "../opentelemetry-api-metrics/tsconfig.esnext.json"
"path": "../../../api-metrics/tsconfig.esnext.json"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"path": "../../../api"
},
{
"path": "../../../packages/opentelemetry-core"
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-resources"
"path": "../../../packages/opentelemetry-core"
},
{
"path": "../opentelemetry-api-metrics"
"path": "../../../packages/opentelemetry-resources"
}
]
}
6 changes: 3 additions & 3 deletions experimental/packages/opentelemetry-sdk-node/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
{
"path": "../../../api"
},
{
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-context-async-hooks"
},
Expand Down Expand Up @@ -45,9 +48,6 @@
{
"path": "../exporter-trace-otlp-proto"
},
{
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-instrumentation"
},
Expand Down
6 changes: 3 additions & 3 deletions experimental/packages/otlp-transformer/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
{
"path": "../../../api"
},
{
"path": "../../../api-metrics"
},
{
"path": "../../../packages/opentelemetry-core"
},
Expand All @@ -21,9 +24,6 @@
{
"path": "../../../packages/opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-sdk-metrics"
}
Expand Down
1 change: 1 addition & 0 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"npmClient": "npm",
"packages": [
"api",
"api-metrics",
"packages/*",
"experimental/packages/*",
"experimental/examples/*",
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
{
"path": "api"
},
{
"path": "api-metrics"
},
{
"path": "packages/opentelemetry-context-async-hooks"
},
Expand Down Expand Up @@ -110,9 +113,6 @@
{
"path": "experimental/packages/exporter-trace-otlp-proto"
},
{
"path": "experimental/packages/opentelemetry-api-metrics"
},
{
"path": "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc"
},
Expand Down