Skip to content

Commit c1fcad2

Browse files
author
Jayson Maxson
committed
Hybrid solution update.
1 parent 5d8ff9c commit c1fcad2

File tree

7 files changed

+60
-9
lines changed

7 files changed

+60
-9
lines changed

src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataCookers/CompositeDataCookerReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ internal static bool TryCreateReference(
7272
{
7373
return TryCreateReference(
7474
candidateType,
75-
Microsoft.Performance.SDK.Runtime.Logger.Null,
75+
Runtime.Logger.Create<CompositeDataCookerReference>(),
7676
out reference);
7777
}
7878

src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataCookers/SourceDataCookerReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ internal static bool TryCreateReference(
140140
{
141141
return TryCreateReference(
142142
candidateType,
143-
Runtime.Logger.Null,
143+
Runtime.Logger.Create<SourceDataCookerReference>(),
144144
out reference);
145145
}
146146

src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataExtensionFactory.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ public bool TryCreateSourceDataCookerReference(
4343
Type candidateType,
4444
out ISourceDataCookerReference reference)
4545
{
46-
return TryCreateSourceDataCookerReference(candidateType, Logger.Null, out reference);
46+
Guard.NotNull(candidateType, nameof(candidateType));
47+
48+
return SourceDataCookerReference.TryCreateReference(candidateType, out reference);
4749
}
4850

4951
/// <summary>
@@ -88,7 +90,9 @@ public bool TryCreateCompositeDataCookerReference(
8890
Type candidateType,
8991
out ICompositeDataCookerReference reference)
9092
{
91-
return TryCreateCompositeDataCookerReference(candidateType, Logger.Null, out reference);
93+
Guard.NotNull(candidateType, nameof(candidateType));
94+
95+
return CompositeDataCookerReference.TryCreateReference(candidateType, out reference);
9296
}
9397

9498
/// <summary>
@@ -156,7 +160,9 @@ public bool TryCreateTableReference(
156160
Type candidateType,
157161
out ITableExtensionReference reference)
158162
{
159-
return TryCreateTableReference(candidateType, Logger.Null, out reference);
163+
Guard.NotNull(candidateType, nameof(candidateType));
164+
165+
return TableExtensionReference.TryCreateReference(candidateType, out reference);
160166
}
161167

162168
/// <summary>

src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataExtensionReflector.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ public DataExtensionReflector(
3737
IDataExtensionRepositoryBuilder repoBuilder,
3838
ILogger logger)
3939
{
40-
Guard.NotNull(logger, nameof(logger));
40+
if (logger == null)
41+
{
42+
logger = Logger.Create<DataExtensionReflector>();
43+
}
4144

4245
this.repoBuilder = repoBuilder;
4346
this.logger = logger;

src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/Tables/TableExtensionReference.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,43 @@ public Func<IDataExtensionRetrieval, bool> IsDataAvailableFunc
117117
}
118118
}
119119

120+
/// <summary>
121+
/// Tries to create an instance of <see cref="ITableExtensionReference"/> based on the
122+
/// <paramref name="candidateType"/>.
123+
/// <para/>
124+
/// A <see cref="Type"/> must satisfy the following criteria in order to
125+
/// be eligible as a reference:
126+
/// <list type="bullet">
127+
/// <item>
128+
/// must expose a valid <see cref="TableDescriptor"/>.
129+
/// See <see cref="TableDescriptorFactory.TryCreate(Type, ITableConfigurationsSerializer, out TableDescriptor)"/>
130+
/// for details on how a table is to expose a descriptor.
131+
/// </item>
132+
/// </list>
133+
/// </summary>
134+
/// <param name="candidateType">
135+
/// Candidate <see cref="Type"/> for the <see cref="ITableExtensionReference"/>
136+
/// </param>
137+
/// <param name="reference">
138+
/// Out <see cref="ITableExtensionReference"/>
139+
/// </param>
140+
/// <returns>
141+
/// <c>true</c> if the <paramref name="candidateType"/> is valid and can create a instance of <see cref="ISourceDataCookerReference"/>;
142+
/// <c>false</c> otherwise.
143+
/// </returns>
144+
/// <exception cref="ArgumentNullException">
145+
/// <paramref name="candidateType"/> is <c>null</c>.
146+
/// </exception>
147+
internal static bool TryCreateReference(
148+
Type candidateType,
149+
out ITableExtensionReference reference)
150+
{
151+
return TryCreateReference(
152+
candidateType,
153+
Logger.Create<TableExtensionReference>(),
154+
out reference);
155+
}
156+
120157
/// <summary>
121158
/// Tries to create an instance of <see cref="ITableExtensionReference"/> based on the
122159
/// <paramref name="candidateType"/>.

src/Microsoft.Performance.SDK.Runtime/SourceDataCookerReferenceFactory.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ public static bool TryCreateReference(
3232
Type candidateType,
3333
out ISourceDataCookerReference reference)
3434
{
35-
return TryCreateReference(candidateType, Logger.Null, out reference);
35+
Guard.NotNull(candidateType, nameof(candidateType));
36+
37+
return SourceDataCookerReference.TryCreateReference(candidateType, out reference);
3638
}
3739

3840
/// <summary>

src/Microsoft.Performance.Toolkit.Engine/Engine.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,9 +750,12 @@ private static Engine CreateCore(EngineCreateInfo createInfo, DataSourceSet inte
750750
{
751751
Debug.Assert(createInfo != null);
752752

753-
var loggerFactory = createInfo.LoggerFactory ?? Logger.Create;
753+
if (createInfo.LoggerFactory != null)
754+
{
755+
Logger.Factory = createInfo.LoggerFactory;
756+
}
754757

755-
var logger = loggerFactory(typeof(Engine));
758+
var logger = Logger.Create(typeof(Engine));
756759

757760
Engine instance = null;
758761
try

0 commit comments

Comments
 (0)