Skip to content

Update injector #5053

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
lloeki wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Update injector #5053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd059fd
Update Ruby injector to deployment mode branch
lloeki Nov 17, 2025
c8dcd37
Adjust OCI package path
lloeki Nov 19, 2025
4f21bde
Add workaround for Ruby 2.6
lloeki Nov 19, 2025
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
9 changes: 8 additions & 1 deletion .gitlab/install_datadog_deps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

tmp_path = current_path.join('tmp', ENV["ARCH"])

versioned_path = tmp_path.join(ruby_api_version)
versioned_path = tmp_path.join(Gem.ruby_engine, RbConfig::CONFIG['ruby_version'])

FileUtils.mkdir_p(versioned_path, verbose: true)

Expand All @@ -34,6 +34,10 @@
file.write("source 'https://rubygems.org'\n")
file.write("gem 'datadog', '#{ENV.fetch('RUBY_PACKAGE_VERSION')}', path: '#{current_path}'\n")
file.write("gem 'ffi', '1.16.3'\n")

# workaround for https://github.com/ruby/ruby/blob/ruby_2_6/gem_prelude.rb#L3-L7
file.write("gem 'did_you_mean', '1.3.0'\n") if RUBY_VERSION.start_with?('2.6.')

# Mimick outdated `msgpack` version, uncomment below line to test
# file.write("gem 'msgpack', '1.6.0'\n")
end
Expand Down Expand Up @@ -80,6 +84,7 @@

# ADD NEW DEPENDENCIES HERE
[
'did_you_mean',
'datadog-ruby_core_source',
'ffi',
'libddwaf',
Expand All @@ -91,6 +96,8 @@
].each do |gem|
version = gem_version_mapping.delete(gem)

next if version.nil?

gem_install_cmd = "gem install #{gem} "\
"--version #{version} "\
'--no-document '\
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/prepare-oci-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi
## Obtain injector source

injector_repo="https://github.com/DataDog/datadog-injector-rb.git"
injector_ref="v1.0.1"
injector_ref="lloeki/deployment-mode"
injector_path="${HOME}/datadog-injector-rb"

git clone "${injector_repo}" --branch "${injector_ref}" "${injector_path}"
Expand Down