Download and Copy libdatadog binaries for Data-Pipeline integration #6777
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -205,6 +205,8 @@ void DeleteReparsePoints(string path) | |
| .DependsOn(PublishManagedTracer) | ||
| .DependsOn(DownloadLibDdwaf) | ||
| .DependsOn(CopyLibDdwaf) | ||
| .DependsOn(DownloadLibDatadog) | ||
| .DependsOn(CopyLibDatadog) | ||
| .DependsOn(CreateMissingNullabilityFile) | ||
| .DependsOn(CreateTrimmingFile) | ||
| .DependsOn(RegenerateSolutions); | ||
|
|
@@ -219,6 +221,8 @@ void DeleteReparsePoints(string path) | |
| .DependsOn(PublishManagedTracerR2R) | ||
| .DependsOn(DownloadLibDdwaf) | ||
| .DependsOn(CopyLibDdwaf) | ||
| .DependsOn(DownloadLibDatadog) | ||
| .DependsOn(CopyLibDatadog) | ||
|
Comment on lines
+224
to
+225
There was a problem hiding this comment. This raises an interesting question actually - should we enable the trace exporter in the AWS Lambda artifacts 🤔 My gut feeling is no, at least initially, as they're very sensitive to size. It's also possible that the lambda layer would strip out this file anyway! There was a problem hiding this comment. I will follow you gut on that There was a problem hiding this comment. The plan was to cover AWS Lambda as well, Lambda layer I think allows 250MB and specially these are all AL2 instances - we should be good. My other question related to this, do we test on AL2 instances in our CI? There was a problem hiding this comment. (this PR is merged already, but commenting here for visiblity)
Yup, we are already stripping it out (DataDog/dd-trace-dotnet-aws-lambda-layer#10), so including this in the Lambda artifacts is useless at the moment. |
||
| .DependsOn(CreateMissingNullabilityFile) | ||
| .DependsOn(CreateTrimmingFile); | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // <copyright file="NativeInterop.cs" company="Datadog"> | ||
| // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. | ||
| // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. | ||
| // </copyright> | ||
|
|
||
| #nullable enable | ||
|
|
||
| using System; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| namespace Datadog.Trace.LibDatadog; | ||
|
|
||
| internal class NativeInterop | ||
| { | ||
| private const string DllName = "LibDatadog"; | ||
|
There was a problem hiding this comment. /question shouldn't this be name of file? There was a problem hiding this comment. in this case, it can be whatever you want: here I use libdatadog for documentation. |
||
|
|
||
| internal static class Exporter | ||
| { | ||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_new")] | ||
| // internal static extern ErrorHandle Create(out IntPtr outHandle, SafeHandle config); | ||
|
Comment on lines
+19
to
+20
There was a problem hiding this comment. I assume these are intentionally comment out, as they'll be used shortly by the trace exporter pipeline? |
||
|
|
||
| [DllImport(DllName, EntryPoint = "ddog_trace_exporter_error_free")] | ||
| internal static extern void ReleaseError(IntPtr error); | ||
|
|
||
| [DllImport(DllName, EntryPoint = "ddog_trace_exporter_free")] | ||
| internal static extern void Release(IntPtr handle); | ||
|
There was a problem hiding this comment. we can probably add a dummy test in Datadog.Trace.Tests, which calls with some ptr. It will fail but we can make sure library is loaded on all platforms and right entry point is invoked. There was a problem hiding this comment. This was to see if the native part was able to rewrite it. There was a problem hiding this comment. After rewrite, were you able to call any of the methods? I want to this on my end as well - just to see library integration is perfect and we can focus on calling the methods. |
||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_send")] | ||
| // internal static extern ErrorHandle Send(SafeHandle handle, ByteSlice trace, UIntPtr traceCount, ref IntPtr response); | ||
| } | ||
|
|
||
| internal static class Config | ||
| { | ||
| [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_new")] | ||
| internal static extern void Create(out IntPtr outHandle); | ||
|
|
||
| [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_free")] | ||
| internal static extern void Release(IntPtr handle); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_url")] | ||
| // internal static extern ErrorHandle SetUrl(SafeHandle config, CharSlice url); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_tracer_version")] | ||
| // internal static extern ErrorHandle SetTracerVersion(SafeHandle config, CharSlice version); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_language")] | ||
| // internal static extern ErrorHandle SetLanguage(SafeHandle config, CharSlice lang); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_lang_version")] | ||
| // internal static extern ErrorHandle SetLanguageVersion(SafeHandle config, CharSlice version); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_lang_interpreter")] | ||
| // internal static extern ErrorHandle SetInterperter(SafeHandle config, CharSlice interpreter); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_hostname")] | ||
| // internal static extern ErrorHandle SetHostname(SafeHandle config, CharSlice hostname); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_env")] | ||
| // internal static extern ErrorHandle SetEnvironment(SafeHandle config, CharSlice env); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_version")] | ||
| // internal static extern ErrorHandle SetVersion(SafeHandle config, CharSlice version); | ||
|
|
||
| // [DllImport(DllName, EntryPoint = "ddog_trace_exporter_config_set_service")] | ||
| // internal static extern ErrorHandle SetService(SafeHandle config, CharSlice service); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you tested this on mac?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no but before merging, I plan to ask someone with a mac