Skip to content

Commit 4e69bc7

Browse files
andrewlockandrewlock
committed
Add usages of TestingAndPrivateOnly 
1 parent 317c7a2 commit 4e69bc7

File tree

37 files changed

+88
-51
lines changed

37 files changed

+88
-51
lines changed

‎tracer/src/Datadog.Trace/Agent/Api.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Datadog.Trace.DogStatsd;
1313
using Datadog.Trace.Logging;
1414
using Datadog.Trace.PlatformHelpers;
15+
using Datadog.Trace.SourceGenerators;
1516
using Datadog.Trace.Telemetry;
1617
using Datadog.Trace.Telemetry.Metrics;
1718
using Datadog.Trace.Util.Http;
@@ -94,7 +95,7 @@ public Task<bool> SendTracesAsync(ArraySegment<byte> traces, int numberOfTraces,
9495
return SendWithRetry(_tracesEndpoint, _sendTraces, state);
9596
}
9697

97-
// internal for testing
98+
[TestingAndPrivateOnly]
9899
internal bool LogPartialFlushWarningIfRequired(string agentVersion)
99100
{
100101
if (agentVersion != _agentVersion)

‎tracer/src/Datadog.Trace/Agent/MovingAverageKeepRateCalculator.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Threading;
88
using System.Threading.Tasks;
99
using Datadog.Trace.Logging;
10+
using Datadog.Trace.SourceGenerators;
1011
using Datadog.Trace.Util;
1112

1213
namespace Datadog.Trace.Agent
@@ -106,6 +107,7 @@ public void CancelUpdates()
106107
/// <summary>
107108
/// Update the current rate. Internal for testing only. Should not be called in normal usage.
108109
/// </summary>
110+
[TestingAndPrivateOnly]
109111
internal void UpdateBucket()
110112
{
111113
var index = _index;

‎tracer/src/Datadog.Trace/Ci/Configuration/TestOptimizationSettings.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Datadog.Trace.Configuration.ConfigurationSources.Telemetry;
1414
using Datadog.Trace.Configuration.Telemetry;
1515
using Datadog.Trace.LibDatadog;
16+
using Datadog.Trace.SourceGenerators;
1617
using Datadog.Trace.Telemetry;
1718
using Datadog.Trace.Util;
1819

@@ -361,7 +362,7 @@ internal void SetDefaultManualInstrumentationSettings()
361362
private TracerSettings InitializeTracerSettings()
362363
=> InitializeTracerSettings(GlobalConfigurationSource.Instance);
363364

364-
// Internal for testing
365+
[TestingAndPrivateOnly]
365366
internal TracerSettings InitializeTracerSettings(IConfigurationSource source)
366367
{
367368
// This is a somewhat hacky way to "tell" TracerSettings that we're running in CI Visibility

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/ILogger/DirectSubmission/LoggerFactoryIntegrationCommon.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Reflection.Emit;
1010
using Datadog.Trace.DuckTyping;
1111
using Datadog.Trace.Logging;
12+
using Datadog.Trace.SourceGenerators;
1213

1314
namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.ILogger.DirectSubmission
1415
{
@@ -17,7 +18,7 @@ internal static class LoggerFactoryIntegrationCommon<TLoggerFactory>
1718
private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor(typeof(LoggerFactoryIntegrationCommon<TLoggerFactory>));
1819

1920
// ReSharper disable once StaticMemberInGenericType
20-
// Internal for testing
21+
[TestingAndPrivateOnly]
2122
internal static readonly Type? ProviderInterfaces;
2223

2324
static LoggerFactoryIntegrationCommon()
@@ -84,7 +85,7 @@ internal static bool TryAddDirectSubmissionLoggerProvider(TLoggerFactory loggerF
8485
return TryAddDirectSubmissionLoggerProvider(loggerFactory, provider);
8586
}
8687

87-
// Internal for testing
88+
[TestingAndPrivateOnly]
8889
internal static bool TryAddDirectSubmissionLoggerProvider(TLoggerFactory loggerFactory, DirectSubmissionLoggerProvider provider)
8990
{
9091
if (ProviderInterfaces is null)

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/DirectSubmission/DirectSubmissionLog4NetAppender.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Datadog.Trace.DuckTyping;
99
using Datadog.Trace.Logging.DirectSubmission;
1010
using Datadog.Trace.Logging.DirectSubmission.Sink;
11+
using Datadog.Trace.SourceGenerators;
1112
using Datadog.Trace.Telemetry;
1213
using Datadog.Trace.Telemetry.Metrics;
1314

@@ -23,7 +24,7 @@ internal class DirectSubmissionLog4NetAppender
2324
private readonly IDirectSubmissionLogSink _sink;
2425
private readonly DirectSubmissionLogLevel _minimumLevel;
2526

26-
// internal for testing
27+
[TestingAndPrivateOnly]
2728
internal DirectSubmissionLog4NetAppender(IDirectSubmissionLogSink sink, DirectSubmissionLogLevel minimumLevel)
2829
{
2930
_sink = sink;

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/DirectSubmission/DirectSubmissionLog4NetLegacyAppender.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Datadog.Trace.DuckTyping;
99
using Datadog.Trace.Logging.DirectSubmission;
1010
using Datadog.Trace.Logging.DirectSubmission.Sink;
11+
using Datadog.Trace.SourceGenerators;
1112
using Datadog.Trace.Telemetry;
1213
using Datadog.Trace.Telemetry.Metrics;
1314

@@ -23,7 +24,7 @@ internal class DirectSubmissionLog4NetLegacyAppender
2324
private readonly IDirectSubmissionLogSink _sink;
2425
private readonly DirectSubmissionLogLevel _minimumLevel;
2526

26-
// internal for testing
27+
[TestingAndPrivateOnly]
2728
internal DirectSubmissionLog4NetLegacyAppender(IDirectSubmissionLogSink sink, DirectSubmissionLogLevel minimumLevel)
2829
{
2930
_sink = sink;

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/NLog/DirectSubmission/DirectSubmissionNLogLegacyTarget.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Datadog.Trace.Logging.DirectSubmission;
1313
using Datadog.Trace.Logging.DirectSubmission.Formatting;
1414
using Datadog.Trace.Logging.DirectSubmission.Sink;
15+
using Datadog.Trace.SourceGenerators;
1516
using Datadog.Trace.Telemetry;
1617
using Datadog.Trace.Telemetry.Metrics;
1718

@@ -32,7 +33,7 @@ internal DirectSubmissionNLogLegacyTarget(IDirectSubmissionLogSink sink, DirectS
3233
{
3334
}
3435

35-
// internal for testing
36+
[TestingAndPrivateOnly]
3637
internal DirectSubmissionNLogLegacyTarget(
3738
IDirectSubmissionLogSink sink,
3839
DirectSubmissionLogLevel minimumLevel,

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/NLog/DirectSubmission/DirectSubmissionNLogTarget.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Datadog.Trace.Logging.DirectSubmission;
1111
using Datadog.Trace.Logging.DirectSubmission.Formatting;
1212
using Datadog.Trace.Logging.DirectSubmission.Sink;
13+
using Datadog.Trace.SourceGenerators;
1314
using Datadog.Trace.Telemetry;
1415
using Datadog.Trace.Telemetry.Metrics;
1516

@@ -30,7 +31,7 @@ internal DirectSubmissionNLogTarget(IDirectSubmissionLogSink sink, DirectSubmiss
3031
{
3132
}
3233

33-
// internal for testing
34+
[TestingAndPrivateOnly]
3435
internal DirectSubmissionNLogTarget(
3536
IDirectSubmissionLogSink sink,
3637
DirectSubmissionLogLevel minimumLevel,

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/NLog/DirectSubmission/DirectSubmissionNLogV5Target.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Datadog.Trace.Logging.DirectSubmission;
1111
using Datadog.Trace.Logging.DirectSubmission.Formatting;
1212
using Datadog.Trace.Logging.DirectSubmission.Sink;
13+
using Datadog.Trace.SourceGenerators;
1314

1415
namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.NLog.DirectSubmission
1516
{
@@ -28,7 +29,7 @@ internal DirectSubmissionNLogV5Target(IDirectSubmissionLogSink sink, DirectSubmi
2829
{
2930
}
3031

31-
// internal for testing
32+
[TestingAndPrivateOnly]
3233
internal DirectSubmissionNLogV5Target(
3334
IDirectSubmissionLogSink sink,
3435
DirectSubmissionLogLevel minimumLevel,

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/NLog/DirectSubmission/NLogCommon.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Datadog.Trace.Configuration;
1414
using Datadog.Trace.DuckTyping;
1515
using Datadog.Trace.Logging;
16+
using Datadog.Trace.SourceGenerators;
1617
using Datadog.Trace.Util;
1718

1819
namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.NLog.DirectSubmission
@@ -216,7 +217,7 @@ public static bool AddDatadogTargetToLoggingRulesList<TLoggingRuleList>(TLogging
216217
return properties;
217218
}
218219

219-
// internal for testing
220+
[TestingAndPrivateOnly]
220221
internal static bool AddDatadogTargetNLog50(object loggingConfiguration, object targetProxy)
221222
{
222223
// Could also do the duck cast in the method signature, but this avoids the allocation in the instrumentation
@@ -252,7 +253,7 @@ internal static bool AddDatadogTargetNLog50(object loggingConfiguration, object
252253
return true;
253254
}
254255

255-
// internal for testing
256+
[TestingAndPrivateOnly]
256257
internal static bool AddDatadogTargetNLog45(object loggingConfiguration, object targetProxy)
257258
{
258259
// Could also do the duck cast in the method signature, but this avoids the allocation in the instrumentation
@@ -288,7 +289,7 @@ internal static bool AddDatadogTargetNLog45(object loggingConfiguration, object
288289
return true;
289290
}
290291

291-
// internal for testing
292+
[TestingAndPrivateOnly]
292293
internal static bool AddDatadogTargetNLog43To45(object loggingConfiguration, object targetProxy)
293294
{
294295
// Could also do the duck cast in the method signature, but this avoids the allocation in the instrumentation
@@ -364,7 +365,7 @@ private static void ReorderLoggingRules(IList rules)
364365
}
365366
}
366367

367-
// internal for testing
368+
[TestingAndPrivateOnly]
368369
internal static bool AddDatadogTargetNLogPre43(object loggingConfiguration, object targetProxy)
369370
{
370371
var loggingConfigurationProxy = loggingConfiguration.DuckCast<ILoggingConfigurationPre43Proxy>();
@@ -408,7 +409,7 @@ internal static bool AddDatadogTargetNLogPre43(object loggingConfiguration, obje
408409
return true;
409410
}
410411

411-
// internal for testing
412+
[TestingAndPrivateOnly]
412413
internal static object CreateNLogTargetProxy(DirectSubmissionNLogV5Target target)
413414
{
414415
if (_targetType is null)
@@ -426,7 +427,7 @@ internal static object CreateNLogTargetProxy(DirectSubmissionNLogV5Target target
426427
return reverseProxy;
427428
}
428429

429-
// internal for testing
430+
[TestingAndPrivateOnly]
430431
internal static object CreateNLogTargetProxy(DirectSubmissionNLogTarget target)
431432
{
432433
if (_targetType is null)
@@ -444,7 +445,7 @@ internal static object CreateNLogTargetProxy(DirectSubmissionNLogTarget target)
444445
return reverseProxy;
445446
}
446447

447-
// internal for testing
448+
[TestingAndPrivateOnly]
448449
internal static object CreateNLogTargetProxy(DirectSubmissionNLogLegacyTarget target)
449450
{
450451
if (_targetType is null)
@@ -466,7 +467,7 @@ internal static object CreateNLogTargetProxy(DirectSubmissionNLogLegacyTarget ta
466467
return reverseProxy;
467468
}
468469

469-
// internal for testing
470+
[TestingAndPrivateOnly]
470471
internal static void TryGetMdcProxy(
471472
Assembly nlogAssembly,
472473
out bool haveMdcProxy,
@@ -504,7 +505,7 @@ internal static void TryGetMdcProxy(
504505
mdc = default;
505506
}
506507

507-
// internal for testing
508+
[TestingAndPrivateOnly]
508509
internal static void TryGetMdlcProxy(
509510
Assembly nlogAssembly,
510511
out bool haveMdlcProxy,
@@ -542,7 +543,7 @@ internal static void TryGetMdlcProxy(
542543
isModernMdlcProxy = false;
543544
}
544545

545-
// internal for testing
546+
[TestingAndPrivateOnly]
546547
internal static Func<object> CreateLoggingRuleActivator(Assembly nlogAssembly)
547548
{
548549
var activator = new ActivatorHelper(nlogAssembly.GetType("NLog.Config.LoggingRule")!);

0 commit comments

Comments
 (0)