From c2cf21bf8254de658f85554ece4b8ef4e2d41d3e Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Mon, 21 Oct 2024 16:43:35 -0400
Subject: [PATCH] Add gem to gemspec and remove from Gemfile

---
 .gitlab/install_datadog_deps.rb  | 2 +-
 Gemfile                          | 3 ---
 datadog.gemspec                  | 3 +--
 lib-injection/host_inject.rb     | 2 +-
 spec/datadog/release_gem_spec.rb | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitlab/install_datadog_deps.rb b/.gitlab/install_datadog_deps.rb
index 16502986431..1f9b254f163 100755
--- 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
index 956a6808278..3e123675675 100644
--- 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'
diff --git a/datadog.gemspec b/datadog.gemspec
index b0ba76a6e1f..8237be107ca 100644
--- 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.6.3'
+  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
index 5a26fb5e63a..c680bda9e6d 100644
--- 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
index 875fb864535..b58fb522b1b 100644
--- 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',