Skip to content

Commit 0decdac

Browse files
CodeBlanchKielek
CodeBlanch
and
Kielek
authored
[geneva] Bump MessagePack to a more modern version in test project (open-telemetry#2177)
Co-authored-by: Piotr Kiełkowicz <[email protected]>
1 parent 6905370 commit 0decdac

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public void TableNameMappingTest(params string[] category)
183183

184184
Assert.Single(logRecordList);
185185
_ = exporter.SerializeLogRecord(logRecordList[0]);
186-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
186+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
187187
actualTableName = (fluentdData as object[])[0] as string;
188188
Assert.Equal(mapping.Value, actualTableName);
189189
logRecordList.Clear();
@@ -200,7 +200,7 @@ public void TableNameMappingTest(params string[] category)
200200

201201
Assert.Single(logRecordList);
202202
_ = exporter.SerializeLogRecord(logRecordList[0]);
203-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
203+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
204204
actualTableName = (fluentdData as object[])[0] as string;
205205
Assert.Equal(defaultLogTable, actualTableName);
206206
logRecordList.Clear();
@@ -302,7 +302,7 @@ public void PassThruTableMappingsWhenTheRuleIsEnabled()
302302
Assert.Single(logRecordList);
303303

304304
_ = exporter.SerializeLogRecord(logRecordList[0]);
305-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
305+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
306306
actualTableName = (fluentdData as object[])[0] as string;
307307
userInitializedCategoryToTableNameMappings.TryGetValue(mapping.Key, out var expectedTableNme);
308308
Assert.Equal(expectedTableNme, actualTableName);
@@ -319,7 +319,7 @@ public void PassThruTableMappingsWhenTheRuleIsEnabled()
319319
Assert.Single(logRecordList);
320320

321321
_ = exporter.SerializeLogRecord(logRecordList[0]);
322-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
322+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
323323
actualTableName = (fluentdData as object[])[0] as string;
324324
string expectedTableName = string.Empty;
325325
expectedTableName = mapping.Value;
@@ -418,7 +418,7 @@ public void SerializeILoggerScopes(bool hasCustomFields)
418418
_ = receiverSocket.Receive(serializedData);
419419
}
420420

421-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(serializedData, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
421+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(serializedData, MessagePack.Resolvers.ContractlessStandardResolver.Options);
422422
var signal = (fluentdData as object[])[0] as string;
423423
var TimeStampAndMappings = ((fluentdData as object[])[1] as object[])[0];
424424
var mapping = (TimeStampAndMappings as object[])[1] as Dictionary<object, object>;
@@ -540,7 +540,7 @@ public void SerializationTestWithILoggerLogMethod(bool includeFormattedMessage)
540540
// VALIDATE
541541
Assert.Single(logRecordList);
542542
_ = exporter.SerializeLogRecord(logRecordList[0]);
543-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
543+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
544544
var body = GetField(fluentdData, "body");
545545

546546
// Body gets populated as "Formatted Message" regardless of the value of `IncludeFormattedMessage`
@@ -564,7 +564,7 @@ public void SerializationTestWithILoggerLogMethod(bool includeFormattedMessage)
564564
// VALIDATE
565565
Assert.Single(logRecordList);
566566
_ = exporter.SerializeLogRecord(logRecordList[0]);
567-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
567+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
568568
body = GetField(fluentdData, "body");
569569

570570
// Body gets populated as "Formatted Message" regardless of the value of `IncludeFormattedMessage`
@@ -585,7 +585,7 @@ public void SerializationTestWithILoggerLogMethod(bool includeFormattedMessage)
585585
// VALIDATE
586586
Assert.Single(logRecordList);
587587
_ = exporter.SerializeLogRecord(logRecordList[0]);
588-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
588+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
589589
body = GetField(fluentdData, "body");
590590

591591
// Even though Formatter is null, body is populated with the state
@@ -609,7 +609,7 @@ public void SerializationTestWithILoggerLogMethod(bool includeFormattedMessage)
609609
// VALIDATE
610610
Assert.Single(logRecordList);
611611
_ = exporter.SerializeLogRecord(logRecordList[0]);
612-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
612+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
613613
Assert.Equal("Value1", GetField(fluentdData, "Key1"));
614614

615615
body = GetField(fluentdData, "body");
@@ -750,7 +750,7 @@ public void SerializationTestWithILoggerLogWithTemplates(bool hasTableNameMappin
750750
foreach (var logRecord in logRecordList)
751751
{
752752
_ = exporter.SerializeLogRecord(logRecord);
753-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
753+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
754754
this.AssertFluentdForwardModeForLogRecord(exporterOptions, fluentdData, logRecord);
755755
}
756756
}
@@ -942,7 +942,7 @@ public void SerializationTestForException()
942942
// VALIDATE
943943
Assert.Single(logRecordList);
944944
_ = exporter.SerializeLogRecord(logRecordList[0]);
945-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
945+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
946946
var exceptionType = GetField(fluentdData, "env_ex_type");
947947
var exceptionMessage = GetField(fluentdData, "env_ex_msg");
948948
Assert.Equal("System.Exception", exceptionType);
@@ -1035,7 +1035,7 @@ public void SerializationTestForEventName(EventNameExportMode eventNameExportMod
10351035
// VALIDATE
10361036
Assert.Single(logRecordList);
10371037
_ = exporter.SerializeLogRecord(logRecordList[0]);
1038-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
1038+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
10391039
var eventName = GetField(fluentdData, "env_name");
10401040

10411041
if (eventNameExportMode.HasFlag(EventNameExportMode.ExportAsPartAName))
@@ -1055,7 +1055,7 @@ public void SerializationTestForEventName(EventNameExportMode eventNameExportMod
10551055
logger.LogInformation(eventId: new EventId(1, "TestEventNameWithLogExtensionMethod"), "Hello from {Name} {Price}.", "tomato", 2.99);
10561056

10571057
_ = exporter.SerializeLogRecord(logRecordList[0]);
1058-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
1058+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
10591059
eventName = GetField(fluentdData, "env_name");
10601060

10611061
if (eventNameExportMode.HasFlag(EventNameExportMode.ExportAsPartAName))
@@ -1074,7 +1074,7 @@ public void SerializationTestForEventName(EventNameExportMode eventNameExportMod
10741074
logger.LogInformation(eventId: 1, "Hello from {Name} {Price}.", "tomato", 2.99);
10751075

10761076
_ = exporter.SerializeLogRecord(logRecordList[0]);
1077-
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
1077+
fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
10781078
eventName = GetField(fluentdData, "env_name");
10791079
Assert.Equal(hasTableNameMapping ? "CustomTableName" : "Log", eventName);
10801080
#endregion
@@ -1179,7 +1179,7 @@ public void SerializationTestForPartBName(bool hasCustomFields, bool hasNameInCu
11791179
// VALIDATE
11801180
Assert.Single(logRecordList);
11811181
_ = exporter.SerializeLogRecord(logRecordList[0]);
1182-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
1182+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
11831183
var signal = (fluentdData as object[])[0] as string;
11841184
var TimeStampAndMappings = ((fluentdData as object[])[1] as object[])[0];
11851185
var mapping = (TimeStampAndMappings as object[])[1] as Dictionary<object, object>;
@@ -1282,7 +1282,7 @@ public void SerializationTestForEventId()
12821282
// VALIDATE
12831283
Assert.Single(logRecordList);
12841284
_ = exporter.SerializeLogRecord(logRecordList[0]);
1285-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
1285+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
12861286

12871287
var TimeStampAndMappings = ((fluentdData as object[])[1] as object[])[0];
12881288
var mapping = (TimeStampAndMappings as object[])[1] as Dictionary<object, object>;

‎test/OpenTelemetry.Exporter.Geneva.Tests/GenevaTraceExporterTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public void GenevaTraceExporter_Serialization_Success(bool hasTableNameMapping,
257257
listener.ActivityStopped = (activity) =>
258258
{
259259
_ = exporter.SerializeActivity(activity);
260-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
260+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(m_buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
261261
this.AssertFluentdForwardModeForActivity(exporterOptions, fluentdData, activity, CS40_PART_B_MAPPING, dedicatedFields, customChecksForActivity);
262262
invocationCount++;
263263
};

‎test/OpenTelemetry.Exporter.Geneva.Tests/LogSerializationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private static Dictionary<object, object> GetExportedFieldsAfterLogging(Action<I
126126

127127
using var exporter = new MsgPackLogExporter(exporterOptions);
128128
_ = exporter.SerializeLogRecord(logRecordList[0]);
129-
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
129+
object fluentdData = MessagePack.MessagePackSerializer.Deserialize<object>(MsgPackLogExporter.Buffer.Value, MessagePack.Resolvers.ContractlessStandardResolver.Options);
130130

131131
return GetFields(fluentdData);
132132
}

‎test/OpenTelemetry.Exporter.Geneva.Tests/MessagePackSerializerTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ private void AssertBytes(byte[] expected, byte[] actual, int length)
2525
}
2626
}
2727

28-
private void MessagePackSerializer_TestSerialization(object obj)
28+
private void MessagePackSerializer_TestSerialization<T>(T value)
2929
{
3030
var buffer = new byte[64 * 1024];
31-
var length = MessagePackSerializer.Serialize(buffer, 0, obj);
32-
this.AssertBytes(MessagePack.MessagePackSerializer.Serialize(obj), buffer, length);
31+
var length = MessagePackSerializer.Serialize(buffer, 0, value);
32+
this.AssertBytes(MessagePack.MessagePackSerializer.Serialize(value), buffer, length);
3333
}
3434

3535
private void MessagePackSerializer_TestASCIIStringSerialization(string input)
@@ -134,7 +134,7 @@ private void MessagePackSerializer_TestUnicodeStringSerialization(string input)
134134
[Fact]
135135
public void MessagePackSerializer_Null()
136136
{
137-
this.MessagePackSerializer_TestSerialization(null);
137+
this.MessagePackSerializer_TestSerialization<object>(null);
138138
}
139139

140140
[Fact]

‎test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Grpc.Tools" Version="2.62.0" PrivateAssets="All" />
1717
<PackageReference Include="Grpc" Version="2.46.6" />
1818
<PackageReference Include="KaitaiStruct.Runtime.CSharp" Version="0.10.0" />
19-
<PackageReference Include="MessagePack" Version="1.9.11" />
19+
<PackageReference Include="MessagePack" Version="2.5.172" />
2020
<!--KaitaiStruct.Runtime.CSharp which is used to deserialize metrics data is not a strong-named assembly.
2121
StrongNamer signs any unsigned assemblies present in the project dependencies -->
2222
<PackageReference Include="StrongNamer" Version="0.2.5" />

0 commit comments

Comments
 (0)