Skip to content

Commit 2800371

Browse files
chojomokchojomok
committed
merge conflicts + rebuild
1 parent 0322134 commit 2800371

22 files changed

+1517
-1413
lines changed

‎Datadog.Trace.Samples.g.sln‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,10 +1129,22 @@ Global
11291129
{95613224-C1D7-4D4A-8926-F70DA26371CA}.Debug|x86.Build.0 = Debug|Any CPU
11301130
{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
11311131
{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|Any CPU.Build.0 = Release|Any CPU
1132+
{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|x64.ActiveCfg = Release|Any CPU
1133+
{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|x64.Build.0 = Release|Any CPU
1134+
{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|x86.ActiveCfg = Release|Any CPU
1135+
{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|x86.Build.0 = Release|Any CPU
11321136
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11331137
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
11341138
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
11351139
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Release|Any CPU.Build.0 = Release|Any CPU
1140+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Debug|x64.ActiveCfg = Debug|Any CPU
1141+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Debug|x64.Build.0 = Debug|Any CPU
1142+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Debug|x86.ActiveCfg = Debug|Any CPU
1143+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Debug|x86.Build.0 = Debug|Any CPU
1144+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Release|x64.ActiveCfg = Release|Any CPU
1145+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Release|x64.Build.0 = Release|Any CPU
1146+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Release|x86.ActiveCfg = Release|Any CPU
1147+
{A1234567-C1D7-4D4A-8926-F70DA26371CA}.Release|x86.Build.0 = Release|Any CPU
11361148
{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11371149
{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}.Debug|Any CPU.Build.0 = Debug|Any CPU
11381150
{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1989,10 +2001,22 @@ Global
19892001
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Debug|x86.Build.0 = Debug|Any CPU
19902002
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
19912003
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|Any CPU.Build.0 = Release|Any CPU
2004+
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|x64.ActiveCfg = Release|Any CPU
2005+
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|x64.Build.0 = Release|Any CPU
2006+
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|x86.ActiveCfg = Release|Any CPU
2007+
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|x86.Build.0 = Release|Any CPU
19922008
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19932009
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
19942010
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
19952011
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|Any CPU.Build.0 = Release|Any CPU
2012+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|x64.ActiveCfg = Debug|Any CPU
2013+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|x64.Build.0 = Debug|Any CPU
2014+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|x86.ActiveCfg = Debug|Any CPU
2015+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|x86.Build.0 = Debug|Any CPU
2016+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|x64.ActiveCfg = Release|Any CPU
2017+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|x64.Build.0 = Release|Any CPU
2018+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|x86.ActiveCfg = Release|Any CPU
2019+
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|x86.Build.0 = Release|Any CPU
19962020
{D59C5649-BE0E-4A33-B868-B652D8614534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19972021
{D59C5649-BE0E-4A33-B868-B652D8614534}.Debug|Any CPU.Build.0 = Debug|Any CPU
19982022
{D59C5649-BE0E-4A33-B868-B652D8614534}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2325,6 +2349,10 @@ Global
23252349
{C770F9F8-0430-587D-EB7A-8BEC2FE9B61C}.Debug|x86.Build.0 = Debug|Any CPU
23262350
{C770F9F8-0430-587D-EB7A-8BEC2FE9B61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
23272351
{C770F9F8-0430-587D-EB7A-8BEC2FE9B61C}.Release|Any CPU.Build.0 = Release|Any CPU
2352+
{C770F9F8-0430-587D-EB7A-8BEC2FE9B61C}.Release|x64.ActiveCfg = Release|Any CPU
2353+
{C770F9F8-0430-587D-EB7A-8BEC2FE9B61C}.Release|x64.Build.0 = Release|Any CPU
2354+
{C770F9F8-0430-587D-EB7A-8BEC2FE9B61C}.Release|x86.ActiveCfg = Release|Any CPU
2355+
{C770F9F8-0430-587D-EB7A-8BEC2FE9B61C}.Release|x86.Build.0 = Release|Any CPU
23282356
{D5A8ABB9-CB23-974E-F338-5D9172D96CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23292357
{D5A8ABB9-CB23-974E-F338-5D9172D96CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
23302358
{D5A8ABB9-CB23-974E-F338-5D9172D96CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2337,6 +2365,30 @@ Global
23372365
{0E3E1069-80FF-99C9-D29F-936D96D5F516}.Debug|Any CPU.Build.0 = Debug|Any CPU
23382366
{0E3E1069-80FF-99C9-D29F-936D96D5F516}.Release|Any CPU.ActiveCfg = Release|Any CPU
23392367
{0E3E1069-80FF-99C9-D29F-936D96D5F516}.Release|Any CPU.Build.0 = Release|Any CPU
2368+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2369+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2370+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Debug|x64.ActiveCfg = Debug|Any CPU
2371+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Debug|x64.Build.0 = Debug|Any CPU
2372+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Debug|x86.ActiveCfg = Debug|Any CPU
2373+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Debug|x86.Build.0 = Debug|Any CPU
2374+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
2375+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Release|Any CPU.Build.0 = Release|Any CPU
2376+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Release|x64.ActiveCfg = Release|Any CPU
2377+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Release|x64.Build.0 = Release|Any CPU
2378+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Release|x86.ActiveCfg = Release|Any CPU
2379+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D}.Release|x86.Build.0 = Release|Any CPU
2380+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2381+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Debug|Any CPU.Build.0 = Debug|Any CPU
2382+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Debug|x64.ActiveCfg = Debug|Any CPU
2383+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Debug|x64.Build.0 = Debug|Any CPU
2384+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Debug|x86.ActiveCfg = Debug|Any CPU
2385+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Debug|x86.Build.0 = Debug|Any CPU
2386+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Release|Any CPU.ActiveCfg = Release|Any CPU
2387+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Release|Any CPU.Build.0 = Release|Any CPU
2388+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Release|x64.ActiveCfg = Release|Any CPU
2389+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Release|x64.Build.0 = Release|Any CPU
2390+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Release|x86.ActiveCfg = Release|Any CPU
2391+
{962B244A-C821-40BA-B4D1-D5AB27493E30}.Release|x86.Build.0 = Release|Any CPU
23402392
EndGlobalSection
23412393
GlobalSection(NestedProjects) = preSolution
23422394
{9518425A-36A5-4B8F-B0B8-6137DB88441D} = {8CEC2042-F11C-49F5-A674-2355793B600A}
@@ -2520,5 +2572,7 @@ Global
25202572
{D5A8ABB9-CB23-974E-F338-5D9172D96CD8} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
25212573
{021D714E-1764-D76B-15B5-C9114FE934C2} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
25222574
{0E3E1069-80FF-99C9-D29F-936D96D5F516} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
2575+
{A1B2C3D4-E5F6-4A5B-8C9D-1E2F3A4B5C6D} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
2576+
{962B244A-C821-40BA-B4D1-D5AB27493E30} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
25232577
EndGlobalSection
25242578
EndGlobal

‎tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/EnumExtensionsGenerator/IntegrationIdExtensions_EnumExtensions.g.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal static partial class IntegrationIdExtensions
1717
/// The number of members in the enum.
1818
/// This is a non-distinct count of defined names.
1919
/// </summary>
20-
public const int Length = 79;
20+
public const int Length = 80;
2121

2222
/// <summary>
2323
/// Returns the string representation of the <see cref="Datadog.Trace.Configuration.IntegrationId"/> value.
@@ -109,6 +109,7 @@ public static string ToStringFast(this Datadog.Trace.Configuration.IntegrationId
109109
Datadog.Trace.Configuration.IntegrationId.DatadogTraceVersionConflict => nameof(Datadog.Trace.Configuration.IntegrationId.DatadogTraceVersionConflict),
110110
Datadog.Trace.Configuration.IntegrationId.Hangfire => nameof(Datadog.Trace.Configuration.IntegrationId.Hangfire),
111111
Datadog.Trace.Configuration.IntegrationId.OpenFeature => nameof(Datadog.Trace.Configuration.IntegrationId.OpenFeature),
112+
Datadog.Trace.Configuration.IntegrationId.MassTransit => nameof(Datadog.Trace.Configuration.IntegrationId.MassTransit),
112113
_ => value.ToString(),
113114
};
114115

@@ -201,6 +202,7 @@ public static Datadog.Trace.Configuration.IntegrationId[] GetValues()
201202
Datadog.Trace.Configuration.IntegrationId.DatadogTraceVersionConflict,
202203
Datadog.Trace.Configuration.IntegrationId.Hangfire,
203204
Datadog.Trace.Configuration.IntegrationId.OpenFeature,
205+
Datadog.Trace.Configuration.IntegrationId.MassTransit,
204206
};
205207

206208
/// <summary>
@@ -293,5 +295,6 @@ public static string[] GetNames()
293295
nameof(Datadog.Trace.Configuration.IntegrationId.DatadogTraceVersionConflict),
294296
nameof(Datadog.Trace.Configuration.IntegrationId.Hangfire),
295297
nameof(Datadog.Trace.Configuration.IntegrationId.OpenFeature),
298+
nameof(Datadog.Trace.Configuration.IntegrationId.MassTransit),
296299
};
297300
}

‎tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/EnumExtensionsGenerator/IntegrationNameToKeys.g.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ public static string[] GetAllIntegrationEnabledKeys() =>
259259
"DD_TRACE_OPENFEATURE_ENABLED", "DD_TRACE_OpenFeature_ENABLED", "DD_OpenFeature_ENABLED",
260260
"DD_TRACE_OPENFEATURE_ANALYTICS_ENABLED", "DD_TRACE_OpenFeature_ANALYTICS_ENABLED", "DD_OpenFeature_ANALYTICS_ENABLED",
261261
"DD_TRACE_OPENFEATURE_ANALYTICS_SAMPLE_RATE", "DD_TRACE_OpenFeature_ANALYTICS_SAMPLE_RATE", "DD_OpenFeature_ANALYTICS_SAMPLE_RATE",
262+
"DD_TRACE_MASSTRANSIT_ENABLED", "DD_TRACE_MassTransit_ENABLED", "DD_MassTransit_ENABLED",
263+
"DD_TRACE_MASSTRANSIT_ANALYTICS_ENABLED", "DD_TRACE_MassTransit_ANALYTICS_ENABLED", "DD_MassTransit_ANALYTICS_ENABLED",
264+
"DD_TRACE_MASSTRANSIT_ANALYTICS_SAMPLE_RATE", "DD_TRACE_MassTransit_ANALYTICS_SAMPLE_RATE", "DD_MassTransit_ANALYTICS_SAMPLE_RATE",
262265
];
263266
/// <summary>
264267
/// Gets the configuration keys for the specified integration name.
@@ -348,6 +351,7 @@ public static System.Collections.Generic.KeyValuePair<string, string[]> GetInteg
348351
"DatadogTraceVersionConflict" => new("DD_TRACE_DATADOGTRACEVERSIONCONFLICT_ENABLED", ["DD_TRACE_DatadogTraceVersionConflict_ENABLED", "DD_DatadogTraceVersionConflict_ENABLED"]),
349352
"Hangfire" => new("DD_TRACE_HANGFIRE_ENABLED", ["DD_TRACE_Hangfire_ENABLED", "DD_Hangfire_ENABLED"]),
350353
"OpenFeature" => new("DD_TRACE_OPENFEATURE_ENABLED", ["DD_TRACE_OpenFeature_ENABLED", "DD_OpenFeature_ENABLED"]),
354+
"MassTransit" => new("DD_TRACE_MASSTRANSIT_ENABLED", ["DD_TRACE_MassTransit_ENABLED", "DD_MassTransit_ENABLED"]),
351355
_ => GetIntegrationEnabledKeysFallback(integrationName) // we should never get here
352356
};
353357
/// <summary>
@@ -439,6 +443,7 @@ public static System.Collections.Generic.KeyValuePair<string, string[]> GetInteg
439443
"DatadogTraceVersionConflict" => new("DD_TRACE_DATADOGTRACEVERSIONCONFLICT_ANALYTICS_ENABLED", ["DD_TRACE_DatadogTraceVersionConflict_ANALYTICS_ENABLED", "DD_DatadogTraceVersionConflict_ANALYTICS_ENABLED"]),
440444
"Hangfire" => new("DD_TRACE_HANGFIRE_ANALYTICS_ENABLED", ["DD_TRACE_Hangfire_ANALYTICS_ENABLED", "DD_Hangfire_ANALYTICS_ENABLED"]),
441445
"OpenFeature" => new("DD_TRACE_OPENFEATURE_ANALYTICS_ENABLED", ["DD_TRACE_OpenFeature_ANALYTICS_ENABLED", "DD_OpenFeature_ANALYTICS_ENABLED"]),
446+
"MassTransit" => new("DD_TRACE_MASSTRANSIT_ANALYTICS_ENABLED", ["DD_TRACE_MassTransit_ANALYTICS_ENABLED", "DD_MassTransit_ANALYTICS_ENABLED"]),
442447
_ => GetIntegrationAnalyticsEnabledKeysFallback(integrationName) // we should never get here
443448
};
444449
/// <summary>
@@ -530,6 +535,7 @@ public static System.Collections.Generic.KeyValuePair<string, string[]> GetInteg
530535
"DatadogTraceVersionConflict" => new("DD_TRACE_DATADOGTRACEVERSIONCONFLICT_ANALYTICS_SAMPLE_RATE", ["DD_TRACE_DatadogTraceVersionConflict_ANALYTICS_SAMPLE_RATE", "DD_DatadogTraceVersionConflict_ANALYTICS_SAMPLE_RATE"]),
531536
"Hangfire" => new("DD_TRACE_HANGFIRE_ANALYTICS_SAMPLE_RATE", ["DD_TRACE_Hangfire_ANALYTICS_SAMPLE_RATE", "DD_Hangfire_ANALYTICS_SAMPLE_RATE"]),
532537
"OpenFeature" => new("DD_TRACE_OPENFEATURE_ANALYTICS_SAMPLE_RATE", ["DD_TRACE_OpenFeature_ANALYTICS_SAMPLE_RATE", "DD_OpenFeature_ANALYTICS_SAMPLE_RATE"]),
538+
"MassTransit" => new("DD_TRACE_MASSTRANSIT_ANALYTICS_SAMPLE_RATE", ["DD_TRACE_MassTransit_ANALYTICS_SAMPLE_RATE", "DD_MassTransit_ANALYTICS_SAMPLE_RATE"]),
533539
_ => GetIntegrationAnalyticsSampleRateKeysFallback(integrationName) // we should never get here
534540
};
535541

‎tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Datadog.Trace.Telemetry;
1212
internal sealed partial class CiVisibilityMetricsTelemetryCollector
1313
{
14-
private const int CountSharedLength = 336;
14+
private const int CountSharedLength = 340;
1515

1616
/// <summary>
1717
/// Creates the buffer for the <see cref="Datadog.Trace.Telemetry.Metrics.CountShared" /> values.
@@ -368,7 +368,7 @@ private static AggregatedMetric[] GetCountSharedBuffer()
368368
/// It is equal to the cardinality of the tag combinations (or 1 if there are no tags)
369369
/// </summary>
370370
private static int[] CountSharedEntryCounts { get; }
371-
= new int[]{ 336, };
371+
= new int[]{ 340, };
372372

373373
public void RecordCountSharedIntegrationsError(Datadog.Trace.Telemetry.Metrics.MetricTags.IntegrationName tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.InstrumentationError tag2, int increment = 1)
374374
{

0 commit comments

Comments
 (0)