Skip to content

Commit 344c304

Browse files
andrewlockandrewlock
authored
Revert "Add Google Protobuf Instrumentation (#6166)" (#6642)
## Summary of changes This reverts commit 02d20a4. ## Reason for change This has broken the master build, so reverting to unblock the pipeline ## Implementation details ## Test coverage ## Other details <!-- Fixes #{issue} --> <!-- ⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. -->
1 parent 02d20a4 commit 344c304

File tree

59 files changed

+540
-1830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+540
-1830
lines changed

‎.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,6 @@ BenchmarkDotNet.Artifacts/
326326
# NServiceBus files
327327
.learningtransport
328328

329-
# protobuf file generate on compile
330-
tracer/test/test-applications/integrations/Samples.GoogleProtobuf/Sample.cs
331-
332329
## Tracer .gitignore settings
333330
# Tracer deployment artifacts
334331
tracer/deploy/linux/

‎Datadog.Trace.OSX.slnf

-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
"tracer\\test\\test-applications\\integrations\\Samples.Elasticsearch.V7\\Samples.Elasticsearch.V7.csproj",
102102
"tracer\\test\\test-applications\\integrations\\Samples.Elasticsearch\\Samples.Elasticsearch.csproj",
103103
"tracer\\test\\test-applications\\integrations\\Samples.FakeDbCommand\\Samples.FakeDbCommand.csproj",
104-
"tracer\\test\\test-applications\\integrations\\Samples.GoogleProtobuf\\Samples.GoogleProtobuf.csproj",
105104
"tracer\\test\\test-applications\\integrations\\Samples.GraphQL3\\Samples.GraphQL3.csproj",
106105
"tracer\\test\\test-applications\\integrations\\Samples.GraphQL4\\Samples.GraphQL4.csproj",
107106
"tracer\\test\\test-applications\\integrations\\Samples.GraphQL7\\Samples.GraphQL7.csproj",

‎Datadog.Trace.Samples.g.sln

-7
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Is
433433
EndProject
434434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Isolated.AspNetCore", "tracer\test\test-applications\azure-functions\Samples.AzureFunctions.V4Isolated.AspNetCore\Samples.AzureFunctions.V4Isolated.AspNetCore.csproj", "{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}"
435435
EndProject
436-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.GoogleProtobuf", "tracer\test\test-applications\integrations\Samples.GoogleProtobuf\Samples.GoogleProtobuf.csproj", "{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}"
437-
EndProject
438436
Global
439437
GlobalSection(SolutionConfigurationPlatforms) = preSolution
440438
Debug|Any CPU = Debug|Any CPU
@@ -1041,10 +1039,6 @@ Global
10411039
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
10421040
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
10431041
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.Build.0 = Release|Any CPU
1044-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1045-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
1046-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
1047-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.Build.0 = Release|Any CPU
10481042
EndGlobalSection
10491043
GlobalSection(NestedProjects) = preSolution
10501044
{9518425A-36A5-4B8F-B0B8-6137DB88441D} = {8CEC2042-F11C-49F5-A674-2355793B600A}
@@ -1217,6 +1211,5 @@ Global
12171211
{18767A3E-9ADC-485C-A8C7-50660D5B579D} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
12181212
{5D2C6B9C-FCE2-4E46-B4ED-BC3B11CFBB3C} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
12191213
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
1220-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12211214
EndGlobalSection
12221215
EndGlobal

‎Datadog.Trace.sln

-7
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Is
603603
EndProject
604604
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Isolated.AspNetCore", "tracer\test\test-applications\azure-functions\Samples.AzureFunctions.V4Isolated.AspNetCore\Samples.AzureFunctions.V4Isolated.AspNetCore.csproj", "{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}"
605605
EndProject
606-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.GoogleProtobuf", "tracer\test\test-applications\integrations\Samples.GoogleProtobuf\Samples.GoogleProtobuf.csproj", "{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}"
607-
EndProject
608606
Global
609607
GlobalSection(SolutionConfigurationPlatforms) = preSolution
610608
Debug|Any CPU = Debug|Any CPU
@@ -1449,10 +1447,6 @@ Global
14491447
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
14501448
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
14511449
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.Build.0 = Release|Any CPU
1452-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1453-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
1454-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
1455-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.Build.0 = Release|Any CPU
14561450
EndGlobalSection
14571451
GlobalSection(SolutionProperties) = preSolution
14581452
HideSolutionNode = FALSE
@@ -1688,7 +1682,6 @@ Global
16881682
{18767A3E-9ADC-485C-A8C7-50660D5B579D} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
16891683
{5D2C6B9C-FCE2-4E46-B4ED-BC3B11CFBB3C} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
16901684
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
1691-
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
16921685
EndGlobalSection
16931686
GlobalSection(ExtensibilityGlobals) = postSolution
16941687
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}

‎docs/development/DuckTyping.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ DuckType.CreateTypeResult proxyResult = DuckType.GetOrCreateProxyType(proxyTarge
315315
if (proxyResult.Success)
316316
{
317317
// Pass in null, as there's no "instance" to duck type here
318-
return proxyResult.CreateInstance(null!);
318+
return proxyResult.CreateInstance(null);
319319
}
320320
else
321321
{
@@ -355,7 +355,7 @@ DuckType.CreateTypeResult proxyResult = DuckType.GetOrCreateProxyType(proxyType,
355355
if (proxyResult.Success)
356356
{
357357
// Pass in null, as there's no "instance" to duck type here, to create an instance of our proxy
358-
var proxy = (IObjectFactoryProxy)proxyResult.CreateInstance(null!);
358+
var proxy = (IObjectFactoryProxy)proxyResult.CreateInstance(null);
359359

360360
// invoke methods on the proxy
361361
object obj = proxy.CreateObject();

‎tracer/build/PackageVersionsGeneratorDefinitions.json

-10
Original file line numberDiff line numberDiff line change
@@ -230,16 +230,6 @@
230230
"ExcludeTargetFrameworks": ["netcoreapp2.1", "netcoreapp3.0"]
231231
}]
232232
},
233-
{
234-
"IntegrationName": "Protobuf",
235-
"SampleProjectName": "Samples.GoogleProtobuf",
236-
"NugetPackageSearchName": "Google.Protobuf",
237-
"MinVersion": "3.0.0",
238-
"MaxVersionExclusive": "4.0.0",
239-
"SpecificVersions": [
240-
"3.*.*"
241-
]
242-
},
243233
{
244234
"IntegrationName": "RabbitMQ",
245235
"SampleProjectName": "Samples.RabbitMQ",

‎tracer/build/_build/Build.ExplorationTests.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -645,13 +645,7 @@ public static ExplorationTestDescription GetExplorationTestDescription(Explorati
645645
"Google.Protobuf.CodedInputStreamTest.MaliciousRecursion",
646646
"Google.Protobuf.CodedInputStreamTest.MaliciousRecursion_UnknownFields",
647647
"Google.Protobuf.CodedInputStreamTest.RecursionLimitAppliedWhileSkippingGroup",
648-
"Google.Protobuf.JsonParserTest.MaliciousRecursion",
649-
// exclude those "legacy" tests because they are on manually modified code
650-
// that throws a NotImplementedException on the `Descriptor` property that we use.
651-
"Google.Protobuf.LegacyGeneratedCodeTest.IntermixingOfNewAndLegacyGeneratedCodeWorksWithCodedInputStream",
652-
"Google.Protobuf.LegacyGeneratedCodeTest.IntermixingOfNewAndLegacyGeneratedCodeWorksWithCodedOutputStream",
653-
"Google.Protobuf.LegacyGeneratedCodeTest.LegacyGeneratedCodeThrowsWithIBufferWriter",
654-
"Google.Protobuf.LegacyGeneratedCodeTest.LegacyGeneratedCodeThrowsWithReadOnlySequence"
648+
"Google.Protobuf.JsonParserTest.MaliciousRecursion"
655649
},
656650
LineProbesEnabled = true
657651
},

‎tracer/build/supported_calltargets.g.json

-96
Original file line numberDiff line numberDiff line change
@@ -11743,102 +11743,6 @@
1174311743
"IsAdoNetIntegration": false,
1174411744
"InstrumentationCategory": 1
1174511745
},
11746-
{
11747-
"IntegrationName": "Protobuf",
11748-
"AssemblyName": "Google.Protobuf",
11749-
"TargetTypeName": "Google.Protobuf.IBufferMessage",
11750-
"TargetMethodName": "InternalMergeFrom",
11751-
"TargetReturnType": "System.Void",
11752-
"TargetParameterTypes": [
11753-
"Google.Protobuf.ParseContext&"
11754-
],
11755-
"MinimumVersion": {
11756-
"Item1": 3,
11757-
"Item2": 15,
11758-
"Item3": 0
11759-
},
11760-
"MaximumVersion": {
11761-
"Item1": 3,
11762-
"Item2": 65535,
11763-
"Item3": 65535
11764-
},
11765-
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.BufferMessageInternalMergeFromIntegration",
11766-
"IntegrationKind": 2,
11767-
"IsAdoNetIntegration": false,
11768-
"InstrumentationCategory": 1
11769-
},
11770-
{
11771-
"IntegrationName": "Protobuf",
11772-
"AssemblyName": "Google.Protobuf",
11773-
"TargetTypeName": "Google.Protobuf.IBufferMessage",
11774-
"TargetMethodName": "InternalWriteTo",
11775-
"TargetReturnType": "System.Void",
11776-
"TargetParameterTypes": [
11777-
"Google.Protobuf.WriteContext&"
11778-
],
11779-
"MinimumVersion": {
11780-
"Item1": 3,
11781-
"Item2": 15,
11782-
"Item3": 0
11783-
},
11784-
"MaximumVersion": {
11785-
"Item1": 3,
11786-
"Item2": 65535,
11787-
"Item3": 65535
11788-
},
11789-
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.BufferMessageInternalWriteToIntegration",
11790-
"IntegrationKind": 2,
11791-
"IsAdoNetIntegration": false,
11792-
"InstrumentationCategory": 1
11793-
},
11794-
{
11795-
"IntegrationName": "Protobuf",
11796-
"AssemblyName": "Google.Protobuf",
11797-
"TargetTypeName": "Google.Protobuf.IMessage",
11798-
"TargetMethodName": "MergeFrom",
11799-
"TargetReturnType": "System.Void",
11800-
"TargetParameterTypes": [
11801-
"Google.Protobuf.CodedInputStream"
11802-
],
11803-
"MinimumVersion": {
11804-
"Item1": 3,
11805-
"Item2": 0,
11806-
"Item3": 0
11807-
},
11808-
"MaximumVersion": {
11809-
"Item1": 3,
11810-
"Item2": 65535,
11811-
"Item3": 65535
11812-
},
11813-
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.MessageMergeFromIntegration",
11814-
"IntegrationKind": 2,
11815-
"IsAdoNetIntegration": false,
11816-
"InstrumentationCategory": 1
11817-
},
11818-
{
11819-
"IntegrationName": "Protobuf",
11820-
"AssemblyName": "Google.Protobuf",
11821-
"TargetTypeName": "Google.Protobuf.IMessage",
11822-
"TargetMethodName": "WriteTo",
11823-
"TargetReturnType": "System.Void",
11824-
"TargetParameterTypes": [
11825-
"Google.Protobuf.CodedOutputStream"
11826-
],
11827-
"MinimumVersion": {
11828-
"Item1": 3,
11829-
"Item2": 0,
11830-
"Item3": 0
11831-
},
11832-
"MaximumVersion": {
11833-
"Item1": 3,
11834-
"Item2": 65535,
11835-
"Item3": 65535
11836-
},
11837-
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.MessageWriteToIntegration",
11838-
"IntegrationKind": 2,
11839-
"IsAdoNetIntegration": false,
11840-
"InstrumentationCategory": 1
11841-
},
1184211746
{
1184311747
"IntegrationName": "RabbitMQ",
1184411748
"AssemblyName": "RabbitMQ.Client",

‎tracer/missing-nullability-files.csv

+1
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ src/Datadog.Trace/Util/ArraySlice.cs
226226
src/Datadog.Trace/Util/AsyncUtil.cs
227227
src/Datadog.Trace/Util/Clock.cs
228228
src/Datadog.Trace/Util/DomainMetadata.cs
229+
src/Datadog.Trace/Util/FnvHash64.cs
229230
src/Datadog.Trace/Util/IClock.cs
230231
src/Datadog.Trace/Util/IRandomIdGenerator.cs
231232
src/Datadog.Trace/Util/RandomIdGenerator.Net6.cs

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Protobuf/BufferMessageInternalMergeFromIntegration.cs

-41
This file was deleted.

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Protobuf/BufferMessageInternalWriteToIntegration.cs

-40
This file was deleted.

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Protobuf/Helper.cs

-66
This file was deleted.

0 commit comments

Comments
 (0)