Skip to content

Commit c128995

Browse files
authored
Rename IncludeTraceId to IncludeActivityData (#391)
1 parent 0dfb5f1 commit c128995

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/Elastic.CommonSchema.NLog/EcsLayout.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal class NlogEcsDocumentCreationOptions : IEcsDocumentCreationOptions
2222
public bool IncludeHost { get; set; } = false;
2323
public bool IncludeProcess { get; set; } = false;
2424
public bool IncludeUser { get; set; } = false;
25-
public bool IncludeTraceId { get; set; } = false;
25+
public bool IncludeActivityData { get; set; } = false;
2626
}
2727

2828
/// <summary> An NLOG layout implementation that renders logs as ECS json</summary>

src/Elastic.CommonSchema.Serilog/EcsTextFormatterConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public class EcsTextFormatterConfiguration<TEcsDocument> : IEcsTextFormatterConf
5757
/// <inheritdoc cref="IEcsDocumentCreationOptions.IncludeUser"/>
5858
public bool IncludeUser { get; set; } = true;
5959

60-
/// <inheritdoc cref="IEcsDocumentCreationOptions.IncludeTraceId"/>
61-
public bool IncludeTraceId { get; set; } = true;
60+
/// <inheritdoc cref="IEcsDocumentCreationOptions.IncludeActivityData"/>
61+
public bool IncludeActivityData { get; set; } = true;
6262

6363
/// <inheritdoc cref="IEcsTextFormatterConfiguration.MapHttpAdapter"/>
6464
public IHttpAdapter? MapHttpAdapter { get; set; }

src/Elastic.CommonSchema/EcsDocument.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public interface IEcsDocumentCreationOptions
3838
/// <summary>
3939
/// Gets or sets a flag indicating whether TraceId/SpanId should be included in the message. Defaults to <c>true</c>.
4040
/// </summary>
41-
bool IncludeTraceId { get; set; }
41+
bool IncludeActivityData { get; set; }
4242
}
4343

4444
/// <summary>
@@ -94,7 +94,7 @@ public static TEcsDocument CreateNewWithDefaults<TEcsDocument>(
9494
if (options?.IncludeHost is null or true) doc.Host = GetHost(initialCache);
9595
if (options?.IncludeProcess is null or true) doc.Process = GetProcess(initialCache);
9696
if (options?.IncludeUser is null or true) doc.User = GetUser();
97-
if (options?.IncludeTraceId is null or true)
97+
if (options?.IncludeActivityData is null or true)
9898
SetActivityData(doc);
9999

100100
return doc;

src/Elastic.Extensions.Logging/Options/ElasticsearchLoggerOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ElasticsearchLoggerOptions : IEcsDocumentCreationOptions
3232
/// <summary>
3333
/// Gets or sets a flag indicating whether TraceId/SpanId should be included in the message. Defaults to <c>true</c>.
3434
/// </summary>
35-
public bool IncludeTraceId { get; set; } = true;
35+
public bool IncludeActivityData { get; set; } = true;
3636

3737
/// <summary>
3838
/// The data stream to log into, defaults to <c>logs-generic-default</c> if neither <see cref="DataStream"/> or <see cref="Index"/> is set.

0 commit comments

Comments
 (0)