Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,6 @@ public RtqElasticsearchIndexerSettings(string eventFeedKey, string rtqGraphitePa
RtqGraphitePathPrefix = rtqGraphitePathPrefix;
}

public static JsonSerializerOptions GetJsonOptions()
{
var defaultJsonSerializerOptions = new JsonSerializerOptions();
defaultJsonSerializerOptions.Converters.Add(new TruncateLongStringsConverter(500));
defaultJsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
defaultJsonSerializerOptions.Converters.Add(new TimestampJsonConverter());
defaultJsonSerializerOptions.Converters.Add(new TimeGuidJsonConverter());
defaultJsonSerializerOptions.Converters.Add(new OmitBinaryAndAbstractPropertyConverter());

return defaultJsonSerializerOptions;
}

public string EventFeedKey { get; }

public string RtqGraphitePathPrefix { get; }
Expand Down Expand Up @@ -66,4 +54,16 @@ public override string ToString()
$"IndexingThreadsCount: {IndexingThreadsCount}, " +
$"BulkIndexRequestTimeout: {BulkIndexRequestTimeout}";
}

public static readonly JsonSerializerOptions DefaultJsonSerializerSettings = new()
{
Converters =
{
new TruncateLongStringsConverter(500),
new JsonStringEnumConverter(),
new TimestampJsonConverter(),
new TimeGuidJsonConverter(),
new OmitBinaryAndAbstractPropertyConverter()
}
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
{
payload[2 * i] = JsonSerializer.Serialize(new {index = CreateIndexInfo(batch[i].TaskMeta)});
var taskIndexedInfo = BuildTaskIndexedInfo(batch[i].TaskMeta, batch[i].TaskExceptionInfos, batch[i].TaskData);
payload[2 * i + 1] = JsonSerializer.Serialize(taskIndexedInfo, RtqElasticsearchIndexerSettings.GetJsonOptions());
payload[2 * i + 1] = JsonSerializer.Serialize(taskIndexedInfo, RtqElasticsearchIndexerSettings.DefaultJsonSerializerSettings);
}
perfGraphiteReporter.ReportTiming("ElasticsearchClient_Bulk", () => elasticClient.Bulk<StringResponse>(PostData.MultiJson(payload), bulkRequestTimeout).DieIfBulkRequestFailed());
}
Expand Down Expand Up @@ -125,7 +125,7 @@
catch (Exception e)
{
logger.Error(e, "Failed to deserialize taskData for: {RtqTaskMeta}", new {RtqTaskMeta = taskMetaInformation});
return null;

Check warning on line 128 in Cassandra.DistributedTaskQueue.Monitoring/Indexer/TaskMetaProcessor.cs

View workflow job for this annotation

GitHub Actions / test (6.8.20)

Possible null reference return.

Check warning on line 128 in Cassandra.DistributedTaskQueue.Monitoring/Indexer/TaskMetaProcessor.cs

View workflow job for this annotation

GitHub Actions / test (7.17.4)

Possible null reference return.

Check warning on line 128 in Cassandra.DistributedTaskQueue.Monitoring/Indexer/TaskMetaProcessor.cs

View workflow job for this annotation

GitHub Actions / test (6.8.20)

Possible null reference return.

Check warning on line 128 in Cassandra.DistributedTaskQueue.Monitoring/Indexer/TaskMetaProcessor.cs

View workflow job for this annotation

GitHub Actions / test (7.17.4)

Possible null reference return.
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ internal static class JsonObjectExtensions
{
public static string ToPrettyJson<T>(this T obj)
{
var options = new JsonSerializerOptions();
options.Converters.Add(new JsonStringEnumConverter());
options.Converters.Add(new TimestampJsonConverter());
options.Converters.Add(new TimeGuidJsonConverter());

return JsonSerializer.Serialize(obj, options);
return JsonSerializer.Serialize(obj, jsonSerializerSettings);
}

private static readonly JsonSerializerOptions jsonSerializerSettings = new()
{
Converters =
{
new JsonStringEnumConverter(),
new TimestampJsonConverter(),
new TimeGuidJsonConverter()
}
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@ public override IRtqTaskData Read(ref Utf8JsonReader reader, Type typeToConvert,

public override void Write(Utf8JsonWriter writer, IRtqTaskData value, JsonSerializerOptions options)
{
JsonSerializerOptions jsonSerializerOptions = new();
jsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
jsonSerializerOptions.Converters.Add(new TimeGuidJsonConverter());
jsonSerializerOptions.Converters.Add(new TimestampJsonConverter());

JsonSerializer.Serialize(writer, value, jsonSerializerOptions);
JsonSerializer.Serialize(writer, value, staticSerializerOptions);
}

private static readonly JsonSerializerOptions staticSerializerOptions = new()
{
Converters =
{
new JsonStringEnumConverter(),
new TimeGuidJsonConverter(),
new TimestampJsonConverter()
}
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private void Check(TaskIndexedInfo source, TaskIndexedInfo expected)

private string Serialize(object obj)
{
return JsonSerializer.Serialize(obj, obj.GetType(), RtqElasticsearchIndexerSettings.GetJsonOptions());
return JsonSerializer.Serialize(obj, obj.GetType(), RtqElasticsearchIndexerSettings.DefaultJsonSerializerSettings);
}

private class Data
Expand Down
Loading