diff --git a/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/Program.cs b/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/Program.cs index 7478e73e..f093b551 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/Program.cs +++ b/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/Program.cs @@ -5,7 +5,6 @@ using Microsoft.ApplicationInsights.Channel; using Microsoft.ApplicationInsights.Extensibility; -using Microsoft.Diagnostics.Correlation.Common; using Newtonsoft.Json; using System; using System.Diagnostics; @@ -19,12 +18,6 @@ public class CorrelationTelemetryInitializer : ITelemetryInitializer { public void Initialize(ITelemetry telemetry) { - //add request id to every event - var ctx = ContextResolver.GetRequestContext(); - if (ctx != null) - { - telemetry.Context.Operation.Id = ctx.CorrelationId; - } } } @@ -60,11 +53,6 @@ static void Main(string[] args) { for (int i = 0; i < 10; i++) { - ContextResolver.SetRequestContext(new MyContext - { - CorrelationId = Guid.NewGuid().ToString(), - OtherId = i.ToString() - }); Trace.TraceWarning($"{DateTime.UtcNow:o} this is log message"); } Task.Delay(10000).Wait(); diff --git a/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/project.json b/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/project.json index f2f6f153..f94ffc44 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/project.json +++ b/src/Microsoft.Diagnostics.EventFlow.Consumers.EventContextConsoleApp/project.json @@ -7,7 +7,6 @@ "dependencies": { "Microsoft.ApplicationInsights": "2.1.0", - "Microsoft.Diagnostics.Correlation.Common": "1.0.0-preview1", "Microsoft.Diagnostics.EventFlow.Core": "1.0.0-*", "Microsoft.Diagnostics.EventFlow.Inputs.Trace": "1.0.0-*", "Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights": "1.0.0-*", diff --git a/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/Program.cs b/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/Program.cs index 2f799914..f2d57704 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/Program.cs +++ b/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/Program.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; -using Microsoft.Diagnostics.Correlation.Common; using Microsoft.Diagnostics.EventFlow.Configuration; using Microsoft.Diagnostics.EventFlow.Inputs; using Microsoft.Diagnostics.EventFlow.Filters; @@ -78,7 +77,6 @@ static void Main(string[] args) name = "ImportantEvent"; } - ContextResolver.SetRequestContext(new {correlationId = eventSequenceNo}); BenchmarkEventSource.Log.ComplexMessage( Guid.NewGuid(), Guid.NewGuid(), diff --git a/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/packages.config b/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/packages.config index a685175a..1127e825 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/packages.config +++ b/src/Microsoft.Diagnostics.EventFlow.Consumers.SimpleBenchmark/packages.config @@ -1,6 +1,5 @@  - diff --git a/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/EventDataExtensions.cs b/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/EventDataExtensions.cs index 3df3b366..1ab577cd 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/EventDataExtensions.cs +++ b/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/EventDataExtensions.cs @@ -10,7 +10,6 @@ using System.Text; using System.Diagnostics.Tracing; using System.Diagnostics; -using Microsoft.Diagnostics.Correlation.Common; namespace Microsoft.Diagnostics.EventFlow.Inputs { @@ -33,12 +32,6 @@ public static EventData ToEventData(this EventWrittenEventArgs eventSourceEvent, eventData.AddPayloadProperty("EventId", eventSourceEvent.EventId, healthReporter, context); eventData.AddPayloadProperty("EventName", eventSourceEvent.EventName, healthReporter, context); eventData.AddPayloadProperty("ActivityID", ActivityPathString(eventSourceEvent.ActivityId), healthReporter, context); - var eventContext = ContextResolver.GetRequestContext(); - if (eventContext != null) - { - eventData.AddPayloadProperty("EventContext", eventContext, healthReporter, context); - } - try { if (eventSourceEvent.Message != null) diff --git a/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/project.json b/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/project.json index 4e35240e..c3e05f91 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/project.json +++ b/src/Microsoft.Diagnostics.EventFlow.Inputs.EventSource/project.json @@ -1,8 +1,7 @@ { "version": "1.0.0-*", - "dependencies": { - "Microsoft.Diagnostics.Correlation.Common": "1.0.0-preview1", + "dependencies": { "Microsoft.Diagnostics.EventFlow.Core": { "target": "project" }, "NETStandard.Library": "1.6.0" }, diff --git a/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/TraceInput.cs b/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/TraceInput.cs index 26fcc7bf..2afefccd 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/TraceInput.cs +++ b/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/TraceInput.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.Globalization; using System.Text; -using Microsoft.Diagnostics.Correlation.Common; using Microsoft.Extensions.Configuration; using Microsoft.Diagnostics.EventFlow.Configuration; @@ -215,12 +214,6 @@ private void SubmitEventData(string message, TraceEventType level, int? id = nul eventPayload["RelatedActivityID"] = relatedActivityId; } - var eventContext = ContextResolver.GetRequestContext(); - if (eventContext != null) - { - eventPayload["EventContext"] = eventContext; - } - this.subject.OnNext(eventEntry); } catch (Exception ex) diff --git a/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/project.json b/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/project.json index cc311c40..bb1cbac6 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/project.json +++ b/src/Microsoft.Diagnostics.EventFlow.Inputs.Trace/project.json @@ -4,8 +4,7 @@ "dependencies": { "Microsoft.Diagnostics.EventFlow.Core": { "target": "project" - }, - "Microsoft.Diagnostics.Correlation.Common" : "1.0.0-preview1" + } }, "frameworks": { diff --git a/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/ApplicationInsightsOutput.cs b/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/ApplicationInsightsOutput.cs index 7ad2ec3f..1377122f 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/ApplicationInsightsOutput.cs +++ b/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/ApplicationInsightsOutput.cs @@ -11,7 +11,6 @@ using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights.Channel; using Microsoft.ApplicationInsights.DataContracts; -using Microsoft.Diagnostics.Correlation.Common; using Microsoft.Diagnostics.EventFlow.Configuration; using Microsoft.Diagnostics.EventFlow.Metadata; using Microsoft.Extensions.Configuration; @@ -67,13 +66,6 @@ public Task SendEventsAsync(IReadOnlyCollection events, long transmis { foreach (var e in events) { - //restore event context so ApplicationInsights TelemetryInitializer could access it - object eventContext; - if (e.TryGetPropertyValue("EventContext", out eventContext)) - { - ContextResolver.SetRequestContext(eventContext); - } - if (cancellationToken.IsCancellationRequested) { return CompletedTask; diff --git a/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/project.json b/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/project.json index a9ff6fab..94a7fa71 100644 --- a/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/project.json +++ b/src/Microsoft.Diagnostics.EventFlow.Outputs.ApplicationInsights/project.json @@ -3,7 +3,6 @@ "dependencies": { "Microsoft.ApplicationInsights": "2.1.0", - "Microsoft.Diagnostics.Correlation.Common": "1.0.0-preview1", "Microsoft.Diagnostics.EventFlow.Core": { "target": "project" }, "NETStandard.Library": "1.6.0" }, diff --git a/test/Microsoft.Diagnostics.EventFlow.Inputs.Tests/TraceInputTests.cs b/test/Microsoft.Diagnostics.EventFlow.Inputs.Tests/TraceInputTests.cs index ae05943d..4a3fcfc3 100644 --- a/test/Microsoft.Diagnostics.EventFlow.Inputs.Tests/TraceInputTests.cs +++ b/test/Microsoft.Diagnostics.EventFlow.Inputs.Tests/TraceInputTests.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using Microsoft.Diagnostics.Correlation.Common; using Microsoft.Diagnostics.EventFlow.Configuration; using Microsoft.Extensions.Configuration; using Moq; @@ -89,25 +88,6 @@ public void TraceShouldSubmitTheData() } } - [Fact] - public void TraceShouldSubmitTheDataWithContext() - { - IConfiguration configuration = (new ConfigurationBuilder()).AddInMemoryCollection(new Dictionary() - { - ["type"] = "Trace", - ["traceLevel"] = "All" - }).Build(); - var healthReporterMock = new Mock(); - var subject = new Mock>(); - using (TraceInput target = new TraceInput(configuration, healthReporterMock.Object)) - using (target.Subscribe(subject.Object)) - { - ContextResolver.SetRequestContext(new MyContext("123")); - Trace.TraceInformation("Message for unit test"); - subject.Verify(s => s.OnNext(It.Is(data => checkContext(data, "123"))), Times.Exactly(1)); - } - } - [Fact] public void TraceShouldNotSubmitFilteredData() {