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

chore: mark otlp exporters experimental #2490

Merged
merged 6 commits into from
Sep 27, 2021
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
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "packages/opentelemetry-exporter-otlp-grpc/protos"]
path = packages/opentelemetry-exporter-otlp-grpc/protos
[submodule "experimental/packages/opentelemetry-exporter-otlp-proto/protos"]
path = experimental/packages/opentelemetry-exporter-otlp-proto/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "packages/opentelemetry-exporter-otlp-proto/protos"]
path = packages/opentelemetry-exporter-otlp-proto/protos
[submodule "experimental/packages/opentelemetry-exporter-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-otlp-grpc/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
4 changes: 2 additions & 2 deletions examples/otlp-exporter-node/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Overview

This example shows how to use [@opentelemetry/exporter-otlp-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application.
This example shows how to use [@opentelemetry/exporter-otlp-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application.

This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](https://github.com/open-telemetry/opentelemetry-proto).
This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](https://github.com/open-telemetry/opentelemetry-proto).

## Installation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
"commonjs": true,
"node": true,
},
...require('../../eslint.config.js')
...require('../../../eslint.config.js')
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"submodule": "git submodule sync --recursive && git submodule update --init --recursive",
"tdd": "npm run test -- --watch-extensions ts --watch",
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "npm run protos:copy && tsc -w",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
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,16 +10,13 @@
],
"references": [
{
"path": "../opentelemetry-core"
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-exporter-otlp-http"
},
{
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-sdk-metrics-base"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ module.exports = {
"node": true,
"browser": true
},
...require('../../eslint.config.js')
...require('../../../eslint.config.js')
}
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
Expand Up @@ -21,7 +21,7 @@
"tdd:browser": "karma start",
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
"test:browser": "nyc karma start --single-run",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-api-metrics/tsconfig.esm.json"
},
{
"path": "../opentelemetry-sdk-metrics-base/tsconfig.esm.json"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
},
"include": [
"src/**/*.ts",
"test/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-sdk-metrics-base"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
"commonjs": true,
"node": true,
},
...require('../../eslint.config.js')
...require('../../../eslint.config.js')
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"submodule": "git submodule sync --recursive && git submodule update --init --recursive",
"tdd": "npm run test -- --watch-extensions ts --watch",
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "npm run protos:copy && tsc -w",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
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,16 +10,13 @@
],
"references": [
{
"path": "../opentelemetry-core"
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-exporter-otlp-http"
},
{
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-sdk-metrics-base"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"references": [
{
"path": "../opentelemetry-api-metrics"
},
{
"path": "../opentelemetry-sdk-metrics-base"
}
]
}
12 changes: 12 additions & 0 deletions experimental/tsconfig.esm.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
{
"path": "packages/opentelemetry-api-metrics/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-exporter-otlp-grpc"
},
{
"path": "packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-exporter-otlp-proto"
},
{
"path": "packages/opentelemetry-exporter-prometheus"
},
{
"path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json"
},
Expand Down
12 changes: 12 additions & 0 deletions experimental/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
{
"path": "packages/opentelemetry-api-metrics"
},
{
"path": "packages/opentelemetry-exporter-otlp-grpc"
},
{
"path": "packages/opentelemetry-exporter-otlp-http"
},
{
"path": "packages/opentelemetry-exporter-otlp-proto"
},
{
"path": "packages/opentelemetry-exporter-prometheus"
},
{
"path": "packages/opentelemetry-instrumentation-fetch"
},
Expand Down
22 changes: 0 additions & 22 deletions packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json

This file was deleted.

22 changes: 0 additions & 22 deletions packages/opentelemetry-exporter-otlp-http/tsconfig.json

This file was deleted.

9 changes: 0 additions & 9 deletions tsconfig.esm.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@
{
"path": "packages/opentelemetry-exporter-jaeger"
},
{
"path": "packages/opentelemetry-exporter-otlp-grpc"
},
{
"path": "packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-exporter-otlp-proto"
},
{
"path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json"
},
Expand Down
15 changes: 3 additions & 12 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"typedocOptions": {
"packages": [
"experimental/packages/opentelemetry-api-metrics",
"experimental/packages/opentelemetry-exporter-otlp-grpc",
"experimental/packages/opentelemetry-exporter-otlp-http",
"experimental/packages/opentelemetry-exporter-otlp-proto",
"experimental/packages/opentelemetry-exporter-prometheus",
"experimental/packages/opentelemetry-instrumentation-fetch",
"experimental/packages/opentelemetry-instrumentation-grpc",
Expand All @@ -16,9 +19,6 @@
"packages/opentelemetry-context-zone",
"packages/opentelemetry-core",
"packages/opentelemetry-exporter-jaeger",
"packages/opentelemetry-exporter-otlp-grpc",
"packages/opentelemetry-exporter-otlp-http",
"packages/opentelemetry-exporter-otlp-proto",
"packages/opentelemetry-exporter-zipkin",
"packages/opentelemetry-propagator-b3",
"packages/opentelemetry-propagator-jaeger",
Expand Down Expand Up @@ -65,15 +65,6 @@
{
"path": "packages/opentelemetry-exporter-jaeger"
},
{
"path": "packages/opentelemetry-exporter-otlp-grpc"
},
{
"path": "packages/opentelemetry-exporter-otlp-http"
},
{
"path": "packages/opentelemetry-exporter-otlp-proto"
},
{
"path": "packages/opentelemetry-exporter-zipkin"
},
Expand Down