add Events SDK (#4629)

* feat(sdk-events): add Events SDK

* updated changelog

* markdown lint

* updated changelog with changes to the events API

* added missing implements

* set defaults for severityNumber and timestamp

* added OTLP exporter to example

* updated package-lock.json

* updated versions

* pinned api-logs and api-events versions

* removed getting global LoggerProvider

* updated example version

* removed unnecessary constant

* lint

* updated events example

* pinned api-logs version for logs sdk

* updated package-lock

* removed unused configuration

* added forceFlush and shutdown to EventLoggerProvider

* updated package-lock.json

* updated tsconfig files

* fixed package-lock.json

* removed shutdown method, updated example

* cleanup

* added domain to examples

* updated versions

* fix browser tests
This commit is contained in:
Martin Kuba 2024-06-05 00:59:05 -07:00 committed by GitHub
parent 9d3bc18f7d
commit 7c808e3117
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 2344 additions and 717 deletions

View File

@ -73,6 +73,7 @@ All notable changes to experimental packages in this project will be documented
* `InstrumentationBase`
* `InstrumentationNodeModuleDefinition`
* `InstrumentationNodeModuleFile`
* feat(api-events): removed traceId and spanId from Event interface, added context and severityNumber [#4629](https://github.com/open-telemetry/opentelemetry-js/pull/4629)
### :rocket: (Enhancement)
@ -85,6 +86,7 @@ All notable changes to experimental packages in this project will be documented
* The value can be overwritten by
* merging a resource containing the `service.instance.id` attribute
* using another resource detector which writes `service.instance.id`
* feat(sdk-events): add Events SDK [#4629](https://github.com/open-telemetry/opentelemetry-js/pull/4629)
### :bug: (Bug Fix)

View File

@ -0,0 +1,21 @@
## Installation
```sh
# from this directory
npm install
```
## Run the Application
```sh
npm start
```
## Useful links
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
- For more information on OpenTelemetry logs, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/sdk-events>
## LICENSE
Apache License 2.0

View File

@ -0,0 +1,55 @@
/*
* 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 { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';
import {
LoggerProvider,
ConsoleLogRecordExporter,
SimpleLogRecordProcessor,
} from '@opentelemetry/sdk-logs';
import { events } from '@opentelemetry/api-events';
import { EventLoggerProvider } from '@opentelemetry/sdk-events';
// Optional and only needed to see the internal diagnostic logging (during development)
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
// configure global LoggerProvider
const loggerProvider = new LoggerProvider();
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())
);
// uncomment to use OTLP exporter
// import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
// const logExporter = new OTLPLogExporter();
// loggerProvider.addLogRecordProcessor(new SimpleLogRecordProcessor(logExporter));
// configure global EventLoggerProvider
const eventLoggerProvider = new EventLoggerProvider(loggerProvider);
events.setGlobalEventLoggerProvider(eventLoggerProvider);
// emit a log record
const eventLogger = events.getEventLogger('example');
eventLogger.emit({
name: 'my-domain.my-event',
data: {
a: 1,
b: 'hello',
c: {
d: 123
}
}
});

View File

@ -0,0 +1,20 @@
{
"name": "events-example",
"version": "0.51.1",
"private": true,
"scripts": {
"start": "ts-node index.ts"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-logs": "0.51.1",
"@opentelemetry/sdk-logs": "0.51.1",
"@opentelemetry/api-events": "0.51.1",
"@opentelemetry/sdk-events": "0.51.1",
"@opentelemetry/exporter-logs-otlp-http": "0.51.1"
},
"devDependencies": {
"@types/node": "18.6.5",
"ts-node": "^10.9.1"
}
}

View File

@ -0,0 +1,28 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "build",
"rootDir": "."
},
"include": ["./index.ts"],
"references": [
{
"path": "../../../api"
},
{
"path": "../../../experimental/packages/api-events"
},
{
"path": "../../../experimental/packages/api-logs"
},
{
"path": "../../../experimental/packages/sdk-events"
},
{
"path": "../../../experimental/packages/sdk-logs"
},
{
"path": "../../../experimental/packages/exporter-logs-otlp-http"
}
]
}

View File

@ -7,8 +7,6 @@ npm install
## Run the Application
LogRecord
```sh
npm start
```

View File

@ -14,20 +14,20 @@
},
"repository": "open-telemetry/opentelemetry-js",
"scripts": {
"prepublishOnly": "npm run compile",
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"build": "npm run compile",
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
"test:browser": "karma start --single-run",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"build": "npm run compile",
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"prepublishOnly": "npm run compile",
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
"prewatch": "node ../../../scripts/version-update.js",
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
"test:browser": "karma start --single-run",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"keywords": [

View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
import { Attributes } from '@opentelemetry/api';
import { AnyValue } from '@opentelemetry/api-logs';
import { Attributes, Context, TimeInput } from '@opentelemetry/api';
import { AnyValue, SeverityNumber } from '@opentelemetry/api-logs';
export interface Event {
/**
* The time when the event occurred as UNIX Epoch time in nanoseconds.
*/
timestamp?: number;
timestamp?: TimeInput;
/**
* The name of the event.
@ -40,17 +40,12 @@ export interface Event {
attributes?: Attributes;
/**
* 8 least significant bits are the trace flags as defined in W3C Trace Context specification.
* Numerical value of the severity.
*/
traceFlags?: number;
severityNumber?: SeverityNumber;
/**
* A unique identifier for a trace.
* The Context associated with the Event.
*/
traceId?: string;
/**
* A unique identifier for a span within a trace.
*/
spanId?: string;
context?: Context;
}

View File

@ -0,0 +1 @@
build

View File

@ -0,0 +1,7 @@
module.exports = {
env: {
mocha: true,
node: true,
},
...require('../../../eslint.base.js'),
};

View File

@ -0,0 +1,4 @@
/bin
/coverage
/doc
/test

View File

@ -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.

View File

@ -0,0 +1,79 @@
# OpenTelemetry Events SDK
[![NPM Published Version][npm-img]][npm-url]
[![Apache License][license-image]][license-image]
**Note: This is an experimental package under active development. New releases may include breaking changes.**
This package provides an experimental Events SDK implementation. The Events SDK is implemented on top of the Logs SDK.
## Installation
```bash
npm install --save @opentelemetry/api-logs
npm install --save @opentelemetry/api-events
npm install --save @opentelemetry/sdk-events
```
## Usage
Here is an example of configuring and using the Events SDK:
```js
const { logs } = require('@opentelemetry/api-logs');
const { events } = require('@opentelemetry/api-events');
const { EventLoggerProvider } = require('@opentelemetry/sdk-events');
const {
LoggerProvider,
SimpleLogRecordProcessor,
ConsoleLogRecordExporter,
} = require('@opentelemetry/sdk-logs');
// The Events SDK has a dependency on the Logs SDK.
// Any processing of events (e.g. export) is done through the Logs SDK.
const loggerProvider = new LoggerProvider();
loggerProvider.addLogRecordProcessor(
new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())
);
// Register a global EventLoggerProvider.
// This would be used by instrumentations, similar to how the global TracerProvider,
// LoggerProvider and MeterProvider work.
const eventLoggerProvider = new EventLoggerProvider(loggerProvider);
events.setGlobalEventLoggerProvider(eventLoggerProvider);
// Get an EventLogger from the global EventLoggerProvider
const eventLogger = events.getEventLogger('default');
// Emit an event
eventLogger.emit({
name: 'my-domain.my-event',
data: {
field1: 'abc',
field2: 123
}
});
// Shutdown is done directly on the LoggerProvider
loggerProvider.shutdown();
```
## Example
See [examples/events](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/events)
## Useful links
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
- For more about OpenTelemetry JavaScript: <https://github.com/open-telemetry/opentelemetry-js>
- 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/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/sdk-logs
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fsdk%2Dlogs.svg

View File

@ -0,0 +1,26 @@
/*!
* 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
*
* 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.
*/
const karmaWebpackConfig = require('../../../karma.webpack');
const karmaBaseConfig = require('../../../karma.base');
module.exports = config => {
config.set(
Object.assign({}, karmaBaseConfig, {
webpack: karmaWebpackConfig,
})
);
};

View File

@ -0,0 +1,104 @@
{
"name": "@opentelemetry/sdk-events",
"version": "0.51.1",
"publishConfig": {
"access": "public"
},
"description": "OpenTelemetry events SDK",
"author": "OpenTelemetry Authors",
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/sdk-events",
"license": "Apache-2.0",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esnext": "build/esnext/index.js",
"types": "build/src/index.d.ts",
"repository": {
"type": "git",
"url": "git+https://github.com/open-telemetry/opentelemetry-js.git"
},
"bugs": {
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"engines": {
"node": ">=14"
},
"scripts": {
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"peer-api-check": "node ../../../scripts/peer-api-check.js",
"prepublishOnly": "npm run compile",
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
"prewatch": "npm run precompile",
"tdd": "npm run test -- --watch-extensions ts --watch",
"tdd:browser": "karma start",
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
"test:browser": "karma start --single-run",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json"
},
"keywords": [
"opentelemetry",
"nodejs",
"browser",
"events",
"stats",
"profiling"
],
"files": [
"build/esm/**/*.js",
"build/esm/**/*.js.map",
"build/esm/**/*.d.ts",
"build/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
"doc",
"LICENSE",
"README.md"
],
"sideEffects": false,
"peerDependencies": {
"@opentelemetry/api": ">=1.4.0 <1.9.0"
},
"devDependencies": {
"@babel/core": "7.22.20",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/api-logs": "0.51.1",
"@opentelemetry/api-events": "0.51.1",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "5.0.1",
"lerna": "6.6.2",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-loader": "9.5.1",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"webpack": "5.89.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
},
"dependencies": {
"@opentelemetry/api-logs": "0.51.1",
"@opentelemetry/api-events": "0.51.1",
"@opentelemetry/sdk-logs": "0.51.1"
}
}

View File

@ -0,0 +1,45 @@
/*
* 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 } from '@opentelemetry/api';
import { Event } from '@opentelemetry/api-events';
import * as api from '@opentelemetry/api-events';
import { Logger, LogRecord, SeverityNumber } from '@opentelemetry/api-logs';
export class EventLogger implements api.EventLogger {
private _logger: Logger;
constructor(logger: Logger) {
this._logger = logger;
}
emit(event: Event) {
const attributes = event.attributes || {};
attributes['event.name'] = event.name;
const logRecord: LogRecord = {
attributes: attributes,
context: event.context || context.active(),
severityNumber: event.severityNumber || SeverityNumber.INFO,
timestamp: event.timestamp || Date.now(),
};
if (event.data) {
logRecord.body = event.data;
}
this._logger.emit(logRecord);
}
}

View File

@ -0,0 +1,39 @@
/*
* 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 * as api from '@opentelemetry/api-events';
import { EventLogger } from './EventLogger';
import { LoggerProvider } from '@opentelemetry/sdk-logs';
export class EventLoggerProvider implements api.EventLoggerProvider {
private _loggerProvider: LoggerProvider;
constructor(loggerProvider: LoggerProvider) {
this._loggerProvider = loggerProvider;
}
getEventLogger(
name: string,
version?: string,
options?: api.EventLoggerOptions
): api.EventLogger {
const logger = this._loggerProvider.getLogger(name, version, options);
return new EventLogger(logger);
}
public forceFlush(): Promise<void> {
return this._loggerProvider.forceFlush();
}
}

View File

@ -0,0 +1,18 @@
/*
* 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 { EventLogger } from './EventLogger';
export { EventLoggerProvider } from './EventLoggerProvider';

View File

@ -0,0 +1,99 @@
/*
* 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 * as assert from 'assert';
import * as sinon from 'sinon';
import { EventLogger } from '../src';
import { TestLogger } from './utils';
import { SeverityNumber } from '@opentelemetry/api-logs';
describe('EventLogger', () => {
describe('constructor', () => {
it('should create an instance', () => {
const eventLogger = new EventLogger(new TestLogger());
assert.ok(eventLogger instanceof EventLogger);
});
});
describe('emit', () => {
it('should emit a logRecord instance', () => {
const logger = new TestLogger();
const eventLogger = new EventLogger(logger);
const now = Date.now();
const spy = sinon.spy(logger, 'emit');
eventLogger.emit({
name: 'event name',
data: {
a: 1,
b: 2,
},
attributes: {
c: 3,
d: 4,
},
severityNumber: SeverityNumber.ERROR,
timestamp: now,
});
assert(
spy.calledWith(
sinon.match({
attributes: {
'event.name': 'event name',
c: 3,
d: 4,
},
body: {
a: 1,
b: 2,
},
severityNumber: SeverityNumber.ERROR,
timestamp: now,
})
)
);
});
it('should set defaults', () => {
const logger = new TestLogger();
const eventLogger = new EventLogger(logger);
const spy = sinon.spy(logger, 'emit');
eventLogger.emit({
name: 'event name',
});
assert(
spy.calledWith(
sinon.match({
severityNumber: SeverityNumber.INFO,
})
),
'severityNumber should be set to INFO'
);
assert(
spy.calledWith(
sinon.match((value: any) => {
return value.timestamp !== undefined;
})
),
'timestamp should not be empty'
);
});
});
});

View File

@ -0,0 +1,53 @@
/*
* 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 * as assert from 'assert';
import { EventLogger, EventLoggerProvider } from '../src';
import { LoggerProvider } from '@opentelemetry/sdk-logs';
import sinon = require('sinon');
describe('EventLoggerProvider', () => {
describe('getLogger', () => {
it('returns an instance of EventLogger', () => {
const provider = new EventLoggerProvider(new LoggerProvider());
const logger = provider.getEventLogger('logger name');
assert.ok(logger instanceof EventLogger);
});
it('uses logger from provided LoggerProvider', () => {
const loggerProvider = new LoggerProvider();
const spy = sinon.spy(loggerProvider, 'getLogger');
const provider = new EventLoggerProvider(loggerProvider);
const eventLogger = provider.getEventLogger('logger name');
assert.ok(eventLogger instanceof EventLogger);
spy.calledOnceWithExactly('logger name');
});
});
describe('forceFlush', () => {
it('calls forceFlush on loggerProvider', () => {
const loggerProvider = new LoggerProvider();
const spy = sinon.spy(loggerProvider, 'forceFlush');
const provider = new EventLoggerProvider(loggerProvider);
provider.forceFlush();
spy.calledOnceWithExactly();
});
});
});

View File

@ -0,0 +1,20 @@
/*
* 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.
*/
{
const testsContext = require.context('./', true, /test$/);
testsContext.keys().forEach(testsContext);
}

View File

@ -0,0 +1,20 @@
/*
* 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.
*/
{
const testsContext = require.context('./', true, /test$/);
testsContext.keys().forEach(testsContext);
}

View File

@ -0,0 +1,21 @@
/*
* 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 { LogRecord, Logger } from '@opentelemetry/api-logs';
export class TestLogger implements Logger {
emit(logRecord: LogRecord): void {}
}

View File

@ -0,0 +1,25 @@
{
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"outDir": "build/esm",
"rootDir": "src",
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../../../api"
},
{
"path": "../api-events"
},
{
"path": "../api-logs"
},
{
"path": "../sdk-logs"
}
]
}

View File

@ -0,0 +1,25 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"outDir": "build/esnext",
"rootDir": "src",
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../../../api"
},
{
"path": "../api-events"
},
{
"path": "../api-logs"
},
{
"path": "../sdk-logs"
}
]
}

View File

@ -0,0 +1,25 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "build",
"rootDir": "."
},
"include": [
"src/**/*.ts",
"test/**/*.ts"
],
"references": [
{
"path": "../../../api"
},
{
"path": "../api-events"
},
{
"path": "../api-logs"
},
{
"path": "../sdk-logs"
}
]
}

View File

@ -69,8 +69,7 @@
],
"sideEffects": false,
"peerDependencies": {
"@opentelemetry/api": ">=1.4.0 <1.9.0",
"@opentelemetry/api-logs": ">=0.39.1"
"@opentelemetry/api": ">=1.4.0 <1.9.0"
},
"devDependencies": {
"@babel/core": "7.24.6",
@ -102,7 +101,8 @@
"webpack-merge": "5.10.0"
},
"dependencies": {
"@opentelemetry/core": "1.24.1",
"@opentelemetry/resources": "1.24.1"
"@opentelemetry/api-logs": "0.51.0",
"@opentelemetry/core": "1.24.0",
"@opentelemetry/resources": "1.24.0"
}
}

2070
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -50,6 +50,9 @@
{
"path": "experimental/packages/propagator-aws-xray-lambda/tsconfig.esm.json"
},
{
"path": "experimental/packages/sdk-events/tsconfig.esm.json"
},
{
"path": "experimental/packages/sdk-logs/tsconfig.esm.json"
},

View File

@ -50,6 +50,9 @@
{
"path": "experimental/packages/propagator-aws-xray-lambda/tsconfig.esnext.json"
},
{
"path": "experimental/packages/sdk-events/tsconfig.esnext.json"
},
{
"path": "experimental/packages/sdk-logs/tsconfig.esnext.json"
},

View File

@ -28,6 +28,7 @@
"experimental/packages/otlp-grpc-exporter-base",
"experimental/packages/otlp-transformer",
"experimental/packages/propagator-aws-xray-lambda",
"experimental/packages/sdk-events",
"experimental/packages/sdk-logs",
"experimental/packages/shim-opencensus",
"packages/opentelemetry-context-async-hooks",
@ -130,6 +131,9 @@
{
"path": "experimental/packages/propagator-aws-xray-lambda"
},
{
"path": "experimental/packages/sdk-events"
},
{
"path": "experimental/packages/sdk-logs"
},