Skip to content
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.

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

Azure Monitor Exporter: rename #18494

Merged
merged 2 commits into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ VisualStudioVersion = 16.0.30330.147
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.TestFramework", "..\..\core\Azure.Core.TestFramework\src\Azure.Core.TestFramework.csproj", "{8052009B-2126-44A3-88CD-4F3B17894C64}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenTelemetry.Exporter.AzureMonitor", "src\Microsoft.OpenTelemetry.Exporter.AzureMonitor.csproj", "{00677EDC-1C5C-4C62-BEFD-9CF1D87195EA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter", "src\Azure.Monitor.OpenTelemetry.Exporter.csproj", "{00677EDC-1C5C-4C62-BEFD-9CF1D87195EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenTelemetry.Exporter.AzureMonitor.Demo.Tracing", "tests\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Demo.Tracing\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Demo.Tracing.csproj", "{966EFB72-64D7-46D8-B592-9C141C5703F9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing", "tests\Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing\Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing.csproj", "{966EFB72-64D7-46D8-B592-9C141C5703F9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenTelemetry.Exporter.AzureMonitor.Tests", "tests\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Tests\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Tests.csproj", "{14546496-6144-49A5-9431-09611F38D30E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter.Tests", "tests\Azure.Monitor.OpenTelemetry.Exporter.Tests\Azure.Monitor.OpenTelemetry.Exporter.Tests.csproj", "{14546496-6144-49A5-9431-09611F38D30E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Integration.Tests.AspNetCoreWebApp", "tests\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.AspNetCoreWebApp\Integration.Tests.AspNetCoreWebApp.csproj", "{E00C15D6-96E5-4A3B-8701-AC24292301CE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp", "tests\Integration.Tests.AspNetCoreWebApp\Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp.csproj", "{E00C15D6-96E5-4A3B-8701-AC24292301CE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Integration.Tests", "tests\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests\Integration.Tests.csproj", "{3CB1B19D-1155-4E4E-9D97-3A7B2926DE2E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests", "tests\Integration.Tests\Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.csproj", "{3CB1B19D-1155-4E4E-9D97-3A7B2926DE2E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenTelemetry.Exporter.AzureMonitor.Benchmarks", "tests\Benchmarks\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Benchmarks.csproj", "{D57D79BA-6D39-4E9E-970C-A5F73A4425BB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Monitor.OpenTelemetry.Exporter.Benchmarks", "tests\Azure.Monitor.OpenTelemetry.Exporter.Benchmarks\Azure.Monitor.OpenTelemetry.Exporter.Benchmarks.csproj", "{D57D79BA-6D39-4E9E-970C-A5F73A4425BB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet)
Install the Azure Monitor Exporter for OpenTelemetry .NET with NuGet:

```shell
dotnet add package Microsoft.OpenTelemetry.Exporter.AzureMonitor
dotnet add package Azure.Monitor.OpenTelemetry.Exporter
```
### Authenticate the client

Expand All @@ -26,10 +26,10 @@ This exporter sends traces to the configured Azure Monitor Resource using HTTPS.

## Examples

Refer to [`DemoTrace.cs`](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/monitor/Microsoft.OpenTelemetry.Exporter.AzureMonitor/tests/Microsoft.OpenTelemetry.Exporter.AzureMonitor.Demo.Tracing/DemoTrace.cs) for a complete demo.
Refer to [`DemoTrace.cs`](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing/DemoTrace.cs) for a complete demo.

```csharp
using Microsoft.OpenTelemetry.Exporter.AzureMonitor;
using Azure.Monitor.OpenTelemetry.Exporter;
using OpenTelemetry.Trace;

OpenTelemetry.Sdk.CreateTracerProviderBuilder()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
public static partial class AzureMonitorExporterHelperExtensions
{
public static OpenTelemetry.Trace.TracerProviderBuilder AddAzureMonitorTraceExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action<Microsoft.OpenTelemetry.Exporter.AzureMonitor.AzureMonitorExporterOptions> configure = null) { throw null; }
public static OpenTelemetry.Trace.TracerProviderBuilder AddAzureMonitorTraceExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action<Azure.Monitor.OpenTelemetry.Exporter.AzureMonitorExporterOptions> configure = null) { throw null; }
}
public partial class AzureMonitorExporterOptions : Azure.Core.ClientOptions
{
Expand All @@ -11,7 +11,7 @@ public AzureMonitorExporterOptions() { }
}
public partial class AzureMonitorTraceExporter : OpenTelemetry.BaseExporter<System.Diagnostics.Activity>
{
public AzureMonitorTraceExporter(Microsoft.OpenTelemetry.Exporter.AzureMonitor.AzureMonitorExporterOptions options) { }
public AzureMonitorTraceExporter(Azure.Monitor.OpenTelemetry.Exporter.AzureMonitorExporterOptions options) { }
public override OpenTelemetry.ExportResult Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> batch) { throw null; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Diagnostics;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
internal static class ActivityExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
using Microsoft.OpenTelemetry.Exporter.AzureMonitor.Models;
using Azure.Monitor.OpenTelemetry.Exporter.Models;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
internal partial class ApplicationInsightsRestClient
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Collections;
using System.Collections.Generic;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
internal readonly struct AzMonList : IEnumerable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="System.Text.Json" />
<PackageReference Include="OpenTelemetry" />
<PackageReference Include="OpenTelemetry" VersionOverride="0.8.0-beta.1"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need the override? https://github.com/Azure/azure-sdk-for-net/blob/master/eng/Packages.Data.props#L98 points to the same version.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That doesn't work because of the $(MSBuildProjectName.StartsWith('Microsoft.'))

<ItemGroup Condition="'$(IsClientLibrary)' == 'true' and $(MSBuildProjectName.StartsWith('Microsoft.'))">
<PackageReference Update="CloudNative.CloudEvents" Version="2.0.0-beta.1" />
<PackageReference Update="OpenTelemetry" Version="0.8.0-beta.1" />

Currently, we can't update the version of OpenTelemetry because the Exporter took a dependency on v0.8 and there are a few breaking changes in v1.0.
My next set of changes are to fix all the breaking changes and then remove this Override.

</ItemGroup>

<!-- Shared source from Azure.Core -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
using System.Collections.Generic;
using System.Diagnostics;

using Microsoft.OpenTelemetry.Exporter.AzureMonitor.Models;
using Azure.Monitor.OpenTelemetry.Exporter.Models;

using OpenTelemetry;
using OpenTelemetry.Logs;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
/// <summary>
/// This class is responsible for converting an OpenTelemetry <see cref="Batch{T}"/> of <see cref="Activity"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Diagnostics.Tracing;
using Azure.Core.Shared;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
[EventSource(Name = EventSourceName)]
internal sealed class AzureMonitorExporterEventSource : EventSource
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System;
using System.Diagnostics;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
/// <summary>
/// test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

using Microsoft.OpenTelemetry.Exporter.AzureMonitor;
using Azure.Monitor.OpenTelemetry.Exporter;

using OpenTelemetry;
using OpenTelemetry.Logs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using Azure.Core;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
public class AzureMonitorExporterOptions : ClientOptions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using OpenTelemetry;
using OpenTelemetry.Logs;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
internal class AzureMonitorLogExporter : BaseExporter<LogRecord>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using OpenTelemetry;
using OpenTelemetry.Trace;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
public class AzureMonitorTraceExporter : BaseExporter<Activity>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
using Azure.Core;
using Azure.Core.Pipeline;

using Microsoft.OpenTelemetry.Exporter.AzureMonitor.ConnectionString;
using Microsoft.OpenTelemetry.Exporter.AzureMonitor.Models;
using Azure.Monitor.OpenTelemetry.Exporter.ConnectionString;
using Azure.Monitor.OpenTelemetry.Exporter.Models;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
/// <summary>
/// This class encapsulates transmitting a collection of <see cref="TelemetryItem"/> to the configured Ingestion Endpoint.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// This alias is necessary because it will otherwise try to default to "Microsoft.Azure.Core" which doesn't exist.
using AzureCoreConnectionString = Azure.Core.ConnectionString;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.ConnectionString
namespace Azure.Monitor.OpenTelemetry.Exporter.ConnectionString
{
internal static class ConnectionStringParser
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.ConnectionString
namespace Azure.Monitor.OpenTelemetry.Exporter.ConnectionString
{
internal static class Constants
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
internal class EventLevelSuffix
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Globalization;
using System.Threading;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Azure.Monitor.OpenTelemetry.Exporter
{
internal static class ExceptionExtensions
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading