From c4ff8ab64003163e0ed8c151e937683e392ca019 Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Wed, 22 Jul 2020 13:18:56 -0300 Subject: [PATCH] renaming from Samples to Examples (#880) * renaming from Samples to Examples * updating changelog * renaming from OT.Examples.name to Examples.name --- CHANGELOG.md | 3 ++- OpenTelemetry.proj | 2 +- OpenTelemetry.sln | 8 ++++---- docs/docfx.json | 2 +- {samples => examples}/AspNet/App_Start/RouteConfig.cs | 2 +- {samples => examples}/AspNet/App_Start/WebApiConfig.cs | 2 +- .../AspNet/Controllers/HomeController.cs | 2 +- .../AspNet/Controllers/WeatherForecastController.cs | 4 ++-- .../AspNet/Examples.AspNet.csproj | 0 examples/AspNet/Global.asax | 1 + {samples => examples}/AspNet/Global.asax.cs | 4 +--- {samples => examples}/AspNet/Models/WeatherForecast.cs | 2 +- {samples => examples}/AspNet/Properties/AssemblyInfo.cs | 4 ++-- {samples => examples}/AspNet/Views/Home/About.cshtml | 0 {samples => examples}/AspNet/Views/Home/Index.cshtml | 0 {samples => examples}/AspNet/Views/Shared/_Layout.cshtml | 0 {samples => examples}/AspNet/Views/Web.config | 0 {samples => examples}/AspNet/Views/_ViewStart.cshtml | 0 {samples => examples}/AspNet/Web.Debug.config | 0 {samples => examples}/AspNet/Web.Release.config | 0 {samples => examples}/AspNet/Web.config | 0 .../AspNetCore/Controllers/WeatherForecastController.cs | 4 ++-- .../AspNetCore/Examples.AspNetCore.csproj | 0 .../AspNetCore/Models/WeatherForecast.cs | 2 +- {samples => examples}/AspNetCore/Program.cs | 2 +- {samples => examples}/AspNetCore/Startup.cs | 2 +- {samples => examples}/AspNetCore/appsettings.json | 0 .../Console/Examples.Console.csproj | 0 .../Console/InstrumentationWithActivitySource.cs | 2 +- {samples => examples}/Console/Program.cs | 4 ++-- {samples => examples}/Console/TestConsoleExporter.cs | 5 +++-- {samples => examples}/Console/TestHttpClient.cs | 5 +++-- {samples => examples}/Console/TestJaegerExporter.cs | 2 +- .../Console/TestOTelShimWithConsoleExporter.cs | 5 ++--- .../Console/TestOpenTracingWithConsoleExporter.cs | 6 +++--- {samples => examples}/Console/TestOtlpExporter.cs | 2 +- {samples => examples}/Console/TestPrometheusExporter.cs | 2 +- {samples => examples}/Console/TestRedis.cs | 2 +- {samples => examples}/Console/TestZPagesExporter.cs | 2 +- {samples => examples}/Console/TestZipkinExporter.cs | 2 +- samples/AspNet/Global.asax | 1 - src/OpenTelemetry.Exporter.Console/README.md | 2 +- src/OpenTelemetry.Exporter.Jaeger/README.md | 2 +- .../README.md | 2 +- src/OpenTelemetry.Exporter.Prometheus/README.md | 2 +- src/OpenTelemetry.Exporter.ZPages/README.md | 2 +- src/OpenTelemetry.Exporter.Zipkin/README.md | 2 +- .../README.md | 2 +- 48 files changed, 50 insertions(+), 50 deletions(-) rename {samples => examples}/AspNet/App_Start/RouteConfig.cs (93%) rename {samples => examples}/AspNet/App_Start/WebApiConfig.cs (94%) rename {samples => examples}/AspNet/Controllers/HomeController.cs (91%) rename {samples => examples}/AspNet/Controllers/WeatherForecastController.cs (98%) rename samples/AspNet/OpenTelemetry.Samples.AspNet.csproj => examples/AspNet/Examples.AspNet.csproj (100%) create mode 100644 examples/AspNet/Global.asax rename {samples => examples}/AspNet/Global.asax.cs (89%) rename {samples => examples}/AspNet/Models/WeatherForecast.cs (85%) rename {samples => examples}/AspNet/Properties/AssemblyInfo.cs (91%) rename {samples => examples}/AspNet/Views/Home/About.cshtml (100%) rename {samples => examples}/AspNet/Views/Home/Index.cshtml (100%) rename {samples => examples}/AspNet/Views/Shared/_Layout.cshtml (100%) rename {samples => examples}/AspNet/Views/Web.config (100%) rename {samples => examples}/AspNet/Views/_ViewStart.cshtml (100%) rename {samples => examples}/AspNet/Web.Debug.config (100%) rename {samples => examples}/AspNet/Web.Release.config (100%) rename {samples => examples}/AspNet/Web.config (100%) rename {samples => examples}/AspNetCore/Controllers/WeatherForecastController.cs (92%) rename samples/AspNetCore/OpenTelemetry.Samples.AspNetCore.csproj => examples/AspNetCore/Examples.AspNetCore.csproj (100%) rename {samples => examples}/AspNetCore/Models/WeatherForecast.cs (84%) rename {samples => examples}/AspNetCore/Program.cs (92%) rename {samples => examples}/AspNetCore/Startup.cs (98%) rename {samples => examples}/AspNetCore/appsettings.json (100%) rename samples/Console/OpenTelemetry.Samples.Console.csproj => examples/Console/Examples.Console.csproj (100%) rename {samples => examples}/Console/InstrumentationWithActivitySource.cs (99%) rename {samples => examples}/Console/Program.cs (98%) rename {samples => examples}/Console/TestConsoleExporter.cs (97%) rename {samples => examples}/Console/TestHttpClient.cs (91%) rename {samples => examples}/Console/TestJaegerExporter.cs (98%) rename {samples => examples}/Console/TestOTelShimWithConsoleExporter.cs (93%) rename {samples => examples}/Console/TestOpenTracingWithConsoleExporter.cs (94%) rename {samples => examples}/Console/TestOtlpExporter.cs (97%) rename {samples => examples}/Console/TestPrometheusExporter.cs (99%) rename {samples => examples}/Console/TestRedis.cs (99%) rename {samples => examples}/Console/TestZPagesExporter.cs (98%) rename {samples => examples}/Console/TestZipkinExporter.cs (97%) delete mode 100644 samples/AspNet/Global.asax diff --git a/CHANGELOG.md b/CHANGELOG.md index 43f443ce2..f0d30cc8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,8 @@ the release. `string`. 2. `HttpListener()` can support "+" as: hostname which listens on all ports. - 3. Modified samples/TestPrometheus.cs to safely use the new implementation. + 3. Modified `examples/Console/TestPrometheusExporter.cs` to safely use the + new implementation. 4. Jaeger exporter implemented * Copy from diff --git a/OpenTelemetry.proj b/OpenTelemetry.proj index 17650f19f..76d2bf265 100644 --- a/OpenTelemetry.proj +++ b/OpenTelemetry.proj @@ -3,7 +3,7 @@ - + diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln index cb69c2a77..7b4867c6c 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -59,7 +59,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.StackExchangeRedis.Tests", "test\OpenTelemetry.Instrumentation.StackExchangeRedis.Tests\OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj", "{CA98AF29-0852-4ADD-A66B-7E96266EE7B7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E359BB2B-9AEC-497D-B321-7DF2450C3B8E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{E359BB2B-9AEC-497D-B321-7DF2450C3B8E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Jaeger", "src\OpenTelemetry.Exporter.Jaeger\OpenTelemetry.Exporter.Jaeger.csproj", "{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}" EndProject @@ -137,11 +137,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore.2.1", "t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.ZPages.Tests", "test\OpenTelemetry.Exporter.ZPages.Tests\OpenTelemetry.Exporter.ZPages.Tests.csproj", "{98F9556B-116F-49B5-9211-BB1D418446FF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Samples.AspNet", "samples\AspNet\OpenTelemetry.Samples.AspNet.csproj", "{9A4E3A68-904B-4835-A3C8-F664B73098DB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples.AspNet", "examples\AspNet\Examples.AspNet.csproj", "{9A4E3A68-904B-4835-A3C8-F664B73098DB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Samples.Console", "samples\Console\OpenTelemetry.Samples.Console.csproj", "{FF3E6E08-E8E4-4523-B526-847CD989279F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Console", "examples\Console\Examples.Console.csproj", "{FF3E6E08-E8E4-4523-B526-847CD989279F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Samples.AspNetCore", "samples\AspNetCore\OpenTelemetry.Samples.AspNetCore.csproj", "{0935622B-9377-4056-8343-AE6ECDC274CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.AspNetCore", "examples\AspNetCore\Examples.AspNetCore.csproj", "{0935622B-9377-4056-8343-AE6ECDC274CF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/docs/docfx.json b/docs/docfx.json index c09b367dc..64292b32b 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -12,7 +12,7 @@ { "files": [ "docs/**.png", - "samples/**.cs", + "examples/**.cs", "src/**.cs" ] } diff --git a/samples/AspNet/App_Start/RouteConfig.cs b/examples/AspNet/App_Start/RouteConfig.cs similarity index 93% rename from samples/AspNet/App_Start/RouteConfig.cs rename to examples/AspNet/App_Start/RouteConfig.cs index d6541bd98..63894371d 100644 --- a/samples/AspNet/App_Start/RouteConfig.cs +++ b/examples/AspNet/App_Start/RouteConfig.cs @@ -1,7 +1,7 @@ using System.Web.Mvc; using System.Web.Routing; -namespace OpenTelemetry.Samples.AspNet +namespace Examples.AspNet { public class RouteConfig { diff --git a/samples/AspNet/App_Start/WebApiConfig.cs b/examples/AspNet/App_Start/WebApiConfig.cs similarity index 94% rename from samples/AspNet/App_Start/WebApiConfig.cs rename to examples/AspNet/App_Start/WebApiConfig.cs index 4a2a8d48c..28c82dbd5 100644 --- a/samples/AspNet/App_Start/WebApiConfig.cs +++ b/examples/AspNet/App_Start/WebApiConfig.cs @@ -1,7 +1,7 @@ using System.Net.Http.Formatting; using System.Web.Http; -namespace OpenTelemetry.Samples.AspNet +namespace Examples.AspNet { public static class WebApiConfig { diff --git a/samples/AspNet/Controllers/HomeController.cs b/examples/AspNet/Controllers/HomeController.cs similarity index 91% rename from samples/AspNet/Controllers/HomeController.cs rename to examples/AspNet/Controllers/HomeController.cs index 6d58f10fd..6ef99fc17 100644 --- a/samples/AspNet/Controllers/HomeController.cs +++ b/examples/AspNet/Controllers/HomeController.cs @@ -1,6 +1,6 @@ using System.Web.Mvc; -namespace OpenTelemetry.Samples.AspNet.Controllers +namespace Examples.AspNet.Controllers { public class HomeController : Controller { diff --git a/samples/AspNet/Controllers/WeatherForecastController.cs b/examples/AspNet/Controllers/WeatherForecastController.cs similarity index 98% rename from samples/AspNet/Controllers/WeatherForecastController.cs rename to examples/AspNet/Controllers/WeatherForecastController.cs index 6869de755..927c113c2 100644 --- a/samples/AspNet/Controllers/WeatherForecastController.cs +++ b/examples/AspNet/Controllers/WeatherForecastController.cs @@ -7,9 +7,9 @@ using System.Net.Http; using System.Web.Http; using System.Threading.Tasks; -using OpenTelemetry.Samples.AspNet.Models; +using Examples.AspNet.Models; -namespace OpenTelemetry.Samples.AspNet.Controllers +namespace Examples.AspNet.Controllers { public class WeatherForecastController : ApiController { diff --git a/samples/AspNet/OpenTelemetry.Samples.AspNet.csproj b/examples/AspNet/Examples.AspNet.csproj similarity index 100% rename from samples/AspNet/OpenTelemetry.Samples.AspNet.csproj rename to examples/AspNet/Examples.AspNet.csproj diff --git a/examples/AspNet/Global.asax b/examples/AspNet/Global.asax new file mode 100644 index 000000000..e6d835ed4 --- /dev/null +++ b/examples/AspNet/Global.asax @@ -0,0 +1 @@ +<%@ Application Codebehind="Global.asax.cs" Inherits="Examples.AspNet.WebApiApplication" Language="C#" %> diff --git a/samples/AspNet/Global.asax.cs b/examples/AspNet/Global.asax.cs similarity index 89% rename from samples/AspNet/Global.asax.cs rename to examples/AspNet/Global.asax.cs index c19cd2764..040976924 100644 --- a/samples/AspNet/Global.asax.cs +++ b/examples/AspNet/Global.asax.cs @@ -3,11 +3,9 @@ using System.Web; using System.Web.Http; using System.Web.Mvc; using System.Web.Routing; -using OpenTelemetry.Context.Propagation; -using OpenTelemetry.Trace; using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.AspNet +namespace Examples.AspNet { public class WebApiApplication : HttpApplication { diff --git a/samples/AspNet/Models/WeatherForecast.cs b/examples/AspNet/Models/WeatherForecast.cs similarity index 85% rename from samples/AspNet/Models/WeatherForecast.cs rename to examples/AspNet/Models/WeatherForecast.cs index 8ed83873f..f380dcc36 100644 --- a/samples/AspNet/Models/WeatherForecast.cs +++ b/examples/AspNet/Models/WeatherForecast.cs @@ -1,6 +1,6 @@ using System; -namespace OpenTelemetry.Samples.AspNet.Models +namespace Examples.AspNet.Models { public class WeatherForecast { diff --git a/samples/AspNet/Properties/AssemblyInfo.cs b/examples/AspNet/Properties/AssemblyInfo.cs similarity index 91% rename from samples/AspNet/Properties/AssemblyInfo.cs rename to examples/AspNet/Properties/AssemblyInfo.cs index 7d67bddcc..48590a96e 100644 --- a/samples/AspNet/Properties/AssemblyInfo.cs +++ b/examples/AspNet/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("OpenTelemetry.Samples.AspNet")] +[assembly: AssemblyTitle("Examples.AspNet")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OpenTelemetry.Samples.AspNet")] +[assembly: AssemblyProduct("Examples.AspNet")] [assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/samples/AspNet/Views/Home/About.cshtml b/examples/AspNet/Views/Home/About.cshtml similarity index 100% rename from samples/AspNet/Views/Home/About.cshtml rename to examples/AspNet/Views/Home/About.cshtml diff --git a/samples/AspNet/Views/Home/Index.cshtml b/examples/AspNet/Views/Home/Index.cshtml similarity index 100% rename from samples/AspNet/Views/Home/Index.cshtml rename to examples/AspNet/Views/Home/Index.cshtml diff --git a/samples/AspNet/Views/Shared/_Layout.cshtml b/examples/AspNet/Views/Shared/_Layout.cshtml similarity index 100% rename from samples/AspNet/Views/Shared/_Layout.cshtml rename to examples/AspNet/Views/Shared/_Layout.cshtml diff --git a/samples/AspNet/Views/Web.config b/examples/AspNet/Views/Web.config similarity index 100% rename from samples/AspNet/Views/Web.config rename to examples/AspNet/Views/Web.config diff --git a/samples/AspNet/Views/_ViewStart.cshtml b/examples/AspNet/Views/_ViewStart.cshtml similarity index 100% rename from samples/AspNet/Views/_ViewStart.cshtml rename to examples/AspNet/Views/_ViewStart.cshtml diff --git a/samples/AspNet/Web.Debug.config b/examples/AspNet/Web.Debug.config similarity index 100% rename from samples/AspNet/Web.Debug.config rename to examples/AspNet/Web.Debug.config diff --git a/samples/AspNet/Web.Release.config b/examples/AspNet/Web.Release.config similarity index 100% rename from samples/AspNet/Web.Release.config rename to examples/AspNet/Web.Release.config diff --git a/samples/AspNet/Web.config b/examples/AspNet/Web.config similarity index 100% rename from samples/AspNet/Web.config rename to examples/AspNet/Web.config diff --git a/samples/AspNetCore/Controllers/WeatherForecastController.cs b/examples/AspNetCore/Controllers/WeatherForecastController.cs similarity index 92% rename from samples/AspNetCore/Controllers/WeatherForecastController.cs rename to examples/AspNetCore/Controllers/WeatherForecastController.cs index 2c172fb14..846a09588 100644 --- a/samples/AspNetCore/Controllers/WeatherForecastController.cs +++ b/examples/AspNetCore/Controllers/WeatherForecastController.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using Microsoft.AspNetCore.Mvc; -using OpenTelemetry.Samples.AspNetCore.Models; +using Examples.AspNetCore.Models; -namespace OpenTelemetry.Samples.AspNetCore.Controllers +namespace Examples.AspNetCore.Controllers { [ApiController] [Route("[controller]")] diff --git a/samples/AspNetCore/OpenTelemetry.Samples.AspNetCore.csproj b/examples/AspNetCore/Examples.AspNetCore.csproj similarity index 100% rename from samples/AspNetCore/OpenTelemetry.Samples.AspNetCore.csproj rename to examples/AspNetCore/Examples.AspNetCore.csproj diff --git a/samples/AspNetCore/Models/WeatherForecast.cs b/examples/AspNetCore/Models/WeatherForecast.cs similarity index 84% rename from samples/AspNetCore/Models/WeatherForecast.cs rename to examples/AspNetCore/Models/WeatherForecast.cs index 247571489..fd19a7ad3 100644 --- a/samples/AspNetCore/Models/WeatherForecast.cs +++ b/examples/AspNetCore/Models/WeatherForecast.cs @@ -1,6 +1,6 @@ using System; -namespace OpenTelemetry.Samples.AspNetCore.Models +namespace Examples.AspNetCore.Models { public class WeatherForecast { diff --git a/samples/AspNetCore/Program.cs b/examples/AspNetCore/Program.cs similarity index 92% rename from samples/AspNetCore/Program.cs rename to examples/AspNetCore/Program.cs index 206443eb4..5b3a0a28f 100644 --- a/samples/AspNetCore/Program.cs +++ b/examples/AspNetCore/Program.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -namespace OpenTelemetry.Samples.AspNetCore +namespace Examples.AspNetCore { public class Program { diff --git a/samples/AspNetCore/Startup.cs b/examples/AspNetCore/Startup.cs similarity index 98% rename from samples/AspNetCore/Startup.cs rename to examples/AspNetCore/Startup.cs index 205f29ecd..51a24961a 100644 --- a/samples/AspNetCore/Startup.cs +++ b/examples/AspNetCore/Startup.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.OpenApi.Models; using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.AspNetCore +namespace Examples.AspNetCore { public class Startup { diff --git a/samples/AspNetCore/appsettings.json b/examples/AspNetCore/appsettings.json similarity index 100% rename from samples/AspNetCore/appsettings.json rename to examples/AspNetCore/appsettings.json diff --git a/samples/Console/OpenTelemetry.Samples.Console.csproj b/examples/Console/Examples.Console.csproj similarity index 100% rename from samples/Console/OpenTelemetry.Samples.Console.csproj rename to examples/Console/Examples.Console.csproj diff --git a/samples/Console/InstrumentationWithActivitySource.cs b/examples/Console/InstrumentationWithActivitySource.cs similarity index 99% rename from samples/Console/InstrumentationWithActivitySource.cs rename to examples/Console/InstrumentationWithActivitySource.cs index b8e501490..8add8b7d6 100644 --- a/samples/Console/InstrumentationWithActivitySource.cs +++ b/examples/Console/InstrumentationWithActivitySource.cs @@ -25,7 +25,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class InstrumentationWithActivitySource : IDisposable { diff --git a/samples/Console/Program.cs b/examples/Console/Program.cs similarity index 98% rename from samples/Console/Program.cs rename to examples/Console/Program.cs index 11babf3aa..be227be0f 100644 --- a/samples/Console/Program.cs +++ b/examples/Console/Program.cs @@ -16,7 +16,7 @@ using CommandLine; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { /// /// Main samples entry point. @@ -34,7 +34,7 @@ namespace OpenTelemetry.Samples.Console /// dotnet run -p Exporters.csproj otlp -e "localhost:55680" /// /// The above must be run from the project root folder - /// (eg: C:\repos\opentelemetry-dotnet\src\samples\Exporters\Console\). + /// (eg: C:\repos\opentelemetry-dotnet\src\examples\Console\). /// /// Arguments from command line. public static void Main(string[] args) diff --git a/samples/Console/TestConsoleExporter.cs b/examples/Console/TestConsoleExporter.cs similarity index 97% rename from samples/Console/TestConsoleExporter.cs rename to examples/Console/TestConsoleExporter.cs index 6ab2c139a..54f164a3b 100644 --- a/samples/Console/TestConsoleExporter.cs +++ b/examples/Console/TestConsoleExporter.cs @@ -18,10 +18,11 @@ using System; using System.Diagnostics; using System.Threading; using System.Threading.Tasks; +using OpenTelemetry.Resources; using OpenTelemetry.Trace.Configuration; using OpenTelemetry.Trace.Export; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestConsoleExporter { @@ -31,7 +32,7 @@ namespace OpenTelemetry.Samples.Console // and use a single pipeline with a custom MyProcessor, and Console exporter. using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry( (builder) => builder.AddActivitySource("MyCompany.MyProduct.MyWebServer") - .SetResource(Resources.Resources.CreateServiceResource("MyServiceName")) + .SetResource(Resources.CreateServiceResource("MyServiceName")) .UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson, (p) => p.AddProcessor((next) => new MyProcessor(next)))); diff --git a/samples/Console/TestHttpClient.cs b/examples/Console/TestHttpClient.cs similarity index 91% rename from samples/Console/TestHttpClient.cs rename to examples/Console/TestHttpClient.cs index 726f9b548..1993c1a99 100644 --- a/samples/Console/TestHttpClient.cs +++ b/examples/Console/TestHttpClient.cs @@ -15,9 +15,10 @@ // using System.Diagnostics; using System.Net.Http; +using OpenTelemetry.Resources; using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestHttpClient { @@ -27,7 +28,7 @@ namespace OpenTelemetry.Samples.Console using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry( (builder) => builder.AddHttpClientDependencyInstrumentation() - .SetResource(Resources.Resources.CreateServiceResource("http-service-example")) + .SetResource(Resources.CreateServiceResource("http-service-example")) .AddActivitySource("http-client-test") .UseConsoleExporter(opt => opt.DisplayAsJson = false)); diff --git a/samples/Console/TestJaegerExporter.cs b/examples/Console/TestJaegerExporter.cs similarity index 98% rename from samples/Console/TestJaegerExporter.cs rename to examples/Console/TestJaegerExporter.cs index 9ecb416a1..edc9a1e1e 100644 --- a/samples/Console/TestJaegerExporter.cs +++ b/examples/Console/TestJaegerExporter.cs @@ -17,7 +17,7 @@ using System; using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestJaegerExporter { diff --git a/samples/Console/TestOTelShimWithConsoleExporter.cs b/examples/Console/TestOTelShimWithConsoleExporter.cs similarity index 93% rename from samples/Console/TestOTelShimWithConsoleExporter.cs rename to examples/Console/TestOTelShimWithConsoleExporter.cs index 7d437a1a4..48c681b55 100644 --- a/samples/Console/TestOTelShimWithConsoleExporter.cs +++ b/examples/Console/TestOTelShimWithConsoleExporter.cs @@ -14,12 +14,11 @@ // limitations under the License. // -using System; using OpenTelemetry.Resources; using OpenTelemetry.Trace; using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestOTelShimWithConsoleExporter { @@ -29,7 +28,7 @@ namespace OpenTelemetry.Samples.Console // and use a single pipeline with a custom MyProcessor, and Console exporter. using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry( (builder) => builder.AddActivitySource("MyCompany.MyProduct.MyWebServer") - .SetResource(Resources.Resources.CreateServiceResource("MyServiceName")) + .SetResource(Resources.CreateServiceResource("MyServiceName")) .UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson)); // The above line is required only in applications diff --git a/samples/Console/TestOpenTracingWithConsoleExporter.cs b/examples/Console/TestOpenTracingWithConsoleExporter.cs similarity index 94% rename from samples/Console/TestOpenTracingWithConsoleExporter.cs rename to examples/Console/TestOpenTracingWithConsoleExporter.cs index ddcbaf933..fe214e316 100644 --- a/samples/Console/TestOpenTracingWithConsoleExporter.cs +++ b/examples/Console/TestOpenTracingWithConsoleExporter.cs @@ -14,14 +14,14 @@ // limitations under the License. // -using System; using OpenTelemetry.Context.Propagation; +using OpenTelemetry.Resources; using OpenTelemetry.Shims.OpenTracing; using OpenTelemetry.Trace; using OpenTelemetry.Trace.Configuration; using OpenTracing; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestOpenTracingWithConsoleExporter { @@ -31,7 +31,7 @@ namespace OpenTelemetry.Samples.Console // and use Console exporter. using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry( (builder) => builder.AddActivitySource("MyCompany.MyProduct.MyWebServer") - .SetResource(Resources.Resources.CreateServiceResource("MyServiceName")) + .SetResource(Resources.CreateServiceResource("MyServiceName")) .UseConsoleExporter(opt => opt.DisplayAsJson = options.DisplayAsJson)); // The above line is required only in applications diff --git a/samples/Console/TestOtlpExporter.cs b/examples/Console/TestOtlpExporter.cs similarity index 97% rename from samples/Console/TestOtlpExporter.cs rename to examples/Console/TestOtlpExporter.cs index 3378d04e8..29ea3aac5 100644 --- a/samples/Console/TestOtlpExporter.cs +++ b/examples/Console/TestOtlpExporter.cs @@ -16,7 +16,7 @@ using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal static class TestOtlpExporter { diff --git a/samples/Console/TestPrometheusExporter.cs b/examples/Console/TestPrometheusExporter.cs similarity index 99% rename from samples/Console/TestPrometheusExporter.cs rename to examples/Console/TestPrometheusExporter.cs index 0dff114a1..29337accd 100644 --- a/samples/Console/TestPrometheusExporter.cs +++ b/examples/Console/TestPrometheusExporter.cs @@ -24,7 +24,7 @@ using OpenTelemetry.Metrics.Configuration; using OpenTelemetry.Metrics.Export; using OpenTelemetry.Trace; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestPrometheusExporter { diff --git a/samples/Console/TestRedis.cs b/examples/Console/TestRedis.cs similarity index 99% rename from samples/Console/TestRedis.cs rename to examples/Console/TestRedis.cs index c97e5c9ac..e243674dd 100644 --- a/samples/Console/TestRedis.cs +++ b/examples/Console/TestRedis.cs @@ -22,7 +22,7 @@ using OpenTelemetry.Trace.Configuration; using StackExchange.Redis; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestRedis { diff --git a/samples/Console/TestZPagesExporter.cs b/examples/Console/TestZPagesExporter.cs similarity index 98% rename from samples/Console/TestZPagesExporter.cs rename to examples/Console/TestZPagesExporter.cs index 28d36e161..78dfc55a6 100644 --- a/samples/Console/TestZPagesExporter.cs +++ b/examples/Console/TestZPagesExporter.cs @@ -19,7 +19,7 @@ using System.Threading; using OpenTelemetry.Exporter.ZPages; using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestZPagesExporter { diff --git a/samples/Console/TestZipkinExporter.cs b/examples/Console/TestZipkinExporter.cs similarity index 97% rename from samples/Console/TestZipkinExporter.cs rename to examples/Console/TestZipkinExporter.cs index c12b60221..d8cb546e6 100644 --- a/samples/Console/TestZipkinExporter.cs +++ b/examples/Console/TestZipkinExporter.cs @@ -17,7 +17,7 @@ using System; using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Samples.Console +namespace Examples.Console { internal class TestZipkinExporter { diff --git a/samples/AspNet/Global.asax b/samples/AspNet/Global.asax deleted file mode 100644 index 2a3fafb21..000000000 --- a/samples/AspNet/Global.asax +++ /dev/null @@ -1 +0,0 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="OpenTelemetry.Samples.AspNet.WebApiApplication" Language="C#" %> diff --git a/src/OpenTelemetry.Exporter.Console/README.md b/src/OpenTelemetry.Exporter.Console/README.md index 996745538..4ec6df63a 100644 --- a/src/OpenTelemetry.Exporter.Console/README.md +++ b/src/OpenTelemetry.Exporter.Console/README.md @@ -22,7 +22,7 @@ You can configure the `ConsoleExporter` by following the directions below: * `DisplayAsJson`: Boolean to show data as JSON. See the -[`TestConsoleExporter.cs`](../../samples/Console/TestConsoleExporter.cs) +[`TestConsoleExporter.cs`](../../examples/Console/TestConsoleExporter.cs) for an example of how to use the exporter. ## References diff --git a/src/OpenTelemetry.Exporter.Jaeger/README.md b/src/OpenTelemetry.Exporter.Jaeger/README.md index ac33f367f..5b665cf67 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/README.md +++ b/src/OpenTelemetry.Exporter.Jaeger/README.md @@ -29,7 +29,7 @@ You can configure the `JaegerExporter` by following the directions below: agent. (default `65000`). See the -[`TestJaegerExporter.cs`](../../samples/Console/TestJaegerExporter.cs) +[`TestJaegerExporter.cs`](../../examples/Console/TestJaegerExporter.cs) for an example of how to use the exporter. ## References diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md index dcc23001c..778b6f816 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md @@ -25,7 +25,7 @@ You can configure the `OtlpExporter` by following the directions below: * `Headers`: Optional headers for the connection. See the -[`TestOtlpExporter.cs`](../../samples/Console/TestOtlpExporter.cs) +[`TestOtlpExporter.cs`](../../examples/Console/TestOtlpExporter.cs) for an example of how to use the exporter. ## References diff --git a/src/OpenTelemetry.Exporter.Prometheus/README.md b/src/OpenTelemetry.Exporter.Prometheus/README.md index 11a1b149f..03e08b4dc 100644 --- a/src/OpenTelemetry.Exporter.Prometheus/README.md +++ b/src/OpenTelemetry.Exporter.Prometheus/README.md @@ -20,7 +20,7 @@ You can configure the `PrometheusExporter` by following the directions below: * `Url`: The url to listen to. Typically it ends with `/metrics` like `http://localhost:9184/metrics/`. See -[`TestPrometheusExporter.cs`](../../samples/Console/TestPrometheusExporter.cs) +[`TestPrometheusExporter.cs`](../../examples/Console/TestPrometheusExporter.cs) for example use. ## References diff --git a/src/OpenTelemetry.Exporter.ZPages/README.md b/src/OpenTelemetry.Exporter.ZPages/README.md index a5bf8fd61..a32eb14fb 100644 --- a/src/OpenTelemetry.Exporter.ZPages/README.md +++ b/src/OpenTelemetry.Exporter.ZPages/README.md @@ -17,7 +17,7 @@ You can configure the `ZPagesExporter` by following the directions below: * `RetentionTime`: The retention time (in milliseconds) for the metrics. See the -[`TestZPagesExporter.cs`](../../samples/Console/TestZPagesExporter.cs) +[`TestZPagesExporter.cs`](../../examples/Console/TestZPagesExporter.cs) for an example of how to use the exporter. ## References diff --git a/src/OpenTelemetry.Exporter.Zipkin/README.md b/src/OpenTelemetry.Exporter.Zipkin/README.md index a208b8099..8f08a37f8 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/README.md +++ b/src/OpenTelemetry.Exporter.Zipkin/README.md @@ -23,7 +23,7 @@ You can configure the `ZipkinExporter` by following the directions below: * `UseShortTraceIds`: Value indicating whether short trace id should be used. See -[`TestZipkinExporter.cs`](../../samples/Console/TestZipkinExporter.cs) +[`TestZipkinExporter.cs`](../../examples/Console/TestZipkinExporter.cs) for example use. ## References diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/README.md b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/README.md index 1a49d0391..8ff49bcd5 100644 --- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/README.md +++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/README.md @@ -26,7 +26,7 @@ using var openTelemetry = OpenTelemetrySdk.EnableOpenTelemetry(b => b ``` For a more detailed example see -[TestRedis](../../samples/Console/TestRedis.cs). +[TestRedis](../../examples/Console/TestRedis.cs). ## References