@@ -120,39 +120,6 @@ func TestProcessLogsResponse(t *testing.T) {
120
120
121
121
require .Contains (t , logsFieldMap , "number" )
122
122
require .Equal (t , data .FieldTypeNullableFloat64 , logsFieldMap ["number" ].Type ())
123
-
124
- require .Contains (t , logsFieldMap , "_source" )
125
- require .Equal (t , data .FieldTypeNullableJSON , logsFieldMap ["_source" ].Type ())
126
-
127
- actualJson1 , err := json .Marshal (logsFieldMap ["_source" ].At (0 ).(* json.RawMessage ))
128
- require .NoError (t , err )
129
- actualJson2 , err := json .Marshal (logsFieldMap ["_source" ].At (1 ).(* json.RawMessage ))
130
- require .NoError (t , err )
131
-
132
- expectedJson1 := `
133
- {
134
- "fields.lvl": "debug",
135
- "host": "djisaodjsoad",
136
- "level": "debug",
137
- "line": "hello, i am a message",
138
- "number": 1,
139
- "testtime": "2019-06-24T09:51:19.765Z",
140
- "line": "hello, i am a message"
141
- }
142
- `
143
-
144
- expectedJson2 := `
145
- {
146
- "testtime": "2019-06-24T09:52:19.765Z",
147
- "host": "dsalkdakdop",
148
- "number": 2,
149
- "line": "hello, i am also message",
150
- "level": "error",
151
- "fields.lvl": "info"
152
- }`
153
-
154
- require .JSONEq (t , expectedJson1 , string (actualJson1 ))
155
- require .JSONEq (t , expectedJson2 , string (actualJson2 ))
156
123
})
157
124
158
125
t .Run ("creates correct level field" , func (t * testing.T ) {
@@ -307,27 +274,24 @@ func TestProcessLogsResponse(t *testing.T) {
307
274
require .Len (t , dataframes , 1 )
308
275
frame := dataframes [0 ]
309
276
310
- require .Equal (t , 12 , len (frame .Fields ))
277
+ require .Equal (t , 11 , len (frame .Fields ))
311
278
// Fields have the correct length
312
279
require .Equal (t , 2 , frame .Fields [0 ].Len ())
313
280
// First field is timeField
314
281
require .Equal (t , data .FieldTypeNullableTime , frame .Fields [0 ].Type ())
315
- // Second is log line
316
282
require .Equal (t , data .FieldTypeNullableString , frame .Fields [1 ].Type ())
317
- require .Equal (t , "line" , frame .Fields [1 ].Name )
318
283
// Correctly renames lvl field to level
319
- require .Equal (t , "level" , frame .Fields [6 ].Name )
284
+ require .Equal (t , "level" , frame .Fields [4 ].Name )
285
+ require .Equal (t , "line" , frame .Fields [5 ].Name )
320
286
// Correctly uses string types
321
287
require .Equal (t , data .FieldTypeNullableString , frame .Fields [1 ].Type ())
322
288
// Correctly detects float64 types
323
- require .Equal (t , data .FieldTypeNullableFloat64 , frame .Fields [4 ].Type ())
324
- // Correctly detects json types
325
- require .Equal (t , data .FieldTypeNullableJSON , frame .Fields [2 ].Type ())
289
+ require .Equal (t , data .FieldTypeNullableFloat64 , frame .Fields [2 ].Type ())
326
290
// Correctly flattens fields
327
- require .Equal (t , "nested.field.double_nested" , frame .Fields [8 ].Name )
328
- require .Equal (t , data .FieldTypeNullableString , frame .Fields [8 ].Type ())
291
+ require .Equal (t , "nested.field.double_nested" , frame .Fields [7 ].Name )
292
+ require .Equal (t , data .FieldTypeNullableString , frame .Fields [7 ].Type ())
329
293
// Correctly detects type even if first value is null
330
- require .Equal (t , data .FieldTypeNullableJSON , frame .Fields [10 ].Type ())
294
+ require .Equal (t , data .FieldTypeNullableJSON , frame .Fields [9 ].Type ())
331
295
})
332
296
}
333
297
0 commit comments