Skip to content

Commit df426fb

Browse files
yuzurihaaayuzurihaaa
committed
wip: fix lint
1 parent b19ea83 commit df426fb

File tree

2 files changed

+36
-48
lines changed

2 files changed

+36
-48
lines changed

‎lib/src/sdk/logs/exporters/otlp_log_exporter.dart‎

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,9 @@ class OTLPLogExporter implements sdk.LogRecordExporter {
8787
final rsm = <sdk.Resource, Map<sdk.InstrumentationScope, List<pb_logs.LogRecord>>>{};
8888
for (final logRecord in logRecords) {
8989
final il = rsm[logRecord.resource] ?? <sdk.InstrumentationScope, List<pb_logs.LogRecord>>{};
90-
91-
if (logRecord.instrumentationScope != null) {
92-
il[logRecord.instrumentationScope!] = il[logRecord.instrumentationScope] ?? <pb_logs.LogRecord>[]
93-
..add(_logToProtobuf(logRecord));
94-
}
95-
if (logRecord.resource != null) {
96-
rsm[logRecord.resource!] = il;
97-
}
90+
il[logRecord.instrumentationScope] = il[logRecord.instrumentationScope] ?? <pb_logs.LogRecord>[]
91+
..add(_logToProtobuf(logRecord));
92+
rsm[logRecord.resource] = il;
9893
}
9994

10095
final rss = <pb_logs.ResourceLogs>[];
@@ -118,24 +113,18 @@ class OTLPLogExporter implements sdk.LogRecordExporter {
118113
}
119114

120115
pb_logs.LogRecord _logToProtobuf(sdk.ReadableLogRecord log) {
121-
var spanId = <int>[];
122-
var traceId = <int>[];
123-
if (log.spanContext != null) {
124-
spanId = log.spanContext!.spanId.get();
125-
traceId = log.spanContext!.traceId.get();
126-
}
127116
return pb_logs.LogRecord(
128-
timeUnixNano: log.timeStamp,
129-
severityNumber:
130-
log.severityNumber != null ? pg_logs_enum.SeverityNumber.valueOf(log.severityNumber!.index) : null,
131-
severityText: log.severityText,
132-
droppedAttributesCount: log.droppedAttributesCount,
133-
body: _attributeONEValueToProtobuf(log.body),
134-
attributes: (log.attributes?.keys ?? [])
135-
.map((key) => pb_common.KeyValue(key: key, value: _attributeValueToProtobuf(log.attributes!.get(key)!))),
136-
spanId: spanId,
137-
traceId: traceId,
138-
observedTimeUnixNano: log.observedTimestamp);
117+
timeUnixNano: Int64(log.timeStamp.microsecondsSinceEpoch),
118+
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log.severityNumber.index),
119+
severityText: log.severityText,
120+
droppedAttributesCount: log.droppedAttributesCount,
121+
body: _attributeONEValueToProtobuf(log.body),
122+
attributes: log.attributes.keys
123+
.map((key) => pb_common.KeyValue(key: key, value: _attributeValueToProtobuf(log.attributes.get(key)!))),
124+
spanId: log.spanContext.spanId.get(),
125+
traceId: log.spanContext.traceId.get(),
126+
observedTimeUnixNano: Int64(log.observedTimestamp.microsecondsSinceEpoch),
127+
);
139128
}
140129

141130
pb_common.AnyValue _attributeONEValueToProtobuf(Object value) {

‎test/unit/sdk/logs/exporters/otlp_log_exporter_test.dart‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:opentelemetry/src/experimental_api.dart' as api;
1212
import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
1313
import 'package:opentelemetry/src/sdk/logs/log_record_limit.dart';
1414
import 'package:opentelemetry/src/sdk/proto/opentelemetry/proto/collector/logs/v1/logs_service.pb.dart'
15-
as pb_log_service;
15+
as pb_log_service;
1616
import 'package:opentelemetry/src/sdk/proto/opentelemetry/proto/common/v1/common.pb.dart' as pb_common;
1717
import 'package:opentelemetry/src/sdk/proto/opentelemetry/proto/logs/v1/logs.pb.dart' as pb_logs;
1818
import 'package:opentelemetry/src/sdk/proto/opentelemetry/proto/logs/v1/logs.pbenum.dart' as pg_logs_enum;
@@ -36,7 +36,7 @@ void main() {
3636
test('sends logs', () {
3737
final resource = sdk.Resource([api.Attribute.fromString('service.name', 'bar')]);
3838
final instrumentationLibrary = sdk.InstrumentationScope('library_name', 'library_version', 'url://schema', []);
39-
final logLimit = LogRecordLimitsImpl(attributeCountLimit: 10, attributeValueLengthLimit: 5);
39+
final logLimit = LogRecordLimits(attributeCountLimit: 10, attributeValueLengthLimit: 5);
4040

4141
final tracer = sdk.TracerProviderBase().getTracer('test');
4242
final parent = tracer.startSpan('parent');
@@ -50,26 +50,25 @@ void main() {
5050
logRecordLimits: logLimit,
5151
context: context,
5252
timeProvider: FakeTimeProvider(now: Int64(123)))
53-
..setAttribute('key', 'value');
53+
..setAttribute(api.Attribute.fromString('key', 'value'));
5454

5555
final log2 = sdk.LogRecord(
5656
resource: resource,
5757
instrumentationScope: instrumentationLibrary,
5858
context: context,
5959
body: 2,
6060
severityNumber: api.Severity.fatal3,
61-
attributes: sdk.Attributes.empty()
62-
..addAll([
63-
api.Attribute.fromBoolean('fromBoolean', false),
64-
api.Attribute.fromDouble('fromDouble', 1.1),
65-
api.Attribute.fromInt('fromInt', 1),
66-
api.Attribute.fromBooleanList('fromBooleanList', [false]),
67-
api.Attribute.fromDoubleList('fromDoubleList', [1.1]),
68-
api.Attribute.fromIntList('fromIntList', [1]),
69-
]),
61+
attributes: [
62+
api.Attribute.fromBoolean('fromBoolean', false),
63+
api.Attribute.fromDouble('fromDouble', 1.1),
64+
api.Attribute.fromInt('fromInt', 1),
65+
api.Attribute.fromBooleanList('fromBooleanList', [false]),
66+
api.Attribute.fromDoubleList('fromDoubleList', [1.1]),
67+
api.Attribute.fromIntList('fromIntList', [1]),
68+
],
7069
logRecordLimits: logLimit,
7170
timeProvider: FakeTimeProvider(now: Int64(123)),
72-
)..setAttribute('key', 'value');
71+
)..setAttribute(api.Attribute.fromString('key', 'value'));
7372

7473
final log3 = sdk.LogRecord(
7574
resource: resource,
@@ -79,7 +78,7 @@ void main() {
7978
severityNumber: api.Severity.fatal3,
8079
logRecordLimits: logLimit,
8180
timeProvider: FakeTimeProvider(now: Int64(123)))
82-
..setAttribute('key', 'value');
81+
..setAttribute(api.Attribute.fromString('key', 'value'));
8382

8483
final log4 = sdk.LogRecord(
8584
resource: resource,
@@ -89,7 +88,7 @@ void main() {
8988
severityNumber: api.Severity.fatal3,
9089
logRecordLimits: logLimit,
9190
timeProvider: FakeTimeProvider(now: Int64(123)))
92-
..setAttribute('key', 'value');
91+
..setAttribute(api.Attribute.fromString('key', 'value'));
9392

9493
sdk.OTLPLogExporter(uri, httpClient: mockClient).export([log1, log2, log3, log4]);
9594

@@ -102,7 +101,7 @@ void main() {
102101
logRecords: [
103102
pb_logs.LogRecord(
104103
timeUnixNano: Int64(123),
105-
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log1.severityNumber!.index),
104+
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log1.severityNumber.index),
106105
attributes: [pb_common.KeyValue(key: 'key', value: pb_common.AnyValue(stringValue: 'value'))],
107106
traceId: parent.spanContext.traceId.get(),
108107
spanId: parent.spanContext.spanId.get(),
@@ -112,7 +111,7 @@ void main() {
112111
),
113112
pb_logs.LogRecord(
114113
timeUnixNano: Int64(123),
115-
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log2.severityNumber!.index),
114+
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log2.severityNumber.index),
116115
attributes: [
117116
pb_common.KeyValue(key: 'fromBoolean', value: pb_common.AnyValue(boolValue: false)),
118117
pb_common.KeyValue(key: 'fromDouble', value: pb_common.AnyValue(doubleValue: 1.1)),
@@ -145,7 +144,7 @@ void main() {
145144
),
146145
pb_logs.LogRecord(
147146
timeUnixNano: Int64(123),
148-
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log1.severityNumber!.index),
147+
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log1.severityNumber.index),
149148
attributes: [pb_common.KeyValue(key: 'key', value: pb_common.AnyValue(stringValue: 'value'))],
150149
traceId: parent.spanContext.traceId.get(),
151150
spanId: parent.spanContext.spanId.get(),
@@ -155,7 +154,7 @@ void main() {
155154
),
156155
pb_logs.LogRecord(
157156
timeUnixNano: Int64(123),
158-
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log1.severityNumber!.index),
157+
severityNumber: pg_logs_enum.SeverityNumber.valueOf(log1.severityNumber.index),
159158
attributes: [pb_common.KeyValue(key: 'key', value: pb_common.AnyValue(stringValue: 'value'))],
160159
traceId: parent.spanContext.traceId.get(),
161160
spanId: parent.spanContext.spanId.get(),
@@ -179,7 +178,7 @@ void main() {
179178

180179
test('does not send log when shutdown', () {
181180
final instrumentationLibrary = sdk.InstrumentationScope('library_name', 'library_version', 'url://schema', []);
182-
final logLimit = LogRecordLimitsImpl(attributeCountLimit: 10, attributeValueLengthLimit: 5);
181+
final logLimit = LogRecordLimits(attributeCountLimit: 10, attributeValueLengthLimit: 5);
183182

184183
final tracer = sdk.TracerProviderBase().getTracer('test');
185184
final parent = tracer.startSpan('parent');
@@ -192,7 +191,7 @@ void main() {
192191
severityNumber: api.Severity.fatal3,
193192
logRecordLimits: logLimit,
194193
timeProvider: FakeTimeProvider(now: Int64(123)))
195-
..setAttribute('key', 'value');
194+
..setAttribute(api.Attribute.fromString('key', 'value'));
196195

197196
sdk.OTLPLogExporter(uri, httpClient: mockClient)
198197
..shutdown()
@@ -204,7 +203,7 @@ void main() {
204203

205204
test('supplies HTTP headers', () {
206205
final instrumentationLibrary = sdk.InstrumentationScope('library_name', 'library_version', 'url://schema', []);
207-
final logLimit = LogRecordLimitsImpl(attributeCountLimit: 10, attributeValueLengthLimit: 5);
206+
final logLimit = LogRecordLimits(attributeCountLimit: 10, attributeValueLengthLimit: 5);
208207

209208
final tracer = sdk.TracerProviderBase().getTracer('test');
210209
final parent = tracer.startSpan('parent');
@@ -217,7 +216,7 @@ void main() {
217216
logRecordLimits: logLimit,
218217
context: context,
219218
timeProvider: FakeTimeProvider(now: Int64(123)))
220-
..setAttribute('key', 'value');
219+
..setAttribute(api.Attribute.fromString('key', 'value'));
221220

222221
final suppliedHeaders = {
223222
'header-param-key-1': 'header-param-value-1',

0 commit comments

Comments
 (0)