Skip to content

Azure Monitor Exporter - Update to Otel0.7 #16246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rajkumar-rangaraj merged 3 commits into from
Oct 25, 2020
Merged

Azure Monitor Exporter - Update to Otel0.7 #16246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c6c6d1
Update to otel0.7
rajkumar-rangaraj Oct 24, 2020
49094c9
Update API
rajkumar-rangaraj Oct 24, 2020
95638c4
Update return type in API
rajkumar-rangaraj Oct 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Packages.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
<PackageReference Update="NSubstitute" Version="3.1.0" />
<PackageReference Update="nunit" Version="3.12.0" />
<PackageReference Update="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Update="OpenTelemetry" Version="0.6.0-beta.1" />
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="0.6.0-beta.1" />
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="0.6.0-beta.1" />
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="0.6.0-beta.1" />
<PackageReference Update="OpenTelemetry" Version="0.7.0-beta.1" />
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="0.7.0-beta.1" />
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="0.7.0-beta.1" />
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="0.7.0-beta.1" />
<PackageReference Update="Polly" Version="7.1.0" />
<PackageReference Update="Portable.BouncyCastle" Version="1.8.5" />
<PackageReference Update="PublicApiGenerator" Version="10.0.1" />
Expand Down
4 changes: 2 additions & 2 deletions ...enTelemetry.Exporter/api/Microsoft.Azure.Monitor.OpenTelemetry.Exporter.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ public AzureMonitorExporterOptions() { }
public long MaxTransmissionStorageCapacity { get { throw null; } set { } }
public string StorageFolder { get { throw null; } set { } }
}
public partial class AzureMonitorTraceExporter : OpenTelemetry.Trace.ActivityExporter
public partial class AzureMonitorTraceExporter : OpenTelemetry.BaseExporter<System.Diagnostics.Activity>
{
public AzureMonitorTraceExporter(Microsoft.Azure.Monitor.OpenTelemetry.Exporter.AzureMonitorExporterOptions options) { }
public override OpenTelemetry.Trace.ExportResult Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> batch) { throw null; }
public override OpenTelemetry.ExportResult Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> batch) { throw null; }
}
}
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Models
Expand Down
4 changes: 3 additions & 1 deletion ...icrosoft.Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorExporterHelperExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using OpenTelemetry;
using OpenTelemetry.Trace;
using System;
using System.Diagnostics;

namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
Expand All @@ -28,7 +30,7 @@ public static TracerProviderBuilder AddAzureMonitorTraceExporter(this TracerProv
configure?.Invoke(options);

// TODO: Pick Simple vs Batching based on AzureMonitorExporterOptions
return builder.AddProcessor(new BatchExportActivityProcessor(new AzureMonitorTraceExporter(options)));
return builder.AddProcessor(new BatchExportProcessor<Activity>(new AzureMonitorTraceExporter(options)));
}
}
}
2 changes: 1 addition & 1 deletion sdk/monitor/Microsoft.Azure.Monitor.OpenTelemetry.Exporter/src/AzureMonitorTraceExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
public class AzureMonitorTraceExporter : ActivityExporter
public class AzureMonitorTraceExporter : BaseExporter<Activity>
{
private readonly ITransmitter Transmitter;
private readonly AzureMonitorExporterOptions options;
Expand Down
6 changes: 4 additions & 2 deletions ...nTelemetry.Exporter.Integration.Tests/TestFramework/OpenTelemetryWebApplicationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

using Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Models;
using OpenTelemetry.Trace;
using OpenTelemetry;
using System.Diagnostics;

namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.TestFramework
{
Expand All @@ -24,11 +26,11 @@ public class OpenTelemetryWebApplicationFactory<TStartup> : WebApplicationFactor

private const string EmptyConnectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000";
private readonly MockTransmitter Transmitter = new MockTransmitter();
private ActivityProcessor ActivityProcessor;
private BaseProcessor<Activity> ActivityProcessor;

protected override void ConfigureWebHost(IWebHostBuilder builder)
{
this.ActivityProcessor = new BatchExportActivityProcessor(new AzureMonitorTraceExporter(
this.ActivityProcessor = new BatchExportProcessor<Activity>(new AzureMonitorTraceExporter(
options: new AzureMonitorExporterOptions
{
ConnectionString = EmptyConnectionString,
Expand Down