From fd1d6cb728cd0414aa8fdd1326256f0812803b5f Mon Sep 17 00:00:00 2001 From: David Luna Date: Fri, 20 Sep 2024 13:18:22 +0200 Subject: [PATCH 1/3] refactor(sdk-logs): replace ResourceAtrributes with Attributes --- .../test/common/export/BatchLogRecordProcessor.test.ts | 5 +++-- .../test/common/export/SimpleLogRecordProcessor.test.ts | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts b/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts index f6a8e77611..46e086d92b 100644 --- a/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts +++ b/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts @@ -32,7 +32,8 @@ import { import { BatchLogRecordProcessorBase } from '../../../src/export/BatchLogRecordProcessorBase'; import { reconfigureLimits } from '../../../src/config'; import { LoggerProviderSharedState } from '../../../src/internal/LoggerProviderSharedState'; -import { Resource, ResourceAttributes } from '@opentelemetry/resources'; +import { Attributes } from '@opentelemetry/api'; +import { Resource } from '@opentelemetry/resources'; class BatchLogRecordProcessor extends BatchLogRecordProcessorBase { onInit() {} @@ -316,7 +317,7 @@ describe('BatchLogRecordProcessorBase', () => { const processor = new BatchLogRecordProcessor(exporter); const asyncResource = new Resource( {}, - new Promise(resolve => { + new Promise(resolve => { setTimeout(() => resolve({ async: 'fromasync' }), 1); }) ); diff --git a/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts b/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts index a19723f4cc..193f6038b9 100644 --- a/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts +++ b/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts @@ -21,7 +21,8 @@ import { loggingErrorHandler, setGlobalErrorHandler, } from '@opentelemetry/core'; -import { Resource, ResourceAttributes } from '@opentelemetry/resources'; +import { Attributes } from '@opentelemetry/api'; +import { Resource } from '@opentelemetry/resources'; import { Resource as Resource190 } from '@opentelemetry/resources_1.9.0'; import { @@ -121,7 +122,7 @@ describe('SimpleLogRecordProcessor', () => { const exporter = new InMemoryLogRecordExporter(); const asyncResource = new Resource( {}, - new Promise(resolve => { + new Promise(resolve => { setTimeout(() => resolve({ async: 'fromasync' }), 1); }) ); @@ -143,7 +144,7 @@ describe('SimpleLogRecordProcessor', () => { const testExporterWithDelay = new TestExporterWithDelay(); const asyncResource = new Resource( {}, - new Promise(resolve => { + new Promise(resolve => { setTimeout(() => resolve({ async: 'fromasync' }), 1); }) ); From c69e64acb6a9b22a453f0eb4f5a3102b6f4ab679 Mon Sep 17 00:00:00 2001 From: David Luna Date: Fri, 20 Sep 2024 13:27:48 +0200 Subject: [PATCH 2/3] chore: add CHANGELOG entry --- experimental/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 956fd01e23..54e9abec59 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -25,6 +25,8 @@ All notable changes to experimental packages in this project will be documented * refactor(browser-detector): replace `ResourceAttributes` with `Attributes` [#5004](https://github.com/open-telemetry/opentelemetry-js/pull/5004) +* refactor(sdk-logs): replace `ResourceAttributes` with `Attributes` [#5005](https://github.com/open-telemetry/opentelemetry-js/pull/5005) @david-luna + ## 0.53.0 ### :boom: Breaking Change From c9f3b5dc34b742806eff96becc99870eb5a34598 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Fri, 20 Sep 2024 13:48:38 +0200 Subject: [PATCH 3/3] Update experimental/CHANGELOG.md --- experimental/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 54e9abec59..4ac335a9cc 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -24,7 +24,6 @@ All notable changes to experimental packages in this project will be documented * refactor(exporter-prometheus): replace `MetricAttributes` and `MetricAttributeValues` with `Attributes` and `AttributeValues` [#4993](https://github.com/open-telemetry/opentelemetry-js/pull/4993) * refactor(browser-detector): replace `ResourceAttributes` with `Attributes` [#5004](https://github.com/open-telemetry/opentelemetry-js/pull/5004) - * refactor(sdk-logs): replace `ResourceAttributes` with `Attributes` [#5005](https://github.com/open-telemetry/opentelemetry-js/pull/5005) @david-luna ## 0.53.0