Skip to content

Commit 81bb919

Browse files
jtmalinowskidyladan
authored andcommitted
fix: adapt propagator-jaeger to core structure
1 parent 2b4c17d commit 81bb919

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

packages/opentelemetry-propagator-jaeger/.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module.exports = {
33
"mocha": true,
44
"commonjs": true,
55
"browser": true,
6-
"jquery": true
76
},
87
...require('../../eslint.config.js')
98
}

packages/opentelemetry-propagator-jaeger/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# OpenTelemetry Propagator Jaeger
22

3-
[![Gitter chat][gitter-image]][gitter-url]
43
[![NPM Published Version][npm-img]][npm-url]
54
[![dependencies][dependencies-image]][dependencies-url]
65
[![devDependencies][devDependencies-image]][devDependencies-url]
@@ -45,15 +44,14 @@ provider.register({
4544

4645
* For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
4746
* For more about OpenTelemetry JavaScript: <https://github.com/open-telemetry/opentelemetry-js>
48-
* For help or feedback on this project, join us on [gitter][gitter-url]
47+
* For help or feedback on this project, join us in [GitHub Discussions][discussions-url]
4948

5049
## License
5150

5251
Apache 2.0 - See [LICENSE][license-url] for more information.
5352

54-
[gitter-image]: https://badges.gitter.im/open-telemetry/opentelemetry-js.svg
55-
[gitter-url]: https://gitter.im/open-telemetry/opentelemetry-node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
56-
[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE
53+
[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions
54+
[license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE
5755
[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
5856
[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-propagator-jaeger
5957
[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-propagator-jaeger

packages/opentelemetry-propagator-jaeger/karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Copyright 2020, OpenTelemetry Authors
2+
* Copyright The OpenTelemetry Authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,6 +19,6 @@ const karmaBaseConfig = require('../../karma.base');
1919

2020
module.exports = (config) => {
2121
config.set(Object.assign({}, karmaBaseConfig, {
22-
webpack: karmaWebpackConfig
22+
webpack: karmaWebpackConfig,
2323
}))
2424
};

packages/opentelemetry-propagator-jaeger/package.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@
44
"description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
7-
"repository": "open-telemetry/opentelemetry-js-contrib",
7+
"repository": "open-telemetry/opentelemetry-js",
88
"scripts": {
9+
"compile": "tsc --build",
910
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'",
1011
"test:browser": "nyc karma start --single-run",
1112
"tdd": "npm run tdd:node",
1213
"tdd:node": "npm run test -- --watch-extensions ts --watch",
1314
"tdd:browser": "karma start",
1415
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
15-
"clean": "rimraf build/*",
16+
"clean": "tsc --build --clean",
1617
"lint": "eslint . --ext .ts",
1718
"lint:fix": "eslint . --ext .ts --fix",
18-
"precompile": "tsc --version",
19-
"compile": "npm run version:update && tsc -p .",
20-
"prepare": "npm run compile",
21-
"version:update": "node ../../scripts/version-update.js",
22-
"watch": "tsc -w"
19+
"version": "node ../../scripts/version-update.js",
20+
"watch": "tsc --build --watch"
2321
},
2422
"keywords": [
2523
"opentelemetry",
@@ -31,10 +29,11 @@
3129
"author": "OpenTelemetry Authors",
3230
"license": "Apache-2.0",
3331
"engines": {
34-
"node": ">=8.0.0"
32+
"node": ">=8.5.0"
3533
},
3634
"files": [
3735
"build/src/**/*.js",
36+
"build/src/**/*.js.map",
3837
"build/src/**/*.d.ts",
3938
"doc",
4039
"LICENSE",
@@ -45,7 +44,7 @@
4544
},
4645
"devDependencies": {
4746
"@types/mocha": "7.0.2",
48-
"@types/node": "12.12.47",
47+
"@types/node": "14.14.20",
4948
"@types/sinon": "9.0.4",
5049
"@types/webpack-env": "1.15.2",
5150
"codecov": "3.7.1",
@@ -60,12 +59,10 @@
6059
"mocha": "7.2.0",
6160
"nyc": "15.1.0",
6261
"rimraf": "3.0.2",
63-
"sinon": "9.0.2",
64-
"ts-loader": "8.0.0",
62+
"sinon": "9.2.3",
63+
"ts-loader": "8.0.14",
6564
"ts-mocha": "8.0.0",
66-
"ts-node": "9.0.0",
67-
"tslint-consistent-codestyle": "1.16.0",
68-
"tslint-microsoft-contrib": "6.2.0",
65+
"ts-node": "9.1.1",
6966
"typescript": "4.1.3",
7067
"webpack": "4.43.0"
7168
},

0 commit comments

Comments
 (0)