Skip to content

Commit

Permalink
chore: bump otlp trace exporters to v1 (#2626)
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Dyla <[email protected]>
  • Loading branch information
rauno56 and dyladan authored Dec 21, 2021
1 parent 8b9935b commit 89f862b
Show file tree
Hide file tree
Showing 108 changed files with 44 additions and 71 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos"]
path = experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos
[submodule "packages/exporter-trace-otlp-proto/protos"]
path = packages/exporter-trace-otlp-proto/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos
[submodule "packages/exporter-trace-otlp-grpc/protos"]
path = 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
Expand Up @@ -68,4 +68,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-metrics-otlp-grpc.svg
[opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
[semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-grpc
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-grpc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
"@grpc/grpc-js": "1.4.4",
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"references": [
{
"path": "../opentelemetry-exporter-metrics-otlp-http"
},
{
"path": "../opentelemetry-exporter-trace-otlp-grpc"
},
{
"path": "../opentelemetry-exporter-trace-otlp-http"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
[opentelemetry-spec-protocol-exporter]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options
[semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-http
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-http
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-exporter-trace-otlp-http/tsconfig.esm2015.json"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@
"include": [
"src/**/*.ts",
"test/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-exporter-trace-otlp-http"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-metrics-otlp-proto.svg
[opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
[semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-http
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-http
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"references": [
{
"path": "../opentelemetry-exporter-metrics-otlp-http"
},
{
"path": "../opentelemetry-exporter-trace-otlp-http"
},
{
"path": "../opentelemetry-exporter-trace-otlp-proto"
}
]
}
9 changes: 0 additions & 9 deletions experimental/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@
{
"path": "packages/opentelemetry-exporter-prometheus"
},
{
"path": "packages/opentelemetry-exporter-trace-otlp-grpc"
},
{
"path": "packages/opentelemetry-exporter-trace-otlp-http/tsconfig.all.json"
},
{
"path": "packages/opentelemetry-exporter-trace-otlp-proto"
},
{
"path": "packages/opentelemetry-instrumentation-fetch/tsconfig.all.json"
},
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')
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-grpc",
"version": "0.27.0",
"version": "1.0.1",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand All @@ -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,7 +10,7 @@
],
"references": [
{
"path": "../opentelemetry-exporter-trace-otlp-http"
"path": "../exporter-trace-otlp-http"
}
]
}
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')
}
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/exporter-trace-otlp-http",
"version": "0.27.0",
"version": "1.0.1",
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand All @@ -23,7 +23,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-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",
"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.esm2015.json",
"extends": "../../tsconfig.base.esm2015.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm2015",
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 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')
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-proto",
"version": "0.27.0",
"version": "1.0.1",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand All @@ -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,7 +10,7 @@
],
"references": [
{
"path": "../opentelemetry-exporter-trace-otlp-http"
"path": "../exporter-trace-otlp-http"
}
]
}
25 changes: 17 additions & 8 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
"typedocOptions": {
"packages": [
"experimental/packages/opentelemetry-api-metrics",
"experimental/packages/opentelemetry-exporter-trace-otlp-grpc",
"experimental/packages/opentelemetry-exporter-trace-otlp-http",
"experimental/packages/opentelemetry-exporter-trace-otlp-proto",
"experimental/packages/opentelemetry-exporter-metrics-otlp-grpc",
"experimental/packages/opentelemetry-exporter-metrics-otlp-http",
"experimental/packages/opentelemetry-exporter-metrics-otlp-proto",
"experimental/packages/opentelemetry-exporter-prometheus",
"experimental/packages/opentelemetry-instrumentation",
"experimental/packages/opentelemetry-instrumentation-fetch",
"experimental/packages/opentelemetry-instrumentation-grpc",
"experimental/packages/opentelemetry-instrumentation-http",
"experimental/packages/opentelemetry-instrumentation-xml-http-request",
"experimental/packages/opentelemetry-instrumentation",
"experimental/packages/opentelemetry-sdk-node",
"experimental/packages/opentelemetry-exporter-metrics-otlp-http",
"experimental/packages/opentelemetry-exporter-metrics-otlp-grpc",
"experimental/packages/opentelemetry-exporter-metrics-otlp-proto",
"packages/exporter-trace-otlp-grpc",
"packages/exporter-trace-otlp-http",
"packages/exporter-trace-otlp-proto",
"packages/opentelemetry-context-async-hooks",
"packages/opentelemetry-context-zone-peer-dep",
"packages/opentelemetry-context-zone",
"packages/opentelemetry-context-zone-peer-dep",
"packages/opentelemetry-core",
"packages/opentelemetry-exporter-jaeger",
"packages/opentelemetry-exporter-zipkin",
Expand All @@ -44,6 +44,15 @@
"excludePrivate": true
},
"references": [
{
"path": "packages/exporter-trace-otlp-grpc"
},
{
"path": "packages/exporter-trace-otlp-http/tsconfig.all.json"
},
{
"path": "packages/exporter-trace-otlp-proto"
},
{
"path": "packages/opentelemetry-context-async-hooks"
},
Expand Down

0 comments on commit 89f862b

Please sign in to comment.