9
9
#include < string>
10
10
#include < unordered_map>
11
11
#include < utility>
12
+ #include < vector>
12
13
13
- #include " opentelemetry/common/attribute_value.h"
14
14
#include " opentelemetry/common/key_value_iterable.h"
15
15
#include " opentelemetry/common/timestamp.h"
16
16
#include " opentelemetry/logs/log_record.h"
22
22
#include " opentelemetry/nostd/string_view.h"
23
23
#include " opentelemetry/nostd/unique_ptr.h"
24
24
#include " opentelemetry/nostd/variant.h"
25
+ #include " opentelemetry/sdk/common/attribute_utils.h"
25
26
#include " opentelemetry/sdk/logs/read_write_log_record.h"
26
27
#include " opentelemetry/sdk/resource/resource.h"
27
28
#include " opentelemetry/trace/span_id.h"
@@ -72,13 +73,9 @@ TEST(ReadWriteLogRecord, SetAndGet)
72
73
73
74
// Test that all fields match what was set
74
75
ASSERT_EQ (record.GetSeverity (), logs_api::Severity::kInvalid );
75
- if (nostd::holds_alternative<const char * >(record.GetBody ()))
76
+ if (nostd::holds_alternative<std::string >(record.GetBody ()))
76
77
{
77
- ASSERT_EQ (std::string (nostd::get<const char *>(record.GetBody ())), " Message" );
78
- }
79
- else if (nostd::holds_alternative<nostd::string_view>(record.GetBody ()))
80
- {
81
- ASSERT_TRUE (nostd::get<nostd::string_view>(record.GetBody ()) == " Message" );
78
+ ASSERT_EQ (std::string (nostd::get<std::string>(record.GetBody ())), " Message" );
82
79
}
83
80
ASSERT_TRUE (nostd::get<bool >(record.GetResource ().GetAttributes ().at (" res1" )));
84
81
ASSERT_EQ (nostd::get<int64_t >(record.GetAttributes ().at (" attr1" )), 314159 );
@@ -109,13 +106,13 @@ class TestBodyLogger : public opentelemetry::logs::Logger
109
106
}
110
107
}
111
108
112
- const opentelemetry::common::AttributeValue &GetLastLogRecord () const noexcept
109
+ const opentelemetry::sdk:: common::OwnedAttributeValue &GetLastLogRecord () const noexcept
113
110
{
114
111
return last_body_;
115
112
}
116
113
117
114
private:
118
- opentelemetry::common::AttributeValue last_body_;
115
+ opentelemetry::sdk:: common::OwnedAttributeValue last_body_;
119
116
};
120
117
121
118
// Define a basic LoggerProvider class that returns an instance of the logger class defined above
@@ -173,28 +170,19 @@ TEST(LogBody, BodyConversation)
173
170
174
171
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , " 128" );
175
172
ASSERT_TRUE (
176
- opentelemetry::nostd::holds_alternative<const char *>(real_logger->GetLastLogRecord ()) ||
177
- opentelemetry::nostd::holds_alternative<nostd::string_view>(real_logger->GetLastLogRecord ()));
178
- if (opentelemetry::nostd::holds_alternative<const char *>(real_logger->GetLastLogRecord ()))
179
- {
180
- ASSERT_EQ (nostd::string_view{" 128" },
181
- opentelemetry::nostd::get<const char *>(real_logger->GetLastLogRecord ()));
182
- }
183
- else
184
- {
185
- ASSERT_EQ (nostd::string_view{" 128" },
186
- opentelemetry::nostd::get<nostd::string_view>(real_logger->GetLastLogRecord ()));
187
- }
173
+ opentelemetry::nostd::holds_alternative<std::string>(real_logger->GetLastLogRecord ()));
174
+ ASSERT_EQ (nostd::string_view{" 128" },
175
+ opentelemetry::nostd::get<std::string>(real_logger->GetLastLogRecord ()));
188
176
189
177
{
190
178
bool data[] = {true , false , true };
191
179
nostd::span<const bool > data_span = data;
192
180
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
193
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const bool >>(
181
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector< bool >>(
194
182
real_logger->GetLastLogRecord ()));
195
183
196
- nostd::span< const bool > output =
197
- opentelemetry::nostd::get<nostd::span< const bool >>(real_logger->GetLastLogRecord ());
184
+ std::vector< bool > output =
185
+ opentelemetry::nostd::get<std::vector< bool >>(real_logger->GetLastLogRecord ());
198
186
199
187
ASSERT_EQ (data_span.size (), output.size ());
200
188
@@ -208,11 +196,11 @@ TEST(LogBody, BodyConversation)
208
196
int32_t data[] = {221 , 222 , 223 };
209
197
nostd::span<const int32_t > data_span = data;
210
198
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
211
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const int32_t >>(
199
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector< int32_t >>(
212
200
real_logger->GetLastLogRecord ()));
213
201
214
202
nostd::span<const int32_t > output =
215
- opentelemetry::nostd::get<nostd::span< const int32_t >>(real_logger->GetLastLogRecord ());
203
+ opentelemetry::nostd::get<std::vector< int32_t >>(real_logger->GetLastLogRecord ());
216
204
217
205
ASSERT_EQ (data_span.size (), output.size ());
218
206
@@ -226,11 +214,11 @@ TEST(LogBody, BodyConversation)
226
214
uint32_t data[] = {231 , 232 , 233 };
227
215
nostd::span<const uint32_t > data_span = data;
228
216
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
229
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const uint32_t >>(
217
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector< uint32_t >>(
230
218
real_logger->GetLastLogRecord ()));
231
219
232
- nostd::span< const uint32_t > output =
233
- opentelemetry::nostd::get<nostd::span< const uint32_t >>(real_logger->GetLastLogRecord ());
220
+ std::vector< uint32_t > output =
221
+ opentelemetry::nostd::get<std::vector< uint32_t >>(real_logger->GetLastLogRecord ());
234
222
235
223
ASSERT_EQ (data_span.size (), output.size ());
236
224
@@ -244,11 +232,11 @@ TEST(LogBody, BodyConversation)
244
232
int64_t data[] = {241 , 242 , 243 };
245
233
nostd::span<const int64_t > data_span = data;
246
234
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
247
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const int64_t >>(
235
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector< int64_t >>(
248
236
real_logger->GetLastLogRecord ()));
249
237
250
- nostd::span< const int64_t > output =
251
- opentelemetry::nostd::get<nostd::span< const int64_t >>(real_logger->GetLastLogRecord ());
238
+ std::vector< int64_t > output =
239
+ opentelemetry::nostd::get<std::vector< int64_t >>(real_logger->GetLastLogRecord ());
252
240
253
241
ASSERT_EQ (data_span.size (), output.size ());
254
242
@@ -262,11 +250,11 @@ TEST(LogBody, BodyConversation)
262
250
uint64_t data[] = {251 , 252 , 253 };
263
251
nostd::span<const uint64_t > data_span = data;
264
252
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
265
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const uint64_t >>(
253
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector< uint64_t >>(
266
254
real_logger->GetLastLogRecord ()));
267
255
268
- nostd::span< const uint64_t > output =
269
- opentelemetry::nostd::get<nostd::span< const uint64_t >>(real_logger->GetLastLogRecord ());
256
+ std::vector< uint64_t > output =
257
+ opentelemetry::nostd::get<std::vector< uint64_t >>(real_logger->GetLastLogRecord ());
270
258
271
259
ASSERT_EQ (data_span.size (), output.size ());
272
260
@@ -280,11 +268,11 @@ TEST(LogBody, BodyConversation)
280
268
uint8_t data[] = {161 , 162 , 163 };
281
269
nostd::span<const uint8_t > data_span = data;
282
270
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
283
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const uint8_t >>(
271
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector< uint8_t >>(
284
272
real_logger->GetLastLogRecord ()));
285
273
286
- nostd::span< const uint8_t > output =
287
- opentelemetry::nostd::get<nostd::span< const uint8_t >>(real_logger->GetLastLogRecord ());
274
+ std::vector< uint8_t > output =
275
+ opentelemetry::nostd::get<std::vector< uint8_t >>(real_logger->GetLastLogRecord ());
288
276
289
277
ASSERT_EQ (data_span.size (), output.size ());
290
278
@@ -298,11 +286,11 @@ TEST(LogBody, BodyConversation)
298
286
double data[] = {271.0 , 272.0 , 273.0 };
299
287
nostd::span<const double > data_span = data;
300
288
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
301
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const double >>(
289
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector< double >>(
302
290
real_logger->GetLastLogRecord ()));
303
291
304
- nostd::span< const double > output =
305
- opentelemetry::nostd::get<nostd::span< const double >>(real_logger->GetLastLogRecord ());
292
+ std::vector< double > output =
293
+ opentelemetry::nostd::get<std::vector< double >>(real_logger->GetLastLogRecord ());
306
294
307
295
ASSERT_EQ (data_span.size (), output.size ());
308
296
@@ -317,12 +305,11 @@ TEST(LogBody, BodyConversation)
317
305
nostd::string_view data[] = {data_origin[0 ], data_origin[1 ], data_origin[2 ]};
318
306
nostd::span<const nostd::string_view> data_span = data;
319
307
real_logger->EmitLogRecord (opentelemetry::logs::Severity::kInfo , data_span);
320
- ASSERT_TRUE (opentelemetry::nostd::holds_alternative<nostd::span< const nostd::string_view >>(
308
+ ASSERT_TRUE (opentelemetry::nostd::holds_alternative<std::vector<std::string >>(
321
309
real_logger->GetLastLogRecord ()));
322
310
323
- nostd::span<const nostd::string_view> output =
324
- opentelemetry::nostd::get<nostd::span<const nostd::string_view>>(
325
- real_logger->GetLastLogRecord ());
311
+ std::vector<std::string> output =
312
+ opentelemetry::nostd::get<std::vector<std::string>>(real_logger->GetLastLogRecord ());
326
313
327
314
ASSERT_EQ (data_span.size (), output.size ());
328
315
0 commit comments