renaming from Samples to Examples (#880)
* renaming from Samples to Examples * updating changelog * renaming from OT.Examples.name to Examples.name
This commit is contained in:
parent
a2b1b45c94
commit
c4ff8ab640
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<SolutionProjects Include="**\*.csproj" />
|
||||
<SolutionProjects Remove="samples\Exporters\AspNet\OpenTelemetry.Exporter.AspNet.csproj" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
<SolutionProjects Remove="examples\AspNet\OpenTelemetry.Exporter.AspNet.csproj" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
<SolutionProjects Remove="src\OpenTelemetry.Instrumentation.AspNet\OpenTelemetry.Instrumentation.AspNet.csproj" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
<SolutionProjects Remove="test\OpenTelemetry.Instrumentation.AspNet.Tests\OpenTelemetry.Instrumentation.AspNet.Tests.csproj" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
{
|
||||
"files": [
|
||||
"docs/**.png",
|
||||
"samples/**.cs",
|
||||
"examples/**.cs",
|
||||
"src/**.cs"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
using System.Web.Mvc;
|
||||
using System.Web.Routing;
|
||||
|
||||
namespace OpenTelemetry.Samples.AspNet
|
||||
namespace Examples.AspNet
|
||||
{
|
||||
public class RouteConfig
|
||||
{
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
using System.Net.Http.Formatting;
|
||||
using System.Web.Http;
|
||||
|
||||
namespace OpenTelemetry.Samples.AspNet
|
||||
namespace Examples.AspNet
|
||||
{
|
||||
public static class WebApiConfig
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
using System.Web.Mvc;
|
||||
|
||||
namespace OpenTelemetry.Samples.AspNet.Controllers
|
||||
namespace Examples.AspNet.Controllers
|
||||
{
|
||||
public class HomeController : Controller
|
||||
{
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -0,0 +1 @@
|
|||
<%@ Application Codebehind="Global.asax.cs" Inherits="Examples.AspNet.WebApiApplication" Language="C#" %>
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace OpenTelemetry.Samples.AspNet.Models
|
||||
namespace Examples.AspNet.Models
|
||||
{
|
||||
public class WeatherForecast
|
||||
{
|
||||
|
|
@ -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("")]
|
||||
|
|
@ -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]")]
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace OpenTelemetry.Samples.AspNetCore.Models
|
||||
namespace Examples.AspNetCore.Models
|
||||
{
|
||||
public class WeatherForecast
|
||||
{
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace OpenTelemetry.Samples.AspNetCore
|
||||
namespace Examples.AspNetCore
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
using CommandLine;
|
||||
|
||||
namespace OpenTelemetry.Samples.Console
|
||||
namespace Examples.Console
|
||||
{
|
||||
/// <summary>
|
||||
/// 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\).
|
||||
/// </summary>
|
||||
/// <param name="args">Arguments from command line.</param>
|
||||
public static void Main(string[] args)
|
||||
|
|
@ -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))));
|
||||
|
||||
|
|
@ -15,9 +15,10 @@
|
|||
// </copyright>
|
||||
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));
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ using System;
|
|||
|
||||
using OpenTelemetry.Trace.Configuration;
|
||||
|
||||
namespace OpenTelemetry.Samples.Console
|
||||
namespace Examples.Console
|
||||
{
|
||||
internal class TestJaegerExporter
|
||||
{
|
||||
|
|
@ -14,12 +14,11 @@
|
|||
// limitations under the License.
|
||||
// </copyright>
|
||||
|
||||
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
|
||||
|
|
@ -14,14 +14,14 @@
|
|||
// limitations under the License.
|
||||
// </copyright>
|
||||
|
||||
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
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
using OpenTelemetry.Trace.Configuration;
|
||||
|
||||
namespace OpenTelemetry.Samples.Console
|
||||
namespace Examples.Console
|
||||
{
|
||||
internal static class TestOtlpExporter
|
||||
{
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -22,7 +22,7 @@ using OpenTelemetry.Trace.Configuration;
|
|||
|
||||
using StackExchange.Redis;
|
||||
|
||||
namespace OpenTelemetry.Samples.Console
|
||||
namespace Examples.Console
|
||||
{
|
||||
internal class TestRedis
|
||||
{
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
using System;
|
||||
using OpenTelemetry.Trace.Configuration;
|
||||
|
||||
namespace OpenTelemetry.Samples.Console
|
||||
namespace Examples.Console
|
||||
{
|
||||
internal class TestZipkinExporter
|
||||
{
|
||||
|
|
@ -1 +0,0 @@
|
|||
<%@ Application Codebehind="Global.asax.cs" Inherits="OpenTelemetry.Samples.AspNet.WebApiApplication" Language="C#" %>
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue