Instrumentation Adapters to support Activity API

samples/Exporters/Web/OpenTelemetry.Exporter.Web.csproj

@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
     <ProjectReference Include="..\..\..\src\OpenTelemetry.Instrumentation.AspNetCore\OpenTelemetry.Instrumentation.AspNetCore.csproj" />
     <ProjectReference Include="..\..\..\src\OpenTelemetry.Instrumentation.Dependencies\OpenTelemetry.Instrumentation.Dependencies.csproj" />
     <ProjectReference Include="..\..\..\src\OpenTelemetry.Exporter.Zipkin\OpenTelemetry.Exporter.Zipkin.csproj" />

samples/Exporters/Web/Startup.cs

@@ -7,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
+using OpenTelemetry.Exporter.Console;
 using OpenTelemetry.Trace.Configuration;
 
 namespace API
@@ -36,6 +37,10 @@ public void ConfigureServices(IServiceCollection services)
                 }
             });
 
+            OpenTelemetrySdk.EnableOpenTelemetry(
+                (builder) => builder.AddActivitySource(string.Empty)
+                .UseConsoleActivityExporter(opt => opt.DisplayAsJson = opt.DisplayAsJson));
+
             services.AddOpenTelemetry((sp, builder) =>
             {
                 builder

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

@@ -22,6 +22,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Trace;
+using OpenTelemetry.Trace.Samplers;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Implementation
 {
@@ -35,6 +36,7 @@ internal class HttpInListener : ListenerHandler
         private readonly PropertyFetcher beforeActionTemplateFetcher = new PropertyFetcher("Template");
         private readonly bool hostingSupportsW3C = false;
         private readonly AspNetCoreInstrumentationOptions options;
+        private readonly ActivitySampler sampler = new AlwaysOnActivitySampler();
 
         public HttpInListener(string name, Tracer tracer, AspNetCoreInstrumentationOptions options)
             : base(name, tracer)
@@ -60,10 +62,21 @@ public override void OnStartActivity(Activity activity, object payload)
                 return;
             }
 
+            // TODO: the line below once .NET ships new Activity
+            // Or do reflection now.
+            // activity.ActivityKind = ActivityKind.Server
+
             var request = context.Request;
 
             // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/data-semantic-conventions.md
             var path = (request.PathBase.HasValue || request.Path.HasValue) ? (request.PathBase + request.Path).ToString() : "/";
+            if (activity != null)
+            {
+                activity.DisplayName = path;
+            }
+
+            var samplingDecision = this.sampler.ShouldSample(activity.Context, activity.TraceId, default, path, activity.Kind, activity.Tags, activity.Links);
+            activity.IsAllDataRequested = samplingDecision.IsSampled;
 
             TelemetrySpan span;
             if (this.hostingSupportsW3C && this.options.TextFormat is TraceContextFormat)
@@ -90,6 +103,25 @@ public override void OnStartActivity(Activity activity, object payload)
                 span.PutHttpUserAgentAttribute(userAgent);
                 span.PutHttpRawUrlAttribute(GetUri(request));
             }
+
+            if (activity.IsAllDataRequested)
+            {
+                if (request.Host.Port == 80 || request.Host.Port == 443)
+                {
+                    activity.AddTag("http.host", request.Host.Host);
+                }
+                else
+                {
+                    activity.AddTag("http.host", request.Host.Host + ":" + request.Host.Port);
+                }
+
+                activity.AddTag("http.method", request.Method);
+                activity.AddTag("http.path", path);
+
+                var userAgent = request.Headers["User-Agent"].FirstOrDefault();
+                activity.AddTag("http.user_agent", userAgent);
+                activity.AddTag("http.url", GetUri(request));
+            }
         }
 
         public override void OnStopActivity(Activity activity, object payload)
@@ -114,6 +146,11 @@ public override void OnStopActivity(Activity activity, object payload)
                 var response = context.Response;
 
                 span.PutHttpStatusCode(response.StatusCode, response.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase);
+
+                if (activity.IsAllDataRequested)
+                {
+                    activity.AddTag("http.status_code", response.StatusCode.ToString());
+                }
             }
 
             span.End();