Skip to content

[skip ci] update process-discovery native FFI #4933

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −18
Draft

[skip ci] update process-discovery native FFI #4933

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
24 changes: 12 additions & 12 deletions ext/libdatadog_api/process_discovery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ static VALUE _native_store_tracer_metadata(int argc, VALUE *argv, VALUE self) {
rb_scan_args(argc, argv, "1:", &logger, &options);
if (options == Qnil) options = rb_hash_new();

VALUE schema_version = rb_hash_fetch(options, ID2SYM(rb_intern("schema_version")));
VALUE runtime_id = rb_hash_fetch(options, ID2SYM(rb_intern("runtime_id")));
VALUE tracer_language = rb_hash_fetch(options, ID2SYM(rb_intern("tracer_language")));
VALUE tracer_version = rb_hash_fetch(options, ID2SYM(rb_intern("tracer_version")));
Expand All @@ -51,7 +50,6 @@ static VALUE _native_store_tracer_metadata(int argc, VALUE *argv, VALUE self) {
VALUE service_env = rb_hash_fetch(options, ID2SYM(rb_intern("service_env")));
VALUE service_version = rb_hash_fetch(options, ID2SYM(rb_intern("service_version")));

ENFORCE_TYPE(schema_version, T_FIXNUM);
ENFORCE_TYPE(runtime_id, T_STRING);
ENFORCE_TYPE(tracer_language, T_STRING);
ENFORCE_TYPE(tracer_version, T_STRING);
Expand All @@ -60,16 +58,18 @@ static VALUE _native_store_tracer_metadata(int argc, VALUE *argv, VALUE self) {
ENFORCE_TYPE(service_env, T_STRING);
ENFORCE_TYPE(service_version, T_STRING);

ddog_Result_TracerMemfdHandle result = ddog_store_tracer_metadata(
(uint8_t) NUM2UINT(schema_version),
char_slice_from_ruby_string(runtime_id),
char_slice_from_ruby_string(tracer_language),
char_slice_from_ruby_string(tracer_version),
char_slice_from_ruby_string(hostname),
char_slice_from_ruby_string(service_name),
char_slice_from_ruby_string(service_env),
char_slice_from_ruby_string(service_version)
);
void* builder = ddog_tracer_metadata_new();

ddog_tracer_metadata_set(builder, DDOG_METADATA_KIND_RUNTIME_ID, char_slice_from_ruby_string(runtime_id));
ddog_tracer_metadata_set(builder, DDOG_METADATA_KIND_TRACER_LANGUAGE, char_slice_from_ruby_string(tracer_language));
ddog_tracer_metadata_set(builder, DDOG_METADATA_KIND_TRACER_VERSION, char_slice_from_ruby_string(tracer_version));
ddog_tracer_metadata_set(builder, DDOG_METADATA_KIND_HOSTNAME, char_slice_from_ruby_string(hostname));
ddog_tracer_metadata_set(builder, DDOG_METADATA_KIND_SERVICE_NAME, char_slice_from_ruby_string(service_name));
ddog_tracer_metadata_set(builder, DDOG_METADATA_KIND_SERVICE_ENVIRONMENT, char_slice_from_ruby_string(service_env));
ddog_tracer_metadata_set(builder, DDOG_METADATA_KIND_SERVICE_VERSION, char_slice_from_ruby_string(service_version));

ddog_Result_TracerMemfdHandle result = ddog_tracer_metadata_store(builder);
ddog_tracer_metadata_free(builder);

if (result.tag == DDOG_RESULT_TRACER_MEMFD_HANDLE_ERR_TRACER_MEMFD_HANDLE) {
rb_funcall(logger, rb_intern("debug"), 1, rb_sprintf("Failed to store the tracer configuration in a memory file descriptor: %"PRIsVALUE, get_error_details_and_drop(&result.err)));
Expand Down
1 change: 0 additions & 1 deletion lib/datadog/core/process_discovery.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ def shutdown!
# In the C method exposed by ddcommon, memfd_create replaces empty strings by None for these fields.
def get_metadata(settings)
{
schema_version: 1,
runtime_id: Core::Environment::Identity.id,
tracer_language: Core::Environment::Identity.lang,
tracer_version: Core::Environment::Identity.gem_datadog_version_semver2,
Expand Down
2 changes: 0 additions & 2 deletions sig/datadog/core/process_discovery.rbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module Datadog

def self._native_store_tracer_metadata: (
Datadog::Core::Logger logger,
schema_version: Integer,
runtime_id: String,
tracer_language: String,
tracer_version: String,
Expand All @@ -26,7 +25,6 @@ module Datadog
def self.shutdown!: () -> void

def self.get_metadata: (Datadog::Core::Configuration::Settings settings) -> {
schema_version: Integer,
runtime_id: String,
tracer_language: String,
tracer_version: String,
Expand Down
3 changes: 0 additions & 3 deletions spec/datadog/core/process_discovery_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@

expect(content).to eq(
{
'schema_version' => 1,
'runtime_id' => Datadog::Core::Environment::Identity.id,
'tracer_language' => Datadog::Core::Environment::Identity.lang,
'tracer_version' => Datadog::Core::Environment::Identity.gem_datadog_version_semver2,
Expand Down Expand Up @@ -79,7 +78,6 @@
# Thus not appearing in the content.
expect(content).to eq(
{
'schema_version' => 1,
'runtime_id' => Datadog::Core::Environment::Identity.id,
'tracer_language' => Datadog::Core::Environment::Identity.lang,
'tracer_version' => Datadog::Core::Environment::Identity.gem_datadog_version_semver2,
Expand Down Expand Up @@ -107,7 +105,6 @@
expect(described_class).to have_received(:publish)
expect(content).to eq(
{
'schema_version' => 1,
'runtime_id' => Datadog::Core::Environment::Identity.id,
'tracer_language' => Datadog::Core::Environment::Identity.lang,
'tracer_version' => Datadog::Core::Environment::Identity.gem_datadog_version_semver2,
Expand Down