open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove MessageEvent to address issue #16, use SpanContext.Blank vs Invalid to match Java implementation, xml doc cleanup on touched files, (#38)

This commit is contained in:
Tim Wegner 2019-05-20 14:59:58 -07:00 committed by Sergey Kanzhelev
parent 7b854b4fff
commit 5549850092
35 changed files with 223 additions and 862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenTelemetry.Abstractions/Trace/Event.cs
View File

@ -55,7 +55,7 @@ namespace OpenTelemetry.Trace
/// Returns a new <see cref="Event"/> with the provided name and set of attributes.
/// </summary>
/// <param name="name">The text name for the <see cref="Event"/>.</param>
/// <param name="attributes">The <see cref="IDictionary{string, IAttributeValue}"/> of attributes for the <see cref="Event"/>.</param>
/// <param name="attributes">The <see cref="IDictionary{String, IAttributeValue}"/> of attributes for the <see cref="Event"/>.</param>
/// <returns>A new <see cref="Event"/> with the provided name and set of attributes.</returns>
/// <exception cref="ArgumentNullException">If <c>name</c> or <c>attributes</c> is <c>null</c>.</exception>
public static IEvent Create(string name, IDictionary<string, IAttributeValue> attributes)

5
src/OpenTelemetry.Abstractions/Trace/Export/ISpanData.cs
View File

@ -58,11 +58,6 @@ namespace OpenTelemetry.Trace.Export
/// </summary>
ITimedEvents<IEvent> Events { get; }
/// <summary>
/// Gets the collection of <see cref="ITimedEvents{IMessageEvent}"/> objects.
/// </summary>
ITimedEvents<IMessageEvent> MessageEvents { get; }
/// <summary>
/// Gets the <see cref="ILinks"/> collection.
/// </summary>

23
src/OpenTelemetry.Abstractions/Trace/Export/SpanData.cs
View File

@ -32,7 +32,6 @@ namespace OpenTelemetry.Trace.Export
Timestamp startTimestamp,
IAttributes attributes,
ITimedEvents<IEvent> events,
ITimedEvents<IMessageEvent> messageEvents,
ILinks links,
int? childSpanCount,
Status status,
@ -46,7 +45,6 @@ namespace OpenTelemetry.Trace.Export
this.StartTimestamp = startTimestamp ?? throw new ArgumentNullException(nameof(startTimestamp));
this.Attributes = attributes ?? Export.Attributes.Create(new Dictionary<string, IAttributeValue>(), 0);
this.Events = events ?? TimedEvents<IEvent>.Create(Enumerable.Empty<ITimedEvent<IEvent>>(), 0);
this.MessageEvents = messageEvents ?? TimedEvents<IMessageEvent>.Create(Enumerable.Empty<ITimedEvent<IMessageEvent>>(), 0);
this.Links = links ?? LinkList.Create(Enumerable.Empty<ILink>(), 0);
this.ChildSpanCount = childSpanCount;
this.Status = status;
@ -72,9 +70,6 @@ namespace OpenTelemetry.Trace.Export
/// <inheritdoc/>
public ITimedEvents<IEvent> Events { get; }
/// <inheritdoc/>
public ITimedEvents<IMessageEvent> MessageEvents { get; }
/// <inheritdoc/>
public ILinks Links { get; }
@ -103,7 +98,6 @@ namespace OpenTelemetry.Trace.Export
/// <param name="startTimestamp">The start <see cref="Timestamp"/> of the <see cref="ISpan"/>.</param>
/// <param name="attributes">The <see cref="IAttributes"/> associated with the <see cref="ISpan"/>.</param>
/// <param name="events">The <see cref="Events"/> associated with the <see cref="ISpan"/>.</param>
/// <param name="messageEvents">The <see cref="MessageEvents"/>associated with the <see cref="ISpan"/>.</param>
/// <param name="links">The <see cref="ILinks"/> associated with the <see cref="ISpan"/>.</param>
/// <param name="childSpanCount">The <see cref="ChildSpanCount"/> associated with the <see cref="ISpan"/>.</param>
/// <param name="status">The <see cref="Status"/> of the <see cref="ISpan"/>.</param>
@ -118,25 +112,24 @@ namespace OpenTelemetry.Trace.Export
Timestamp startTimestamp,
IAttributes attributes,
ITimedEvents<IEvent> events,
ITimedEvents<IMessageEvent> messageEvents,
ILinks links,
int? childSpanCount,
Status status,
SpanKind kind,
Timestamp endTimestamp)
{
if (messageEvents == null)
if (events == null)
{
messageEvents = TimedEvents<IMessageEvent>.Create(new List<ITimedEvent<IMessageEvent>>(), 0);
events = TimedEvents<IEvent>.Create(new List<ITimedEvent<IEvent>>(), 0);
}
var messageEventsList = new List<ITimedEvent<IMessageEvent>>();
foreach (ITimedEvent<IMessageEvent> timedEvent in messageEvents.Events)
var eventsList = new List<ITimedEvent<IEvent>>();
foreach (ITimedEvent<IEvent> timedEvent in events.Events)
{
messageEventsList.Add(timedEvent);
eventsList.Add(timedEvent);
}
ITimedEvents<IMessageEvent> timedMessageEvents = TimedEvents<IMessageEvent>.Create(messageEventsList, messageEvents.DroppedEventsCount);
ITimedEvents<IEvent> timedMessageEvents = TimedEvents<IEvent>.Create(eventsList, events.DroppedEventsCount);
return new SpanData(
context,
parentSpanId,
@ -145,7 +138,6 @@ namespace OpenTelemetry.Trace.Export
startTimestamp,
attributes,
events,
timedMessageEvents,
links,
childSpanCount,
status,
@ -164,7 +156,6 @@ namespace OpenTelemetry.Trace.Export
+ "startTimestamp=" + this.StartTimestamp + ", "
+ "attributes=" + this.Attributes + ", "
+ "events=" + this.Events + ", "
+ "messageEvents=" + this.MessageEvents + ", "
+ "links=" + this.Links + ", "
+ "childSpanCount=" + this.ChildSpanCount + ", "
+ "status=" + this.Status + ", "
@ -189,7 +180,6 @@ namespace OpenTelemetry.Trace.Export
&& this.StartTimestamp.Equals(that.StartTimestamp)
&& this.Attributes.Equals(that.Attributes)
&& this.Events.Equals(that.Events)
&& this.MessageEvents.Equals(that.MessageEvents)
&& this.Links.Equals(that.Links)
&& ((this.ChildSpanCount == null) ? (that.ChildSpanCount == null) : this.ChildSpanCount.Equals(that.ChildSpanCount))
&& ((this.Status == null) ? (that.Status == null) : this.Status.Equals(that.Status))
@ -218,7 +208,6 @@ namespace OpenTelemetry.Trace.Export
h *= 1000003;
h ^= this.Events.GetHashCode();
h *= 1000003;
h ^= this.MessageEvents.GetHashCode();
h *= 1000003;
h ^= this.Links.GetHashCode();
h *= 1000003;

2
src/OpenTelemetry.Abstractions/Trace/IEvent.cs
View File

@ -29,7 +29,7 @@ namespace OpenTelemetry.Trace
string Name { get; }
/// <summary>
/// Gets the <see cref="IDictionary{string, IAttributeValue}"/> collection of attributes associated with the event.
/// Gets the <see cref="IDictionary{String, IAttributeValue}"/> collection of attributes associated with the event.
/// </summary>
IDictionary<string, IAttributeValue> Attributes { get; }
}

44
src/OpenTelemetry.Abstractions/Trace/IMessageEvent.cs
View File

@ -1,44 +0,0 @@
// <copyright file="IMessageEvent.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
namespace OpenTelemetry.Trace
{
/// <summary>
/// Message event happened during the span execution.
/// </summary>
public interface IMessageEvent
{
/// <summary>
/// Gets ths type of the event.
/// </summary>
MessageEventType Type { get; }
/// <summary>
/// Gets the message identitifer associated with the event.
/// </summary>
long MessageId { get; }
/// <summary>
/// Gets the uncompressed message size.
/// </summary>
long UncompressedMessageSize { get; }
/// <summary>
/// Gets the compressed message size.
/// </summary>
long CompressedMessageSize { get; }
}
}

10
src/OpenTelemetry.Abstractions/Trace/ISpan.cs
View File

@ -77,10 +77,10 @@ namespace OpenTelemetry.Trace
void AddEvent(string name);
/// <summary>
/// Adds a single <see cref="IEvent"/> with the <see cref="IDictionary{string, IAttributeValue}"/> attributes to the <see cref="ISpan"/>.
/// Adds a single <see cref="IEvent"/> with the <see cref="IDictionary{String, IAttributeValue}"/> attributes to the <see cref="ISpan"/>.
/// </summary>
/// <param name="name">Event name.</param>
/// <param name="attributes"><see cref="IDictionary{string, IAttributeValue}"/> of attributes name/value pairs associted with the <see cref="IEvent"/>.</param>
/// <param name="attributes"><see cref="IDictionary{String, IAttributeValue}"/> of attributes name/value pairs associted with the <see cref="IEvent"/>.</param>
void AddEvent(string name, IDictionary<string, IAttributeValue> attributes);
/// <summary>
@ -89,12 +89,6 @@ namespace OpenTelemetry.Trace
/// <param name="newEvent"><see cref="IEvent"/> to add to the span.</param>
void AddEvent(IEvent newEvent);
/// <summary>
/// Adds the message even to the span.
/// </summary>
/// <param name="messageEvent">Message event to add to the span.</param>
void AddMessageEvent(IMessageEvent messageEvent);
/// <summary>
/// Adds link to the span.
/// </summary>

39
src/OpenTelemetry.Abstractions/Trace/MessageEventType.cs
View File

@ -1,39 +0,0 @@
// <copyright file="MessageEventType.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
namespace OpenTelemetry.Trace
{
/// <summary>
/// Messages event type.
/// </summary>
public enum MessageEventType
{
/// <summary>
/// Unknown event type.
/// </summary>
Unspecified = 0,
/// <summary>
/// Represent message that was sent from client.
/// </summary>
Sent = 1,
/// <summary>
/// Represents message that was recieved by the client.
/// </summary>
Received = 2,
}
}

32
src/OpenTelemetry.Abstractions/Trace/SpanContext.cs
View File

@ -18,12 +18,15 @@ namespace OpenTelemetry.Trace
{
/// <summary>
/// A class that represents a span context. A span context contains the state that must propagate to
/// child <see cref="SpanBase"/> and across process boundaries. It contains the identifiers <see cref="TraceId"/>
/// and <see cref="SpanId"/> associated with the <see cref="SpanBase"/> and a set of <see cref="TraceOptions"/>.
/// child <see cref="ISpan"/> and across process boundaries. It contains the identifiers <see cref="TraceId"/>
/// and <see cref="SpanId"/> associated with the <see cref="ISpan"/> and a set of <see cref="TraceOptions"/>.
/// </summary>
public sealed class SpanContext : ISpanContext
{
public static readonly SpanContext Invalid = new SpanContext(Trace.TraceId.Invalid, Trace.SpanId.Invalid, TraceOptions.Default, Tracestate.Empty);
/// <summary>
/// A blank <see cref="ISpanContext"/> that can be used for no-op operations.
/// </summary>
public static readonly SpanContext Blank = new SpanContext(Trace.TraceId.Invalid, Trace.SpanId.Invalid, TraceOptions.Default, Tracestate.Empty);
private SpanContext(ITraceId traceId, ISpanId spanId, TraceOptions traceOptions, Tracestate tracestate)
{
@ -33,16 +36,39 @@ namespace OpenTelemetry.Trace
this.Tracestate = tracestate;
}
/// <summary>
/// Gets the <see cref="ITraceId"/> associated with this <see cref="ISpanContext"/>.
/// </summary>
public ITraceId TraceId { get; }
/// <summary>
/// Gets the <see cref="ISpanId"/> associated with this <see cref="ISpanContext"/>.
/// </summary>
public ISpanId SpanId { get; }
/// <summary>
/// Gets the <see cref="TraceOptions"/> associated with this <see cref="ISpanContext"/>.
/// </summary>
public TraceOptions TraceOptions { get; }
/// <summary>
/// Gets a value indicating whether this <see cref="ISpanContext"/> is valid.
/// </summary>
public bool IsValid => this.TraceId.IsValid && this.SpanId.IsValid;
/// <summary>
/// Gets the <see cref="Tracestate"/> associated with this <see cref="ISpanContext"/>.
/// </summary>
public Tracestate Tracestate { get; }
/// <summary>
/// Creates a new <see cref="ISpanContext"/> with the given identifiers and options.
/// </summary>
/// <param name="traceId">The <see cref="ITraceId"/> to associate with the <see cref="ISpanContext"/>.</param>
/// <param name="spanId">The <see cref="ISpanId"/> to associate with the <see cref="ISpanContext"/>.</param>
/// <param name="traceOptions">The <see cref="TraceOptions"/> to associate with the <see cref="ISpanContext"/>.</param>
/// <param name="tracestate">The <see cref="Tracestate"/> to associate with the <see cref="ISpanContext"/>.</param>
/// <returns>A new <see cref="ISpanContext"/> with the given identifiers and options.</returns>
public static ISpanContext Create(ITraceId traceId, ISpanId spanId, TraceOptions traceOptions, Tracestate tracestate)
{
return new SpanContext(traceId, spanId, traceOptions, tracestate);

7
src/OpenTelemetry.Collector.StackExchangeRedis/Implementation/RedisProfilerEntryToSpanConverter.cs
View File

@ -27,7 +27,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
{
public static void DrainSession(ISpan parentSpan, IEnumerable<IProfiledCommand> sessionCommands, ISampler sampler, ICollection<ISpanData> spans)
{
var parentContext = parentSpan?.Context ?? SpanContext.Invalid;
var parentContext = parentSpan?.Context ?? SpanContext.Blank;
foreach (var command in sessionCommands)
{
@ -102,7 +102,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
Timestamp startTimestamp = Timestamp.FromMillis(new DateTimeOffset(command.CommandCreated).ToUnixTimeMilliseconds());
var timestamp = new DateTimeOffset(command.CommandCreated).Add(command.CreationToEnqueued);
var annotations = TimedEvents<IEvent>.Create(
var events = TimedEvents<IEvent>.Create(
new List<ITimedEvent<IEvent>>()
{
TimedEvent<IEvent>.Create(Timestamp.FromMillis(timestamp.ToUnixTimeMilliseconds()), Event.Create("Enqueued")),
@ -140,7 +140,6 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
var attributes = Attributes.Create(attributesMap, 0);
ITimedEvents<IMessageEvent> messageOrNetworkEvents = null;
ILinks links = null;
int? childSpanCount = 0;
@ -148,7 +147,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
Status status = Status.Ok;
SpanKind kind = SpanKind.Client;
return SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
return SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
}
}
}

28
src/OpenTelemetry.Exporter.ApplicationInsights/Implementation/TraceExporterHandler.cs
View File

@ -166,34 +166,6 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Implementation
this.telemetryClient.Track(log);
}
foreach (var m in span.MessageEvents.Events)
{
var log = new TraceTelemetry();
if (m.Timestamp != null)
{
var logTimestamp = DateTimeOffset.FromUnixTimeSeconds(m.Timestamp.Seconds);
logTimestamp = logTimestamp.Add(TimeSpan.FromTicks(m.Timestamp.Nanos / 100));
log.Timestamp = logTimestamp;
}
log.Message = string.Concat(
"MessageEvent. messageId: '",
m.Event.MessageId,
"', type: '",
m.Event.Type.ToString(),
"', compressed size: '",
m.Event.CompressedMessageSize,
"', uncompressed size: '",
m.Event.UncompressedMessageSize,
"'");
log.Context.Operation.Id = traceId;
log.Context.Operation.ParentId = string.Concat("|", traceId, ".", spanId, ".");
this.telemetryClient.Track(log);
}
this.OverwriteSpanKindFromAttribute(spanKindAttr, ref resultKind);
this.OverwriteErrorAttribute(errorAttr, ref success);
this.OverwriteFieldsForHttpSpans(

26
src/OpenTelemetry.Exporter.Ocagent/Implementation/SpanDataExtentions.cs
View File

@ -66,7 +66,7 @@ namespace OpenTelemetry.Exporter.Ocagent.Implementation
!spanData.HasRemoteParent.GetValueOrDefault() && spanData.ParentSpanId != null,
ChildSpanCount = spanData.ChildSpanCount.HasValue ? (uint)spanData.ChildSpanCount.Value : 0,
Attributes = FromIAttributes(spanData.Attributes),
TimeEvents = FromITimeEvents(spanData.MessageEvents, spanData.Events),
TimeEvents = FromITimeEvents(spanData.Events),
Links = new Span.Types.Links
{
DroppedLinksCount = spanData.Links.DroppedLinksCount,
@ -105,32 +105,12 @@ namespace OpenTelemetry.Exporter.Ocagent.Implementation
return attributes;
}
private static Span.Types.TimeEvent FromITimeEvent(ITimedEvent<IMessageEvent> source)
{
return new Span.Types.TimeEvent
{
Time = new Timestamp
{
Nanos = source.Timestamp.Nanos,
Seconds = source.Timestamp.Seconds,
},
MessageEvent = new Span.Types.TimeEvent.Types.MessageEvent
{
Type = source.Event.Type == MessageEventType.Sent ? Span.Types.TimeEvent.Types.MessageEvent.Types.Type.Sent : Span.Types.TimeEvent.Types.MessageEvent.Types.Type.Received,
CompressedSize = (ulong)source.Event.CompressedMessageSize,
UncompressedSize = (ulong)source.Event.UncompressedMessageSize,
Id = (ulong)source.Event.MessageId,
},
};
}
private static Span.Types.TimeEvents FromITimeEvents(ITimedEvents<IMessageEvent> messages, ITimedEvents<IEvent> events)
private static Span.Types.TimeEvents FromITimeEvents(ITimedEvents<IEvent> events)
{
var timedEvents = new Span.Types.TimeEvents
{
DroppedMessageEventsCount = messages.DroppedEventsCount,
DroppedAnnotationsCount = events.DroppedEventsCount,
TimeEvent = { messages.Events.Select(FromITimeEvent), },
TimeEvent = { events.Events.Select(FromITimeEvent), },
};
timedEvents.TimeEvent.AddRange(events.Events.Select(FromITimeEvent));

5
src/OpenTelemetry.Exporter.Zipkin/Implementation/TraceExporterHandler.cs
View File

@ -102,11 +102,6 @@ namespace OpenTelemetry.Exporter.Zipkin.Implementation
spanBuilder.AddAnnotation(this.ToEpochMicroseconds(annotation.Timestamp), annotation.Event.Name);
}
foreach (var networkEvent in spanData.MessageEvents.Events)
{
spanBuilder.AddAnnotation(this.ToEpochMicroseconds(networkEvent.Timestamp), networkEvent.Event.Type.ToString());
}
return spanBuilder.Build();
}

6
src/OpenTelemetry/Trace/Internal/BlankSpan.cs
View File

@ -25,7 +25,7 @@ namespace OpenTelemetry.Trace.Internal
public static readonly BlankSpan Instance = new BlankSpan();
private BlankSpan()
: base(SpanContext.Invalid, default(SpanOptions))
: base(SpanContext.Blank, default(SpanOptions))
{
}
@ -85,10 +85,6 @@ namespace OpenTelemetry.Trace.Internal
{
}
public override void AddMessageEvent(IMessageEvent messageEvent)
{
}
public override void AddLink(ILink link)
{
}

94
src/OpenTelemetry/Trace/MessageEvent.cs
View File

@ -1,94 +0,0 @@
// <copyright file="MessageEvent.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
namespace OpenTelemetry.Trace
{
public class MessageEvent : IMessageEvent
{
internal MessageEvent(MessageEventType type, long messageId, long uncompressedMessageSize, long compressedMessageSize)
{
this.Type = type;
this.MessageId = messageId;
this.UncompressedMessageSize = uncompressedMessageSize;
this.CompressedMessageSize = compressedMessageSize;
}
public MessageEventType Type { get; }
public long MessageId { get; }
public long UncompressedMessageSize { get; }
public long CompressedMessageSize { get; }
public static MessageEventBuilder Builder(MessageEventType type, long messageId)
{
return new MessageEventBuilder()
.SetType(type)
.SetMessageId(messageId)
// We need to set a value for the message size because the autovalue requires all
// primitives to be initialized.
.SetUncompressedMessageSize(0)
.SetCompressedMessageSize(0);
}
/// <inheritdoc/>
public override string ToString()
{
return "MessageEvent{"
+ "type=" + this.Type + ", "
+ "messageId=" + this.MessageId + ", "
+ "uncompressedMessageSize=" + this.UncompressedMessageSize + ", "
+ "compressedMessageSize=" + this.CompressedMessageSize
+ "}";
}
/// <inheritdoc/>
public override bool Equals(object o)
{
if (o == this)
{
return true;
}
if (o is MessageEvent that)
{
return this.Type.Equals(that.Type)
&& (this.MessageId == that.MessageId)
&& (this.UncompressedMessageSize == that.UncompressedMessageSize)
&& (this.CompressedMessageSize == that.CompressedMessageSize);
}
return false;
}
/// <inheritdoc/>
public override int GetHashCode()
{
long h = 1;
h *= 1000003;
h ^= this.Type.GetHashCode();
h *= 1000003;
h ^= (this.MessageId >> 32) ^ this.MessageId;
h *= 1000003;
h ^= (this.UncompressedMessageSize >> 32) ^ this.UncompressedMessageSize;
h *= 1000003;
h ^= (this.CompressedMessageSize >> 32) ^ this.CompressedMessageSize;
return (int)h;
}
}
}

103
src/OpenTelemetry/Trace/MessageEventBuilder.cs
View File

@ -1,103 +0,0 @@
// <copyright file="MessageEventBuilder.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
namespace OpenTelemetry.Trace
{
using System;
public class MessageEventBuilder
{
private MessageEventType? type;
private long? messageId;
private long? uncompressedMessageSize;
private long? compressedMessageSize;
internal MessageEventBuilder()
{
}
internal MessageEventBuilder(
MessageEventType type,
long messageId,
long uncompressedMessageSize,
long compressedMessageSize)
{
this.type = type;
this.messageId = messageId;
this.uncompressedMessageSize = uncompressedMessageSize;
this.compressedMessageSize = compressedMessageSize;
}
public MessageEventBuilder SetUncompressedMessageSize(long uncompressedMessageSize)
{
this.uncompressedMessageSize = uncompressedMessageSize;
return this;
}
public MessageEventBuilder SetCompressedMessageSize(long compressedMessageSize)
{
this.compressedMessageSize = compressedMessageSize;
return this;
}
public IMessageEvent Build()
{
string missing = string.Empty;
if (!this.type.HasValue)
{
missing += " type";
}
if (!this.messageId.HasValue)
{
missing += " messageId";
}
if (!this.uncompressedMessageSize.HasValue)
{
missing += " uncompressedMessageSize";
}
if (!this.compressedMessageSize.HasValue)
{
missing += " compressedMessageSize";
}
if (!string.IsNullOrEmpty(missing))
{
throw new ArgumentOutOfRangeException("Missing required properties:" + missing);
}
return new MessageEvent(
this.type.Value,
this.messageId.Value,
this.uncompressedMessageSize.Value,
this.compressedMessageSize.Value);
}
internal MessageEventBuilder SetType(MessageEventType type)
{
this.type = type;
return this;
}
internal MessageEventBuilder SetMessageId(long messageId)
{
this.messageId = messageId;
return this;
}
}
}

2
src/OpenTelemetry/Trace/Propagation/Implementation/NoopBinaryFormat.cs
View File

@ -27,7 +27,7 @@ namespace OpenTelemetry.Trace.Propagation.Implementation
throw new ArgumentNullException(nameof(bytes));
}
return SpanContext.Invalid;
return SpanContext.Blank;
}
public byte[] ToByteArray(ISpanContext spanContext)

2
src/OpenTelemetry/Trace/Propagation/Implementation/NoopTextFormat.cs
View File

@ -57,7 +57,7 @@ namespace OpenTelemetry.Trace.Propagation.Implementation
throw new ArgumentNullException(nameof(getter));
}
return SpanContext.Invalid;
return SpanContext.Blank;
}
}
}

42
src/OpenTelemetry/Trace/Span.cs
View File

@ -37,7 +37,6 @@ namespace OpenTelemetry.Trace
private readonly object @lock = new object();
private AttributesWithCapacity attributes;
private TraceEvents<EventWithTime<IEvent>> events;
private TraceEvents<EventWithTime<IMessageEvent>> messageEvents;
private TraceEvents<ILink> links;
private Status status;
private DateTimeOffset endTime;
@ -218,20 +217,6 @@ namespace OpenTelemetry.Trace
}
}
private TraceEvents<EventWithTime<IMessageEvent>> InitializedMessageEvents
{
get
{
if (this.messageEvents == null)
{
this.messageEvents =
new TraceEvents<EventWithTime<IMessageEvent>>(this.traceParams.MaxNumberOfMessageEvents);
}
return this.messageEvents;
}
}
private TraceEvents<ILink> InitializedLinks
{
get
@ -363,31 +348,6 @@ namespace OpenTelemetry.Trace
}
}
/// <inheritdoc/>
public override void AddMessageEvent(IMessageEvent messageEvent)
{
if (!this.Options.HasFlag(SpanOptions.RecordEvents))
{
return;
}
lock (this.@lock)
{
if (this.hasBeenEnded)
{
// logger.log(Level.FINE, "Calling addNetworkEvent() on an ended Span.");
return;
}
if (messageEvent == null)
{
throw new ArgumentNullException(nameof(messageEvent));
}
this.InitializedMessageEvents.AddEvent(new EventWithTime<IMessageEvent>(this.timestampConverter.Now, messageEvent));
}
}
/// <inheritdoc/>
public override void End(EndSpanOptions options)
{
@ -429,7 +389,6 @@ namespace OpenTelemetry.Trace
: Attributes.Create(this.attributes, this.attributes.NumberOfDroppedAttributes);
ITimedEvents<IEvent> annotationsSpanData = CreateTimedEvents(this.InitializedEvents, this.timestampConverter);
ITimedEvents<IMessageEvent> messageEventsSpanData = CreateTimedEvents(this.InitializedMessageEvents, this.timestampConverter);
LinkList linksSpanData = this.links == null ? LinkList.Create(new List<ILink>(), 0) : LinkList.Create(this.links.Events, this.links.NumberOfDroppedEvents);
return SpanData.Create(
@ -440,7 +399,6 @@ namespace OpenTelemetry.Trace
Timestamp.FromDateTimeOffset(this.startTime),
attributesSpanData,
annotationsSpanData,
messageEventsSpanData,
linksSpanData,
null, // Not supported yet.
this.hasBeenEnded ? this.StatusWithDefault : null,

3
src/OpenTelemetry/Trace/SpanBase.cs
View File

@ -120,9 +120,6 @@ namespace OpenTelemetry.Trace
/// <inheritdoc/>
public abstract void AddEvent(IEvent addEvent);
/// <inheritdoc/>
public abstract void AddMessageEvent(IMessageEvent messageEvent);
/// <inheritdoc/>
public abstract void AddLink(ILink link);

10
test/OpenTelemetry.Collector.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToSpanConverterSamplingTests.cs
View File

@ -31,17 +31,17 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
{
var m = new Mock<ISampler>();
m.Setup(x => x.ShouldSample(It.IsAny<ISpanContext>(), It.IsAny<bool>(), It.IsAny<ITraceId>(), It.IsAny<ISpanId>(), It.IsAny<string>(), It.IsAny<IEnumerable<ISpan>>())).Returns(true);
Assert.True(RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Invalid, "SET", m.Object, out var context, out var parentId));
Assert.True(RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Blank, "SET", m.Object, out var context, out var parentId));
m = new Mock<ISampler>();
m.Setup(x => x.ShouldSample(It.IsAny<ISpanContext>(), It.IsAny<bool>(), It.IsAny<ITraceId>(), It.IsAny<ISpanId>(), It.IsAny<string>(), It.IsAny<IEnumerable<ISpan>>())).Returns(false);
Assert.False(RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Invalid, "SET", m.Object, out context, out parentId));
Assert.False(RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Blank, "SET", m.Object, out context, out parentId));
}
[Fact]
public void ShouldSampleDoesntThrowWithoutSampler()
{
RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Invalid, "SET", null, out var context, out var parentId);
RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Blank, "SET", null, out var context, out var parentId);
}
[Fact]
@ -68,10 +68,10 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
var m = new Mock<ISampler>();
m.Setup(x => x.ShouldSample(It.IsAny<ISpanContext>(), It.IsAny<bool>(), It.IsAny<ITraceId>(), It.IsAny<ISpanId>(), It.IsAny<string>(), It.IsAny<IEnumerable<ISpan>>())).Returns((ISpanContext parentContext, bool hasRemoteParent, ITraceId traceId, ISpanId spanId, string name, IEnumerable<ISpan> parentLinks) => parentContext.TraceOptions.IsSampled);
RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Invalid, "SET", m.Object, out var context, out var parentId);
RedisProfilerEntryToSpanConverter.ShouldSample(SpanContext.Blank, "SET", m.Object, out var context, out var parentId);
m.Verify(x => x.ShouldSample(
It.Is<ISpanContext>(y => y == SpanContext.Invalid),
It.Is<ISpanContext>(y => y == SpanContext.Blank),
It.Is<bool>(y => y == false),
It.Is<ITraceId>(y => y.IsValid && y == context.TraceId),
It.Is<ISpanId>(y => y.IsValid && y == context.SpanId),

8
test/OpenTelemetry.Collector.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToSpanConverterTests.cs
View File

@ -48,7 +48,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
var profiledCommand = new Mock<IProfiledCommand>();
var now = DateTimeOffset.Now;
profiledCommand.Setup(m => m.CommandCreated).Returns(now.DateTime);
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Invalid, "SET", SpanId.Invalid, profiledCommand.Object);
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Blank, "SET", SpanId.Invalid, profiledCommand.Object);
Assert.Equal(Timestamp.FromMillis(now.ToUnixTimeMilliseconds()), result.StartTimestamp);
}
@ -56,7 +56,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
public void ProfiledCommandToSpanDataSetsDbTypeAttributeAsRedis()
{
var profiledCommand = new Mock<IProfiledCommand>();
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Invalid, "SET", SpanId.Invalid, profiledCommand.Object);
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Blank, "SET", SpanId.Invalid, profiledCommand.Object);
Assert.Contains("db.type", result.Attributes.AttributeMap.Keys);
Assert.Equal(AttributeValue.StringAttributeValue("redis"), result.Attributes.AttributeMap["db.type"]);
}
@ -66,7 +66,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
{
var profiledCommand = new Mock<IProfiledCommand>();
profiledCommand.Setup(m => m.Command).Returns("SET");
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Invalid, "another name", SpanId.Invalid, profiledCommand.Object);
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Blank, "another name", SpanId.Invalid, profiledCommand.Object);
Assert.Contains("db.statement", result.Attributes.AttributeMap.Keys);
Assert.Equal(AttributeValue.StringAttributeValue("SET"), result.Attributes.AttributeMap["db.statement"]);
}
@ -77,7 +77,7 @@ namespace OpenTelemetry.Collector.StackExchangeRedis.Implementation
var profiledCommand = new Mock<IProfiledCommand>();
var expectedFlags = StackExchange.Redis.CommandFlags.FireAndForget | StackExchange.Redis.CommandFlags.NoRedirect;
profiledCommand.Setup(m => m.Flags).Returns(expectedFlags);
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Invalid, "SET", SpanId.Invalid, profiledCommand.Object);
var result = RedisProfilerEntryToSpanConverter.ProfiledCommandToSpanData(SpanContext.Blank, "SET", SpanId.Invalid, profiledCommand.Object);
Assert.Contains("redis.flags", result.Attributes.AttributeMap.Keys);
Assert.Equal(AttributeValue.StringAttributeValue("None, FireAndForget, NoRedirect"), result.Attributes.AttributeMap["redis.flags"]);
}

300
test/OpenTelemetry.Exporter.ApplicationInsights.Tests/Implementation/TraceExporterHandlerTests.cs
View File

@ -79,8 +79,8 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksRequest()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -111,7 +111,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
context = SpanContext.Create(
context.TraceId,
@ -122,7 +122,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
.Set("k2", "v2")
.Build());
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -142,11 +142,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithParent()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
parentSpanId = SpanId.FromBytes(this.testParentSpanIdBytes);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -159,11 +159,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithInvalidParent()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
parentSpanId = SpanId.Invalid;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -176,11 +176,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithStatus()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
status = Status.Ok;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -197,11 +197,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithStatusAndDescription()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
status = Status.Ok.WithDescription("all good");
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -219,11 +219,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithNonSuccessStatusAndDescription()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
status = Status.Cancelled.WithDescription("all bad");
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
@ -241,11 +241,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestErrorAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "error", AttributeValue.BooleanAttributeValue(true) } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -258,11 +258,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksClientDependency()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -292,11 +292,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksProducerDependency()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Producer;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -326,7 +326,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithTracestate()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
context = SpanContext.Create(
@ -339,7 +339,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
.Build());
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -363,11 +363,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
// ARRANGE
var now = DateTime.UtcNow;
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
span.TimeEvents = new Span.Types.TimeEvents
@ -433,10 +433,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithParent()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
parentSpanId = SpanId.FromBytes(this.testParentSpanIdBytes);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -450,10 +450,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithStatus()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
status = Status.Ok;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -471,10 +471,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithStatusAndDescription()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
status = Status.Ok.WithDescription("all good");
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -494,10 +494,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithNonSuccessStatusAndDescription()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
status = Status.Cancelled.WithDescription("all bad");
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -515,10 +515,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDependencyErrorAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "error", AttributeValue.BooleanAttributeValue(true) } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -530,11 +530,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestBasedOnServerSpanKindAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "span.kind", AttributeValue.StringAttributeValue("server") } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -544,11 +544,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestBasedOnClientSpanKindAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "span.kind", AttributeValue.StringAttributeValue("client") } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -558,11 +558,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestBasedOnProducerSpanKindAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "span.kind", AttributeValue.StringAttributeValue("producer") } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -572,11 +572,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestBasedOnConsumerSpanKindAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "span.kind", AttributeValue.StringAttributeValue("consumer") } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -586,11 +586,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestBasedOnOtherSpanKindAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "span.kind", AttributeValue.StringAttributeValue("other") } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -600,10 +600,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestBasedOnSpanKindProperty()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
parentSpanId = SpanId.FromBytes(this.testParentSpanIdBytes);
hasRemoteParent = null;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -613,11 +613,11 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDependencyBasedOnSpanKindProperty()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Client;
parentSpanId = SpanId.FromBytes(this.testParentSpanIdBytes);
hasRemoteParent = null;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -627,10 +627,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDependenciesBasedOnSpanKindAttribute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Internal;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>() { { "span.kind", AttributeValue.StringAttributeValue("client") } }, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -640,10 +640,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestBasedOnSameProcessAsParentFlag()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Internal;
hasRemoteParent = true;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
Assert.True(sentItems.Single() is RequestTelemetry);
@ -652,10 +652,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDepednencyBasedOnSameProcessAsParentFlag()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Internal;
hasRemoteParent = false;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
Assert.True(sentItems.Single() is DependencyTelemetry);
@ -664,10 +664,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDepednencyBasedOnSameProcessAsParentFlagNotSet()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Internal;
hasRemoteParent = null;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -678,9 +678,9 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
//[Fact]
//public void OpenTelemetryTelemetryConverterTests_TracksRequestWithoutName()
//{
// this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
// this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
// name = null;
// var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
// var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// var sentItems = this.ConvertSpan(span);
@ -690,9 +690,9 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithoutKind()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
kind = SpanKind.Internal;
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -703,10 +703,10 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
//[Fact]
//public void OpenTelemetryTelemetryConverterTests_TracksRequestWithoutStartAndEndTime()
//{
// this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
// this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
// startTimestamp = null;
// endTimestamp = null;
// var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
// var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// var sentItems = this.ConvertSpan(span);
@ -718,7 +718,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestWithUrl()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -727,7 +727,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.method", AttributeValue.StringAttributeValue("POST") },
{ "http.status_code", AttributeValue.LongAttributeValue(409) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -740,7 +740,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestWithRelativeUrl()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -749,7 +749,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.method", AttributeValue.StringAttributeValue("POST") },
{ "http.status_code", AttributeValue.LongAttributeValue(409) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -762,7 +762,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestWithUrlAndRoute()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -772,7 +772,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.route", AttributeValue.StringAttributeValue("route") },
{ "http.status_code", AttributeValue.LongAttributeValue(503) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -785,7 +785,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestWithUrlAndNoMethod()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -793,7 +793,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.url", AttributeValue.StringAttributeValue(url.ToString()) },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -806,7 +806,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestWithUrlOtherAttributesAreIgnored()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -818,7 +818,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.port", AttributeValue.LongAttributeValue(8080) },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -832,14 +832,14 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithStringStatusCode()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
{
{ "http.status_code", AttributeValue.LongAttributeValue(201) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -853,7 +853,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestHostPortPathAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -864,7 +864,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.port", AttributeValue.LongAttributeValue(123) },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -877,7 +877,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestPortPathAndEmptyHostAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
{
@ -887,7 +887,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.port", AttributeValue.LongAttributeValue(123) },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -900,7 +900,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestHostPathAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -910,7 +910,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.host", AttributeValue.StringAttributeValue("host") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -923,7 +923,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestHostAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
{
@ -931,7 +931,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.host", AttributeValue.StringAttributeValue("host") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -944,7 +944,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestOnlyMethodAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpIn";
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -952,7 +952,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.method", AttributeValue.StringAttributeValue("POST") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -966,7 +966,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithStringStatusCode()
{
// ARRANGE
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
kind = SpanKind.Client;
name = "HttpIn";
@ -974,7 +974,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{
{ "http.status_code", AttributeValue.LongAttributeValue(201) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
// ACT
var sentItems = this.ConvertSpan(span);
@ -988,7 +988,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpRequestUserAgent()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host/path");
var userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36";
name = "HttpIn";
@ -997,7 +997,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.url", AttributeValue.StringAttributeValue(url.ToString()) },
{ "http.user_agent", AttributeValue.StringAttributeValue(userAgent) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1008,7 +1008,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithUrl()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpOut";
kind = SpanKind.Client;
@ -1018,7 +1018,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.method", AttributeValue.StringAttributeValue("POST") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1033,7 +1033,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithRelativeUrl()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpOut";
kind = SpanKind.Client;
@ -1043,7 +1043,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.method", AttributeValue.StringAttributeValue("POST") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1058,7 +1058,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithUrlIgnoresHostPortPath()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpOut";
kind = SpanKind.Client;
@ -1071,7 +1071,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.port", AttributeValue.LongAttributeValue(8080) },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1086,7 +1086,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithHostPortPath()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "HttpOut";
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -1097,7 +1097,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.port", AttributeValue.LongAttributeValue(123) },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1112,7 +1112,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithHostPort()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "HttpOut";
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -1122,7 +1122,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.port", AttributeValue.LongAttributeValue(123) },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1137,7 +1137,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithPathAndEmptyHost()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "HttpOut";
kind = SpanKind.Client;
attributes = Attributes.Create(new Dictionary<string, IAttributeValue>()
@ -1147,7 +1147,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.host", AttributeValue.StringAttributeValue("") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1162,7 +1162,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithHost()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpOut";
kind = SpanKind.Client;
@ -1172,7 +1172,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.host", AttributeValue.StringAttributeValue("host") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1187,7 +1187,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithMethod()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpOut";
kind = SpanKind.Client;
@ -1196,7 +1196,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "http.method", AttributeValue.StringAttributeValue("POST") },
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1212,7 +1212,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksHttpDependencyWithStatusCodeOnly()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "HttpOut";
kind = SpanKind.Client;
@ -1220,7 +1220,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{
{ "http.status_code", AttributeValue.LongAttributeValue(200) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1235,7 +1235,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithCustomAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "spanName";
kind = SpanKind.Client;
@ -1245,7 +1245,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "custom.longAttribute", AttributeValue.LongAttributeValue(long.MaxValue) },
{ "custom.boolAttribute", AttributeValue.BooleanAttributeValue(true) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1265,7 +1265,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestsWithCustomAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
var url = new Uri("https://host:123/path?query");
name = "spanName";
kind = SpanKind.Server;
@ -1275,7 +1275,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
{ "custom.longAttribute", AttributeValue.LongAttributeValue(long.MaxValue) },
{ "custom.boolAttribute", AttributeValue.BooleanAttributeValue(true) },
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1303,20 +1303,22 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
var (link1SpanId, link1SpanIdBytes) = GenerateRandomId(8);
var (link2SpanId, link2SpanIdBytes) = GenerateRandomId(8);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "spanName";
kind = SpanKind.Client;
links = LinkList.Create(new List<ILink>() {
links = LinkList.Create(
new List<ILink>()
{
Link.FromSpanContext(
SpanContext.Create(TraceId.FromBytes(link0TraceIdBytes), SpanId.FromBytes(link0SpanIdBytes), TraceOptions.Default, Tracestate.Empty), LinkType.ChildLinkedSpan),
Link.FromSpanContext(
SpanContext.Create(TraceId.FromBytes(link1TraceIdBytes), SpanId.FromBytes(link1SpanIdBytes), TraceOptions.Default, Tracestate.Empty), LinkType.ParentLinkedSpan),
Link.FromSpanContext(
SpanContext.Create(TraceId.FromBytes(link2TraceIdBytes), SpanId.FromBytes(link2SpanIdBytes), TraceOptions.Default, Tracestate.Empty), LinkType.Unspecified),
}, 0);
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1351,12 +1353,13 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDependencyWithLinksAndAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "spanName";
kind = SpanKind.Client;
links = LinkList.Create(
new List<ILink>() {
new List<ILink>()
{
Link.FromSpanContext(
SpanContext.Create(
TraceId.FromBytes(GenerateRandomId(16).Item2),
@ -1373,7 +1376,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
},
droppedLinksCount: 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1401,11 +1404,12 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
var (link1SpanId, link1SpanIdBytes) = GenerateRandomId(8);
var (link2SpanId, link2SpanIdBytes) = GenerateRandomId(8);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "spanName";
kind = SpanKind.Server;
links = LinkList.Create(new List<ILink>() {
links = LinkList.Create(new List<ILink>()
{
Link.FromSpanContext(
SpanContext.Create(TraceId.FromBytes(link0TraceIdBytes), SpanId.FromBytes(link0SpanIdBytes), TraceOptions.Default, Tracestate.Empty), LinkType.ChildLinkedSpan),
Link.FromSpanContext(
@ -1414,7 +1418,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
SpanContext.Create(TraceId.FromBytes(link2TraceIdBytes), SpanId.FromBytes(link2SpanIdBytes), TraceOptions.Default, Tracestate.Empty), LinkType.Unspecified),
}, 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1449,7 +1453,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithLinksAndAttributes()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
name = "spanName";
kind = SpanKind.Server;
@ -1472,7 +1476,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
},
droppedLinksCount: 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1492,12 +1496,12 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithEvents()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
Thread.Sleep(TimeSpan.FromTicks(10));
name = "spanName";
kind = SpanKind.Server;
annotations = TimedEvents<IEvent>.Create(
events = TimedEvents<IEvent>.Create(
new List<ITimedEvent<IEvent>>()
{
TimedEvent<IEvent>.Create(NowTimestamp, Event.Create("test message1")),
@ -1510,7 +1514,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
},
droppedEventsCount: 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1617,7 +1621,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksDependenciesWithEvents()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var events, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
nowDateTimeOffset = nowDateTimeOffset.Subtract(TimeSpan.FromSeconds(1));
name = "spanName";
kind = SpanKind.Client;
@ -1635,7 +1639,7 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
},
droppedEventsCount: 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, events, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
@ -1671,46 +1675,6 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
Assert.Equal(bool.TrueString, trace2.Properties["custom.boolAttribute"]);
}
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithMessage()
{
this.GetDefaults(out var context, out var parentSpanId, out var hasRemoteParent, out var name, out var startTimestamp, out var attributes, out var annotations, out var messageOrNetworkEvents, out var links, out var childSpanCount, out var status, out var kind, out var endTimestamp);
Thread.Sleep(TimeSpan.FromTicks(10));
name = "spanName";
kind = SpanKind.Server;
messageOrNetworkEvents = TimedEvents<IMessageEvent>.Create(
new List<ITimedEvent<IMessageEvent>>()
{
TimedEvent<IMessageEvent>.Create(NowTimestamp, MessageEvent.Builder(MessageEventType.Received, 1).SetCompressedMessageSize(2).SetUncompressedMessageSize(3).Build()),
TimedEvent<IMessageEvent>.Create(NowTimestamp, MessageEvent.Builder(MessageEventType.Sent, 4).SetCompressedMessageSize(5).SetUncompressedMessageSize(6).Build()),
TimedEvent<IMessageEvent>.Create(null, MessageEvent.Builder(MessageEventType.Unspecified, 7).SetCompressedMessageSize(8).SetUncompressedMessageSize(9).Build()),
},
droppedEventsCount: 0);
var span = SpanData.Create(context, parentSpanId, hasRemoteParent, name, startTimestamp, attributes, annotations, messageOrNetworkEvents, links, childSpanCount, status, kind, endTimestamp);
var sentItems = this.ConvertSpan(span);
Assert.Equal(4, sentItems.Count);
Assert.Single(sentItems.OfType<RequestTelemetry>());
Assert.Equal(3, sentItems.OfType<TraceTelemetry>().Count());
var request = sentItems.OfType<RequestTelemetry>().Single();
var traces = sentItems.OfType<TraceTelemetry>().ToArray();
foreach (var t in traces)
{
Assert.Equal(request.Context.Operation.Id, t.Context.Operation.Id);
Assert.Equal(request.Id, t.Context.Operation.ParentId);
Assert.False(t.Properties.Any());
}
Assert.Equal("MessageEvent. messageId: '1', type: 'Received', compressed size: '2', uncompressed size: '3'", traces[0].Message);
Assert.Equal("MessageEvent. messageId: '4', type: 'Sent', compressed size: '5', uncompressed size: '6'", traces[1].Message);
Assert.Equal("MessageEvent. messageId: '7', type: 'Unspecified', compressed size: '8', uncompressed size: '9'", traces[2].Message);
}
/*
[Fact]
public void OpenTelemetryTelemetryConverterTests_TracksRequestWithCorrectIkey()
@ -1942,7 +1906,6 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
out Timestamp startTimestamp,
out IAttributes attributes,
out ITimedEvents<IEvent> events,
out ITimedEvents<IMessageEvent> messageOrNetworkEvents,
out ILinks links,
out int? childSpanCount,
out Status status,
@ -1956,7 +1919,6 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests
startTimestamp = NowTimestamp.AddDuration(Duration.Create(TimeSpan.FromSeconds(-1)));
attributes = null;
events = null;
messageOrNetworkEvents = null;
links = null;
childSpanCount = null;
status = null;

6
test/OpenTelemetry.Tests/Impl/Trace/BlankSpanTest.cs
View File

@ -25,7 +25,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void HasInvalidContextAndDefaultSpanOptions()
{
Assert.Equal(SpanContext.Invalid, BlankSpan.Instance.Context);
Assert.Equal(SpanContext.Blank, BlankSpan.Instance.Context);
Assert.True(BlankSpan.Instance.Options.HasFlag(SpanOptions.None));
}
@ -50,10 +50,8 @@ namespace OpenTelemetry.Trace.Test
BlankSpan.Instance.AddEvent("MyEvent", attributes);
BlankSpan.Instance.AddEvent("MyEvent", multipleAttributes);
BlankSpan.Instance.AddEvent(Event.Create("MyEvent"));
// BlankSpan.Instance.addNetworkEvent(NetworkEvent.builder(NetworkEvent.Type.SENT, 1L).build());
BlankSpan.Instance.AddMessageEvent(MessageEvent.Builder(MessageEventType.Sent, 1L).Build());
BlankSpan.Instance.AddLink(
Link.FromSpanContext(SpanContext.Invalid, LinkType.ChildLinkedSpan));
Link.FromSpanContext(SpanContext.Blank, LinkType.ChildLinkedSpan));
BlankSpan.Instance.Status = Status.Ok;
BlankSpan.Instance.End(EndSpanOptions.Default);
BlankSpan.Instance.End();

61
test/OpenTelemetry.Tests/Impl/Trace/Export/SpanDataTest.cs
View File

@ -31,12 +31,6 @@ namespace OpenTelemetry.Trace.Export.Test
private static readonly string SPAN_NAME = "MySpanName";
private static readonly string EVENT_TEXT = "MyEventText";
private static readonly IEvent spanEvent = Event.Create(EVENT_TEXT);
// private static readonly NetworkEvent recvNetworkEvent =
// NetworkEvent.Builder(NetworkEvent.Type.RECV, 1).build();
// private static readonly NetworkEvent sentNetworkEvent =
// NetworkEvent.Builder(NetworkEvent.Type.SENT, 1).build();
private static readonly IMessageEvent recvMessageEvent = MessageEvent.Builder(MessageEventType.Received, 1).Build();
private static readonly IMessageEvent sentMessageEvent = MessageEvent.Builder(MessageEventType.Sent, 1).Build();
private static readonly Status status = Status.DeadlineExceeded.WithDescription("TooSlow");
private static readonly SpanKind kind = SpanKind.Client;
private static readonly int CHILD_SPAN_COUNT = 13;
@ -45,15 +39,11 @@ namespace OpenTelemetry.Trace.Export.Test
private readonly ISpanId parentSpanId;
private readonly IDictionary<string, IAttributeValue> attributesMap = new Dictionary<string, IAttributeValue>();
private readonly List<ITimedEvent<IEvent>> eventList = new List<ITimedEvent<IEvent>>();
// private readonly List<TimedEvent<NetworkEvent>> networkEventsList =
// new List<SpanData.TimedEvent<NetworkEvent>>();
private readonly List<ITimedEvent<IMessageEvent>> messageEventsList = new List<ITimedEvent<IMessageEvent>>();
private readonly List<ILink> linksList = new List<ILink>();
private IAttributes attributes;
private ITimedEvents<IEvent> events;
// private TimedEvents<NetworkEvent> networkEvents;
private ITimedEvents<IMessageEvent> messageEvents;
private LinkList links;
public SpanDataTest()
@ -69,14 +59,6 @@ namespace OpenTelemetry.Trace.Export.Test
eventList.Add(TimedEvent<IEvent>.Create(eventTimestamp3, spanEvent));
events = TimedEvents<IEvent>.Create(eventList, 2);
// networkEventsList.add(SpanData.TimedEvent.Create(eventTimestamp1, recvNetworkEvent));
// networkEventsList.add(SpanData.TimedEvent.Create(eventTimestamp2, sentNetworkEvent));
// networkEvents = TimedEvents.Create(networkEventsList, 3);
messageEventsList.Add(TimedEvent<IMessageEvent>.Create(eventTimestamp1, recvMessageEvent));
messageEventsList.Add(TimedEvent<IMessageEvent>.Create(eventTimestamp2, sentMessageEvent));
messageEvents = TimedEvents<IMessageEvent>.Create(messageEventsList, 3);
linksList.Add(Link.FromSpanContext(spanContext, LinkType.ChildLinkedSpan));
links = LinkList.Create(linksList, 0);
}
@ -93,7 +75,6 @@ namespace OpenTelemetry.Trace.Export.Test
startTimestamp,
attributes,
events,
messageEvents,
links,
CHILD_SPAN_COUNT,
status,
@ -106,45 +87,12 @@ namespace OpenTelemetry.Trace.Export.Test
Assert.Equal(startTimestamp, spanData.StartTimestamp);
Assert.Equal(attributes, spanData.Attributes);
Assert.Equal(events, spanData.Events);
Assert.Equal(messageEvents, spanData.MessageEvents);
Assert.Equal(links, spanData.Links);
Assert.Equal(CHILD_SPAN_COUNT, spanData.ChildSpanCount);
Assert.Equal(status, spanData.Status);
Assert.Equal(endTimestamp, spanData.EndTimestamp);
}
// [Fact]
// public void SpanData_Create_Compatibility()
// {
// SpanData spanData =
// SpanData.Create(
// spanContext,
// parentSpanId,
// true,
// SPAN_NAME,
// startTimestamp,
// attributes,
// events,
// networkEvents,
// links,
// CHILD_SPAN_COUNT,
// status,
// endTimestamp);
// Assert.Equal(spanData.getContext()).isEqualTo(spanContext);
// Assert.Equal(spanData.getParentSpanId()).isEqualTo(parentSpanId);
// Assert.Equal(spanData.getHasRemoteParent()).isTrue();
// Assert.Equal(spanData.getName()).isEqualTo(SPAN_NAME);
// Assert.Equal(spanData.getStartTimestamp()).isEqualTo(startTimestamp);
// Assert.Equal(spanData.getAttributes()).isEqualTo(attributes);
// Assert.Equal(spanData.getEvents()).isEqualTo(events);
// Assert.Equal(spanData.getNetworkEvents()).isEqualTo(networkEvents);
// Assert.Equal(spanData.getMessageEvents()).isEqualTo(messageEvents);
// Assert.Equal(spanData.getLinks()).isEqualTo(links);
// Assert.Equal(spanData.getChildSpanCount()).isEqualTo(CHILD_SPAN_COUNT);
// Assert.Equal(spanData.getStatus()).isEqualTo(status);
// Assert.Equal(spanData.getEndTimestamp()).isEqualTo(endTimestamp);
// }
[Fact]
public void SpanData_RootActiveSpan()
{
@ -157,7 +105,6 @@ namespace OpenTelemetry.Trace.Export.Test
startTimestamp,
attributes,
events,
messageEvents,
links,
null,
null,
@ -170,7 +117,6 @@ namespace OpenTelemetry.Trace.Export.Test
Assert.Equal(startTimestamp, spanData.StartTimestamp);
Assert.Equal(attributes, spanData.Attributes);
Assert.Equal(events, spanData.Events);
Assert.Equal(messageEvents, spanData.MessageEvents);
Assert.Equal(links, spanData.Links);
Assert.Null(spanData.ChildSpanCount);
Assert.Null(spanData.Status);
@ -189,7 +135,6 @@ namespace OpenTelemetry.Trace.Export.Test
startTimestamp,
Attributes.Create(new Dictionary<string, IAttributeValue>(), 0),
TimedEvents<IEvent>.Create(new List<ITimedEvent<IEvent>>(), 0),
TimedEvents<IMessageEvent>.Create(new List<ITimedEvent<IMessageEvent>>(), 0),
LinkList.Create(new List<ILink>(), 0),
0,
status,
@ -203,7 +148,6 @@ namespace OpenTelemetry.Trace.Export.Test
Assert.Equal(startTimestamp, spanData.StartTimestamp);
Assert.Empty(spanData.Attributes.AttributeMap);
Assert.Empty(spanData.Events.Events);
Assert.Empty(spanData.MessageEvents.Events);
Assert.Empty(spanData.Links.Links);
Assert.Equal(0, spanData.ChildSpanCount);
Assert.Equal(status, spanData.Status);
@ -222,7 +166,6 @@ namespace OpenTelemetry.Trace.Export.Test
startTimestamp,
attributes,
events,
messageEvents,
links,
CHILD_SPAN_COUNT,
status,
@ -237,7 +180,6 @@ namespace OpenTelemetry.Trace.Export.Test
startTimestamp,
attributes,
events,
messageEvents,
links,
CHILD_SPAN_COUNT,
status,
@ -252,7 +194,6 @@ namespace OpenTelemetry.Trace.Export.Test
startTimestamp,
Attributes.Create(new Dictionary<string, IAttributeValue>(), 0),
TimedEvents<IEvent>.Create(new List<ITimedEvent<IEvent>>(), 0),
TimedEvents<IMessageEvent>.Create(new List<ITimedEvent<IMessageEvent>>(), 0),
LinkList.Create(new List<ILink>(), 0),
0,
status,
@ -277,7 +218,6 @@ namespace OpenTelemetry.Trace.Export.Test
startTimestamp,
attributes,
events,
messageEvents,
links,
CHILD_SPAN_COUNT,
status,
@ -290,7 +230,6 @@ namespace OpenTelemetry.Trace.Export.Test
Assert.Contains(startTimestamp.ToString(), spanDataString);
Assert.Contains(attributes.ToString(), spanDataString);
Assert.Contains(events.ToString(), spanDataString);
Assert.Contains(messageEvents.ToString(), spanDataString);
Assert.Contains(links.ToString(), spanDataString);
Assert.Contains(status.ToString(), spanDataString);
Assert.Contains(endTimestamp.ToString(), spanDataString);

82
test/OpenTelemetry.Tests/Impl/Trace/MessageEventTest.cs
View File

@ -1,82 +0,0 @@
// <copyright file="MessageEventTest.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
namespace OpenTelemetry.Trace.Test
{
using Xunit;
public class MessageEventTest
{
[Fact]
public void BuildMessageEvent_WithRequiredFields()
{
IMessageEvent messageEvent = MessageEvent.Builder(MessageEventType.Sent, 1L).Build();
Assert.Equal(MessageEventType.Sent, messageEvent.Type);
Assert.Equal(1L, messageEvent.MessageId);
Assert.Equal(0L, messageEvent.UncompressedMessageSize);
}
[Fact]
public void BuildMessageEvent_WithUncompressedMessageSize()
{
IMessageEvent messageEvent =
MessageEvent.Builder(MessageEventType.Sent, 1L).SetUncompressedMessageSize(123L).Build();
Assert.Equal(MessageEventType.Sent, messageEvent.Type);
Assert.Equal(1L, messageEvent.MessageId);
Assert.Equal(123L, messageEvent.UncompressedMessageSize);
}
[Fact]
public void BuildMessageEvent_WithCompressedMessageSize()
{
IMessageEvent messageEvent =
MessageEvent.Builder(MessageEventType.Sent, 1L).SetCompressedMessageSize(123L).Build();
Assert.Equal(MessageEventType.Sent, messageEvent.Type);
Assert.Equal(1L, messageEvent.MessageId);
Assert.Equal(123L, messageEvent.CompressedMessageSize);
}
[Fact]
public void BuildMessageEvent_WithAllValues()
{
IMessageEvent messageEvent =
MessageEvent.Builder(MessageEventType.Received, 1L)
.SetUncompressedMessageSize(123L)
.SetCompressedMessageSize(63L)
.Build();
Assert.Equal(MessageEventType.Received, messageEvent.Type);
Assert.Equal(1L, messageEvent.MessageId);
Assert.Equal(123L, messageEvent.UncompressedMessageSize);
Assert.Equal(63L, messageEvent.CompressedMessageSize);
}
[Fact]
public void MessageEvent_ToString()
{
IMessageEvent messageEvent =
MessageEvent.Builder(MessageEventType.Sent, 1L)
.SetUncompressedMessageSize(123L)
.SetCompressedMessageSize(63L)
.Build();
Assert.Contains("type=Sent", messageEvent.ToString());
Assert.Contains("messageId=1", messageEvent.ToString());
Assert.Contains("compressedMessageSize=63", messageEvent.ToString());
Assert.Contains("uncompressedMessageSize=123", messageEvent.ToString());
}
}
}

4
test/OpenTelemetry.Tests/Impl/Trace/NoopSpan.cs
View File

@ -55,10 +55,6 @@ namespace OpenTelemetry.Trace.Test
{
}
public override void AddMessageEvent(IMessageEvent messageEvent)
{
}
public override void End(EndSpanOptions options)
{
}

4
test/OpenTelemetry.Tests/Impl/Trace/Propagation/BinaryFormatBaseTest.cs
View File

@ -32,7 +32,7 @@ namespace OpenTelemetry.Trace.Propagation.Test
[Fact]
public void ToByteArray_NotNullSpanContext()
{
Assert.Equal(new byte[0], binaryFormat.ToByteArray(SpanContext.Invalid));
Assert.Equal(new byte[0], binaryFormat.ToByteArray(SpanContext.Blank));
}
[Fact]
@ -44,7 +44,7 @@ namespace OpenTelemetry.Trace.Propagation.Test
[Fact]
public void FromByteArray_NotNullInput()
{
Assert.Equal(SpanContext.Invalid, binaryFormat.FromByteArray(new byte[0]));
Assert.Equal(SpanContext.Blank, binaryFormat.FromByteArray(new byte[0]));
}
}
}

34
test/OpenTelemetry.Tests/Impl/Trace/Propagation/BinaryFormatTest.cs
View File

@ -65,7 +65,7 @@ namespace OpenTelemetry.Trace.Propagation.Test
{
Assert.Equal(
new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0},
binaryFormat.ToByteArray(SpanContext.Invalid));
binaryFormat.ToByteArray(SpanContext.Blank));
}
@ -84,18 +84,17 @@ namespace OpenTelemetry.Trace.Propagation.Test
[Fact]
public void FromBinaryValue_EmptyInput()
{
Assert.Throws<SpanContextParseException>(() => binaryFormat.FromByteArray(new byte[0]));
}
[Fact]
public void FromBinaryValue_UnsupportedVersionId()
{
Assert.Throws<SpanContextParseException>(() => binaryFormat.FromByteArray(
new byte[] {
66, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 97, 98, 99, 100, 101,
102, 103, 104, 1,
new byte[]
{
66, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 97, 98, 99, 100, 101,
102, 103, 104, 1,
}));
}
@ -105,10 +104,11 @@ namespace OpenTelemetry.Trace.Propagation.Test
Assert.Equal(
SpanContext.Create(TraceId.Invalid, SpanId.Invalid, TraceOptions.Default, Tracestate.Empty),
binaryFormat.FromByteArray(
new byte[] {
0, 4, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 1, 97, 98,
99, 100, 101, 102, 103, 104, 2, 1,
}));
new byte[]
{
0, 4, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 1, 97, 98,
99, 100, 101, 102, 103, 104, 2, 1,
}));
}
[Fact]
@ -116,22 +116,20 @@ namespace OpenTelemetry.Trace.Propagation.Test
{
Assert.Equal(
SpanContext.Create(
TraceId.FromBytes(
new byte[] { 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79 }),
TraceId.FromBytes(new byte[] { 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79 }),
SpanId.Invalid,
TraceOptions.Default, Tracestate.Empty),
binaryFormat.FromByteArray(
new byte[] {
0, 0, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 3, 97, 98,
99, 100, 101, 102, 103, 104, 2, 1,
new byte[]
{
0, 0, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 3, 97, 98,
99, 100, 101, 102, 103, 104, 2, 1,
}));
}
[Fact]
public void FromBinaryValue_ShorterTraceId()
{
Assert.Throws<SpanContextParseException>(() => binaryFormat.FromByteArray(
new byte[] { 0, 0, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76 }));
}
@ -139,14 +137,12 @@ namespace OpenTelemetry.Trace.Propagation.Test
[Fact]
public void FromBinaryValue_ShorterSpanId()
{
Assert.Throws<SpanContextParseException>(() => binaryFormat.FromByteArray(new byte[] { 0, 1, 97, 98, 99, 100, 101, 102, 103 }));
}
[Fact]
public void FromBinaryValue_ShorterTraceOptions()
{
Assert.Throws<SpanContextParseException>(() => binaryFormat.FromByteArray(
new byte[] {
0, 0, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 1, 97, 98, 99, 100,

4
test/OpenTelemetry.Tests/Impl/Trace/Propagation/TextFormatBaseTest.cs
View File

@ -32,7 +32,7 @@ namespace OpenTelemetry.Trace.Propagation.Test
[Fact]
public void Inject_NotNullSpanContext_DoesNotFail()
{
textFormat.Inject(SpanContext.Invalid, new object(), (d, k, v) => { });
textFormat.Inject(SpanContext.Blank, new object(), (d, k, v) => { });
}
[Fact]
@ -44,7 +44,7 @@ namespace OpenTelemetry.Trace.Propagation.Test
[Fact]
public void FromHeaders_NotNullGetter()
{
Assert.Same(SpanContext.Invalid, textFormat.Extract(new object(), (d, k) => null));
Assert.Same(SpanContext.Blank, textFormat.Extract(new object(), (d, k) => null));
}
}
}

12
test/OpenTelemetry.Tests/Impl/Trace/SpanBaseTest.cs
View File

@ -89,19 +89,15 @@ namespace OpenTelemetry.Trace.Test
}
[Fact]
public void AddMessageEventDefaultImplementation()
public void AddEventDefaultImplementation()
{
Mock<SpanBase> mockSpan = new Mock<SpanBase>();
var span = mockSpan.Object;
IMessageEvent messageEvent =
MessageEvent.Builder(MessageEventType.Sent, 123)
.SetUncompressedMessageSize(456)
.SetCompressedMessageSize(789)
.Build();
IEvent @event = Event.Create("MyEvent");
span.AddEvent(@event);
span.AddMessageEvent(messageEvent);
mockSpan.Verify((s) => s.AddMessageEvent(messageEvent));
mockSpan.Verify((s) => s.AddEvent(@event));
}
}
}

5
test/OpenTelemetry.Tests/Impl/Trace/SpanBuilderTest.cs
View File

@ -122,7 +122,7 @@ namespace OpenTelemetry.Trace.Test
public void StartRemoteSpanInvalidParent()
{
ISpan span =
SpanBuilder.CreateWithRemoteParent(SPAN_NAME, SpanKind.Internal, SpanContext.Invalid, spanBuilderOptions)
SpanBuilder.CreateWithRemoteParent(SPAN_NAME, SpanKind.Internal, SpanContext.Blank, spanBuilderOptions)
.StartSpan();
Assert.True(span.Context.IsValid);
Assert.True(span.Options.HasFlag(SpanOptions.RecordEvents));
@ -278,7 +278,8 @@ namespace OpenTelemetry.Trace.Test
// is not less than probability * Long.MAX_VALUE;
ITraceId traceId =
TraceId.FromBytes(
new byte[] {
new byte[]
{
0x8F,
0xFF,
0xFF,

8
test/OpenTelemetry.Tests/Impl/Trace/SpanContextTest.cs
View File

@ -43,15 +43,15 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void InvalidSpanContext()
{
Assert.Equal(TraceId.Invalid, SpanContext.Invalid.TraceId);
Assert.Equal(SpanId.Invalid, SpanContext.Invalid.SpanId);
Assert.Equal(TraceOptions.Default, SpanContext.Invalid.TraceOptions);
Assert.Equal(TraceId.Invalid, SpanContext.Blank.TraceId);
Assert.Equal(SpanId.Invalid, SpanContext.Blank.SpanId);
Assert.Equal(TraceOptions.Default, SpanContext.Blank.TraceOptions);
}
[Fact]
public void IsValid()
{
Assert.False(SpanContext.Invalid.IsValid);
Assert.False(SpanContext.Blank.IsValid);
Assert.False(
SpanContext.Create(
TraceId.FromBytes(firstTraceIdBytes), SpanId.Invalid, TraceOptions.Default, Tracestate.Empty)

66
test/OpenTelemetry.Tests/Impl/Trace/SpanTest.cs
View File

@ -77,8 +77,6 @@ namespace OpenTelemetry.Trace.Test
span.SetAttributes(attributes);
span.AddEvent(Event.Create(EVENT_DESCRIPTION));
span.AddEvent(EVENT_DESCRIPTION, attributes);
span.AddMessageEvent(
MessageEvent.Builder(MessageEventType.Received, 1).SetUncompressedMessageSize(3).Build());
span.AddLink(Link.FromSpanContext(spanContext, LinkType.ChildLinkedSpan));
span.End();
// exception.expect(IllegalStateException);
@ -107,14 +105,11 @@ namespace OpenTelemetry.Trace.Test
AttributeValue.StringAttributeValue("MySingleStringAttributeValue"));
span.AddEvent(Event.Create(EVENT_DESCRIPTION));
span.AddEvent(EVENT_DESCRIPTION, attributes);
span.AddMessageEvent(
MessageEvent.Builder(MessageEventType.Received, 1).SetUncompressedMessageSize(3).Build());
span.AddLink(Link.FromSpanContext(spanContext, LinkType.ChildLinkedSpan));
ISpanData spanData = ((Span)span).ToSpanData();
Assert.Equal(timestamp, spanData.StartTimestamp);
Assert.Empty(spanData.Attributes.AttributeMap);
Assert.Empty(spanData.Events.Events);
Assert.Empty(spanData.MessageEvents.Events);
Assert.Empty(spanData.Links.Links);
Assert.Equal(Status.Ok, spanData.Status);
Assert.Equal(timestamp, spanData.EndTimestamp);
@ -143,9 +138,6 @@ namespace OpenTelemetry.Trace.Test
interval = TimeSpan.FromMilliseconds(200);
span.AddEvent(EVENT_DESCRIPTION, attributes);
interval = TimeSpan.FromMilliseconds(300);
IMessageEvent networkEvent =
MessageEvent.Builder(MessageEventType.Received, 1).SetUncompressedMessageSize(3).Build();
span.AddMessageEvent(networkEvent);
interval = TimeSpan.FromMilliseconds(400);
ILink link = Link.FromSpanContext(spanContext, LinkType.ChildLinkedSpan);
span.AddLink(link);
@ -162,10 +154,6 @@ namespace OpenTelemetry.Trace.Test
Assert.Equal(Event.Create(EVENT_DESCRIPTION), spanData.Events.Events.ToList()[0].Event);
Assert.Equal(timestamp.AddDuration(Duration.Create(TimeSpan.FromMilliseconds(200))), spanData.Events.Events.ToList()[1].Timestamp);
Assert.Equal(Event.Create(EVENT_DESCRIPTION, attributes), spanData.Events.Events.ToList()[1].Event);
Assert.Equal(0, spanData.MessageEvents.DroppedEventsCount);
Assert.Single(spanData.MessageEvents.Events);
Assert.Equal(timestamp.AddDuration(Duration.Create(TimeSpan.FromMilliseconds(300))), spanData.MessageEvents.Events.First().Timestamp);
Assert.Equal(networkEvent, spanData.MessageEvents.Events.First().Event);
Assert.Equal(0, spanData.Links.DroppedLinksCount);
Assert.Single(spanData.Links.Links);
Assert.Equal(link, spanData.Links.Links.First());
@ -201,9 +189,6 @@ namespace OpenTelemetry.Trace.Test
interval = TimeSpan.FromMilliseconds(200);
span.AddEvent(EVENT_DESCRIPTION, attributes);
interval = TimeSpan.FromMilliseconds(300);
IMessageEvent networkEvent =
MessageEvent.Builder(MessageEventType.Received, 1).SetUncompressedMessageSize(3).Build();
span.AddMessageEvent(networkEvent);
ILink link = Link.FromSpanContext(spanContext, LinkType.ChildLinkedSpan);
span.AddLink(link);
interval = TimeSpan.FromMilliseconds(400);
@ -222,10 +207,6 @@ namespace OpenTelemetry.Trace.Test
Assert.Equal(Event.Create(EVENT_DESCRIPTION), spanData.Events.Events.ToList()[0].Event);
Assert.Equal(timestamp.AddDuration(Duration.Create(TimeSpan.FromMilliseconds(200))), spanData.Events.Events.ToList()[1].Timestamp);
Assert.Equal(Event.Create(EVENT_DESCRIPTION, attributes), spanData.Events.Events.ToList()[1].Event);
Assert.Equal(0, spanData.MessageEvents.DroppedEventsCount);
Assert.Single(spanData.MessageEvents.Events);
Assert.Equal(timestamp.AddDuration(Duration.Create(TimeSpan.FromMilliseconds(300))), spanData.MessageEvents.Events.First().Timestamp);
Assert.Equal(networkEvent, spanData.MessageEvents.Events.First().Event);
Assert.Equal(0, spanData.Links.DroppedLinksCount);
Assert.Single(spanData.Links.Links);
Assert.Equal(link, spanData.Links.Links.First());
@ -440,53 +421,6 @@ namespace OpenTelemetry.Trace.Test
}
}
[Fact]
public void DroppingNetworkEvents()
{
int maxNumberOfNetworkEvents = 8;
TraceParams traceParams =
TraceParams.Default
.ToBuilder()
.SetMaxNumberOfMessageEvents(maxNumberOfNetworkEvents)
.Build();
ISpan span =
Span.StartSpan(
spanContext,
recordSpanOptions,
SPAN_NAME,
parentSpanId,
false,
traceParams,
startEndHandler,
timestampConverter);
IMessageEvent networkEvent =
MessageEvent.Builder(MessageEventType.Received, 1).SetUncompressedMessageSize(3).Build();
for (int i = 0; i < 2 * maxNumberOfNetworkEvents; i++)
{
span.AddMessageEvent(networkEvent);
interval += TimeSpan.FromMilliseconds(100);
}
ISpanData spanData = ((Span)span).ToSpanData();
Assert.Equal(maxNumberOfNetworkEvents, spanData.MessageEvents.DroppedEventsCount);
Assert.Equal(maxNumberOfNetworkEvents, spanData.MessageEvents.Events.Count());
var list = spanData.MessageEvents.Events.ToList();
for (int i = 0; i < maxNumberOfNetworkEvents; i++)
{
Assert.Equal(timestamp.AddDuration(Duration.Create(TimeSpan.FromMilliseconds(100 * (maxNumberOfNetworkEvents + i)))), list[i].Timestamp);
Assert.Equal(networkEvent, list[i].Event);
}
span.End();
spanData = ((Span)span).ToSpanData();
Assert.Equal(maxNumberOfNetworkEvents, spanData.MessageEvents.DroppedEventsCount);
Assert.Equal(maxNumberOfNetworkEvents, spanData.MessageEvents.Events.Count());
list = spanData.MessageEvents.Events.ToList();
for (int i = 0; i < maxNumberOfNetworkEvents; i++)
{
Assert.Equal(timestamp.AddDuration(Duration.Create(TimeSpan.FromMilliseconds(100 * (maxNumberOfNetworkEvents + i)))), list[i].Timestamp);
Assert.Equal(networkEvent, list[i].Event);
}
}
[Fact]
public void DroppingLinks()
{

4
test/OpenTelemetry.Tests/Impl/Trace/TracerBaseTest.cs
View File

@ -17,9 +17,9 @@
namespace OpenTelemetry.Trace.Test
{
using System;
using Internal;
using Moq;
using OpenTelemetry.Common;
using OpenTelemetry.Trace.Internal;
using Xunit;
public class TracerBaseTest
@ -145,7 +145,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void DefaultSpanBuilderWithRemoteParent()
{
Assert.Same(BlankSpan.Instance, noopTracer.SpanBuilderWithRemoteParent(SPAN_NAME, remoteParentSpanContext: SpanContext.Invalid).StartSpan());
Assert.Same(BlankSpan.Instance, noopTracer.SpanBuilderWithRemoteParent(SPAN_NAME, remoteParentSpanContext: SpanContext.Blank).StartSpan());
}
[Fact]

2
test/OpenTelemetry.Tests/Impl/Trace/TracerTest.cs
View File

@ -46,7 +46,7 @@ namespace OpenTelemetry.Trace.Test
[Fact]
public void CreateSpanBuilderWithRemoteParet()
{
ISpanBuilder spanBuilder = tracer.SpanBuilderWithRemoteParent(SPAN_NAME, remoteParentSpanContext: SpanContext.Invalid);
ISpanBuilder spanBuilder = tracer.SpanBuilderWithRemoteParent(SPAN_NAME, remoteParentSpanContext: SpanContext.Blank);
Assert.IsType<SpanBuilder>(spanBuilder);
}
}