Remove API class name from span name

Author: Muriel Picone Farías

instrumentation/grape/lib/opentelemetry/instrumentation/grape/event_handler.rb

@@ -88,7 +88,7 @@ def tracer
           end
 
           def span_name(endpoint)
-            "#{api_instance(endpoint)} #{request_method(endpoint)} #{path(endpoint)}"
+            "#{request_method(endpoint)} #{path(endpoint)}"
           end
 
           def run_attributes(payload)
@@ -97,7 +97,7 @@ def run_attributes(payload)
             {
               'component' => 'web',
               'operation' => 'endpoint_run',
-              'grape.route.endpoint' => api_instance(endpoint),
+              'grape.route.endpoint' => endpoint.options[:for]&.base.to_s,
               'grape.route.path' => path,
               'grape.route.method' => endpoint.options[:method].first,
               OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => request_method(endpoint),
@@ -116,10 +116,6 @@ def handle_payload_exception(span, exception)
             span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, exception.status)
           end
 
-          def api_instance(endpoint)
-            endpoint.options[:for]&.base.to_s
-          end
-
           def request_method(endpoint)
             endpoint.options[:method]&.first
           end

instrumentation/grape/test/opentelemetry/instrumentation/grape_test.rb

@@ -37,7 +37,7 @@ class BasicAPI < Grape::API
 
       let(:app) { BasicAPI }
       let(:request_path) { '/hello' }
-      let(:expected_span_name) { 'BasicAPI GET /hello' }
+      let(:expected_span_name) { 'GET /hello' }
 
       before { get request_path }
 
@@ -103,7 +103,7 @@ class RouteParamAPI < Grape::API
 
       let(:app) { RouteParamAPI }
       let(:request_path) { '/users/1' }
-      let(:expected_span_name) { 'RouteParamAPI GET /users/:id' }
+      let(:expected_span_name) { 'GET /users/:id' }
       let(:expected_path) { '/users/:id' }
 
       before { get request_path }
@@ -128,7 +128,7 @@ class VersionedWithPrefixAPI < Grape::API
 
       let(:app) { VersionedWithPrefixAPI }
       let(:request_path) { '/api/v1/hello' }
-      let(:expected_span_name) { 'VersionedWithPrefixAPI GET /api/v1/hello' }
+      let(:expected_span_name) { 'GET /api/v1/hello' }
       let(:expected_path) { '/api/v1/hello' }
 
       before { get request_path }
@@ -156,7 +156,7 @@ class NestedAPI < Grape::API
 
       let(:app) { NestedAPI }
       let(:request_path) { '/internal/users' }
-      let(:expected_span_name) { 'NestedAPI GET /internal/users' }
+      let(:expected_span_name) { 'GET /internal/users' }
       let(:expected_path) { '/internal/users' }
 
       before { get request_path }
@@ -181,7 +181,7 @@ class FilteredAPI < Grape::API
 
       let(:app) { FilteredAPI }
       let(:request_path) { '/filtered' }
-      let(:expected_span_name) { 'FilteredAPI GET /filtered' }
+      let(:expected_span_name) { 'GET /filtered' }
 
       before { get request_path }
 
@@ -239,7 +239,7 @@ class ValidationErrorAPI < Grape::API
 
       let(:app) { ValidationErrorAPI }
       let(:request_path) { '/new' }
-      let(:expected_span_name) { 'ValidationErrorAPI POST /new' }
+      let(:expected_span_name) { 'POST /new' }
       let(:headers) { { 'Content-Type' => 'application/json' } }
       let(:expected_error_type) { 'Grape::Exceptions::ValidationErrors' }
 
@@ -279,7 +279,7 @@ class RaisedErrorAPI < Grape::API
 
       let(:app) { RaisedErrorAPI }
       let(:request_path) { '/failure' }
-      let(:expected_span_name) { 'RaisedErrorAPI GET /failure' }
+      let(:expected_span_name) { 'GET /failure' }
       let(:expected_error_type) { 'StandardError' }
 
       before do
@@ -326,7 +326,7 @@ class ErrorInFilterAPI < Grape::API
 
       let(:app) { ErrorInFilterAPI }
       let(:request_path) { '/filtered' }
-      let(:expected_span_name) { 'ErrorInFilterAPI GET /filtered' }
+      let(:expected_span_name) { 'GET /filtered' }
       let(:expected_error_type) { 'StandardError' }
 
       before do
@@ -369,7 +369,7 @@ class ErrorInFormatterAPI < Grape::API
 
       let(:app) { ErrorInFormatterAPI }
       let(:request_path) { '/bad_format' }
-      let(:expected_span_name) { 'ErrorInFormatterAPI GET /bad_format' }
+      let(:expected_span_name) { 'GET /bad_format' }
       let(:expected_error_type) { 'Grape::Exceptions::InvalidFormatter' }
 
       before { get request_path }
@@ -412,7 +412,7 @@ class ErrorResponseAPI < Grape::API
 
       let(:app) { ErrorResponseAPI }
       let(:request_path) { '/error_response' }
-      let(:expected_span_name) { 'ErrorResponseAPI GET /error_response' }
+      let(:expected_span_name) { 'GET /error_response' }
 
       before { get request_path }
 
@@ -440,7 +440,7 @@ class IgnoredEventAPI < Grape::API
       let(:config) { { ignored_events: [:endpoint_render] } }
       let(:app) { IgnoredEventAPI }
       let(:request_path) { '/success' }
-      let(:expected_span_name) { 'IgnoredEventAPI GET /success' }
+      let(:expected_span_name) { 'GET /success' }
 
       before { get request_path }