refactor: fix test directory structure

open-telemetry · Oct 8, 2023 · 2ecca7e · 2ecca7e
1 parent a39ce1b
commit 2ecca7e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/subscriber.rb b/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/subscriber.rb
@@ -62,11 +62,18 @@ def finish(_name, _id, payload)
         rescue StandardError => e
           OpenTelemetry.handle_error(exception: e)
         ensure
+          finish_span(span, tokens)
+        end
+
+        def finish_span(span, tokens)
+          # closes the span after all attributes have been finalized
           begin
             span&.finish
           rescue StandardError => e
             OpenTelemetry.handle_error(exception: e)
           end
+
+          # pops the context stack
           tokens&.reverse&.each do |token|
             OpenTelemetry::Context.detach(token)
           rescue StandardError => e

diff --git a/...tation/active_job/instrumentation_test.rb → ...tation/active_job/instrumentation_test.rb b/...tation/active_job/instrumentation_test.rb → ...tation/active_job/instrumentation_test.rb
@@ -6,7 +6,7 @@
 
 require 'test_helper'
 
-require_relative '../../../lib/opentelemetry/instrumentation/active_job'
+require_relative '../../../../lib/opentelemetry/instrumentation/active_job'
 
 describe OpenTelemetry::Instrumentation::ActiveJob do
   let(:instrumentation) { OpenTelemetry::Instrumentation::ActiveJob::Instrumentation.instance }

diff --git a/...mentation/active_job/patches/base_test.rb → ...mentation/active_job/patches/base_test.rb b/...mentation/active_job/patches/base_test.rb → ...mentation/active_job/patches/base_test.rb
@@ -6,7 +6,7 @@
 
 require 'test_helper'
 
-require_relative '../../../../lib/opentelemetry/instrumentation/active_job'
+require_relative '../../../../../lib/opentelemetry/instrumentation/active_job'
 
 describe OpenTelemetry::Instrumentation::ActiveJob::Patches::Base do
   describe 'serialization / deserialization' do

diff --git a/...rumentation/active_job/subscriber_test.rb → ...rumentation/active_job/subscriber_test.rb b/...rumentation/active_job/subscriber_test.rb → ...rumentation/active_job/subscriber_test.rb
@@ -6,7 +6,7 @@
 
 require 'test_helper'
 
-require_relative '../../../lib/opentelemetry/instrumentation/active_job'
+require_relative '../../../../lib/opentelemetry/instrumentation/active_job'
 
 describe OpenTelemetry::Instrumentation::ActiveJob::Subscriber do
   let(:instrumentation) { OpenTelemetry::Instrumentation::ActiveJob::Instrumentation.instance }