Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2

### :rocket: Features

* feat(sdk-logs): implement log creation metrics [#6433](https://github.com/open-telemetry/opentelemetry-js/pull/6433) @anuraaga
* feat(sdk-logs): implement log creation metrics [#6433](https://github.com/open-telemetry/opentelemetry-js/pull/6433) @anuraaga

### :bug: Bug Fixes

fix(opentelemetry-resources): do not discard OTEL_RESOURCE_ATTRIBUTES when it contains empty kv pairs
* fix(opentelemetry-resources): do not discard OTEL_RESOURCE_ATTRIBUTES when it contains empty kv pairs
* fix(otlp-transformer): add check for possible unsafe json parse [#6588](https://github.com/open-telemetry/opentelemetry-js/pull/6588) @maryliag

### :books: Documentation

Expand Down
10 changes: 9 additions & 1 deletion experimental/packages/otlp-transformer/src/logs/json/logs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { ReadableLogRecord } from '@opentelemetry/sdk-logs';
import { createExportLogsServiceRequest } from '../internal';
import type { IExportLogsServiceResponse } from '../export-response';
import { JSON_ENCODER } from '../../common/utils';
import { diag } from '@opentelemetry/api';

/*
* @experimental this serializer may receive breaking changes in minor versions, pin this package's version when using this constant
Expand All @@ -25,6 +26,13 @@ export const JsonLogsSerializer: ISerializer<
return {};
}
const decoder = new TextDecoder();
return JSON.parse(decoder.decode(arg)) as IExportLogsServiceResponse;
try {
return JSON.parse(decoder.decode(arg)) as IExportLogsServiceResponse;
} catch (err) {
diag.warn(
`Failed to parse logs export response: ${err.message}. Returning empty response`
);
return {};
Comment thread
maryliag marked this conversation as resolved.
}
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { ResourceMetrics } from '@opentelemetry/sdk-metrics';
import { createExportMetricsServiceRequest } from '../internal';
import type { IExportMetricsServiceResponse } from '../export-response';
import { JSON_ENCODER } from '../../common/utils';
import { diag } from '@opentelemetry/api';

export const JsonMetricsSerializer: ISerializer<
ResourceMetrics,
Expand All @@ -22,6 +23,13 @@ export const JsonMetricsSerializer: ISerializer<
return {};
}
const decoder = new TextDecoder();
return JSON.parse(decoder.decode(arg)) as IExportMetricsServiceResponse;
try {
return JSON.parse(decoder.decode(arg)) as IExportMetricsServiceResponse;
} catch (err) {
diag.warn(
`Failed to parse metrics export response: ${err.message}. Returning empty response`
);
return {};
}
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { IExportTraceServiceResponse } from '../export-response';
import { createExportTraceServiceRequest } from '../internal';
import { JSON_ENCODER } from '../../common/utils';
import { diag } from '@opentelemetry/api';

export const JsonTraceSerializer: ISerializer<
ReadableSpan[],
Expand All @@ -22,6 +23,13 @@ export const JsonTraceSerializer: ISerializer<
return {};
}
const decoder = new TextDecoder();
return JSON.parse(decoder.decode(arg)) as IExportTraceServiceResponse;
try {
return JSON.parse(decoder.decode(arg)) as IExportTraceServiceResponse;
} catch (err) {
diag.warn(
`Failed to parse trace export response: ${err.message}. Returning empty response`
);
return {};
}
},
};
15 changes: 15 additions & 0 deletions experimental/packages/otlp-transformer/test/logs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,21 @@ describe('Logs', () => {
);
});

it('deserializes a malformed response', () => {
const malformedResponse =
'{ "partialSuccess": { "errorMessage": foo, "rejectedLogRecords": 1, }';
const encoder = new TextEncoder();
const encodedResponse = encoder.encode(malformedResponse);
const deserializedResponse =
JsonLogsSerializer.deserializeResponse(encodedResponse);

assert.deepEqual(
deserializedResponse,
{},
'Malformed response should result in an empty object being returned'
);
});

it('does not throw when deserializing an empty response', () => {
assert.doesNotThrow(() =>
JsonLogsSerializer.deserializeResponse(new Uint8Array([]))
Expand Down
15 changes: 15 additions & 0 deletions experimental/packages/otlp-transformer/test/metrics.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,21 @@ describe('Metrics', () => {
);
});

it('deserializes a malformed response', () => {
const malformedResponse =
'{ "partialSuccess": { "errorMessage": foo, "rejectedLogRecords": 1, }';
const encoder = new TextEncoder();
const encodedResponse = encoder.encode(malformedResponse);
const deserializedResponse =
JsonMetricsSerializer.deserializeResponse(encodedResponse);

assert.deepEqual(
deserializedResponse,
{},
'Malformed response should result in an empty object being returned'
);
});

it('does not throw when deserializing an empty response', () => {
assert.doesNotThrow(() =>
JsonMetricsSerializer.deserializeResponse(new Uint8Array([]))
Expand Down
15 changes: 15 additions & 0 deletions experimental/packages/otlp-transformer/test/trace.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,21 @@ describe('Trace', () => {
);
});

it('deserializes a malformed response', () => {
const malformedResponse =
'{ "partialSuccess": { "errorMessage": foo, "rejectedLogRecords": 1, }';
const encoder = new TextEncoder();
const encodedResponse = encoder.encode(malformedResponse);
const deserializedResponse =
JsonTraceSerializer.deserializeResponse(encodedResponse);

assert.deepEqual(
deserializedResponse,
{},
'Malformed response should result in an empty object being returned'
);
});

it('does not throw when deserializing an empty response', () => {
assert.doesNotThrow(() =>
JsonTraceSerializer.deserializeResponse(new Uint8Array([]))
Expand Down
Loading