-
Notifications
You must be signed in to change notification settings - Fork 1k
feat(opentelemetry-sdk-node): skeleton for experimental function to start SDK #6145
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
75c2aab
start sdk
maryliag 7f7defb
changelog
maryliag e3b3b57
interface for config
maryliag 182726d
feedback
maryliag 05daae0
rename
maryliag ce92b4f
make config public
maryliag 20290e0
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag 6e6a656
feedback from PR
maryliag e8d8809
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag 8bac153
fix tests
maryliag 679766e
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * 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 { | ||
| ConfigFactory, | ||
| createConfigFactory, | ||
| } from '@opentelemetry/configuration'; | ||
| import { diag, DiagConsoleLogger } from '@opentelemetry/api'; | ||
| import { setupDefaultContextManager } from './utils'; | ||
|
|
||
| /** | ||
| * @experimental Function to start the OpenTelemetry Node SDK | ||
| * @param sdkOptions | ||
|
maryliag marked this conversation as resolved.
|
||
| */ | ||
| export function startNodeSDK(): { | ||
| shutdown: () => Promise<void>; | ||
| } { | ||
| const configFactory: ConfigFactory = createConfigFactory(); | ||
| const config = configFactory.getConfigModel(); | ||
|
|
||
| if (config.disabled) { | ||
| diag.info('OpenTelemetry SDK is disabled'); | ||
| return NOOP_SDK; | ||
| } | ||
| if (config.log_level != null) { | ||
| diag.setLogger(new DiagConsoleLogger(), { logLevel: config.log_level }); | ||
| } | ||
|
|
||
| setupDefaultContextManager(); | ||
|
|
||
| const shutdownFn = async () => { | ||
| const promises: Promise<unknown>[] = []; | ||
| await Promise.all(promises); | ||
| }; | ||
| return { shutdown: shutdownFn }; | ||
| } | ||
| const NOOP_SDK = { | ||
| shutdown: async () => {}, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
experimental/packages/opentelemetry-sdk-node/test/start.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * 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 { startNodeSDK } from '../src/start'; | ||
| import { context, diag } from '@opentelemetry/api'; | ||
| import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks'; | ||
| import * as Sinon from 'sinon'; | ||
|
|
||
| describe('startNodeSDK', function () { | ||
| const _origEnvVariables = { ...process.env }; | ||
|
|
||
| afterEach(function () { | ||
| for (const key of Object.keys(process.env)) { | ||
| delete process.env[key]; | ||
| } | ||
| for (const [key, value] of Object.entries(_origEnvVariables)) { | ||
| process.env[key] = value; | ||
| } | ||
| Sinon.restore(); | ||
| }); | ||
|
|
||
| it('should return NOOP_SDK when disabled is true', () => { | ||
| const info = Sinon.spy(diag, 'info'); | ||
| process.env.OTEL_SDK_DISABLED = 'true'; | ||
| const sdk = startNodeSDK(); | ||
|
|
||
| Sinon.assert.calledWith(info, 'OpenTelemetry SDK is disabled'); | ||
|
|
||
| sdk.shutdown(); | ||
| }); | ||
|
|
||
| it('should return NOOP_SDK when disabled is true', () => { | ||
| process.env.OTEL_EXPERIMENTAL_CONFIG_FILE = | ||
| 'test/fixtures/kitchen-sink.yaml'; | ||
| const sdk = startNodeSDK(); | ||
|
|
||
| assertDefaultContextManagerRegistered(); | ||
|
|
||
| sdk.shutdown(); | ||
| }); | ||
| }); | ||
|
|
||
| function assertDefaultContextManagerRegistered() { | ||
| assert.ok( | ||
| context['_getContextManager']().constructor.name === | ||
| AsyncLocalStorageContextManager.name | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.