Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Add Google Protobuf Instrumentation (#6166)" #6642

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Revert "Add Google Protobuf Instrumentation (#6166)" #6642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "Add Google Protobuf Instrumentation (#6166)" 
This reverts commit 02d20a4.
  • Loading branch information
@andrewlock
andrewlock committed Feb 10, 2025
commit fdab494c2bcee29057966e2ff241c159e9b0264e
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,6 @@ BenchmarkDotNet.Artifacts/
# NServiceBus files
.learningtransport

# protobuf file generate on compile
tracer/test/test-applications/integrations/Samples.GoogleProtobuf/Sample.cs

## Tracer .gitignore settings
# Tracer deployment artifacts
tracer/deploy/linux/
Expand Down
1 change: 0 additions & 1 deletion Datadog.Trace.OSX.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
"tracer\\test\\test-applications\\integrations\\Samples.Elasticsearch.V7\\Samples.Elasticsearch.V7.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.Elasticsearch\\Samples.Elasticsearch.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.FakeDbCommand\\Samples.FakeDbCommand.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.GoogleProtobuf\\Samples.GoogleProtobuf.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.GraphQL3\\Samples.GraphQL3.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.GraphQL4\\Samples.GraphQL4.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.GraphQL7\\Samples.GraphQL7.csproj",
Expand Down
7 changes: 0 additions & 7 deletions Datadog.Trace.Samples.g.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Is
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.GoogleProtobuf", "tracer\test\test-applications\integrations\Samples.GoogleProtobuf\Samples.GoogleProtobuf.csproj", "{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1041,10 +1039,6 @@ Global
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.Build.0 = Release|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9518425A-36A5-4B8F-B0B8-6137DB88441D} = {8CEC2042-F11C-49F5-A674-2355793B600A}
Expand Down Expand Up @@ -1217,6 +1211,5 @@ Global
{18767A3E-9ADC-485C-A8C7-50660D5B579D} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
{5D2C6B9C-FCE2-4E46-B4ED-BC3B11CFBB3C} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
EndGlobalSection
EndGlobal
7 changes: 0 additions & 7 deletions Datadog.Trace.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Is
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.GoogleProtobuf", "tracer\test\test-applications\integrations\Samples.GoogleProtobuf\Samples.GoogleProtobuf.csproj", "{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1449,10 +1447,6 @@ Global
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77}.Release|Any CPU.Build.0 = Release|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1688,7 +1682,6 @@ Global
{18767A3E-9ADC-485C-A8C7-50660D5B579D} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
{5D2C6B9C-FCE2-4E46-B4ED-BC3B11CFBB3C} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
{0F8EAB52-0C5B-4F60-92C5-42FAC21F4E77} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
Expand Down
4 changes: 2 additions & 2 deletions docs/development/DuckTyping.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ DuckType.CreateTypeResult proxyResult = DuckType.GetOrCreateProxyType(proxyTarge
if (proxyResult.Success)
{
// Pass in null, as there's no "instance" to duck type here
return proxyResult.CreateInstance(null!);
return proxyResult.CreateInstance(null);
}
else
{
Expand Down Expand Up @@ -355,7 +355,7 @@ DuckType.CreateTypeResult proxyResult = DuckType.GetOrCreateProxyType(proxyType,
if (proxyResult.Success)
{
// Pass in null, as there's no "instance" to duck type here, to create an instance of our proxy
var proxy = (IObjectFactoryProxy)proxyResult.CreateInstance(null!);
var proxy = (IObjectFactoryProxy)proxyResult.CreateInstance(null);

// invoke methods on the proxy
object obj = proxy.CreateObject();
Expand Down
10 changes: 0 additions & 10 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,6 @@
"ExcludeTargetFrameworks": ["netcoreapp2.1", "netcoreapp3.0"]
}]
},
{
"IntegrationName": "Protobuf",
"SampleProjectName": "Samples.GoogleProtobuf",
"NugetPackageSearchName": "Google.Protobuf",
"MinVersion": "3.0.0",
"MaxVersionExclusive": "4.0.0",
"SpecificVersions": [
"3.*.*"
]
},
{
"IntegrationName": "RabbitMQ",
"SampleProjectName": "Samples.RabbitMQ",
Expand Down
8 changes: 1 addition & 7 deletions tracer/build/_build/Build.ExplorationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,13 +645,7 @@ public static ExplorationTestDescription GetExplorationTestDescription(Explorati
"Google.Protobuf.CodedInputStreamTest.MaliciousRecursion",
"Google.Protobuf.CodedInputStreamTest.MaliciousRecursion_UnknownFields",
"Google.Protobuf.CodedInputStreamTest.RecursionLimitAppliedWhileSkippingGroup",
"Google.Protobuf.JsonParserTest.MaliciousRecursion",
// exclude those "legacy" tests because they are on manually modified code
// that throws a NotImplementedException on the `Descriptor` property that we use.
"Google.Protobuf.LegacyGeneratedCodeTest.IntermixingOfNewAndLegacyGeneratedCodeWorksWithCodedInputStream",
"Google.Protobuf.LegacyGeneratedCodeTest.IntermixingOfNewAndLegacyGeneratedCodeWorksWithCodedOutputStream",
"Google.Protobuf.LegacyGeneratedCodeTest.LegacyGeneratedCodeThrowsWithIBufferWriter",
"Google.Protobuf.LegacyGeneratedCodeTest.LegacyGeneratedCodeThrowsWithReadOnlySequence"
"Google.Protobuf.JsonParserTest.MaliciousRecursion"
},
LineProbesEnabled = true
},
Expand Down
96 changes: 0 additions & 96 deletions tracer/build/supported_calltargets.g.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11743,102 +11743,6 @@
"IsAdoNetIntegration": false,
"InstrumentationCategory": 1
},
{
"IntegrationName": "Protobuf",
"AssemblyName": "Google.Protobuf",
"TargetTypeName": "Google.Protobuf.IBufferMessage",
"TargetMethodName": "InternalMergeFrom",
"TargetReturnType": "System.Void",
"TargetParameterTypes": [
"Google.Protobuf.ParseContext&"
],
"MinimumVersion": {
"Item1": 3,
"Item2": 15,
"Item3": 0
},
"MaximumVersion": {
"Item1": 3,
"Item2": 65535,
"Item3": 65535
},
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.BufferMessageInternalMergeFromIntegration",
"IntegrationKind": 2,
"IsAdoNetIntegration": false,
"InstrumentationCategory": 1
},
{
"IntegrationName": "Protobuf",
"AssemblyName": "Google.Protobuf",
"TargetTypeName": "Google.Protobuf.IBufferMessage",
"TargetMethodName": "InternalWriteTo",
"TargetReturnType": "System.Void",
"TargetParameterTypes": [
"Google.Protobuf.WriteContext&"
],
"MinimumVersion": {
"Item1": 3,
"Item2": 15,
"Item3": 0
},
"MaximumVersion": {
"Item1": 3,
"Item2": 65535,
"Item3": 65535
},
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.BufferMessageInternalWriteToIntegration",
"IntegrationKind": 2,
"IsAdoNetIntegration": false,
"InstrumentationCategory": 1
},
{
"IntegrationName": "Protobuf",
"AssemblyName": "Google.Protobuf",
"TargetTypeName": "Google.Protobuf.IMessage",
"TargetMethodName": "MergeFrom",
"TargetReturnType": "System.Void",
"TargetParameterTypes": [
"Google.Protobuf.CodedInputStream"
],
"MinimumVersion": {
"Item1": 3,
"Item2": 0,
"Item3": 0
},
"MaximumVersion": {
"Item1": 3,
"Item2": 65535,
"Item3": 65535
},
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.MessageMergeFromIntegration",
"IntegrationKind": 2,
"IsAdoNetIntegration": false,
"InstrumentationCategory": 1
},
{
"IntegrationName": "Protobuf",
"AssemblyName": "Google.Protobuf",
"TargetTypeName": "Google.Protobuf.IMessage",
"TargetMethodName": "WriteTo",
"TargetReturnType": "System.Void",
"TargetParameterTypes": [
"Google.Protobuf.CodedOutputStream"
],
"MinimumVersion": {
"Item1": 3,
"Item2": 0,
"Item3": 0
},
"MaximumVersion": {
"Item1": 3,
"Item2": 65535,
"Item3": 65535
},
"InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.Protobuf.MessageWriteToIntegration",
"IntegrationKind": 2,
"IsAdoNetIntegration": false,
"InstrumentationCategory": 1
},
{
"IntegrationName": "RabbitMQ",
"AssemblyName": "RabbitMQ.Client",
Expand Down
1 change: 1 addition & 0 deletions tracer/missing-nullability-files.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ src/Datadog.Trace/Util/ArraySlice.cs
src/Datadog.Trace/Util/AsyncUtil.cs
src/Datadog.Trace/Util/Clock.cs
src/Datadog.Trace/Util/DomainMetadata.cs
src/Datadog.Trace/Util/FnvHash64.cs
src/Datadog.Trace/Util/IClock.cs
src/Datadog.Trace/Util/IRandomIdGenerator.cs
src/Datadog.Trace/Util/RandomIdGenerator.Net6.cs
Expand Down
41 changes: 0 additions & 41 deletions ...ace/ClrProfiler/AutoInstrumentation/Protobuf/BufferMessageInternalMergeFromIntegration.cs
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions ...Trace/ClrProfiler/AutoInstrumentation/Protobuf/BufferMessageInternalWriteToIntegration.cs
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Protobuf/Helper.cs
View file
Open in desktop

This file was deleted.

Loading
Loading