From 7c09e46025cc6a43f259989890e246e5423524a0 Mon Sep 17 00:00:00 2001 From: Sebastian Burckhardt Date: Fri, 7 Dec 2018 10:41:52 -0800 Subject: [PATCH] use more consistent dll and namespace names --- Applications/Counter.Benchmark.OnEmulator/Program.cs | 2 +- .../Counter.Benchmark.OnFunctions/ApplicationInfo.cs | 2 +- Hosts/FunctionsHost/FunctionsHostConfiguration.cs | 2 +- Hosts/FunctionsHost/Host/Host.cs | 4 ++-- Hosts/FunctionsHost/Host/HostManager.cs | 2 +- Hosts/SimpleHost/Emulator.cs | 2 +- Hosts/SimpleHost/MultiThreadedSimulation.cs | 4 ++-- Hosts/SimpleHost/SingleThreadSimulation.cs | 4 ++-- Hosts/SimpleHost/TelemetryListenerArray.cs | 4 ++-- Samples/HelloWorld.Service.OnFunctions/ApplicationInfo.cs | 2 +- Samples/HelloWorld.Test.OnEmulator/Program.cs | 2 +- Telemetry/TaskoMeter/TaskoMeter.csproj | 6 +++--- Telemetry/TelemetryBlobWriter/Configuration.cs | 2 +- Telemetry/TelemetryBlobWriter/TaskoMeterLauncher.cs | 2 +- Telemetry/TelemetryBlobWriter/TelemetryBlobFormat.cs | 2 +- Telemetry/TelemetryBlobWriter/TelemetryBlobWriter.csproj | 4 ++-- Telemetry/TelemetryBlobWriter/TelemetryWriter.cs | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Applications/Counter.Benchmark.OnEmulator/Program.cs b/Applications/Counter.Benchmark.OnEmulator/Program.cs index 3cddd21..b7b7689 100644 --- a/Applications/Counter.Benchmark.OnEmulator/Program.cs +++ b/Applications/Counter.Benchmark.OnEmulator/Program.cs @@ -68,7 +68,7 @@ namespace Counter.Benchmark.OnEmulator RuntimeLogLevel = LogLevel.Trace }; - var telemetryConfig = new TelemetryBlobWriter.Configuration() + var telemetryConfig = new ReactiveMachine.TelemetryBlobWriter.Configuration() { CollectHostEvents = false, CollectApplicationEvents = (System.Diagnostics.Debugger.IsAttached || appConfig.IsFixedRateExperiment), diff --git a/Applications/Counter.Benchmark.OnFunctions/ApplicationInfo.cs b/Applications/Counter.Benchmark.OnFunctions/ApplicationInfo.cs index 1c878c1..6861587 100644 --- a/Applications/Counter.Benchmark.OnFunctions/ApplicationInfo.cs +++ b/Applications/Counter.Benchmark.OnFunctions/ApplicationInfo.cs @@ -62,7 +62,7 @@ namespace Counter.Benchmark.OnFunctions SendLogLevel = LogLevel.Debug, }; - var telemetryConfig = new TelemetryBlobWriter.Configuration() + var telemetryConfig = new ReactiveMachine.TelemetryBlobWriter.Configuration() { CollectHostEvents = true, CollectApplicationEvents = true, diff --git a/Hosts/FunctionsHost/FunctionsHostConfiguration.cs b/Hosts/FunctionsHost/FunctionsHostConfiguration.cs index f5cd410..fe7b790 100644 --- a/Hosts/FunctionsHost/FunctionsHostConfiguration.cs +++ b/Hosts/FunctionsHost/FunctionsHostConfiguration.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using ReactiveMachine; -using TelemetryBlobWriter; +using ReactiveMachine.TelemetryBlobWriter; namespace FunctionsHost { diff --git a/Hosts/FunctionsHost/Host/Host.cs b/Hosts/FunctionsHost/Host/Host.cs index 6c01338..231a792 100644 --- a/Hosts/FunctionsHost/Host/Host.cs +++ b/Hosts/FunctionsHost/Host/Host.cs @@ -16,7 +16,7 @@ using System.Text; using System.Threading.Tasks; using System.Xml; using System.Xml.Serialization; -using TelemetryBlobWriter; +using ReactiveMachine.TelemetryBlobWriter; namespace FunctionsHost { @@ -73,7 +73,7 @@ namespace FunctionsHost this.payloadSerializerLoopback = new DataContractSerializer(typeof(List), application.SerializableTypes); this.Connections = new EventHubsConnections(processId, HostLogger, configuration.ehConnectionString); - if (application.TryGetConfiguration(out var config)) + if (application.TryGetConfiguration(out var config)) { this.collectHostEvents = config.CollectHostEvents; this.blobTelemetryListener = new TelemetryCollector(config, application, processId, this.GetType()); diff --git a/Hosts/FunctionsHost/Host/HostManager.cs b/Hosts/FunctionsHost/Host/HostManager.cs index 95239a0..9203a68 100644 --- a/Hosts/FunctionsHost/Host/HostManager.cs +++ b/Hosts/FunctionsHost/Host/HostManager.cs @@ -10,7 +10,7 @@ using System.Runtime.Serialization; using Microsoft.Azure.EventHubs; using ReactiveMachine; using System.Collections.Generic; -using TelemetryBlobWriter; +using ReactiveMachine.TelemetryBlobWriter; using Microsoft.Extensions.Logging; using ReactiveMachine.Util; diff --git a/Hosts/SimpleHost/Emulator.cs b/Hosts/SimpleHost/Emulator.cs index a165da2..2265440 100644 --- a/Hosts/SimpleHost/Emulator.cs +++ b/Hosts/SimpleHost/Emulator.cs @@ -61,7 +61,7 @@ namespace EmulatorHost } if (Debugger.IsAttached) - TelemetryBlobWriter.TaskoMeterLauncher.Launch(application, deploymentId); + ReactiveMachine.TelemetryBlobWriter.TaskoMeterLauncher.Launch(application, deploymentId); if (streamWriter != null) { diff --git a/Hosts/SimpleHost/MultiThreadedSimulation.cs b/Hosts/SimpleHost/MultiThreadedSimulation.cs index 7ff1019..8813afc 100644 --- a/Hosts/SimpleHost/MultiThreadedSimulation.cs +++ b/Hosts/SimpleHost/MultiThreadedSimulation.cs @@ -49,9 +49,9 @@ namespace EmulatorHost public void Run(ICompiledApplication application) { TelemetryListenerArray telemetry = null; - if (application.Configurations.TryGetValue(typeof(TelemetryBlobWriter.Configuration), out var c)) + if (application.Configurations.TryGetValue(typeof(ReactiveMachine.TelemetryBlobWriter.Configuration), out var c)) { - telemetry = new TelemetryListenerArray((TelemetryBlobWriter.Configuration)c, application, this.GetType(), deploymentId, deploymentTimestamp); + telemetry = new TelemetryListenerArray((ReactiveMachine.TelemetryBlobWriter.Configuration)c, application, this.GetType(), deploymentId, deploymentTimestamp); application.HostServices.RegisterTelemetryListener(telemetry); } diff --git a/Hosts/SimpleHost/SingleThreadSimulation.cs b/Hosts/SimpleHost/SingleThreadSimulation.cs index d428057..0e1d8db 100644 --- a/Hosts/SimpleHost/SingleThreadSimulation.cs +++ b/Hosts/SimpleHost/SingleThreadSimulation.cs @@ -45,9 +45,9 @@ namespace EmulatorHost public void Run(ICompiledApplication application) { TelemetryListenerArray telemetry = null; - if (application.Configurations.TryGetValue(typeof(TelemetryBlobWriter.Configuration), out var c)) + if (application.Configurations.TryGetValue(typeof(ReactiveMachine.TelemetryBlobWriter.Configuration), out var c)) { - telemetry = new TelemetryListenerArray((TelemetryBlobWriter.Configuration)c, application, this.GetType(), deploymentId, deploymentTimestamp); + telemetry = new TelemetryListenerArray((ReactiveMachine.TelemetryBlobWriter.Configuration)c, application, this.GetType(), deploymentId, deploymentTimestamp); application.HostServices.RegisterTelemetryListener(telemetry); } diff --git a/Hosts/SimpleHost/TelemetryListenerArray.cs b/Hosts/SimpleHost/TelemetryListenerArray.cs index 435e312..eaeb11d 100644 --- a/Hosts/SimpleHost/TelemetryListenerArray.cs +++ b/Hosts/SimpleHost/TelemetryListenerArray.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using TelemetryBlobWriter; +using ReactiveMachine.TelemetryBlobWriter; namespace EmulatorHost { @@ -16,7 +16,7 @@ namespace EmulatorHost private string deploymentId; private DateTime deploymentTimestamp; - public TelemetryListenerArray(TelemetryBlobWriter.Configuration config, ICompiledApplication application, Type hosttype, string deploymentId, DateTime deploymentTimestamp) + public TelemetryListenerArray(ReactiveMachine.TelemetryBlobWriter.Configuration config, ICompiledApplication application, Type hosttype, string deploymentId, DateTime deploymentTimestamp) { listeners = new TelemetryCollector[application.NumberProcesses]; for (uint i = 0; i < application.NumberProcesses; i++) diff --git a/Samples/HelloWorld.Service.OnFunctions/ApplicationInfo.cs b/Samples/HelloWorld.Service.OnFunctions/ApplicationInfo.cs index 9d5af55..5e8089f 100644 --- a/Samples/HelloWorld.Service.OnFunctions/ApplicationInfo.cs +++ b/Samples/HelloWorld.Service.OnFunctions/ApplicationInfo.cs @@ -27,7 +27,7 @@ namespace HelloWorld.Test.OnFunctions NumberRepetitions = 100 }; - var telemetryConfig = new TelemetryBlobWriter.Configuration() + var telemetryConfig = new ReactiveMachine.TelemetryBlobWriter.Configuration() { CollectHostEvents = true, CollectApplicationEvents = true, diff --git a/Samples/HelloWorld.Test.OnEmulator/Program.cs b/Samples/HelloWorld.Test.OnEmulator/Program.cs index 9e543db..550c44c 100644 --- a/Samples/HelloWorld.Test.OnEmulator/Program.cs +++ b/Samples/HelloWorld.Test.OnEmulator/Program.cs @@ -20,7 +20,7 @@ namespace HelloWorld.Emulator { NumberRepetitions = 100 }); - compiler.SetConfiguration(new TelemetryBlobWriter.Configuration() + compiler.SetConfiguration(new ReactiveMachine.TelemetryBlobWriter.Configuration() { CollectHostEvents = true, CollectApplicationEvents = true, diff --git a/Telemetry/TaskoMeter/TaskoMeter.csproj b/Telemetry/TaskoMeter/TaskoMeter.csproj index fb4781e..a788a0a 100644 --- a/Telemetry/TaskoMeter/TaskoMeter.csproj +++ b/Telemetry/TaskoMeter/TaskoMeter.csproj @@ -8,8 +8,8 @@ {B6B493AE-C534-4324-B775-6F4FD4249E5D} Exe Properties - ReactiveMachine.Tools.Taskometer - ReactiveMachine.Tools.Taskometer + ReactiveMachine.Taskometer + ReactiveMachine.Taskometer v4.5 512 @@ -54,7 +54,7 @@ TRACE prompt 4 - Release\ReactiveMachine.Tools.Taskometer.xml + Release\ReactiveMachine.Taskometer.xml false diff --git a/Telemetry/TelemetryBlobWriter/Configuration.cs b/Telemetry/TelemetryBlobWriter/Configuration.cs index 3c5dbed..76c0c52 100644 --- a/Telemetry/TelemetryBlobWriter/Configuration.cs +++ b/Telemetry/TelemetryBlobWriter/Configuration.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace TelemetryBlobWriter +namespace ReactiveMachine.TelemetryBlobWriter { public class Configuration { diff --git a/Telemetry/TelemetryBlobWriter/TaskoMeterLauncher.cs b/Telemetry/TelemetryBlobWriter/TaskoMeterLauncher.cs index f454a4d..880dba2 100644 --- a/Telemetry/TelemetryBlobWriter/TaskoMeterLauncher.cs +++ b/Telemetry/TelemetryBlobWriter/TaskoMeterLauncher.cs @@ -8,7 +8,7 @@ using System.Diagnostics; using System.IO; using System.Text; -namespace TelemetryBlobWriter +namespace ReactiveMachine.TelemetryBlobWriter { public static class TaskoMeterLauncher { diff --git a/Telemetry/TelemetryBlobWriter/TelemetryBlobFormat.cs b/Telemetry/TelemetryBlobWriter/TelemetryBlobFormat.cs index cd01165..43b0f82 100644 --- a/Telemetry/TelemetryBlobWriter/TelemetryBlobFormat.cs +++ b/Telemetry/TelemetryBlobWriter/TelemetryBlobFormat.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace TelemetryBlobWriter +namespace ReactiveMachine.TelemetryBlobWriter { public class BlobFormat diff --git a/Telemetry/TelemetryBlobWriter/TelemetryBlobWriter.csproj b/Telemetry/TelemetryBlobWriter/TelemetryBlobWriter.csproj index a9e3a11..9b859db 100644 --- a/Telemetry/TelemetryBlobWriter/TelemetryBlobWriter.csproj +++ b/Telemetry/TelemetryBlobWriter/TelemetryBlobWriter.csproj @@ -27,8 +27,8 @@ Initial Release true ReactiveMachine - AssemblyName - AssemblyName + ReactiveMachine.TelemetryBlobWriter + ReactiveMachine.TelemetryBlobWriter diff --git a/Telemetry/TelemetryBlobWriter/TelemetryWriter.cs b/Telemetry/TelemetryBlobWriter/TelemetryWriter.cs index a63243f..d1b31c2 100644 --- a/Telemetry/TelemetryBlobWriter/TelemetryWriter.cs +++ b/Telemetry/TelemetryBlobWriter/TelemetryWriter.cs @@ -13,7 +13,7 @@ using Microsoft.WindowsAzure.Storage.Blob; using Newtonsoft.Json; using ReactiveMachine; -namespace TelemetryBlobWriter +namespace ReactiveMachine.TelemetryBlobWriter { public class TelemetryCollector : ITelemetryListener {