Skip to content

Commit

Permalink
Revert "Azure Monitor Exporter - Rename" (#16668)
Browse files Browse the repository at this point in the history
* Revert "Azure Monitor Exporter - Rename (#16654)"

This reverts commit 930f07b.

* Remove link for CI to pass
  • Loading branch information
rajkumar-rangaraj authored Nov 6, 2020
1 parent 930f07b commit cb0eb55
Show file tree
Hide file tree
Showing 102 changed files with 73 additions and 3,944 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 1.0.0-beta.1 (2020-11-06)
## 1.0.0-beta.1 (2020-10-07)

* Initial release of Azure Monitor Exporter for [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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}") = "Microsoft.Azure.Monitor.OpenTelemetry.Exporter", "src\Microsoft.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}") = "Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing", "tests\Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing\Microsoft.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}") = "Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Tests", "tests\Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Tests\Microsoft.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}") = "Integration.Tests.AspNetCoreWebApp", "tests\Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp\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}") = "Integration.Tests", "tests\Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests\Integration.Tests.csproj", "{3CB1B19D-1155-4E4E-9D97-3A7B2926DE2E}"
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 Microsoft.Azure.Monitor.OpenTelemetry.Exporter
```
### Authenticate the client

Expand All @@ -26,10 +26,9 @@ 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.

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

OpenTelemetry.Sdk.CreateTracerProviderBuilder()
Expand Down
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 Microsoft.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 Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Models;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.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;
using System.Diagnostics;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.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 Azure.Core;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
public class AzureMonitorExporterOptions : ClientOptions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
[EventSource(Name = EventSourceName)]
internal sealed class AzureMonitorTraceExporterEventSource : EventSource
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 Microsoft.Azure.Monitor.OpenTelemetry.Exporter.ConnectionString;
using Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Models;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.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 Microsoft.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 Microsoft.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 Microsoft.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 Microsoft.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.

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
using System.Threading;
using System.Threading.Tasks;

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

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal interface ITransmitter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
using Azure.Core;
using Azure.Core.Pipeline;

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

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal class IngestionResponsePolicy : HttpPipelineSynchronousPolicy
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.IO;
using System.Text.Json;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal class NDJsonWriter: IDisposable
{
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 Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal enum PartBType
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")]
[assembly: InternalsVisibleTo("Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")]

// Moq
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
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 Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal class ResponseStatusCodes
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

using OpenTelemetrySdk = OpenTelemetry.Sdk;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal static class SdkVersionUtils
{
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 Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
/// <summary>
/// Constants for semantic attribute names outlined by the OpenTelemetry specifications.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal static class StringExtensions
{
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 Microsoft.Azure.Monitor.OpenTelemetry.Exporter
{
internal enum TelemetryType
{
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.Monitor.OpenTelemetry.Sdk" which doesn't exist.
using OpenTelemetrySdk = OpenTelemetry.Sdk;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Demo.Tracing
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing
{
public static class DemoTrace
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Demo.Tracing
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Demo.Tracing
{
internal class InstrumentationWithActivitySource : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.OpenTelemetry.Exporter.AzureMonitor.csproj" />
<ProjectReference Include="..\..\src\Microsoft.Azure.Monitor.OpenTelemetry.Exporter.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Microsoft.AspNetCore.Mvc;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.AspNetCoreWebApp
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp
{
/// <summary>
/// This controller is used to verify that the IntegrationTests project can send requests to this WebApp and receive responses.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
<RootNamespace>Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.AspNetCoreWebApp</RootNamespace>
<RootNamespace>Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp</RootNamespace>

<!-- Azure SDK pipeline tries to pack test projects. This warning will be treated as an error and fail the whole build. -->
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.AspNetCoreWebApp
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp
{
public class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.AspNetCoreWebApp
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp
{
public class Startup
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

using Xunit;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests
{
/// <summary>
/// These tests are to verify that the IntegrationTests work (i.e. This project can communicate with the <see cref="AspNetCoreWebApp"/> project).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
<RootNamespace>Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests</RootNamespace>
<AssemblyName>Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests</AssemblyName>
<RootNamespace>Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests</RootNamespace>
<AssemblyName>Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests</AssemblyName>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -34,8 +34,8 @@

<ItemGroup>
<ProjectReference Include="..\..\..\..\core\Azure.Core.TestFramework\src\Azure.Core.TestFramework.csproj" />
<ProjectReference Include="..\..\src\Microsoft.OpenTelemetry.Exporter.AzureMonitor.csproj" />
<ProjectReference Include="..\Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.AspNetCoreWebApp\Integration.Tests.AspNetCoreWebApp.csproj" />
<ProjectReference Include="..\..\src\Microsoft.Azure.Monitor.OpenTelemetry.Exporter.csproj" />
<ProjectReference Include="..\Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp\Integration.Tests.AspNetCoreWebApp.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
using System.Linq;
using System.Threading.Tasks;

using Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.TestFramework;
using Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.TestFramework;

using Xunit;
using Xunit.Abstractions;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests
{
public class OpenTelemetryTests : IClassFixture<OpenTelemetryWebApplicationFactory<AspNetCoreWebApp.Startup>>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
using System.Linq;
using System.Threading.Tasks;

using Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests.TestFramework;
using Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.TestFramework;

using OpenTelemetry;
using OpenTelemetry.Trace;

using Xunit;

namespace Microsoft.OpenTelemetry.Exporter.AzureMonitor.Integration.Tests
namespace Microsoft.Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests
{
/// <summary>
/// The purpose of these tests are to verify various types of Telemetry.
Expand Down
Loading

0 comments on commit cb0eb55

Please sign in to comment.