add deprecation notice for operation_name configuration option

DataDog · Dec 5, 2023 · 7b14b71 · 7b14b71
1 parent be56e57
commit 7b14b71
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/lib/datadog/ci/contrib/cucumber/configuration/settings.rb b/lib/datadog/ci/contrib/cucumber/configuration/settings.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "datadog/core"
+
 require_relative "../ext"
 require_relative "../../settings"
 
@@ -26,6 +28,14 @@ class Settings < Datadog::CI::Contrib::Settings
               o.type :string
               o.env Ext::ENV_OPERATION_NAME
               o.default Ext::OPERATION_NAME
+
+              o.after_set do |value|
+                if value
+                  Datadog::Core.log_deprecation do
+                    "The operation_name setting has no effect and will be removed in 1.0"
+                  end
+                end
+              end
             end
           end
         end

diff --git a/lib/datadog/ci/contrib/minitest/configuration/settings.rb b/lib/datadog/ci/contrib/minitest/configuration/settings.rb
@@ -26,6 +26,14 @@ class Settings < Datadog::CI::Contrib::Settings
               o.type :string
               o.env Ext::ENV_OPERATION_NAME
               o.default Ext::OPERATION_NAME
+
+              o.after_set do |value|
+                if value
+                  Datadog::Core.log_deprecation do
+                    "The operation_name setting has no effect and will be removed in 1.0"
+                  end
+                end
+              end
             end
           end
         end

diff --git a/lib/datadog/ci/contrib/rspec/configuration/settings.rb b/lib/datadog/ci/contrib/rspec/configuration/settings.rb
@@ -26,6 +26,14 @@ class Settings < Datadog::CI::Contrib::Settings
               o.type :string
               o.env Ext::ENV_OPERATION_NAME
               o.default Ext::OPERATION_NAME
+
+              o.after_set do |value|
+                if value
+                  Datadog::Core.log_deprecation do
+                    "The operation_name setting has no effect and will be removed in 1.0"
+                  end
+                end
+              end
             end
           end
         end

diff --git a/vendor/rbs/ddtrace/0/datadog/core.rbs b/vendor/rbs/ddtrace/0/datadog/core.rbs
@@ -1,5 +1,6 @@
 module Datadog
   module Core
+    def self.log_deprecation: () ?{() -> untyped} -> untyped
   end
 
   extend Core::Configuration

diff --git a/vendor/rbs/ddtrace/0/datadog/core/configuration/option_definition.rbs b/vendor/rbs/ddtrace/0/datadog/core/configuration/option_definition.rbs
@@ -6,21 +6,19 @@ module Datadog
 
         attr_reader default: untyped
 
-        attr_reader experimental_default_proc: untyped
+        attr_reader default_proc: untyped
 
         attr_reader env: untyped
 
         attr_reader deprecated_env: untyped
 
         attr_reader env_parser: untyped
 
-        attr_reader delegate_to: untyped
-
         attr_reader depends_on: untyped
 
         attr_reader name: untyped
 
-        attr_reader on_set: untyped
+        attr_reader after_set: untyped
 
         attr_reader resetter: untyped
 
@@ -39,9 +37,7 @@ module Datadog
 
           def default: (?untyped? value) ?{ () -> untyped } -> untyped
 
-          def experimental_default_proc: () { () -> untyped } -> untyped
-
-          def delegate_to: () { () -> untyped } -> untyped
+          def default_proc: () { () -> untyped } -> untyped
 
           def env: (untyped value) -> untyped
 
@@ -53,7 +49,7 @@ module Datadog
 
           def helper: (untyped name, *untyped _args) { () -> untyped } -> untyped
 
-          def on_set: () { (untyped value) -> untyped } -> untyped
+          def after_set: () { (untyped value) -> untyped } -> untyped
 
           def resetter: () { (untyped value) -> untyped } -> untyped
 
@@ -63,7 +59,7 @@ module Datadog
 
           def to_definition: () -> untyped
 
-          def meta: () -> { default: untyped, delegate_to: untyped, depends_on: untyped, on_set: untyped, resetter: untyped, setter: untyped }
+          def meta: () -> { default: untyped, after_set: untyped, resetter: untyped, setter: untyped }
         end
       end
     end