Skip to content

Commit d881dd1

Browse files
committed
format
1 parent 13fcf18 commit d881dd1

File tree

3 files changed

+40
-28
lines changed

3 files changed

+40
-28
lines changed

packages/telemetry/src/logging/fetch-transport.edge.test.ts

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
2+
* @license
23
* Copyright The OpenTelemetry Authors
34
* Copyright 2025 Google LLC
4-
*
5+
*
56
* This file has been modified by Google LLC
67
*
78
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,15 +21,19 @@
2021
import * as sinon from 'sinon';
2122
import * as assert from 'assert';
2223
import { FetchTransportEdge } from './fetch-transport.edge';
23-
import { ExportResponseRetryable, ExportResponseFailure, ExportResponseSuccess } from '@opentelemetry/otlp-exporter-base';
24+
import {
25+
ExportResponseRetryable,
26+
ExportResponseFailure,
27+
ExportResponseSuccess
28+
} from '@opentelemetry/otlp-exporter-base';
2429

2530
const testTransportParameters = {
2631
url: 'http://example.test',
2732
headers: () => ({
2833
foo: 'foo-value',
2934
bar: 'bar-value',
30-
'Content-Type': 'application/json',
31-
}),
35+
'Content-Type': 'application/json'
36+
})
3237
};
3338

3439
const requestTimeout = 1000;
@@ -40,7 +45,7 @@ describe('FetchTransportEdge', () => {
4045
});
4146

4247
describe('send', () => {
43-
it('returns success when request succeeds', (done) => {
48+
it('returns success when request succeeds', done => {
4449
// arrange
4550
const fetchStub = sinon
4651
.stub(globalThis, 'fetch')
@@ -65,9 +70,9 @@ describe('FetchTransportEdge', () => {
6570
headers: {
6671
foo: 'foo-value',
6772
bar: 'bar-value',
68-
'Content-Type': 'application/json',
73+
'Content-Type': 'application/json'
6974
},
70-
body: testPayload,
75+
body: testPayload
7176
}
7277
);
7378
done();
@@ -77,7 +82,7 @@ describe('FetchTransportEdge', () => {
7782
}, done /* catch any rejections */);
7883
});
7984

80-
it('returns failure when request fails', (done) => {
85+
it('returns failure when request fails', done => {
8186
// arrange
8287
sinon
8388
.stub(globalThis, 'fetch')
@@ -96,7 +101,7 @@ describe('FetchTransportEdge', () => {
96101
}, done /* catch any rejections */);
97102
});
98103

99-
it('returns retryable when request is retryable', (done) => {
104+
it('returns retryable when request is retryable', done => {
100105
// arrange
101106
sinon
102107
.stub(globalThis, 'fetch')
@@ -121,7 +126,7 @@ describe('FetchTransportEdge', () => {
121126
}, done /* catch any rejections */);
122127
});
123128

124-
it('returns failure when request times out', (done) => {
129+
it('returns failure when request times out', done => {
125130
// arrange
126131
const abortError = new Error('aborted request');
127132
abortError.name = 'AbortError';
@@ -146,7 +151,7 @@ describe('FetchTransportEdge', () => {
146151
clock.tick(requestTimeout + 100);
147152
});
148153

149-
it('returns failure when no server exists', (done) => {
154+
it('returns failure when no server exists', done => {
150155
// arrange
151156
sinon.stub(globalThis, 'fetch').throws(new Error('fetch failed'));
152157
const clock = sinon.useFakeTimers();
@@ -169,4 +174,4 @@ describe('FetchTransportEdge', () => {
169174
clock.tick(requestTimeout + 100);
170175
});
171176
});
172-
});
177+
});

packages/telemetry/src/logging/fetch-transport.edge.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
2+
* @license
23
* Copyright The OpenTelemetry Authors
34
* Copyright 2025 Google LLC
4-
*
5+
*
56
* This file has been modified by Google LLC
67
*
78
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +18,10 @@
1718
* limitations under the License.
1819
*/
1920

20-
import { IExporterTransport, ExportResponse } from '@opentelemetry/otlp-exporter-base';
21+
import {
22+
IExporterTransport,
23+
ExportResponse
24+
} from '@opentelemetry/otlp-exporter-base';
2125
import { diag } from '@opentelemetry/api';
2226

2327
function isExportRetryable(statusCode: number): boolean {
@@ -53,7 +57,7 @@ export interface FetchTransportParameters {
5357

5458
/**
5559
* An implementation of IExporterTransport that can be used in the Edge Runtime.
56-
*
60+
*
5761
* @internal
5862
*/
5963
export class FetchTransportEdge implements IExporterTransport {
@@ -84,15 +88,15 @@ export class FetchTransportEdge implements IExporterTransport {
8488
}
8589
return {
8690
status: 'failure',
87-
error: new Error('Fetch request failed with non-retryable status'),
91+
error: new Error('Fetch request failed with non-retryable status')
8892
};
8993
} catch (error) {
9094
if (error instanceof Error) {
91-
return {status: 'failure', error,};
95+
return { status: 'failure', error };
9296
}
9397
return {
9498
status: 'failure',
95-
error: new Error(`Fetch request errored: ${error}`),
99+
error: new Error(`Fetch request errored: ${error}`)
96100
};
97101
} finally {
98102
clearTimeout(timeout);
@@ -102,4 +106,4 @@ export class FetchTransportEdge implements IExporterTransport {
102106
shutdown(): void {
103107
// Intentionally left empty, nothing to do.
104108
}
105-
}
109+
}

packages/telemetry/src/logging/logger-provider.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ import {
1919
LoggerProvider,
2020
BatchLogRecordProcessor,
2121
ReadableLogRecord,
22-
LogRecordExporter,
22+
LogRecordExporter
2323
} from '@opentelemetry/sdk-logs';
2424
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
2525
import { resourceFromAttributes } from '@opentelemetry/resources';
2626
import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
2727
import { JsonLogsSerializer } from '@opentelemetry/otlp-transformer';
2828
import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base';
29-
import { OTLPExporterBase, createOtlpNetworkExportDelegate } from '@opentelemetry/otlp-exporter-base';
29+
import {
30+
OTLPExporterBase,
31+
createOtlpNetworkExportDelegate
32+
} from '@opentelemetry/otlp-exporter-base';
3033
import { FetchTransportEdge } from './fetch-transport.edge';
3134

3235
/**
@@ -44,18 +47,18 @@ export function createLoggerProvider(): LoggerProvider {
4447
// We need a slightly custom implementation for the Edge Runtime, because it doesn't have access
4548
// to many features available in Node.
4649
const logExporter = new OTLPLogExporterEdge({ url: otlpEndpoint });
47-
const provider = new LoggerProvider({
50+
const provider = new LoggerProvider({
4851
resource,
4952
processors: [new BatchLogRecordProcessor(logExporter)],
5053
logRecordLimits: {}
5154
});
5255
return provider;
5356
} else {
54-
const logExporter = new OTLPLogExporter({ url: otlpEndpoint });
55-
return new LoggerProvider({
56-
resource,
57-
processors: [new BatchLogRecordProcessor(logExporter)]
58-
});
57+
const logExporter = new OTLPLogExporter({ url: otlpEndpoint });
58+
return new LoggerProvider({
59+
resource,
60+
processors: [new BatchLogRecordProcessor(logExporter)]
61+
});
5962
}
6063
}
6164

@@ -78,7 +81,7 @@ class OTLPLogExporterEdge
7881
headers: () => ({
7982
'Content-Type': 'application/json'
8083
})
81-
}),
84+
})
8285
)
8386
);
8487
}

0 commit comments

Comments
 (0)