Add datadog gem to gemspec and remove from Gemfile

DataDog · Oct 21, 2024 · 379eb47 · 379eb47
1 parent c579c62
commit 379eb47
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/.gitlab/install_datadog_deps.rb b/.gitlab/install_datadog_deps.rb
@@ -70,7 +70,7 @@
 }
 
 [
- # 'datadog-ruby_core_source',
+ 'datadog-ruby_core_source',
  'ffi',
  'libddwaf',
  'msgpack',

diff --git a/Gemfile b/Gemfile
@@ -98,6 +98,3 @@ end
 #
 # TODO: Remove this once the issue is resolved: https://github.com/ffi/ffi/issues/1107
 gem 'ffi', '~> 1.16.3', require: false
-
-# TODO: Remove when datadog-ruby_core_source has officially been published as a gem
-gem 'datadog-ruby_core_source', git: 'https://github.com/DataDog/datadog-ruby_core_source', branch: 'sarahchen6/change-debase-to-datadog'
diff --git a/datadog.gemspec b/datadog.gemspec
@@ -64,8 +64,7 @@ Gem::Specification.new do |spec|
  # Used by the profiler native extension to support Ruby < 2.6 and > 3.2
  #
  # We decided to pin it at the latest available version and will manually bump the dependency as needed.
- # Uncomment when datadog-ruby_core_source has officially been published as a gem
- # spec.add_dependency 'datadog-ruby_core_source', '= 3.3.6'
+ spec.add_dependency 'datadog-ruby_core_source', '= 3.3.6'
 
  # Used by appsec
  spec.add_dependency 'libddwaf', '~> 1.14.0.0.0'

diff --git a/lib-injection/host_inject.rb b/lib-injection/host_inject.rb
@@ -178,7 +178,7 @@ def bundler_supported?
  [
  'msgpack',
  'ffi',
- # 'datadog-ruby_core_source',
+ 'datadog-ruby_core_source',
  'libdatadog',
  'libddwaf',
  'datadog'

diff --git a/spec/datadog/release_gem_spec.rb b/spec/datadog/release_gem_spec.rb
@@ -100,7 +100,7 @@
  # This list MUST NOT derive from the `gemspec.dependencies`,
  # since it is used to alarm when dependencies modified.
  'datadog',
- # 'datadog-ruby_core_source',
+ 'datadog-ruby_core_source',
  'ffi',
  'libdatadog',
  'libddwaf',