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: move trace exporters back to experimental #2835

Merged
merged 11 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from 5 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
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "packages/exporter-trace-otlp-proto/protos"]
path = packages/exporter-trace-otlp-proto/protos
path = experimental/packages/exporter-trace-otlp-proto/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "packages/exporter-trace-otlp-grpc/protos"]
path = packages/exporter-trace-otlp-grpc/protos
path = experimental/packages/exporter-trace-otlp-grpc/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-grpc",
"version": "1.1.1",
"version": "0.27.0",
"private": "true",
Flarna marked this conversation as resolved.
Show resolved Hide resolved
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
Expand All @@ -17,7 +17,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-dependencies",
"prewatch": "npm run precompile"
Expand Down Expand Up @@ -50,7 +50,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/api": "1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -65,13 +65,13 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.3"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
Flarna marked this conversation as resolved.
Show resolved Hide resolved
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/exporter-trace-otlp-http": "1.1.1",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1"
}
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 @@ -11,15 +11,6 @@
"references": [
{
"path": "../exporter-trace-otlp-http"
},
{
"path": "../opentelemetry-core"
},
{
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-trace-base"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-http",
"version": "1.1.1",
"version": "0.27.0",
"private": "true",
Flarna marked this conversation as resolved.
Show resolved Hide resolved
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
Expand All @@ -25,7 +25,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.all.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
"prewatch": "npm run precompile"
Expand Down Expand Up @@ -63,7 +63,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/api": "1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -90,7 +90,7 @@
"webpack-merge": "5.8.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.3"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.1.1",
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
11 changes: 11 additions & 0 deletions experimental/packages/exporter-trace-otlp-http/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
},
"include": [
"src/**/*.ts",
"test/**/*.ts"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-proto",
"version": "1.1.1",
"version": "0.27.0",
"private": "true",
Flarna marked this conversation as resolved.
Show resolved Hide resolved
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
"main": "build/src/index.js",
Expand All @@ -17,7 +17,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-dependencies",
"prewatch": "npm run precompile"
Expand Down Expand Up @@ -50,7 +50,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/api": "1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -65,12 +65,12 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.3"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "1.1.1",
"@opentelemetry/exporter-trace-otlp-http": "1.1.1",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1",
"protobufjs": "^6.9.0"
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 @@ -11,15 +11,6 @@
"references": [
{
"path": "../exporter-trace-otlp-http"
},
{
"path": "../opentelemetry-core"
},
{
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-trace-base"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"test/**/*.ts"
],
"references": [
{
"path": "../exporter-trace-otlp-grpc"
},
{
"path": "../exporter-trace-otlp-http"
},
{
"path": "../opentelemetry-exporter-metrics-otlp-http"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,10 @@
"include": [
"src/**/*.ts",
"test/**/*.ts"
],
"references": [
{
"path": "../exporter-trace-otlp-http"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"test/**/*.ts"
],
"references": [
{
"path": "../exporter-trace-otlp-http"
},
{
"path": "../exporter-trace-otlp-proto"
},
{
"path": "../opentelemetry-exporter-metrics-otlp-http"
}
Expand Down
9 changes: 9 additions & 0 deletions experimental/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
"extends": "../tsconfig.base.json",
"files": [],
"references": [
{
"path": "packages/exporter-trace-otlp-grpc"
},
{
"path": "packages/exporter-trace-otlp-http"
},
{
"path": "packages/exporter-trace-otlp-proto"
},
{
"path": "packages/opentelemetry-api-metrics"
},
Expand Down
22 changes: 0 additions & 22 deletions packages/exporter-trace-otlp-http/tsconfig.json

This file was deleted.

9 changes: 0 additions & 9 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@
"excludePrivate": true
},
"references": [
{
"path": "packages/exporter-trace-otlp-grpc"
},
{
"path": "packages/exporter-trace-otlp-http"
},
{
"path": "packages/exporter-trace-otlp-proto"
},
{
"path": "packages/opentelemetry-context-async-hooks"
},
Expand Down