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.

Sign up for GitHub

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

Jump to bottom

refactor(sdk-logs): replace ResourceAtrributes with Attributes #5005

Merged
merged 4 commits into from
Sep 20, 2024
Merged

refactor(sdk-logs): replace ResourceAtrributes with Attributes #5005

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd1d6cb
refactor(sdk-logs): replace ResourceAtrributes with Attributes
david-luna Sep 20, 2024
7ab13c2
Merge branch 'main' into dluna/4175-replace-attrib-interfaces-sdk-logs
david-luna Sep 20, 2024
c69e64a
chore: add CHANGELOG entry
david-luna Sep 20, 2024
c9f3b5d
Update experimental/CHANGELOG.md
pichlermarc Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions experimental/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

pichlermarc marked this conversation as resolved.
Show resolved Hide resolved
* 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
Expand Down
5 changes: 3 additions & 2 deletions experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<BufferConfig> {
onInit() {}
Expand Down Expand Up @@ -316,7 +317,7 @@ describe('BatchLogRecordProcessorBase', () => {
const processor = new BatchLogRecordProcessor(exporter);
const asyncResource = new Resource(
{},
new Promise<ResourceAttributes>(resolve => {
new Promise<Attributes>(resolve => {
setTimeout(() => resolve({ async: 'fromasync' }), 1);
})
);
Expand Down
7 changes: 4 additions & 3 deletions experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -121,7 +122,7 @@ describe('SimpleLogRecordProcessor', () => {
const exporter = new InMemoryLogRecordExporter();
const asyncResource = new Resource(
{},
new Promise<ResourceAttributes>(resolve => {
new Promise<Attributes>(resolve => {
setTimeout(() => resolve({ async: 'fromasync' }), 1);
})
);
Expand All @@ -143,7 +144,7 @@ describe('SimpleLogRecordProcessor', () => {
const testExporterWithDelay = new TestExporterWithDelay();
const asyncResource = new Resource(
{},
new Promise<ResourceAttributes>(resolve => {
new Promise<Attributes>(resolve => {
setTimeout(() => resolve({ async: 'fromasync' }), 1);
})
);
Expand Down