From 7d57c818501c6f24d7fa4a97632f8ab4553f9761 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Thu, 18 Apr 2024 11:35:14 +0100 Subject: [PATCH 01/17] Add new baggage span processor package --- package-lock.json | 59 +++++ .../.eslintignore | 1 + .../.eslintrc.js | 7 + .../CHANGELOG.md | 5 + .../LICENSE | 201 ++++++++++++++++++ .../README.md | 42 ++++ .../package.json | 60 ++++++ .../src/baggage-span-processor.ts | 59 +++++ .../test/baggage-span-processor.test.ts | 63 ++++++ .../tsconfig.json | 11 + 10 files changed, 508 insertions(+) create mode 100644 packages/opentelemetry-baggage-span-processor/.eslintignore create mode 100644 packages/opentelemetry-baggage-span-processor/.eslintrc.js create mode 100644 packages/opentelemetry-baggage-span-processor/CHANGELOG.md create mode 100644 packages/opentelemetry-baggage-span-processor/LICENSE create mode 100644 packages/opentelemetry-baggage-span-processor/README.md create mode 100644 packages/opentelemetry-baggage-span-processor/package.json create mode 100644 packages/opentelemetry-baggage-span-processor/src/baggage-span-processor.ts create mode 100644 packages/opentelemetry-baggage-span-processor/test/baggage-span-processor.test.ts create mode 100644 packages/opentelemetry-baggage-span-processor/tsconfig.json diff --git a/package-lock.json b/package-lock.json index b25cf160bb..630ba667f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8215,6 +8215,10 @@ "resolved": "metapackages/auto-instrumentations-web", "link": true }, + "node_modules/@opentelemetry/baggage-span-processor": { + "resolved": "packages/opentelemetry-baggage-span-processor", + "link": true + }, "node_modules/@opentelemetry/context-async-hooks": { "version": "1.23.0", "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.23.0.tgz", @@ -36611,6 +36615,38 @@ "tslib": "^2.0.0" } }, + "packages/opentelemetry-baggage-span-processor": { + "name": "@opentelemetry/baggage-span-processor", + "version": "0.1.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@types/mocha": "8.2.3", + "@types/node": "18.6.5", + "expect": "29.2.0", + "mocha": "7.2.0", + "nyc": "15.1.0", + "rimraf": "5.0.5", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/opentelemetry-baggage-span-processor/node_modules/@types/mocha": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz", + "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==", + "dev": true + }, "packages/opentelemetry-host-metrics": { "name": "@opentelemetry/host-metrics", "version": "0.35.0", @@ -45601,6 +45637,29 @@ } } }, + "@opentelemetry/baggage-span-processor": { + "version": "file:packages/opentelemetry-baggage-span-processor", + "requires": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", + "@types/mocha": "8.2.3", + "@types/node": "18.6.5", + "expect": "29.2.0", + "mocha": "7.2.0", + "nyc": "15.1.0", + "rimraf": "5.0.5", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + }, + "dependencies": { + "@types/mocha": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz", + "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==", + "dev": true + } + } + }, "@opentelemetry/context-async-hooks": { "version": "1.23.0", "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.23.0.tgz", diff --git a/packages/opentelemetry-baggage-span-processor/.eslintignore b/packages/opentelemetry-baggage-span-processor/.eslintignore new file mode 100644 index 0000000000..378eac25d3 --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/.eslintignore @@ -0,0 +1 @@ +build diff --git a/packages/opentelemetry-baggage-span-processor/.eslintrc.js b/packages/opentelemetry-baggage-span-processor/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/packages/opentelemetry-baggage-span-processor/CHANGELOG.md b/packages/opentelemetry-baggage-span-processor/CHANGELOG.md new file mode 100644 index 0000000000..bb2d503c69 --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/CHANGELOG.md @@ -0,0 +1,5 @@ +# Changelog + +## 0.1.0 + +Initial version. diff --git a/packages/opentelemetry-baggage-span-processor/LICENSE b/packages/opentelemetry-baggage-span-processor/LICENSE new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/opentelemetry-baggage-span-processor/README.md b/packages/opentelemetry-baggage-span-processor/README.md new file mode 100644 index 0000000000..ebfe24b067 --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/README.md @@ -0,0 +1,42 @@ +# OpenTelemetry Host Metrics for Node.js + +[![NPM Published Version][npm-img]][npm-url] +[![Apache License][license-image]][license-url] + +The BaggageSpanProcessor reads entries stored in Baggage from the parent context and adds the baggage entries' keys and +values to the span as attributes on span start. + +Add this span processor to a tracer provider. + +Keys and values added to Baggage will appear on subsequent child spans for a trace within this service *and* be propagated to external services in accordance with any configured propagation formatsconfigured. +If the external services also have a Baggage span processor, the keys and values will appear in those child spans as well. + +⚠ Warning ⚠️ + +Do not put sensitive information in Baggage. + +To repeat: a consequence of adding data to Baggage is that the keys and values will appear in all outgoing HTTP headers from the application. + +Compatible with OpenTelemetry JS API and SDK `1.0+`. + +## Installation + +```bash +npm install --save @opentelemetry/baggage-span-processor +``` + +## Useful links + +* For more information on OpenTelemetry, visit: +* For more about OpenTelemetry JavaScript: +* 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. + +[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions +[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE +[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat +[npm-url]: https://www.npmjs.com/package/@opentelemetry/host-metrics +[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fhost-metrics.svg diff --git a/packages/opentelemetry-baggage-span-processor/package.json b/packages/opentelemetry-baggage-span-processor/package.json new file mode 100644 index 0000000000..e1b6225b67 --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/package.json @@ -0,0 +1,60 @@ +{ + "name": "@opentelemetry/baggage-span-processor", + "version": "0.1.0", + "description": "Baggage span processsor", + "main": "build/src/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "clean": "rimraf build/*", + "compile": "tsc -p .", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/baggage-span-processor --include-dependencies", + "prewatch": "npm run precompile", + "prepublishOnly": "npm run compile", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", + "version:update": "node ../../scripts/version-update.js", + "watch": "tsc -w" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "tracing", + "baggage", + "plugin" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts" + ], + "publishConfig": { + "access": "public" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + }, + "dependencies": { + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@types/mocha": "8.2.3", + "@types/node": "18.6.5", + "expect": "29.2.0", + "mocha": "7.2.0", + "nyc": "15.1.0", + "rimraf": "5.0.5", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-baggage-span-processor#readme" +} diff --git a/packages/opentelemetry-baggage-span-processor/src/baggage-span-processor.ts b/packages/opentelemetry-baggage-span-processor/src/baggage-span-processor.ts new file mode 100644 index 0000000000..bb07a0f0d5 --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/src/baggage-span-processor.ts @@ -0,0 +1,59 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Context, propagation } from '@opentelemetry/api'; +import { + NoopSpanProcessor, + Span, +} from '@opentelemetry/sdk-trace-base'; + +/** + * The BaggageSpanProcessor reads entries stored in {@link Baggage} + * from the parent context and adds the baggage entries' keys and + * values to the span as attributes on span start. + * + * Add this span processor to a tracer provider. + * + * Keys and values added to Baggage will appear on subsequent child + * spans for a trace within this service *and* be propagated to external + * services in accordance with any configured propagation formats + * configured. If the external services also have a Baggage span + * processor, the keys and values will appear in those child spans as + * well. + * + * ⚠ Warning ⚠️ + * + * Do not put sensitive information in Baggage. + * + * To repeat: a consequence of adding data to Baggage is that the keys and + * values will appear in all outgoing HTTP headers from the application. + */ +export class BaggageSpanProcessor extends NoopSpanProcessor { + /** + * Adds an attribute to the `span` for each {@link Baggage} key and {@link BaggageEntry | entry value} + * present in the `parentContext`. + * + * @param span a {@link Span} being started + * @param parentContext the {@link Context} in which `span` was started + */ + override onStart(span: Span, parentContext: Context): void { + (propagation.getBaggage(parentContext)?.getAllEntries() ?? []).forEach( + (entry) => { + span.setAttribute(entry[0], entry[1].value); + }, + ); + } +} diff --git a/packages/opentelemetry-baggage-span-processor/test/baggage-span-processor.test.ts b/packages/opentelemetry-baggage-span-processor/test/baggage-span-processor.test.ts new file mode 100644 index 0000000000..ed909e1415 --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/test/baggage-span-processor.test.ts @@ -0,0 +1,63 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaggageSpanProcessor } from '../src/baggage-span-processor'; +import { + propagation, + ROOT_CONTEXT, + SpanKind, + TraceFlags, +} from '@opentelemetry/api'; +import { BasicTracerProvider, Span } from '@opentelemetry/sdk-trace-base'; +import { expect } from 'expect'; + + +describe('BaggageSpanProcessor', () => { + const baggageProcessor = new BaggageSpanProcessor(); + + const bag = propagation.createBaggage({ + brand: { value: 'samsonite' }, + }); + + const expectedAttrs = { + brand: 'samsonite', + }; + + let span: Span; + + beforeEach(() => { + span = new Span( + new BasicTracerProvider().getTracer('baggage-testing'), + ROOT_CONTEXT, + 'Edward W. Span', + { + traceId: 'e4cda95b652f4a1592b449d5929fda1b', + spanId: '7e0c63257de34c92', + traceFlags: TraceFlags.SAMPLED, + }, + SpanKind.SERVER, + ); + }); + + it('onStart adds current Baggage entries to a span as attributes', () => { + expect(span.attributes).toEqual({}); + const ctx = propagation.setBaggage(ROOT_CONTEXT, bag); + + baggageProcessor.onStart(span, ctx); + + expect(span.attributes).toEqual(expectedAttrs); + }); +}); diff --git a/packages/opentelemetry-baggage-span-processor/tsconfig.json b/packages/opentelemetry-baggage-span-processor/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/opentelemetry-baggage-span-processor/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} From 893f63024346594ac80f287523a736dd39f0a683 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Thu, 18 Apr 2024 11:42:18 +0100 Subject: [PATCH 02/17] add new package to release manifest --- .release-please-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index da8e4144db..473ca78f0a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -8,6 +8,7 @@ "detectors/node/opentelemetry-resource-detector-instana": "0.8.0", "metapackages/auto-instrumentations-node": "0.44.0", "metapackages/auto-instrumentations-web": "0.38.0", + "packages/opentelemetry-baggage-span-processor": "0.0.1", "packages/opentelemetry-host-metrics": "0.35.0", "packages/opentelemetry-id-generator-aws-xray": "1.2.1", "packages/opentelemetry-propagation-utils": "0.30.8", From eaf075b26d654dca5cf60f3e49678a3aa3d76fae Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Thu, 18 Apr 2024 11:46:19 +0100 Subject: [PATCH 03/17] tweak version in release manifest --- .release-please-manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 473ca78f0a..5867a16fdd 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -8,7 +8,7 @@ "detectors/node/opentelemetry-resource-detector-instana": "0.8.0", "metapackages/auto-instrumentations-node": "0.44.0", "metapackages/auto-instrumentations-web": "0.38.0", - "packages/opentelemetry-baggage-span-processor": "0.0.1", + "packages/opentelemetry-baggage-span-processor": "0.1.0", "packages/opentelemetry-host-metrics": "0.35.0", "packages/opentelemetry-id-generator-aws-xray": "1.2.1", "packages/opentelemetry-propagation-utils": "0.30.8", From b7b22943884d22036678e5470209e3eaa4dc1b2a Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Thu, 18 Apr 2024 17:06:27 +0100 Subject: [PATCH 04/17] update package directory structure --- .release-please-manifest.json | 2 +- package-lock.json | 8 ++++---- .../.eslintignore | 0 .../.eslintrc.js | 0 .../CHANGELOG.md | 0 .../LICENSE | 0 .../README.md | 0 .../package.json | 2 +- .../src/baggage-span-processor.ts | 0 .../test/baggage-span-processor.test.ts | 0 .../tsconfig.json | 0 11 files changed, 6 insertions(+), 6 deletions(-) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/.eslintignore (100%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/.eslintrc.js (100%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/CHANGELOG.md (100%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/LICENSE (100%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/README.md (100%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/package.json (95%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/src/baggage-span-processor.ts (100%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/test/baggage-span-processor.test.ts (100%) rename packages/{opentelemetry-baggage-span-processor => baggage-span-processor}/tsconfig.json (100%) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 5867a16fdd..5a4c2833d6 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -8,7 +8,7 @@ "detectors/node/opentelemetry-resource-detector-instana": "0.8.0", "metapackages/auto-instrumentations-node": "0.44.0", "metapackages/auto-instrumentations-web": "0.38.0", - "packages/opentelemetry-baggage-span-processor": "0.1.0", + "packages/baggage-span-processor": "0.1.0", "packages/opentelemetry-host-metrics": "0.35.0", "packages/opentelemetry-id-generator-aws-xray": "1.2.1", "packages/opentelemetry-propagation-utils": "0.30.8", diff --git a/package-lock.json b/package-lock.json index 630ba667f2..309b0379bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8216,7 +8216,7 @@ "link": true }, "node_modules/@opentelemetry/baggage-span-processor": { - "resolved": "packages/opentelemetry-baggage-span-processor", + "resolved": "packages/baggage-span-processor", "link": true }, "node_modules/@opentelemetry/context-async-hooks": { @@ -36615,7 +36615,7 @@ "tslib": "^2.0.0" } }, - "packages/opentelemetry-baggage-span-processor": { + "packages/baggage-span-processor": { "name": "@opentelemetry/baggage-span-processor", "version": "0.1.0", "license": "Apache-2.0", @@ -36641,7 +36641,7 @@ "@opentelemetry/api": "^1.0.0" } }, - "packages/opentelemetry-baggage-span-processor/node_modules/@types/mocha": { + "packages/baggage-span-processor/node_modules/@types/mocha": { "version": "8.2.3", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz", "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==", @@ -45638,7 +45638,7 @@ } }, "@opentelemetry/baggage-span-processor": { - "version": "file:packages/opentelemetry-baggage-span-processor", + "version": "file:packages/baggage-span-processor", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.0.0", diff --git a/packages/opentelemetry-baggage-span-processor/.eslintignore b/packages/baggage-span-processor/.eslintignore similarity index 100% rename from packages/opentelemetry-baggage-span-processor/.eslintignore rename to packages/baggage-span-processor/.eslintignore diff --git a/packages/opentelemetry-baggage-span-processor/.eslintrc.js b/packages/baggage-span-processor/.eslintrc.js similarity index 100% rename from packages/opentelemetry-baggage-span-processor/.eslintrc.js rename to packages/baggage-span-processor/.eslintrc.js diff --git a/packages/opentelemetry-baggage-span-processor/CHANGELOG.md b/packages/baggage-span-processor/CHANGELOG.md similarity index 100% rename from packages/opentelemetry-baggage-span-processor/CHANGELOG.md rename to packages/baggage-span-processor/CHANGELOG.md diff --git a/packages/opentelemetry-baggage-span-processor/LICENSE b/packages/baggage-span-processor/LICENSE similarity index 100% rename from packages/opentelemetry-baggage-span-processor/LICENSE rename to packages/baggage-span-processor/LICENSE diff --git a/packages/opentelemetry-baggage-span-processor/README.md b/packages/baggage-span-processor/README.md similarity index 100% rename from packages/opentelemetry-baggage-span-processor/README.md rename to packages/baggage-span-processor/README.md diff --git a/packages/opentelemetry-baggage-span-processor/package.json b/packages/baggage-span-processor/package.json similarity index 95% rename from packages/opentelemetry-baggage-span-processor/package.json rename to packages/baggage-span-processor/package.json index e1b6225b67..7425b0cbaa 100644 --- a/packages/opentelemetry-baggage-span-processor/package.json +++ b/packages/baggage-span-processor/package.json @@ -56,5 +56,5 @@ "ts-mocha": "10.0.0", "typescript": "4.4.4" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-baggage-span-processor#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/baggage-span-processor#readme" } diff --git a/packages/opentelemetry-baggage-span-processor/src/baggage-span-processor.ts b/packages/baggage-span-processor/src/baggage-span-processor.ts similarity index 100% rename from packages/opentelemetry-baggage-span-processor/src/baggage-span-processor.ts rename to packages/baggage-span-processor/src/baggage-span-processor.ts diff --git a/packages/opentelemetry-baggage-span-processor/test/baggage-span-processor.test.ts b/packages/baggage-span-processor/test/baggage-span-processor.test.ts similarity index 100% rename from packages/opentelemetry-baggage-span-processor/test/baggage-span-processor.test.ts rename to packages/baggage-span-processor/test/baggage-span-processor.test.ts diff --git a/packages/opentelemetry-baggage-span-processor/tsconfig.json b/packages/baggage-span-processor/tsconfig.json similarity index 100% rename from packages/opentelemetry-baggage-span-processor/tsconfig.json rename to packages/baggage-span-processor/tsconfig.json From c7abc66d9d8b13e764630d0919f6dd0315c0111a Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Thu, 18 Apr 2024 17:07:03 +0100 Subject: [PATCH 05/17] update readme title --- packages/baggage-span-processor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/baggage-span-processor/README.md b/packages/baggage-span-processor/README.md index ebfe24b067..453f995b82 100644 --- a/packages/baggage-span-processor/README.md +++ b/packages/baggage-span-processor/README.md @@ -1,4 +1,4 @@ -# OpenTelemetry Host Metrics for Node.js +# OpenTelemetry Baggage Span Processor for Node.js [![NPM Published Version][npm-img]][npm-url] [![Apache License][license-image]][license-url] From fbf0a4754894d5d41bbd726febeac6a4e2bbf7e2 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Fri, 19 Apr 2024 14:11:17 +0100 Subject: [PATCH 06/17] add link to baggage docs --- packages/baggage-span-processor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/baggage-span-processor/README.md b/packages/baggage-span-processor/README.md index 453f995b82..46911f8cc2 100644 --- a/packages/baggage-span-processor/README.md +++ b/packages/baggage-span-processor/README.md @@ -3,7 +3,7 @@ [![NPM Published Version][npm-img]][npm-url] [![Apache License][license-image]][license-url] -The BaggageSpanProcessor reads entries stored in Baggage from the parent context and adds the baggage entries' keys and +The BaggageSpanProcessor reads entries stored in Baggage from the parent context and adds the [baggage](https://opentelemetry.io/docs/concepts/signals/baggage) entries' keys and values to the span as attributes on span start. Add this span processor to a tracer provider. From 88b02d2dcf8f68f6ab65056a61ca727fea4328b2 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Fri, 19 Apr 2024 14:19:37 +0100 Subject: [PATCH 07/17] add example to readme --- packages/baggage-span-processor/README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/baggage-span-processor/README.md b/packages/baggage-span-processor/README.md index 46911f8cc2..b28279d1bf 100644 --- a/packages/baggage-span-processor/README.md +++ b/packages/baggage-span-processor/README.md @@ -8,7 +8,7 @@ values to the span as attributes on span start. Add this span processor to a tracer provider. -Keys and values added to Baggage will appear on subsequent child spans for a trace within this service *and* be propagated to external services in accordance with any configured propagation formatsconfigured. +Keys and values added to Baggage will appear on subsequent child spans for a trace within this service *and* be propagated to external services in accordance with any configured propagation formats configured. If the external services also have a Baggage span processor, the keys and values will appear in those child spans as well. ⚠ Warning ⚠️ @@ -25,6 +25,27 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`. npm install --save @opentelemetry/baggage-span-processor ``` +### Usage + +Add to the span processors during configurtion: + +```javascript +import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions"; +import { NodeSDK } from "@opentelemetry/sdk-node"; +import { BaggageSpanProcessor } from "@opentelemetry/baggage-span-processor"; + +const globalResource = new Resource({ + [SemanticResourceAttributes.SERVICE_NAME]: "TestService", +}); + +const sdk = new NodeSDK({ + resource: globalResource, + SemanticResourceAttributes: new BaggageSpanProcessor(), +}); + +sdk.start() +``` + ## Useful links * For more information on OpenTelemetry, visit: From b6ce13f6f3c87ea68164dc3ca3c7ec54d2e5483a Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Fri, 19 Apr 2024 14:24:22 +0100 Subject: [PATCH 08/17] update baggage span processor to implement SpanProcessor interface --- .../src/baggage-span-processor.ts | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/packages/baggage-span-processor/src/baggage-span-processor.ts b/packages/baggage-span-processor/src/baggage-span-processor.ts index bb07a0f0d5..a4cc41cc0f 100644 --- a/packages/baggage-span-processor/src/baggage-span-processor.ts +++ b/packages/baggage-span-processor/src/baggage-span-processor.ts @@ -16,8 +16,9 @@ import { Context, propagation } from '@opentelemetry/api'; import { - NoopSpanProcessor, + SpanProcessor, Span, + ReadableSpan, } from '@opentelemetry/sdk-trace-base'; /** @@ -41,19 +42,43 @@ import { * To repeat: a consequence of adding data to Baggage is that the keys and * values will appear in all outgoing HTTP headers from the application. */ -export class BaggageSpanProcessor extends NoopSpanProcessor { +export class BaggageSpanProcessor implements SpanProcessor { /** - * Adds an attribute to the `span` for each {@link Baggage} key and {@link BaggageEntry | entry value} - * present in the `parentContext`. - * - * @param span a {@link Span} being started - * @param parentContext the {@link Context} in which `span` was started + * Forces to export all finished spans */ - override onStart(span: Span, parentContext: Context): void { + forceFlush(): Promise { + // no-op + return Promise.resolve(); + } + + /** + * Called when a {@link Span} is started, if the `span.isRecording()` + * returns true. + * @param span the Span that just started. + */ + onStart(span: Span, parentContext: Context): void { (propagation.getBaggage(parentContext)?.getAllEntries() ?? []).forEach( (entry) => { span.setAttribute(entry[0], entry[1].value); }, ); } + + /** + * Called when a {@link ReadableSpan} is ended, if the `span.isRecording()` + * returns true. + * @param span the Span that just ended. + */ + onEnd(span: ReadableSpan): void { + // no-op + } + + /** + * Shuts down the processor. Called when SDK is shut down. This is an + * opportunity for processor to do any cleanup required. + */ + shutdown(): Promise { + // no-op + return Promise.resolve(); + } } From c38a7bded4d18a933e50843c587870c2d1f84971 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Fri, 19 Apr 2024 14:30:01 +0100 Subject: [PATCH 09/17] add entry to component_owners --- .github/component_owners.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/component_owners.yml b/.github/component_owners.yml index cafc2a7065..210413659d 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -27,6 +27,9 @@ components: - pichlermarc - legendecas - blumamir + packages/baggage-span-processor: + - mikegoldsmith + - jamiedanielson packages/opentelemetry-host-metrics: - legendecas packages/opentelemetry-id-generator-aws-xray: From 4c762a2d920d2aafd718ef8e8504c9070799a99a Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Fri, 19 Apr 2024 14:38:02 +0100 Subject: [PATCH 10/17] fix linting errors --- .../baggage-span-processor/src/baggage-span-processor.ts | 6 +++--- .../test/baggage-span-processor.test.ts | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/baggage-span-processor/src/baggage-span-processor.ts b/packages/baggage-span-processor/src/baggage-span-processor.ts index a4cc41cc0f..f0f8c9dfe5 100644 --- a/packages/baggage-span-processor/src/baggage-span-processor.ts +++ b/packages/baggage-span-processor/src/baggage-span-processor.ts @@ -58,9 +58,9 @@ export class BaggageSpanProcessor implements SpanProcessor { */ onStart(span: Span, parentContext: Context): void { (propagation.getBaggage(parentContext)?.getAllEntries() ?? []).forEach( - (entry) => { + entry => { span.setAttribute(entry[0], entry[1].value); - }, + } ); } @@ -69,7 +69,7 @@ export class BaggageSpanProcessor implements SpanProcessor { * returns true. * @param span the Span that just ended. */ - onEnd(span: ReadableSpan): void { + onEnd(_: ReadableSpan): void { // no-op } diff --git a/packages/baggage-span-processor/test/baggage-span-processor.test.ts b/packages/baggage-span-processor/test/baggage-span-processor.test.ts index ed909e1415..7390f07550 100644 --- a/packages/baggage-span-processor/test/baggage-span-processor.test.ts +++ b/packages/baggage-span-processor/test/baggage-span-processor.test.ts @@ -24,7 +24,6 @@ import { import { BasicTracerProvider, Span } from '@opentelemetry/sdk-trace-base'; import { expect } from 'expect'; - describe('BaggageSpanProcessor', () => { const baggageProcessor = new BaggageSpanProcessor(); @@ -48,7 +47,7 @@ describe('BaggageSpanProcessor', () => { spanId: '7e0c63257de34c92', traceFlags: TraceFlags.SAMPLED, }, - SpanKind.SERVER, + SpanKind.SERVER ); }); From 1d3a86d11866fb9d328b0395d2115f57a6310472 Mon Sep 17 00:00:00 2001 From: Mike Goldsmith Date: Mon, 22 Apr 2024 10:14:34 +0100 Subject: [PATCH 11/17] Apply suggestions from code review Co-authored-by: Jamie Danielson --- packages/baggage-span-processor/README.md | 2 +- packages/baggage-span-processor/package.json | 2 +- packages/baggage-span-processor/src/baggage-span-processor.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/baggage-span-processor/README.md b/packages/baggage-span-processor/README.md index b28279d1bf..e3d074d7bd 100644 --- a/packages/baggage-span-processor/README.md +++ b/packages/baggage-span-processor/README.md @@ -27,7 +27,7 @@ npm install --save @opentelemetry/baggage-span-processor ### Usage -Add to the span processors during configurtion: +Add to the span processors during configuration: ```javascript import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions"; diff --git a/packages/baggage-span-processor/package.json b/packages/baggage-span-processor/package.json index 7425b0cbaa..d566f523fd 100644 --- a/packages/baggage-span-processor/package.json +++ b/packages/baggage-span-processor/package.json @@ -1,7 +1,7 @@ { "name": "@opentelemetry/baggage-span-processor", "version": "0.1.0", - "description": "Baggage span processsor", + "description": "OpenTelemetry Baggage Span Processor for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", diff --git a/packages/baggage-span-processor/src/baggage-span-processor.ts b/packages/baggage-span-processor/src/baggage-span-processor.ts index f0f8c9dfe5..13d3c84260 100644 --- a/packages/baggage-span-processor/src/baggage-span-processor.ts +++ b/packages/baggage-span-processor/src/baggage-span-processor.ts @@ -22,7 +22,7 @@ import { } from '@opentelemetry/sdk-trace-base'; /** - * The BaggageSpanProcessor reads entries stored in {@link Baggage} + * BaggageSpanProcessor is a {@link SpanProcessor} that reads entries stored in {@link Baggage} * from the parent context and adds the baggage entries' keys and * values to the span as attributes on span start. * From 7d50c88898d60afe9340efc1be768176f2121c45 Mon Sep 17 00:00:00 2001 From: Mike Goldsmith Date: Mon, 22 Apr 2024 10:15:25 +0100 Subject: [PATCH 12/17] Update readme with cleaner example Co-authored-by: Jamie Danielson --- packages/baggage-span-processor/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/baggage-span-processor/README.md b/packages/baggage-span-processor/README.md index e3d074d7bd..913abdba9d 100644 --- a/packages/baggage-span-processor/README.md +++ b/packages/baggage-span-processor/README.md @@ -30,20 +30,20 @@ npm install --save @opentelemetry/baggage-span-processor Add to the span processors during configuration: ```javascript -import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions"; -import { NodeSDK } from "@opentelemetry/sdk-node"; +import { NodeSDK, tracing } from "@opentelemetry/sdk-node"; import { BaggageSpanProcessor } from "@opentelemetry/baggage-span-processor"; -const globalResource = new Resource({ - [SemanticResourceAttributes.SERVICE_NAME]: "TestService", -}); +const spanProcessors = [ + new tracing.SimpleSpanProcessor( + new tracing.ConsoleSpanExporter()), + new BaggageSpanProcessor()]; const sdk = new NodeSDK({ - resource: globalResource, - SemanticResourceAttributes: new BaggageSpanProcessor(), + serviceName: "example-service", + spanProcessors }); -sdk.start() +sdk.start(); ``` ## Useful links From aad1ebc9004c6979302e0716f5fd79e82b2b7fd2 Mon Sep 17 00:00:00 2001 From: Mike Goldsmith Date: Mon, 22 Apr 2024 10:16:12 +0100 Subject: [PATCH 13/17] Remove OTel API from "dependencies" Co-authored-by: Jamie Danielson --- packages/baggage-span-processor/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/baggage-span-processor/package.json b/packages/baggage-span-processor/package.json index d566f523fd..13cc09c5d2 100644 --- a/packages/baggage-span-processor/package.json +++ b/packages/baggage-span-processor/package.json @@ -42,7 +42,6 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0" }, "devDependencies": { From d3a73f796ae090875b5d1bc1ac667f5e94e970a5 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Mon, 22 Apr 2024 10:18:39 +0100 Subject: [PATCH 14/17] add src/index.js that exports processor --- packages/baggage-span-processor/src/index.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/baggage-span-processor/src/index.js diff --git a/packages/baggage-span-processor/src/index.js b/packages/baggage-span-processor/src/index.js new file mode 100644 index 0000000000..39e175e9b3 --- /dev/null +++ b/packages/baggage-span-processor/src/index.js @@ -0,0 +1,17 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export { BaggageSpanProcessor } from './baggage-span-processor'; From 010d43567ca8ee4d077e026c0abe2be6bd48dcdb Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Mon, 22 Apr 2024 10:21:31 +0100 Subject: [PATCH 15/17] add processor to release-please-config --- release-please-config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index 63294044ec..8142b3b582 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -15,6 +15,7 @@ "detectors/node/opentelemetry-resource-detector-instana": {}, "metapackages/auto-instrumentations-node": {}, "metapackages/auto-instrumentations-web": {}, + "packages/baggage-span-processor": {}, "packages/opentelemetry-host-metrics": {}, "packages/opentelemetry-id-generator-aws-xray": {}, "packages/opentelemetry-propagation-utils": {}, @@ -67,4 +68,4 @@ "propagators/opentelemetry-propagator-instana": {}, "propagators/opentelemetry-propagator-ot-trace": {} } -} \ No newline at end of file +} From 3552c9eed3781914935e438d9e342859d0b74138 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Mon, 22 Apr 2024 10:57:40 +0100 Subject: [PATCH 16/17] add tests for no-op funcs --- .../test/baggage-span-processor.test.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/baggage-span-processor/test/baggage-span-processor.test.ts b/packages/baggage-span-processor/test/baggage-span-processor.test.ts index 7390f07550..2829858ab1 100644 --- a/packages/baggage-span-processor/test/baggage-span-processor.test.ts +++ b/packages/baggage-span-processor/test/baggage-span-processor.test.ts @@ -59,4 +59,16 @@ describe('BaggageSpanProcessor', () => { expect(span.attributes).toEqual(expectedAttrs); }); + + it('forceFlush is a no-op and does not throw error', async () => { + await expect(baggageProcessor.forceFlush()).resolves.not.toThrow(); + }); + + it('onEnd is a no-op and does not throw error', async () => { + expect(() => baggageProcessor.onEnd(span)).not.toThrow(); + }); + + it('shutdown is a no-op and does not throw error', async () => { + await expect(baggageProcessor.shutdown()).resolves.not.toThrow(); + }); }); From 1120b2537e3cd33db456ba3150804ffda73021c2 Mon Sep 17 00:00:00 2001 From: Mike Goldsmth Date: Mon, 22 Apr 2024 12:34:38 +0100 Subject: [PATCH 17/17] make src/index a ts file --- packages/baggage-span-processor/package.json | 2 +- packages/baggage-span-processor/src/{index.js => index.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/baggage-span-processor/src/{index.js => index.ts} (100%) diff --git a/packages/baggage-span-processor/package.json b/packages/baggage-span-processor/package.json index 13cc09c5d2..ca10dfb792 100644 --- a/packages/baggage-span-processor/package.json +++ b/packages/baggage-span-processor/package.json @@ -2,7 +2,7 @@ "name": "@opentelemetry/baggage-span-processor", "version": "0.1.0", "description": "OpenTelemetry Baggage Span Processor for Node.js", - "main": "build/src/index.js", + "main": "build/src/index.ts", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { diff --git a/packages/baggage-span-processor/src/index.js b/packages/baggage-span-processor/src/index.ts similarity index 100% rename from packages/baggage-span-processor/src/index.js rename to packages/baggage-span-processor/src/index.ts