Fix grape endpoint resource name after upgrading grape

Appboy · May 15, 2020 · dcd0bd0 · dcd0bd0
1 parent 4be8fef
commit dcd0bd0
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/lib/ddtrace/contrib/grape/endpoint.rb b/lib/ddtrace/contrib/grape/endpoint.rb
@@ -61,15 +61,22 @@ def endpoint_run(name, start, finish, id, payload)
             begin
               # collect endpoint details
               api = payload[:endpoint].options[:for]
-              # If the API inherits from Grape::API in version >= 1.2.0
-              # then the API will be an instance and the name must be derived from the base.
-              # See https://github.com/ruby-grape/grape/issues/1825
-              api_view = if defined?(::Grape::API::Instance) && api <= ::Grape::API::Instance
-                           api.base.to_s
-                         else
-                           api.to_s
-                         end
 
+              # BRAZE MODIFICATION
+              # The changes here https://github.com/ruby-grape/grape/issues/1825 don't work with the way we use grape
+              api_view = api.to_s
+
+              if api_view.blank?
+                # If the API inherits from Grape::API in version >= 1.2.0
+                # then the API will be an instance and the name must be derived from the base.
+                # See https://github.com/ruby-grape/grape/issues/1825
+                api_view = if defined?(::Grape::API::Instance) && api <= ::Grape::API::Instance
+                             api.base.to_s
+                           else
+                             api.to_s
+                           end
+              end
+
               path = payload[:endpoint].options[:path].join('/')
               resource = "#{api_view}##{path}"
               span.resource = resource