diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/api/OpenTelemetry.Exporter.AzureMonitor.netstandard2.0.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/api/OpenTelemetry.Exporter.AzureMonitor.netstandard2.0.cs index 4ff2756c7e10..e47ef3c2ce0f 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/api/OpenTelemetry.Exporter.AzureMonitor.netstandard2.0.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/api/OpenTelemetry.Exporter.AzureMonitor.netstandard2.0.cs @@ -21,7 +21,7 @@ namespace OpenTelemetry.Exporter.AzureMonitor.Models { public partial class AvailabilityData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public AvailabilityData(int version, string id, string name, string duration, bool success) { } + public AvailabilityData(int version, string id, string name, string duration, bool success) : base (default(int)) { } public string Duration { get { throw null; } } public string Id { get { throw null; } } public System.Collections.Generic.IDictionary Measurements { get { throw null; } } @@ -30,7 +30,6 @@ public AvailabilityData(int version, string id, string name, string duration, bo public System.Collections.Generic.IDictionary Properties { get { throw null; } } public string RunLocation { get { throw null; } set { } } public bool Success { get { throw null; } } - public int Version { get { throw null; } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct ContextTagKeys : System.IEquatable @@ -96,12 +95,11 @@ public AvailabilityData(int version, string id, string name, string duration, bo } public partial class MessageData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public MessageData(int version, string message) { } + public MessageData(int version, string message) : base (default(int)) { } public System.Collections.Generic.IDictionary Measurements { get { throw null; } } public string Message { get { throw null; } } public System.Collections.Generic.IDictionary Properties { get { throw null; } } public OpenTelemetry.Exporter.AzureMonitor.Models.SeverityLevel? SeverityLevel { get { throw null; } set { } } - public int Version { get { throw null; } } } public partial class MetricDataPoint { @@ -117,10 +115,9 @@ public MetricDataPoint(string name, double value) { } } public partial class MetricsData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public MetricsData(int version, System.Collections.Generic.IEnumerable metrics) { } + public MetricsData(int version, System.Collections.Generic.IEnumerable metrics) : base (default(int)) { } public System.Collections.Generic.IList Metrics { get { throw null; } } public System.Collections.Generic.IDictionary Properties { get { throw null; } } - public int Version { get { throw null; } } } public partial class MonitorBase { @@ -130,12 +127,12 @@ public MonitorBase() { } } public partial class MonitorDomain { - public MonitorDomain() { } - public string Test { get { throw null; } set { } } + public MonitorDomain(int version) { } + public int Version { get { throw null; } } } public partial class PageViewData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public PageViewData(int version, string id, string name) { } + public PageViewData(int version, string id, string name) : base (default(int)) { } public string Duration { get { throw null; } set { } } public string Id { get { throw null; } } public System.Collections.Generic.IDictionary Measurements { get { throw null; } } @@ -143,11 +140,10 @@ public PageViewData(int version, string id, string name) { } public System.Collections.Generic.IDictionary Properties { get { throw null; } } public string ReferredUri { get { throw null; } set { } } public string Url { get { throw null; } set { } } - public int Version { get { throw null; } } } public partial class PageViewPerfData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public PageViewPerfData(int version, string id, string name) { } + public PageViewPerfData(int version, string id, string name) : base (default(int)) { } public string DomProcessing { get { throw null; } set { } } public string Duration { get { throw null; } set { } } public string Id { get { throw null; } } @@ -159,11 +155,10 @@ public PageViewPerfData(int version, string id, string name) { } public string ReceivedResponse { get { throw null; } set { } } public string SentRequest { get { throw null; } set { } } public string Url { get { throw null; } set { } } - public int Version { get { throw null; } } } public partial class RemoteDependencyData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public RemoteDependencyData(int version, string name, string duration) { } + public RemoteDependencyData(int version, string name, string duration) : base (default(int)) { } public string Data { get { throw null; } set { } } public string Duration { get { throw null; } } public string Id { get { throw null; } set { } } @@ -174,11 +169,10 @@ public RemoteDependencyData(int version, string name, string duration) { } public bool? Success { get { throw null; } set { } } public string Target { get { throw null; } set { } } public string Type { get { throw null; } set { } } - public int Version { get { throw null; } } } public partial class RequestData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public RequestData(int version, string id, string duration, bool success, string responseCode) { } + public RequestData(int version, string id, string duration, bool success, string responseCode) : base (default(int)) { } public string Duration { get { throw null; } } public string Id { get { throw null; } } public System.Collections.Generic.IDictionary Measurements { get { throw null; } } @@ -188,7 +182,6 @@ public RequestData(int version, string id, string duration, bool success, string public string Source { get { throw null; } set { } } public bool Success { get { throw null; } } public string Url { get { throw null; } set { } } - public int Version { get { throw null; } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct SeverityLevel : System.IEquatable @@ -229,21 +222,19 @@ internal TelemetryErrorDetails() { } } public partial class TelemetryEventData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public TelemetryEventData(int version, string name) { } + public TelemetryEventData(int version, string name) : base (default(int)) { } public System.Collections.Generic.IDictionary Measurements { get { throw null; } } public string Name { get { throw null; } } public System.Collections.Generic.IDictionary Properties { get { throw null; } } - public int Version { get { throw null; } } } public partial class TelemetryExceptionData : OpenTelemetry.Exporter.AzureMonitor.Models.MonitorDomain { - public TelemetryExceptionData(int version) { } + public TelemetryExceptionData(int version, System.Collections.Generic.IEnumerable exceptions) : base (default(int)) { } public System.Collections.Generic.IList Exceptions { get { throw null; } } public System.Collections.Generic.IDictionary Measurements { get { throw null; } } public string ProblemId { get { throw null; } set { } } public System.Collections.Generic.IDictionary Properties { get { throw null; } } public OpenTelemetry.Exporter.AzureMonitor.Models.SeverityLevel? SeverityLevel { get { throw null; } set { } } - public int Version { get { throw null; } } } public partial class TelemetryExceptionDetails { @@ -258,14 +249,14 @@ public TelemetryExceptionDetails(string message) { } } public partial class TelemetryItem { - public TelemetryItem(string name, System.DateTimeOffset time) { } + public TelemetryItem(string name, string time) { } public OpenTelemetry.Exporter.AzureMonitor.Models.MonitorBase Data { get { throw null; } set { } } public string InstrumentationKey { get { throw null; } set { } } public string Name { get { throw null; } } public float? SampleRate { get { throw null; } set { } } public string Sequence { get { throw null; } set { } } public System.Collections.Generic.IDictionary Tags { get { throw null; } } - public System.DateTimeOffset Time { get { throw null; } } + public string Time { get { throw null; } } public int? Version { get { throw null; } set { } } } public partial class TrackResponse diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/ApplicationInsightsRestClient.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/ApplicationInsightsRestClient.cs new file mode 100644 index 000000000000..0bf9d06c5237 --- /dev/null +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/ApplicationInsightsRestClient.cs @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; +using OpenTelemetry.Exporter.AzureMonitor.Models; + +namespace OpenTelemetry.Exporter.AzureMonitor +{ + internal partial class ApplicationInsightsRestClient + { + internal HttpMessage CreateTrackRequest(IEnumerable body) + { + var message = _pipeline.CreateMessage(); + var request = message.Request; + request.Method = RequestMethod.Post; + var uri = new RawRequestUriBuilder(); + uri.AppendRaw(host, false); + uri.AppendRaw("/v2", false); + uri.AppendPath("/track", false); + request.Uri = uri; + request.Headers.Add("Content-Type", "application/json"); + request.Headers.Add("Accept", "application/json"); + using var content = new NDJsonWriter(); + foreach (var item in body) + { + content.JsonWriter.WriteObjectValue(item); + content.WriteNewLine(); + } + request.Content = RequestContent.Create(content.ToBytes()); + return message; + } + } +} diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/AzureMonitorTransmitter.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/AzureMonitorTransmitter.cs index 52b8930de7e7..c82a5b04090f 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/AzureMonitorTransmitter.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/AzureMonitorTransmitter.cs @@ -9,6 +9,7 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; +using Azure; using Azure.Core.Pipeline; using OpenTelemetry.Exporter.AzureMonitor.ConnectionString; @@ -20,7 +21,7 @@ namespace OpenTelemetry.Exporter.AzureMonitor { internal class AzureMonitorTransmitter { - private readonly ApplicationInsightsRestClient serviceRestClient; + private readonly ApplicationInsightsRestClient applicationInsightsRestClient; private readonly AzureMonitorExporterOptions options; private readonly string instrumentationKey; @@ -45,7 +46,7 @@ public AzureMonitorTransmitter(AzureMonitorExporterOptions exporterOptions) ConnectionStringParser.GetValues(exporterOptions.ConnectionString, out this.instrumentationKey, out string ingestionEndpoint); options = exporterOptions; - serviceRestClient = new ApplicationInsightsRestClient(new ClientDiagnostics(options), HttpPipelineBuilder.Build(options), endpoint: ingestionEndpoint); + applicationInsightsRestClient = new ApplicationInsightsRestClient(new ClientDiagnostics(options), HttpPipelineBuilder.Build(options), host: ingestionEndpoint); } internal async ValueTask AddBatchActivityAsync(Batch batchActivity, bool async, CancellationToken cancellationToken) @@ -70,11 +71,12 @@ internal async ValueTask AddBatchActivityAsync(Batch batchActivit if (async) { - response = await this.serviceRestClient.TrackAsync(telemetryItems, cancellationToken).ConfigureAwait(false); + // TODO: RequestFailedException is thrown when http response is not equal to 200 or 206. Implement logic to catch exception. + response = await this.applicationInsightsRestClient.TrackAsync(telemetryItems, cancellationToken).ConfigureAwait(false); } else { - response = this.serviceRestClient.TrackAsync(telemetryItems, cancellationToken).Result; + response = this.applicationInsightsRestClient.TrackAsync(telemetryItems, cancellationToken).Result; } // TODO: Handle exception, check telemetryItems has items @@ -83,7 +85,7 @@ internal async ValueTask AddBatchActivityAsync(Batch batchActivit private static TelemetryItem GeneratePartAEnvelope(Activity activity) { - TelemetryItem telemetryItem = new TelemetryItem(PartA_Name_Mapping[activity.GetTelemetryType()], activity.StartTimeUtc); + TelemetryItem telemetryItem = new TelemetryItem(PartA_Name_Mapping[activity.GetTelemetryType()], activity.StartTimeUtc.ToString(CultureInfo.InvariantCulture)); ExtractRoleInfo(activity.GetResource(), out var roleName, out var roleInstance); telemetryItem.Tags[ContextTagKeys.AiCloudRole.ToString()] = roleName; telemetryItem.Tags[ContextTagKeys.AiCloudRoleInstance.ToString()] = roleInstance; diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/ApplicationInsightsRestClient.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/ApplicationInsightsRestClient.cs index 26adaea4ad7d..b8c580838b5e 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/ApplicationInsightsRestClient.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/ApplicationInsightsRestClient.cs @@ -19,52 +19,29 @@ namespace OpenTelemetry.Exporter.AzureMonitor { internal partial class ApplicationInsightsRestClient { - private string endpoint; + private string host; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; /// Initializes a new instance of ApplicationInsightsRestClient. /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. - /// Breeze endpoint: https://dc.services.visualstudio.com. - /// is null. - public ApplicationInsightsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint = "https://dc.services.visualstudio.com") + /// Breeze endpoint: https://dc.services.visualstudio.com. + /// is null. + public ApplicationInsightsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string host = "https://dc.services.visualstudio.com") { - if (endpoint == null) + if (host == null) { - throw new ArgumentNullException(nameof(endpoint)); + throw new ArgumentNullException(nameof(host)); } - this.endpoint = endpoint; + this.host = host; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; } - internal HttpMessage CreateTrackRequest(IEnumerable body) - { - var message = _pipeline.CreateMessage(); - var request = message.Request; - request.Method = RequestMethod.Post; - var uri = new RawRequestUriBuilder(); - uri.AppendRaw(endpoint, false); - uri.AppendRaw("/v2", false); - uri.AppendPath("/track", false); - request.Uri = uri; - request.Headers.Add("Content-Type", "application/json"); - request.Headers.Add("Accept", "application/json"); - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteStartArray(); - foreach (var item in body) - { - content.JsonWriter.WriteObjectValue(item); - } - content.JsonWriter.WriteEndArray(); - request.Content = content; - return message; - } - - /// This operation generates a model using an entire series, each point is detected with the same model. With this method, points before and after a certain point are used to determine whether it is an anomaly. The entire detection can give user an overall status of the time series. - /// Time series points and period if needed. Advanced model parameters can also be set in the request. + /// This operation sends a sequence of telemetry events that will be monitored by Azure Monitor. + /// The list of telemetry events to track. /// The cancellation token to use. /// is null. public async Task> TrackAsync(IEnumerable body, CancellationToken cancellationToken = default) @@ -80,11 +57,6 @@ public async Task> TrackAsync(IEnumerable { case 200: case 206: - case 400: - case 402: - case 429: - case 500: - case 503: { TrackResponse value = default; using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false); @@ -96,8 +68,8 @@ public async Task> TrackAsync(IEnumerable } } - /// This operation generates a model using an entire series, each point is detected with the same model. With this method, points before and after a certain point are used to determine whether it is an anomaly. The entire detection can give user an overall status of the time series. - /// Time series points and period if needed. Advanced model parameters can also be set in the request. + /// This operation sends a sequence of telemetry events that will be monitored by Azure Monitor. + /// The list of telemetry events to track. /// The cancellation token to use. /// is null. public Response Track(IEnumerable body, CancellationToken cancellationToken = default) @@ -113,11 +85,6 @@ public Response Track(IEnumerable body, Cancellati { case 200: case 206: - case 400: - case 402: - case 429: - case 500: - case 503: { TrackResponse value = default; using var document = JsonDocument.Parse(message.Response.ContentStream); diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.Serialization.cs index 598d73072426..195c332f0f1c 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.Serialization.cs @@ -15,8 +15,6 @@ public partial class AvailabilityData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); writer.WritePropertyName("id"); writer.WriteStringValue(Id); writer.WritePropertyName("name"); @@ -57,11 +55,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.cs index 1d3976a42ae2..ab50f9952047 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/AvailabilityData.cs @@ -21,7 +21,7 @@ public partial class AvailabilityData : MonitorDomain /// Duration in format: DD.HH:MM:SS.MMMMMM. Must be less than 1000 days. /// Success flag. /// , , or is null. - public AvailabilityData(int version, string id, string name, string duration, bool success) + public AvailabilityData(int version, string id, string name, string duration, bool success) : base(version) { if (id == null) { @@ -36,7 +36,6 @@ public AvailabilityData(int version, string id, string name, string duration, bo throw new ArgumentNullException(nameof(duration)); } - Version = version; Id = id; Name = name; Duration = duration; @@ -45,8 +44,6 @@ public AvailabilityData(int version, string id, string name, string duration, bo Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Identifier of a test run. Use it to correlate steps of test run and telemetry generated by the service. public string Id { get; } /// Name of the test that these availability results represent. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.Serialization.cs index c943fbebab92..9e28962bdaef 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.Serialization.cs @@ -15,8 +15,6 @@ public partial class MessageData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); writer.WritePropertyName("message"); writer.WriteStringValue(Message); if (Optional.IsDefined(SeverityLevel)) @@ -46,11 +44,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.cs index 072ba336b98d..777e151db63f 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MessageData.cs @@ -11,28 +11,25 @@ namespace OpenTelemetry.Exporter.AzureMonitor.Models { - /// Instances of Message represent printf-like trace statements that are text-searched. Log4Net, NLog and other text-based log file entries are translated into intances of this type. The message does not have measurements. + /// Instances of Message represent printf-like trace statements that are text-searched. Log4Net, NLog and other text-based log file entries are translated into instances of this type. The message does not have measurements. public partial class MessageData : MonitorDomain { /// Initializes a new instance of MessageData. /// Schema version. /// Trace message. /// is null. - public MessageData(int version, string message) + public MessageData(int version, string message) : base(version) { if (message == null) { throw new ArgumentNullException(nameof(message)); } - Version = version; Message = message; Properties = new ChangeTrackingDictionary(); Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Trace message. public string Message { get; } /// Trace severity level. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.Serialization.cs index 4a157c925fa5..2f7369a996d3 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.Serialization.cs @@ -15,8 +15,6 @@ public partial class MetricsData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); writer.WritePropertyName("metrics"); writer.WriteStartArray(); foreach (var item in Metrics) @@ -35,11 +33,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.cs index d68a038d0bbd..7848d6a94e77 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MetricsData.cs @@ -19,20 +19,17 @@ public partial class MetricsData : MonitorDomain /// Schema version. /// List of metrics. Only one metric in the list is currently supported by Application Insights storage. If multiple data points were sent only the first one will be used. /// is null. - public MetricsData(int version, IEnumerable metrics) + public MetricsData(int version, IEnumerable metrics) : base(version) { if (metrics == null) { throw new ArgumentNullException(nameof(metrics)); } - Version = version; Metrics = metrics.ToList(); Properties = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// List of metrics. Only one metric in the list is currently supported by Application Insights storage. If multiple data points were sent only the first one will be used. public IList Metrics { get; } /// Collection of custom properties. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.Serialization.cs index db373a5019d8..85fad62b166e 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.Serialization.cs @@ -15,11 +15,8 @@ public partial class MonitorDomain : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.cs index 09bc74cd8f4f..fa1b231a4c6c 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/MonitorDomain.cs @@ -11,11 +11,13 @@ namespace OpenTelemetry.Exporter.AzureMonitor.Models public partial class MonitorDomain { /// Initializes a new instance of MonitorDomain. - public MonitorDomain() + /// Schema version. + public MonitorDomain(int version) { + Version = version; } - /// Ignored value. - public string Test { get; set; } + /// Schema version. + public int Version { get; } } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.Serialization.cs index 93eee571f7d9..83b8cb403702 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.Serialization.cs @@ -15,8 +15,6 @@ public partial class PageViewData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); writer.WritePropertyName("id"); writer.WriteStringValue(Id); writer.WritePropertyName("name"); @@ -58,11 +56,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.cs index 8a36fbeb52b0..1e9637579608 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewData.cs @@ -19,7 +19,7 @@ public partial class PageViewData : MonitorDomain /// Identifier of a page view instance. Used for correlation between page view and other telemetry items. /// Event name. Keep it low cardinality to allow proper grouping and useful metrics. /// or is null. - public PageViewData(int version, string id, string name) + public PageViewData(int version, string id, string name) : base(version) { if (id == null) { @@ -30,15 +30,12 @@ public PageViewData(int version, string id, string name) throw new ArgumentNullException(nameof(name)); } - Version = version; Id = id; Name = name; Properties = new ChangeTrackingDictionary(); Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Identifier of a page view instance. Used for correlation between page view and other telemetry items. public string Id { get; } /// Event name. Keep it low cardinality to allow proper grouping and useful metrics. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.Serialization.cs index 176c9b2c98e3..b520e3b4c0bf 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.Serialization.cs @@ -15,8 +15,6 @@ public partial class PageViewPerfData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); writer.WritePropertyName("id"); writer.WriteStringValue(Id); writer.WritePropertyName("name"); @@ -78,11 +76,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.cs index 2d760a8c4768..113282a30d95 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/PageViewPerfData.cs @@ -19,7 +19,7 @@ public partial class PageViewPerfData : MonitorDomain /// Identifier of a page view instance. Used for correlation between page view and other telemetry items. /// Event name. Keep it low cardinality to allow proper grouping and useful metrics. /// or is null. - public PageViewPerfData(int version, string id, string name) + public PageViewPerfData(int version, string id, string name) : base(version) { if (id == null) { @@ -30,15 +30,12 @@ public PageViewPerfData(int version, string id, string name) throw new ArgumentNullException(nameof(name)); } - Version = version; Id = id; Name = name; Properties = new ChangeTrackingDictionary(); Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Identifier of a page view instance. Used for correlation between page view and other telemetry items. public string Id { get; } /// Event name. Keep it low cardinality to allow proper grouping and useful metrics. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.Serialization.cs index 877406928d88..bc0da94456f3 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.Serialization.cs @@ -15,8 +15,6 @@ public partial class RemoteDependencyData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); if (Optional.IsDefined(Id)) { writer.WritePropertyName("id"); @@ -73,11 +71,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.cs index a08b2426a926..7904d351bee1 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RemoteDependencyData.cs @@ -19,7 +19,7 @@ public partial class RemoteDependencyData : MonitorDomain /// Name of the command initiated with this dependency call. Low cardinality value. Examples are stored procedure name and URL path template. /// Request duration in format: DD.HH:MM:SS.MMMMMM. Must be less than 1000 days. /// or is null. - public RemoteDependencyData(int version, string name, string duration) + public RemoteDependencyData(int version, string name, string duration) : base(version) { if (name == null) { @@ -30,22 +30,19 @@ public RemoteDependencyData(int version, string name, string duration) throw new ArgumentNullException(nameof(duration)); } - Version = version; Name = name; Duration = duration; Properties = new ChangeTrackingDictionary(); Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Identifier of a dependency call instance. Used for correlation with the request telemetry item corresponding to this dependency call. public string Id { get; set; } /// Name of the command initiated with this dependency call. Low cardinality value. Examples are stored procedure name and URL path template. public string Name { get; } /// Result code of a dependency call. Examples are SQL error code and HTTP status code. public string ResultCode { get; set; } - /// Command initiated by this dependency call. Examples are SQL statement and HTTP URL's with all query parameters. + /// Command initiated by this dependency call. Examples are SQL statement and HTTP URL with all query parameters. public string Data { get; set; } /// Dependency type name. Very low cardinality value for logical grouping of dependencies and interpretation of other fields like commandName and resultCode. Examples are SQL, Azure table, and HTTP. public string Type { get; set; } @@ -53,7 +50,7 @@ public RemoteDependencyData(int version, string name, string duration) public string Target { get; set; } /// Request duration in format: DD.HH:MM:SS.MMMMMM. Must be less than 1000 days. public string Duration { get; } - /// Indication of successfull or unsuccessfull call. + /// Indication of successful or unsuccessful call. public bool? Success { get; set; } /// Collection of custom properties. public IDictionary Properties { get; } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.Serialization.cs index 610e695c43e5..537f9b78e43e 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.Serialization.cs @@ -15,8 +15,6 @@ public partial class RequestData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); writer.WritePropertyName("id"); writer.WriteStringValue(Id); if (Optional.IsDefined(Name)) @@ -62,11 +60,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.cs index d9433729d0f0..e079a7146284 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/RequestData.cs @@ -11,17 +11,17 @@ namespace OpenTelemetry.Exporter.AzureMonitor.Models { - /// An instance of PageView represents a generic action on a page like a button click. It is also the base type for PageView. + /// An instance of Request represents completion of an external request to the application to do work and contains a summary of that request execution and the results. public partial class RequestData : MonitorDomain { /// Initializes a new instance of RequestData. /// Schema version. /// Identifier of a request call instance. Used for correlation between request and other telemetry items. /// Request duration in format: DD.HH:MM:SS.MMMMMM. Must be less than 1000 days. - /// Indication of successfull or unsuccessfull call. + /// Indication of successful or unsuccessful call. /// Result of a request execution. HTTP status code for HTTP requests. /// , , or is null. - public RequestData(int version, string id, string duration, bool success, string responseCode) + public RequestData(int version, string id, string duration, bool success, string responseCode) : base(version) { if (id == null) { @@ -36,7 +36,6 @@ public RequestData(int version, string id, string duration, bool success, string throw new ArgumentNullException(nameof(responseCode)); } - Version = version; Id = id; Duration = duration; Success = success; @@ -45,15 +44,13 @@ public RequestData(int version, string id, string duration, bool success, string Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Identifier of a request call instance. Used for correlation between request and other telemetry items. public string Id { get; } /// Name of the request. Represents code path taken to process request. Low cardinality value to allow better grouping of requests. For HTTP requests it represents the HTTP method and URL path template like 'GET /values/{id}'. public string Name { get; set; } /// Request duration in format: DD.HH:MM:SS.MMMMMM. Must be less than 1000 days. public string Duration { get; } - /// Indication of successfull or unsuccessfull call. + /// Indication of successful or unsuccessful call. public bool Success { get; } /// Result of a request execution. HTTP status code for HTTP requests. public string ResponseCode { get; } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.Serialization.cs index 60a3ac15247d..4a282488027c 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.Serialization.cs @@ -15,8 +15,6 @@ public partial class TelemetryEventData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); writer.WritePropertyName("name"); writer.WriteStringValue(Name); if (Optional.IsCollectionDefined(Properties)) @@ -41,11 +39,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.cs index cc051f1df07e..a1dd65aaade4 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryEventData.cs @@ -18,21 +18,18 @@ public partial class TelemetryEventData : MonitorDomain /// Schema version. /// Event name. Keep it low cardinality to allow proper grouping and useful metrics. /// is null. - public TelemetryEventData(int version, string name) + public TelemetryEventData(int version, string name) : base(version) { if (name == null) { throw new ArgumentNullException(nameof(name)); } - Version = version; Name = name; Properties = new ChangeTrackingDictionary(); Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Event name. Keep it low cardinality to allow proper grouping and useful metrics. public string Name { get; } /// Collection of custom properties. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.Serialization.cs index 896de6487a9d..9aa35db7e901 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.Serialization.cs @@ -15,18 +15,13 @@ public partial class TelemetryExceptionData : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("ver"); - writer.WriteNumberValue(Version); - if (Optional.IsCollectionDefined(Exceptions)) + writer.WritePropertyName("exceptions"); + writer.WriteStartArray(); + foreach (var item in Exceptions) { - writer.WritePropertyName("exceptions"); - writer.WriteStartArray(); - foreach (var item in Exceptions) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); + writer.WriteObjectValue(item); } + writer.WriteEndArray(); if (Optional.IsDefined(SeverityLevel)) { if (SeverityLevel != null) @@ -66,11 +61,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndObject(); } - if (Optional.IsDefined(Test)) - { - writer.WritePropertyName("test"); - writer.WriteStringValue(Test); - } + writer.WritePropertyName("ver"); + writer.WriteNumberValue(Version); writer.WriteEndObject(); } } diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.cs index c5e1ef34ad79..4238f3ad30f2 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryExceptionData.cs @@ -5,7 +5,9 @@ #nullable disable +using System; using System.Collections.Generic; +using System.Linq; using Azure.Core; namespace OpenTelemetry.Exporter.AzureMonitor.Models @@ -15,16 +17,20 @@ public partial class TelemetryExceptionData : MonitorDomain { /// Initializes a new instance of TelemetryExceptionData. /// Schema version. - public TelemetryExceptionData(int version) + /// Exception chain - list of inner exceptions. + /// is null. + public TelemetryExceptionData(int version, IEnumerable exceptions) : base(version) { - Version = version; - Exceptions = new ChangeTrackingList(); + if (exceptions == null) + { + throw new ArgumentNullException(nameof(exceptions)); + } + + Exceptions = exceptions.ToList(); Properties = new ChangeTrackingDictionary(); Measurements = new ChangeTrackingDictionary(); } - /// Schema version. - public int Version { get; } /// Exception chain - list of inner exceptions. public IList Exceptions { get; } /// Severity level. Mostly used to indicate exception severity level when it is reported by logging library. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.Serialization.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.Serialization.cs index e0683c4c3b33..530b2c989963 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.Serialization.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.Serialization.cs @@ -23,7 +23,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("name"); writer.WriteStringValue(Name); writer.WritePropertyName("time"); - writer.WriteStringValue(Time, "O"); + writer.WriteStringValue(Time); if (Optional.IsDefined(SampleRate)) { writer.WritePropertyName("sampleRate"); diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.cs index ec2599f2ace2..cd4eec2bbbe0 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/Generated/Models/TelemetryItem.cs @@ -17,13 +17,17 @@ public partial class TelemetryItem /// Initializes a new instance of TelemetryItem. /// Type name of telemetry data item. /// Event date time when telemetry item was created. This is the wall clock time on the client when the event was generated. There is no guarantee that the client's time is accurate. This field must be formatted in UTC ISO 8601 format, with a trailing 'Z' character, as described publicly on https://en.wikipedia.org/wiki/ISO_8601#UTC. Note: the number of decimal seconds digits provided are variable (and unspecified). Consumers should handle this, i.e. managed code consumers should not use format 'O' for parsing as it specifies a fixed length. Example: 2009-06-15T13:45:30.0000000Z. - /// is null. - public TelemetryItem(string name, DateTimeOffset time) + /// or is null. + public TelemetryItem(string name, string time) { if (name == null) { throw new ArgumentNullException(nameof(name)); } + if (time == null) + { + throw new ArgumentNullException(nameof(time)); + } Name = name; Time = time; @@ -35,7 +39,7 @@ public TelemetryItem(string name, DateTimeOffset time) /// Type name of telemetry data item. public string Name { get; } /// Event date time when telemetry item was created. This is the wall clock time on the client when the event was generated. There is no guarantee that the client's time is accurate. This field must be formatted in UTC ISO 8601 format, with a trailing 'Z' character, as described publicly on https://en.wikipedia.org/wiki/ISO_8601#UTC. Note: the number of decimal seconds digits provided are variable (and unspecified). Consumers should handle this, i.e. managed code consumers should not use format 'O' for parsing as it specifies a fixed length. Example: 2009-06-15T13:45:30.0000000Z. - public DateTimeOffset Time { get; } + public string Time { get; } /// Sampling rate used in application. This telemetry item represents 1 / sampleRate actual telemetry items. public float? SampleRate { get; set; } /// Sequence field used to track absolute order of uploaded events. diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/OpenTelemetry.Exporter.AzureMonitor.csproj b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/OpenTelemetry.Exporter.AzureMonitor.csproj index 013ceff9047b..69aecd69a18d 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/OpenTelemetry.Exporter.AzureMonitor.csproj +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/OpenTelemetry.Exporter.AzureMonitor.csproj @@ -9,7 +9,7 @@ - + diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/autorest.md b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/autorest.md index 89a5437d498f..f16975169c6f 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/autorest.md +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/src/autorest.md @@ -4,5 +4,5 @@ Run `dotnet build /t:GenerateCode` to generate code. ``` yaml input-file: - - https://github.com/srnagar/swagger/blob/05b8ab86a14164a364ac18869fa2b2e689324403/application-insights.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/0ae35fd0c27e0f06004d820e75a13c615b9c2e96/specification/applicationinsights/data-plane/Monitor.Exporters/preview/2020-09-15_Preview/swagger.json ``` diff --git a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/tests/OpenTelemetry.Exporter.AzureMonitor.UnitTest/AzureMonitorTraceExporterTests.cs b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/tests/OpenTelemetry.Exporter.AzureMonitor.UnitTest/AzureMonitorTraceExporterTests.cs index 2b45f88d0564..1a8f9904ea73 100644 --- a/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/tests/OpenTelemetry.Exporter.AzureMonitor.UnitTest/AzureMonitorTraceExporterTests.cs +++ b/sdk/monitor/OpenTelemetry.Exporter.AzureMonitor/tests/OpenTelemetry.Exporter.AzureMonitor.UnitTest/AzureMonitorTraceExporterTests.cs @@ -68,11 +68,11 @@ private void GetInternalFields(AzureMonitorTraceExporter exporter, out string ik .ToString(); var serviceRestClient = typeof(AzureMonitorTransmitter) - .GetField("serviceRestClient", BindingFlags.Instance | BindingFlags.NonPublic) + .GetField("applicationInsightsRestClient", BindingFlags.Instance | BindingFlags.NonPublic) .GetValue(transmitter); endpoint = typeof(ApplicationInsightsRestClient) - .GetField("endpoint", BindingFlags.Instance | BindingFlags.NonPublic) + .GetField("host", BindingFlags.Instance | BindingFlags.NonPublic) .GetValue(serviceRestClient) .ToString(); }