From 81bb91927a8b489f106423e1858f426ca2ea3a9b Mon Sep 17 00:00:00 2001 From: Jakub Malinowski Date: Sun, 28 Mar 2021 23:37:59 +0200 Subject: [PATCH] fix: adapt propagator-jaeger to core structure --- .../.eslintrc.js | 1 - .../opentelemetry-propagator-jaeger/README.md | 8 +++--- .../karma.conf.js | 4 +-- .../package.json | 25 ++++++++----------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/packages/opentelemetry-propagator-jaeger/.eslintrc.js b/packages/opentelemetry-propagator-jaeger/.eslintrc.js index 01b8d0974..b23ee98fc 100644 --- a/packages/opentelemetry-propagator-jaeger/.eslintrc.js +++ b/packages/opentelemetry-propagator-jaeger/.eslintrc.js @@ -3,7 +3,6 @@ module.exports = { "mocha": true, "commonjs": true, "browser": true, - "jquery": true }, ...require('../../eslint.config.js') } diff --git a/packages/opentelemetry-propagator-jaeger/README.md b/packages/opentelemetry-propagator-jaeger/README.md index 8304c8b22..499071461 100644 --- a/packages/opentelemetry-propagator-jaeger/README.md +++ b/packages/opentelemetry-propagator-jaeger/README.md @@ -1,6 +1,5 @@ # OpenTelemetry Propagator Jaeger -[![Gitter chat][gitter-image]][gitter-url] [![NPM Published Version][npm-img]][npm-url] [![dependencies][dependencies-image]][dependencies-url] [![devDependencies][devDependencies-image]][devDependencies-url] @@ -45,15 +44,14 @@ provider.register({ * For more information on OpenTelemetry, visit: * For more about OpenTelemetry JavaScript: -* For help or feedback on this project, join us on [gitter][gitter-url] +* For help or feedback on this project, join us in [GitHub Discussions][discussions-url] ## License Apache 2.0 - See [LICENSE][license-url] for more information. -[gitter-image]: https://badges.gitter.im/open-telemetry/opentelemetry-js.svg -[gitter-url]: https://gitter.im/open-telemetry/opentelemetry-node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge -[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE +[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions +[license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat [dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-propagator-jaeger [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-propagator-jaeger diff --git a/packages/opentelemetry-propagator-jaeger/karma.conf.js b/packages/opentelemetry-propagator-jaeger/karma.conf.js index edcd9f055..bf2a41b79 100644 --- a/packages/opentelemetry-propagator-jaeger/karma.conf.js +++ b/packages/opentelemetry-propagator-jaeger/karma.conf.js @@ -1,5 +1,5 @@ /*! - * Copyright 2020, OpenTelemetry Authors + * Copyright The OpenTelemetry Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,6 @@ const karmaBaseConfig = require('../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { - webpack: karmaWebpackConfig + webpack: karmaWebpackConfig, })) }; diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index 85d141a71..f72e6cf7d 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -4,22 +4,20 @@ "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": "open-telemetry/opentelemetry-js", "scripts": { + "compile": "tsc --build", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'", "test:browser": "nyc karma start --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "clean": "rimraf build/*", + "clean": "tsc --build --clean", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version", - "compile": "npm run version:update && tsc -p .", - "prepare": "npm run compile", - "version:update": "node ../../scripts/version-update.js", - "watch": "tsc -w" + "version": "node ../../scripts/version-update.js", + "watch": "tsc --build --watch" }, "keywords": [ "opentelemetry", @@ -31,10 +29,11 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=8.0.0" + "node": ">=8.5.0" }, "files": [ "build/src/**/*.js", + "build/src/**/*.js.map", "build/src/**/*.d.ts", "doc", "LICENSE", @@ -45,7 +44,7 @@ }, "devDependencies": { "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@types/node": "14.14.20", "@types/sinon": "9.0.4", "@types/webpack-env": "1.15.2", "codecov": "3.7.1", @@ -60,12 +59,10 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.0.2", - "ts-loader": "8.0.0", + "sinon": "9.2.3", + "ts-loader": "8.0.14", "ts-mocha": "8.0.0", - "ts-node": "9.0.0", - "tslint-consistent-codestyle": "1.16.0", - "tslint-microsoft-contrib": "6.2.0", + "ts-node": "9.1.1", "typescript": "4.1.3", "webpack": "4.43.0" },