From 4638756d5ae60c0d05eca8c43e629ad951754a3a Mon Sep 17 00:00:00 2001
From: David Elner <david@elner.co>
Date: Tue, 5 Mar 2024 13:23:25 -0500
Subject: [PATCH] Removed: Obsolete google protobuf references

---
 integration/apps/rack/Gemfile             | 17 -----------------
 integration/apps/rails-five/Gemfile       | 20 --------------------
 integration/apps/rails-seven/Gemfile      | 10 ----------
 integration/apps/rails-six/Gemfile        | 11 -----------
 integration/apps/sinatra2-classic/Gemfile | 17 -----------------
 integration/apps/sinatra2-modular/Gemfile | 17 -----------------
 6 files changed, 92 deletions(-)

diff --git a/integration/apps/rack/Gemfile b/integration/apps/rack/Gemfile
index 6f0d1696a61..3d69edf7514 100644
--- a/integration/apps/rack/Gemfile
+++ b/integration/apps/rack/Gemfile
@@ -26,23 +26,6 @@ gem 'dogstatsd-ruby'
 # Choose correct specs for 'datadog' demo environment
 gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog')
 
-# Needed for datadog profiling
-google_protobuf_versions = [
-  '~> 3.0',
-  '!= 3.7.0.rc.2',
-  '!= 3.7.0.rc.3',
-  '!= 3.7.0',
-  '!= 3.7.1',
-  '!= 3.8.0.rc.1',
-  '!= 3.24.0.rc.1',
-]
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4')
-  gem 'google-protobuf', *google_protobuf_versions
-else
-  # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3)
-  gem 'google-protobuf', *google_protobuf_versions, '< 3.19.2'
-end
-
 # Development
 gem 'pry-byebug' if RUBY_VERSION >= '2.3.0' && RUBY_ENGINE != 'truffleruby' && RUBY_VERSION < '3.2.0'
 gem 'pry-nav' if RUBY_VERSION < '2.3.0'
diff --git a/integration/apps/rails-five/Gemfile b/integration/apps/rails-five/Gemfile
index 2ac08f93da1..765d3bea197 100644
--- a/integration/apps/rails-five/Gemfile
+++ b/integration/apps/rails-five/Gemfile
@@ -4,18 +4,6 @@ source "https://rubygems.org"
 
   # gem 'rails', '5.2.2'
 
-google_protobuf_versions = [
-  '~> 3.0',
-  '!= 3.7.0.rc.2',
-  '!= 3.7.0.rc.3',
-  '!= 3.7.0',
-  '!= 3.7.1',
-  '!= 3.8.0.rc.1',
-  '!= 3.20.0.rc.1',
-  '!= 3.20.0.rc.2',
-  '!= 3.24.0.rc.1',
-]
-
 rails_version = ['~> 5.2', '>= 5.2.6']
 
 gem 'actioncable', *rails_version
@@ -42,14 +30,6 @@ gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog')
 gem 'dogstatsd-ruby'
 gem 'ffi'
 
-# Needed for datadog profiling
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4')
-  gem 'google-protobuf', *google_protobuf_versions
-else
-  # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3)
-  gem 'google-protobuf', '< 3.19.2'
-end
-
 # Fixes conflict with profiling (patch overwrite in Thread)
 # Upgrade this to latest when this patch is merged & released.
 # https://github.com/rollbar/rollbar-gem/pull/1018
diff --git a/integration/apps/rails-seven/Gemfile b/integration/apps/rails-seven/Gemfile
index 35503bc5ae9..cc39a6c097d 100644
--- a/integration/apps/rails-seven/Gemfile
+++ b/integration/apps/rails-seven/Gemfile
@@ -11,16 +11,6 @@ gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog')
 
 gem 'dogstatsd-ruby'
 
-google_protobuf_versions = [
-  '~> 3.0',
-  '!= 3.7.0.rc.2',
-  '!= 3.7.0.rc.3',
-  '!= 3.7.0',
-  '!= 3.7.1',
-  '!= 3.8.0.rc.1'
-]
-gem 'google-protobuf', *google_protobuf_versions
-
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem "sprockets-rails"
 
diff --git a/integration/apps/rails-six/Gemfile b/integration/apps/rails-six/Gemfile
index 9297bdb81fe..70a3073a631 100644
--- a/integration/apps/rails-six/Gemfile
+++ b/integration/apps/rails-six/Gemfile
@@ -2,16 +2,6 @@ require 'datadog/demo_env'
 
 source "https://rubygems.org"
 
-google_protobuf_versions = [
-  '~> 3.0',
-  '!= 3.7.0.rc.2',
-  '!= 3.7.0.rc.3',
-  '!= 3.7.0',
-  '!= 3.7.1',
-  '!= 3.8.0.rc.1',
-  '!= 3.24.0.rc.1',
-]
-
 rails_version = ['~> 6.1']
 
 gem 'actioncable', *rails_version
@@ -32,7 +22,6 @@ gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog')
 
 gem 'dogstatsd-ruby'
 gem 'ffi'
-gem 'google-protobuf', *google_protobuf_versions
 
 # Gems which give aide to higher performance
 gem 'hiredis', platform: :ruby
diff --git a/integration/apps/sinatra2-classic/Gemfile b/integration/apps/sinatra2-classic/Gemfile
index 109ef2d1bbd..cbbc60735b5 100644
--- a/integration/apps/sinatra2-classic/Gemfile
+++ b/integration/apps/sinatra2-classic/Gemfile
@@ -10,23 +10,6 @@ gem 'dogstatsd-ruby'
 # Choose correct specs for 'datadog' demo environment
 gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog')
 
-# Needed for datadog profiling
-google_protobuf_versions = [
-  '~> 3.0',
-  '!= 3.7.0.rc.2',
-  '!= 3.7.0.rc.3',
-  '!= 3.7.0',
-  '!= 3.7.1',
-  '!= 3.8.0.rc.1',
-  '!= 3.24.0.rc.1',
-]
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4')
-  gem 'google-protobuf', *google_protobuf_versions
-else
-  # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3)
-  gem 'google-protobuf', *google_protobuf_versions, '< 3.19.2'
-end
-
 # Development
 gem 'pry-byebug'
 # gem 'pry-stack_explorer', platform: :ruby
diff --git a/integration/apps/sinatra2-modular/Gemfile b/integration/apps/sinatra2-modular/Gemfile
index de5f83afe23..6f9490206ab 100644
--- a/integration/apps/sinatra2-modular/Gemfile
+++ b/integration/apps/sinatra2-modular/Gemfile
@@ -11,23 +11,6 @@ gem 'dogstatsd-ruby'
 # Choose correct specs for 'datadog' demo environment
 gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog')
 
-# Needed for datadog profiling
-google_protobuf_versions = [
-  '~> 3.0',
-  '!= 3.7.0.rc.2',
-  '!= 3.7.0.rc.3',
-  '!= 3.7.0',
-  '!= 3.7.1',
-  '!= 3.8.0.rc.1',
-  '!= 3.24.0.rc.1',
-]
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4')
-  gem 'google-protobuf', *google_protobuf_versions
-else
-  # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3)
-  gem 'google-protobuf', *google_protobuf_versions, '< 3.19.2'
-end
-
 # Development
 gem 'pry-byebug'
 # gem 'pry-stack_explorer', platform: :ruby