Skip to content

Commit

Permalink
Update API after security merge and WebRequest merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewlock
andrewlock committed Aug 11, 2021
1 parent 102a482 commit fad06e8
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 1 deletion.
53 changes: 53 additions & 0 deletions ...Datadog.Trace.Tests/Snapshots/PublicApiTests.PublicApiHasNotChanged_net4_6_1.verified.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Datadog.Trace.OpenTracing, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Datadog.Trace.OpenTracing.IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Datadog.Trace.OpenTracing.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Datadog.Trace.Security.IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Datadog.Trace.ServiceFabric, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Datadog.Trace.TestHelpers, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Datadog.Trace.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
Expand All @@ -22,6 +23,15 @@
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"System.Web.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100B5FC90E7027F67871E773A8FDE8938C81DD402BA65B9201D60593E96C492651E889CC13F1415EBB53FAC1131AE0BD333C5EE6021672D9718EA31A8AEBD0DA0072F25D87DBA6FC90FFD598ED4DA35E44C398C454307E8E33B8426143DAEC9F596836F97C8F74750E5975C64E2189F45DEF46B2A2B1247ADC3652BF5C308055DA9")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"dd-trace, PublicKey=002400000480000094000000060200000024000052534131000400000100010025b855c8bc41b1d47e777fc247392999ca6f553cdb030fac8e3bd010171ded9982540d988553935f44f7dd58cb4b17fbb92653d5c2dc5112696886665b317c6f92795bf64beab2405c501c8a30cb1b31b1541ed66e27d9823169ec2815b00ceeeecc8d5a1bf43db67d2961a3e9bea1397f043ec07491709649252f5565b756c5")]
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")]
namespace Datadog.Trace.AppSec
{
public class Security : System.IDisposable
{
public Security() { }
public static Datadog.Trace.AppSec.Security Instance { get; set; }
public void Dispose() { }
}
}
namespace Datadog.Trace.AspNet
{
public class TracingHttpModule : System.Web.IHttpModule
Expand Down Expand Up @@ -361,6 +371,15 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNet
public static Datadog.Trace.ClrProfiler.CallTarget.CallTargetState OnMethodBegin<TTarget, TCollection, TFunc>(TTarget instance, TCollection methods, TFunc setHostingEnvironmentCultures) { }
}
}
namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AspNetCore
{
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="Microsoft.AspNetCore.Http", IntegrationName="AspNetCore", MaximumVersion="2", MethodName="Build", MinimumVersion="2", ReturnTypeName="Microsoft.AspNetCore.Http.RequestDelegate", TypeName="Microsoft.AspNetCore.Builder.Internal.ApplicationBuilder")]
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="Microsoft.AspNetCore.Http", IntegrationName="AspNetCore", MaximumVersion="6", MethodName="Build", MinimumVersion="3", ReturnTypeName="System.Void", TypeName="Microsoft.AspNetCore.Builder.ApplicationBuilder")]
public static class AspNetCoreMiddlewareIntegration
{
public static Datadog.Trace.ClrProfiler.CallTarget.CallTargetState OnMethodBegin<TTarget>(TTarget instance) { }
}
}
namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.CosmosDb
{
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="Microsoft.Azure.Cosmos.Client", IntegrationName="CosmosDb", MaximumVersion="3", MethodName="GetDatabaseQueryIterator", MinimumVersion="3.6.0", ParameterTypeNames=new string[] {
Expand Down Expand Up @@ -752,6 +771,33 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.HttpClient.WinHttpH
}
namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.WebRequest
{
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System", IntegrationName="WebRequest", MaximumVersion="4", MethodName="BeginGetRequestStream", MinimumVersion="4", ParameterTypeNames=new string[] {
"System.AsyncCallback",
"System.Object"}, ReturnTypeName="System.IAsyncResult", TypeName="System.Net.HttpWebRequest")]
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System.Net.Requests", IntegrationName="WebRequest", MaximumVersion="5", MethodName="BeginGetRequestStream", MinimumVersion="4", ParameterTypeNames=new string[] {
"System.AsyncCallback",
"System.Object"}, ReturnTypeName="System.IAsyncResult", TypeName="System.Net.HttpWebRequest")]
public class HttpWebRequest_BeginGetRequestStream_Integration
{
public HttpWebRequest_BeginGetRequestStream_Integration() { }
public static Datadog.Trace.ClrProfiler.CallTarget.CallTargetState OnMethodBegin<TTarget>(TTarget instance, System.AsyncCallback callback, object state) { }
}
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System", IntegrationName="WebRequest", MaximumVersion="4", MethodName="BeginGetResponse", MinimumVersion="4", ParameterTypeNames=new string[] {
"System.AsyncCallback",
"System.Object"}, ReturnTypeName="System.IAsyncResult", TypeName="System.Net.HttpWebRequest")]
public class HttpWebRequest_BeginGetResponse_Integration
{
public HttpWebRequest_BeginGetResponse_Integration() { }
public static Datadog.Trace.ClrProfiler.CallTarget.CallTargetState OnMethodBegin<TTarget>(TTarget instance, System.AsyncCallback callback, object state) { }
}
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System", IntegrationName="WebRequest", MaximumVersion="4", MethodName="EndGetResponse", MinimumVersion="4", ParameterTypeNames=new string[] {
"System.IAsyncResult"}, ReturnTypeName="System.Net.WebResponse", TypeName="System.Net.HttpWebRequest")]
public class HttpWebRequest_EndGetResponse_Integration
{
public HttpWebRequest_EndGetResponse_Integration() { }
public static Datadog.Trace.ClrProfiler.CallTarget.CallTargetReturn<TReturn> OnMethodEnd<TTarget, TReturn>(TTarget instance, TReturn returnValue, System.Exception exception, Datadog.Trace.ClrProfiler.CallTarget.CallTargetState state)
where TTarget : Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.WebRequest.IHttpWebRequest, Datadog.Trace.DuckTyping.IDuckType { }
}
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System", IntegrationName="WebRequest", MaximumVersion="4", MethodName="GetRequestStream", MinimumVersion="4", ReturnTypeName="System.IO.Stream", TypeName="System.Net.HttpWebRequest")]
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System.Net.Requests", IntegrationName="WebRequest", MaximumVersion="5", MethodName="GetRequestStream", MinimumVersion="4", ReturnTypeName="System.IO.Stream", TypeName="System.Net.HttpWebRequest")]
public class HttpWebRequest_GetRequestStream_Integration
Expand All @@ -767,6 +813,11 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.WebRequest
public static Datadog.Trace.ClrProfiler.CallTarget.CallTargetState OnMethodBegin<TTarget>(TTarget instance) { }
public static Datadog.Trace.ClrProfiler.CallTarget.CallTargetReturn<TReturn> OnMethodEnd<TTarget, TReturn>(TTarget instance, TReturn returnValue, System.Exception exception, Datadog.Trace.ClrProfiler.CallTarget.CallTargetState state) { }
}
public interface IHttpWebRequest
{
[Datadog.Trace.DuckTyping.Duck(Kind=Datadog.Trace.DuckTyping.DuckKind.Field, Name="m_StartTimestamp")]
long RequestStartTicks { get; }
}
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System", IntegrationName="WebRequest", MaximumVersion="4", MethodName="GetResponseAsync", MinimumVersion="4", ReturnTypeName="System.Threading.Tasks.Task`1<System.Net.WebResponse>", TypeName="System.Net.WebRequest")]
[Datadog.Trace.ClrProfiler.InstrumentMethod(AssemblyName="System.Net.Requests", IntegrationName="WebRequest", MaximumVersion="5", MethodName="GetResponseAsync", MinimumVersion="4", ReturnTypeName="System.Threading.Tasks.Task`1<System.Net.WebResponse>", TypeName="System.Net.WebRequest")]
public class WebRequest_GetResponseAsync_Integration
Expand Down Expand Up @@ -2288,6 +2339,8 @@ namespace Datadog.Trace.Configuration
public const string AgentPort = "DD_TRACE_AGENT_PORT";
public const string AgentUri = "DD_TRACE_AGENT_URL";
public const string ApiKey = "DD_API_KEY";
public const string AppSecBlockingEnabled = "DD_APPSEC_BLOCKING_ENABLED";
public const string AppSecEnabled = "DD_APPSEC_ENABLED";
public const string BufferSize = "DD_TRACE_BUFFER_SIZE";
public const string ConfigurationFileName = "DD_TRACE_CONFIG_FILE";
public const string CustomSamplingRules = "DD_TRACE_SAMPLING_RULES";
Expand Down
Loading

0 comments on commit fad06e8

Please sign in to comment.