Skip to content
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

Create sync resource with some attributes that resolve asynchronously #3460

Merged
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
9615a79
feat(sync-resource-detectors): initial
samimusallam Dec 1, 2022
f0c6044
feat(sync-resource-detectors): initial
samimusallam Dec 1, 2022
a2f77f6
Merge branch 'main' of https://github.com/samimusallam/opentelemetry-…
samimusallam Dec 4, 2022
6b80ab0
feat(sync-resource-detectors): updated CHANGELOG.md
samimusallam Dec 4, 2022
40957fb
feat(sync-resource-detectors): fixed lint issues
samimusallam Dec 4, 2022
7f63622
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 5, 2022
c360f8b
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 5, 2022
60f763d
feat(sync-resource-detectors): fixed failing tests
samimusallam Dec 5, 2022
8279b7c
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 5, 2022
e42a64e
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 6, 2022
2776fe3
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 7, 2022
bc926fa
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 11, 2022
876a978
Update packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts
samimusallam Dec 12, 2022
e27b6b8
feat(sync-resource-detectors): _asyncAttributesPromise merged .catch …
samimusallam Dec 19, 2022
11e4955
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 19, 2022
ab9e481
feat(sync-resource-detectors): fixed tests
samimusallam Dec 20, 2022
6c29f97
feat(sync-resource-detectors): using isPromiseLike
samimusallam Dec 20, 2022
bb89113
feat(sync-resource-detectors): documented waitForAsyncAttributes retu…
samimusallam Dec 20, 2022
cc16c50
feat(sync-resource-detectors): updated asyncAttributesPromise nullish…
samimusallam Dec 20, 2022
0ad492a
feat(sync-resource-detectors): using globalErrorHandler instead of diag
samimusallam Dec 20, 2022
5dc4d31
feat(sync-resource-detectors): removed code duplication for detect-re…
samimusallam Dec 20, 2022
3ab49fb
feat(sync-resource-detectors): fixed test
samimusallam Dec 20, 2022
721bf45
feat(sync-resource-detectors): updated README.md to use sync start()
samimusallam Dec 20, 2022
508739f
feat(sync-resource-detectors): updated test with a promise that resol…
samimusallam Dec 20, 2022
7d14a7d
feat(sync-resource-detectors): removed unnecessary attributes getter
samimusallam Dec 20, 2022
952cbf4
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 20, 2022
da7adc9
feat(sync-resource-detectors): small refactor
samimusallam Dec 20, 2022
16d223a
feat(sync-resource-detectors): removed internalConfig
samimusallam Dec 20, 2022
881645e
feat(sync-resource-detectors): updated merge() to check if promise ha…
samimusallam Dec 20, 2022
6ec14cb
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Dec 22, 2022
692ef0e
feat(sync-resource-detectors): added more tests for merge()
samimusallam Dec 22, 2022
61964a5
feat(sync-resource-detectors): fixed merge() where attribute overridi…
samimusallam Jan 3, 2023
c56bff4
feat(sync-resource-detectors): updated upgrade guidelines
samimusallam Jan 3, 2023
67e8756
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 3, 2023
04c6b2f
feat(sync-resource-detectors): fixed lint
samimusallam Jan 3, 2023
86de5b4
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 4, 2023
5baca81
feat(sync-resource-detectors): removed unnecessary await
samimusallam Jan 4, 2023
270d67e
feat(sync-resource-detectors): updated upgrade guidelines
samimusallam Jan 4, 2023
0d5b588
feat(sync-resource-detectors): updated outdated test
samimusallam Jan 4, 2023
551ed5d
feat(sync-resource-detectors): use globalErrorHandler in BatchSpanPro…
samimusallam Jan 4, 2023
c635de1
feat(sync-resource-detectors): remove unused code
samimusallam Jan 4, 2023
94bfcea
feat(sync-resource-detectors): resolve _flushOneBatch() if it fails b…
samimusallam Jan 4, 2023
e719e90
feat(sync-resource-detectors): reduced timeout to avoid test delays f…
samimusallam Jan 4, 2023
c0758b3
feat(sync-resource-detectors): removed redundant call to waitForAsync…
samimusallam Jan 5, 2023
8d82355
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 5, 2023
19817f0
feat(sync-resource-detectors): await unresolved resources in forceFlu…
samimusallam Jan 9, 2023
1af7935
feat(sync-resource-detectors): fixed test that should log detected re…
samimusallam Jan 10, 2023
76ce6f5
feat(sync-resource-detectors): fixed envDetector test
samimusallam Jan 11, 2023
cc24162
feat(sync-resource-detectors): fixed envDetector test
samimusallam Jan 11, 2023
754810d
feat(sync-resource-detectors): fixed test
samimusallam Jan 11, 2023
321f295
Update Resource's asyncAttributesHaveResolved description
samimusallam Jan 11, 2023
1c48e83
feat(sync-resource-detectors): using diag.error instead of debug
samimusallam Jan 12, 2023
85d8dbd
feat(sync-resource-detectors): removed asyncAttributesHaveResolved() …
samimusallam Jan 12, 2023
97eb9fe
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 12, 2023
8121a4d
feat(sync-resource-detectors): removed irrelevant call to shutdown()
samimusallam Jan 12, 2023
9e85a43
Update packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProc…
samimusallam Jan 12, 2023
05a83df
feat(sync-resource-detectors): updated SimpleSpanProcessor.ts
samimusallam Jan 12, 2023
ad81025
feat(sync-resource-detectors): removed redundant call
samimusallam Jan 12, 2023
ce2e87c
feat(sync-resource-detectors): updated test name
samimusallam Jan 12, 2023
8d9c4a7
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 15, 2023
e1a3795
feat(sync-resource-detectors): Added DetectorSync interface
samimusallam Jan 15, 2023
62546b0
feat(sync-resource-detectors): revert change
samimusallam Jan 15, 2023
70f47a3
feat(sync-resource-detectors): Added new interface for sync detector …
samimusallam Jan 17, 2023
9e87de6
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 17, 2023
588d93c
feat(sync-resource-detectors): Fixed issues with Detector/DetectorSync
samimusallam Jan 17, 2023
4414ba5
feat(sync-resource-detectors): removed unnecessary comments
samimusallam Jan 17, 2023
b110dca
feat(sync-resource-detectors): added test for pending resource in Bat…
samimusallam Jan 18, 2023
2365748
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 18, 2023
79a8321
Update packages/opentelemetry-resources/src/types.ts
samimusallam Jan 19, 2023
1800c53
Update packages/opentelemetry-resources/src/Resource.ts
samimusallam Jan 19, 2023
c92412f
feat(sync-resource-detectors): fixed failing tests
samimusallam Jan 19, 2023
11848b3
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 22, 2023
680f955
feat(sync-resource-detectors): deprecated Detector interface
samimusallam Jan 24, 2023
b49a1d8
feat(sync-resource-detectors): added compatibility tests and renamed …
samimusallam Jan 24, 2023
1117c1e
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 24, 2023
a9e6614
feat(sync-resource-detectors): using JSON.stringify instead of utils.…
samimusallam Jan 24, 2023
0eefbdf
feat(sync-resource-detectors): added logging test
samimusallam Jan 24, 2023
d070c0c
feat(sync-resource-detectors): updated "Upgrade guidelines"
samimusallam Jan 24, 2023
79496cd
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 25, 2023
fd850e2
feat(sync-resource-detectors): fixed regex in test
samimusallam Jan 26, 2023
964a20b
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 29, 2023
f66ebad
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 30, 2023
0c20294
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 30, 2023
96230d6
feat(sync-resource-detectors): removed typo
samimusallam Jan 30, 2023
bc8f2ba
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Jan 31, 2023
7611fa8
feat(sync-resource-detectors): created IResource interface
samimusallam Feb 2, 2023
5271cb2
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Feb 3, 2023
0ff2427
feat(sync-resource-detectors): reverted detectors to the old detector…
samimusallam Feb 5, 2023
031461e
feat(sync-resource-detectors): fixed codecov issues
samimusallam Feb 5, 2023
c2d6760
feat(sync-resource-detectors): fix typo
samimusallam Feb 5, 2023
0f1dff0
feat(sync-resource-detectors): using optional chaining
samimusallam Feb 5, 2023
f14271f
feat(sync-resource-detectors): updated README.md
samimusallam Feb 5, 2023
000adf9
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Feb 7, 2023
33eee0b
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Feb 8, 2023
7334f64
Merge branch 'main' into feat/sync-resource-detectors
dyladan Feb 8, 2023
1149d96
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Feb 9, 2023
e46852a
Merge branch 'main' into feat/sync-resource-detectors
samimusallam Feb 12, 2023
60a161a
Merge branch 'main' into feat/sync-resource-detectors
legendecas Feb 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
### :rocket: (Enhancement)

* feat(api): add `getActiveBaggage` API [#3385](https://github.com/open-telemetry/opentelemetry-js/pull/3385)
* feat(resource): create sync resource with some attributes that resolve asynchronously [#3460](https://github.com/open-telemetry/opentelemetry-js/pull/3460)
* feat(instrumentation-grpc): set net.peer.name and net.peer.port on client spans [#3430](https://github.com/open-telemetry/opentelemetry-js/pull/3430)

### :bug: (Bug Fix)
Expand Down
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-sdk-node/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
} from '@opentelemetry/instrumentation';
import {
Detector,
detectResources,
detectResourcesSync,
envDetector,
processDetector,
Resource,
Expand Down Expand Up @@ -174,12 +174,12 @@ export class NodeSDK {
}

/** Detect resource attributes */
public async detectResources(): Promise<void> {
public detectResources(): void {
samimusallam marked this conversation as resolved.
Show resolved Hide resolved
const internalConfig: ResourceDetectionConfig = {
detectors: this._resourceDetectors,
};

this.addResource(await detectResources(internalConfig));
this.addResource(detectResourcesSync(internalConfig));
}

/** Manually add a resource */
Expand All @@ -190,9 +190,9 @@ export class NodeSDK {
/**
* Once the SDK has been configured, call this method to construct SDK components and register them with the OpenTelemetry API.
*/
public async start(): Promise<void> {
public start(): void {
samimusallam marked this conversation as resolved.
Show resolved Hide resolved
samimusallam marked this conversation as resolved.
Show resolved Hide resolved
if (this._autoDetectResources) {
await this.detectResources();
this.detectResources();
}

this._resource =
Expand Down
57 changes: 31 additions & 26 deletions experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe('Node SDK', () => {
autoDetectResources: false,
});

await sdk.start();
sdk.start();

assert.strictEqual(
context['_getContextManager'](),
Expand All @@ -114,7 +114,7 @@ describe('Node SDK', () => {
autoDetectResources: false,
});

await sdk.start();
sdk.start();

assert.ok(!(metrics.getMeterProvider() instanceof MeterProvider));

Expand All @@ -139,7 +139,7 @@ describe('Node SDK', () => {
autoDetectResources: false,
});

await sdk.start();
sdk.start();

assert.ok(!(metrics.getMeterProvider() instanceof MeterProvider));

Expand Down Expand Up @@ -171,7 +171,7 @@ describe('Node SDK', () => {
autoDetectResources: false,
});

await sdk.start();
sdk.start();

assert.strictEqual(
context['_getContextManager'](),
Expand Down Expand Up @@ -237,7 +237,7 @@ describe('Node SDK', () => {
autoDetectResources: false,
});

await sdk.start();
sdk.start();

assert.strictEqual(
context['_getContextManager'](),
Expand Down Expand Up @@ -393,6 +393,7 @@ describe('Node SDK', () => {
});
await sdk.detectResources();
samimusallam marked this conversation as resolved.
Show resolved Hide resolved
const resource = sdk['_resource'];
await resource.waitForAsyncAttributes();

assert.strictEqual(resource.attributes['customAttr'], 'someValue');

Expand Down Expand Up @@ -420,8 +421,9 @@ describe('Node SDK', () => {
],
});

await sdk.detectResources();
sdk.detectResources();
const resource = sdk['_resource'];
await resource.waitForAsyncAttributes();

assertServiceResource(resource, {
instanceId: '627cc493',
Expand Down Expand Up @@ -468,7 +470,8 @@ describe('Node SDK', () => {
DiagLogLevel.VERBOSE
);

await sdk.detectResources();
sdk.detectResources();
await sdk['_resource'].waitForAsyncAttributes().catch(() => {});

// Test that the Env Detector successfully found its resource and populated it with the right values.
assert.ok(
Expand Down Expand Up @@ -500,7 +503,7 @@ describe('Node SDK', () => {
DiagLogLevel.DEBUG
);

await sdk.detectResources();
sdk.detectResources();

assert.ok(
callArgsContains(
Expand All @@ -519,7 +522,7 @@ describe('Node SDK', () => {
serviceName: 'config-set-name',
});

await sdk.start();
sdk.start();
const resource = sdk['_resource'];

assertServiceResource(resource, {
Expand All @@ -531,8 +534,9 @@ describe('Node SDK', () => {
process.env.OTEL_SERVICE_NAME = 'env-set-name';
const sdk = new NodeSDK();

await sdk.start();
sdk.start();
const resource = sdk['_resource'];
await resource.waitForAsyncAttributes();

assertServiceResource(resource, {
name: 'env-set-name',
Expand All @@ -546,7 +550,7 @@ describe('Node SDK', () => {
serviceName: 'config-set-name',
});

await sdk.start();
sdk.start();
const resource = sdk['_resource'];

assertServiceResource(resource, {
Expand All @@ -560,8 +564,9 @@ describe('Node SDK', () => {
'service.name=resource-env-set-name';
const sdk = new NodeSDK();

await sdk.start();
sdk.start();
const resource = sdk['_resource'];
await resource.waitForAsyncAttributes();
samimusallam marked this conversation as resolved.
Show resolved Hide resolved

assertServiceResource(resource, {
name: 'resource-env-set-name',
Expand All @@ -576,7 +581,7 @@ describe('Node SDK', () => {
serviceName: 'config-set-name',
});

await sdk.start();
sdk.start();
const resource = sdk['_resource'];

assertServiceResource(resource, {
samimusallam marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -604,7 +609,7 @@ describe('setup exporter from env', () => {
});
it('use default exporter TracerProviderWithEnvExporters when user does not provide span processor or trace exporter to sdk config', async () => {
const sdk = new NodeSDK();
await sdk.start();
sdk.start();
const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;

Expand All @@ -617,7 +622,7 @@ describe('setup exporter from env', () => {
const sdk = new NodeSDK({
traceExporter,
});
await sdk.start();
sdk.start();
const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;

Expand All @@ -634,7 +639,7 @@ describe('setup exporter from env', () => {
const sdk = new NodeSDK({
spanProcessor,
});
await sdk.start();
sdk.start();
const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;

Expand All @@ -651,7 +656,7 @@ describe('setup exporter from env', () => {
const sdk = new NodeSDK({
traceExporter,
});
await sdk.start();
sdk.start();
const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;

Expand All @@ -667,7 +672,7 @@ describe('setup exporter from env', () => {
env.OTEL_TRACES_EXPORTER = 'otlp';
env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;
Expand All @@ -680,7 +685,7 @@ describe('setup exporter from env', () => {
it('use noop span processor when user sets env exporter to none', async () => {
env.OTEL_TRACES_EXPORTER = 'none';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;
Expand All @@ -693,7 +698,7 @@ describe('setup exporter from env', () => {
it('log warning that sdk will not be initalized when exporter is set to none', async () => {
env.OTEL_TRACES_EXPORTER = 'none';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

assert.strictEqual(
stubLoggerError.args[0][0],
Expand All @@ -704,7 +709,7 @@ describe('setup exporter from env', () => {
it('do not use any exporters when empty value is provided for exporter', async () => {
env.OTEL_TRACES_EXPORTER = '';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;
Expand All @@ -718,7 +723,7 @@ describe('setup exporter from env', () => {
it('use only default exporter when none value is provided with other exporters', async () => {
env.OTEL_TRACES_EXPORTER = 'otlp,zipkin,none';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;
Expand All @@ -731,7 +736,7 @@ describe('setup exporter from env', () => {
it('log warning that only default exporter will be used since exporter list contains none with other exports ', async () => {
env.OTEL_TRACES_EXPORTER = 'otlp,zipkin,none';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

assert.strictEqual(
stubLoggerError.args[0][0],
Expand All @@ -742,7 +747,7 @@ describe('setup exporter from env', () => {
it('should warn that provided exporter value is unrecognized and not able to be set up', async () => {
env.OTEL_TRACES_EXPORTER = 'invalid';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

assert.strictEqual(
stubLoggerError.args[0][0],
Expand All @@ -760,7 +765,7 @@ describe('setup exporter from env', () => {
env.OTEL_TRACES_EXPORTER = 'zipkin, otlp, jaeger';
env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'grpc';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;
Expand All @@ -776,7 +781,7 @@ describe('setup exporter from env', () => {
it('use the console exporter', async () => {
env.OTEL_TRACES_EXPORTER = 'console, otlp';
const sdk = new NodeSDK();
await sdk.start();
sdk.start();

const listOfProcessors =
sdk['_tracerProvider']!['_registeredSpanProcessors']!;
Expand Down