Skip to content

refactor(resources)!: replace ResourceAttributes with Attributes #5016

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

Merged
pichlermarc merged 8 commits into from
Sep 26, 2024
Merged

refactor(resources)!: replace ResourceAttributes with Attributes #5016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a16eebb
feat(resources): replace ResourceAttributes with Attributes
david-luna Sep 23, 2024
c9388c3
chore(resources): update peer dependencies
david-luna Sep 23, 2024
fadb557
Merge branch 'next' into dluna/4175-replace-attrib-interfaces-resourc…
david-luna Sep 25, 2024
bd800af
feat(resources): lint fixes
david-luna Sep 25, 2024
f634e30
Merge branch 'next' into dluna/4175-replace-attrib-interfaces-resourc…
david-luna Sep 25, 2024
e674e9d
chore(resources): merge next
david-luna Sep 25, 2024
0ce74f4
Merge branch 'dluna/4175-replace-attrib-interfaces-resources-package'…
david-luna Sep 25, 2024
15bb139
chore(resources): replace leftovers
david-luna Sep 25, 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
Prev Previous commit
chore(resources): replace leftovers
  • Loading branch information
@david-luna
david-luna committed Sep 25, 2024
commit 15bb139ddad801079114f04f53492d8bd7b8587b
6 changes: 3 additions & 3 deletions packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ import {
Span,
SpanExporter,
} from '../../../src';
import { context } from '@opentelemetry/api';
import { Attributes, context } from '@opentelemetry/api';
Copy link
Contributor Author

@david-luna david-luna Sep 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note for reviewer: leftover from #5009

import { TestRecordOnlySampler } from './TestRecordOnlySampler';
import { TestTracingSpanExporter } from './TestTracingSpanExporter';
import { TestStackContextManager } from './TestStackContextManager';
import { BatchSpanProcessorBase } from '../../../src/export/BatchSpanProcessorBase';
import { Resource, ResourceAttributes } from '@opentelemetry/resources';
import { Resource } from '@opentelemetry/resources';

function createSampledSpan(spanName: string): Span {
const tracer = new BasicTracerProvider({
Expand Down Expand Up @@ -442,7 +442,7 @@ describe('BatchSpanProcessorBase', () => {
const tracer = new BasicTracerProvider({
resource: new Resource(
{},
new Promise<ResourceAttributes>(resolve => {
new Promise<Attributes>(resolve => {
setTimeout(() => resolve({ async: 'fromasync' }), 1);
})
),
Expand Down
7 changes: 4 additions & 3 deletions packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import {
} from '../../../src';
import { TestStackContextManager } from './TestStackContextManager';
import { TestTracingSpanExporter } from './TestTracingSpanExporter';
import { Resource, ResourceAttributes } from '@opentelemetry/resources';
import { Attributes } from '@opentelemetry/api';
Copy link
Contributor Author

@david-luna david-luna Sep 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note for reviewer: leftover from #5009

import { Resource } from '@opentelemetry/resources';
import { TestExporterWithDelay } from './TestExporterWithDelay';

describe('SimpleSpanProcessor', () => {
Expand Down Expand Up @@ -164,7 +165,7 @@ describe('SimpleSpanProcessor', () => {
const providerWithAsyncResource = new BasicTracerProvider({
resource: new Resource(
{},
new Promise<ResourceAttributes>(resolve => {
new Promise<Attributes>(resolve => {
setTimeout(() => resolve({ async: 'fromasync' }), 1);
})
),
Expand Down Expand Up @@ -205,7 +206,7 @@ describe('SimpleSpanProcessor', () => {
const providerWithAsyncResource = new BasicTracerProvider({
resource: new Resource(
{},
new Promise<ResourceAttributes>(resolve => {
new Promise<Attributes>(resolve => {
setTimeout(() => resolve({ async: 'fromasync' }), 1);
})
),
Expand Down