Merge branch 'main' into add_shoryuken_instrumentation

open-telemetry · Aug 7, 2023 · 08b5b5c · 08b5b5c
2 parents 6b6f51f + cf5f236
commit 08b5b5c
Show file tree

Hide file tree

Showing 128 changed files with 1,872 additions and 586 deletions.
diff --git a/.github/actions/test_gem/action.yml b/.github/actions/test_gem/action.yml
@@ -24,6 +24,11 @@ inputs:
     required: false
     type: boolean
     default: false
+  latest:
+    description: Build against the latest version of the gem
+    required: false
+    type: boolean
+    default: false
 
 runs:
   using: composite
@@ -50,8 +55,11 @@ runs:
         fi
 
         echo "appraisals=false" >> $GITHUB_OUTPUT
-        if [[ -f "${dir}/Appraisals" ]]; then
-          echo "appraisals=true" >> $GITHUB_OUTPUT
+
+        if [[ "${{ inputs.latest }}" != "true" ]]; then
+          if [[ -f "${dir}/Appraisals" ]]; then
+            echo "appraisals=true" >> $GITHUB_OUTPUT
+          fi
         fi
 
     # Install ruby and bundle dependencies and cache!

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -181,3 +181,7 @@ updates:
   directory: "/resource_detectors"
   schedule:
     interval: weekly
+- package-ecosystem: bundler
+  directory: "/resources/container"
+  schedule:
+    interval: weekly
diff --git a/.github/workflows/ci-contrib-canary.yml b/.github/workflows/ci-contrib-canary.yml
@@ -26,17 +26,20 @@ jobs:
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "3.2"
+          latest: "true"
       - name: "Test Ruby 3.1"
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "3.1"
+          latest: "true"
       - name: "Test Ruby 3.0"
         if: "${{ matrix.os == 'ubuntu-latest' }}"
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "3.0"
+          latest: "true"
           yard: true
           rubocop: true
           build: true
@@ -46,19 +49,22 @@ jobs:
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "jruby-9.4.2.0"
+          latest: "true"
       - name: "Test truffleruby"
         if: "${{ matrix.os == 'ubuntu-latest' }}"
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "truffleruby"
+          latest: "true"
 
   resource-detectors:
     strategy:
       fail-fast: false
       matrix:
         gem:
           - resource_detectors
+          - resource-detector-container
         os:
           - ubuntu-latest
           - macos-latest
@@ -72,17 +78,20 @@ jobs:
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "3.2"
+          latest: "true"
       - name: "Test Ruby 3.1"
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "3.1"
+          latest: "true"
       - name: "Test Ruby 3.0"
         if: "${{ matrix.os == 'ubuntu-latest' }}"
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "3.0"
+          latest: "true"
           yard: true
           rubocop: true
           build: true
@@ -92,9 +101,11 @@ jobs:
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "jruby-9.4.2.0"
+          latest: "true"
       - name: "Test truffleruby"
         if: "${{ matrix.os == 'ubuntu-latest' }}"
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "truffleruby"
+          latest: "true"
diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
@@ -55,6 +55,7 @@ jobs:
       matrix:
         gem:
           - resource_detectors
+          - resource-detector-container
         os:
           - ubuntu-latest
     name: "opentelemetry-${{ matrix.gem }} / ${{ matrix.os }}"

diff --git a/.github/workflows/ci-instrumentation-canary.yml b/.github/workflows/ci-instrumentation-canary.yml
@@ -62,17 +62,20 @@ jobs:
         with:
           gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.2"
+          latest: "true"
       - name: "Test Ruby 3.1"
         uses: ./.github/actions/test_gem
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
+          latest: "true"
       - name: "Test Ruby 3.0"
         if: "${{ matrix.os == 'ubuntu-latest' }}"
         uses: ./.github/actions/test_gem
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.0"
+          latest: "true"
           yard: true
           rubocop: true
           build: true
@@ -102,6 +105,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
+          latest: "true"
           ruby: "jruby-9.4.2.0"
       - name: "Truffleruby Filter"
         id: truffleruby_skip
@@ -124,3 +128,4 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "truffleruby"
+          latest: "true"
diff --git a/.github/workflows/ci-instrumentation-with-services-canary.yml b/.github/workflows/ci-instrumentation-with-services-canary.yml
@@ -34,16 +34,19 @@ jobs:
         with:
           gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.2"
+          latest: "true"
       - name: "Test Ruby 3.1"
         uses: ./.github/actions/test_gem
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
+          latest: "true"
       - name: "Test Ruby 3.0"
         uses: ./.github/actions/test_gem
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.0"
+          latest: "true"
           yard: true
           rubocop: true
           build: true
@@ -70,6 +73,7 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "jruby-9.4.2.0"
+          latest: "true"
       - name: "Truffleruby Filter"
         id: truffleruby_skip
         shell: bash
@@ -86,6 +90,7 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "truffleruby"
+          latest: "true"
     services:
       zookeeper:
         image: confluentinc/cp-zookeeper:latest

diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml
@@ -0,0 +1,30 @@
+# This workflow is intended to catch issues with installation issues after a release
+# If the jobs fail that means users will not be able to install the latest version of gems
+# You may have to update and release gems that fail to install
+name: Installation Tests
+
+on:
+  workflow_dispatch:
+  schedule:
+    # Everyday at 2 PM UTC
+    - cron: "0 14 * * *"
+
+jobs:
+  installation-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - 3.2
+          - 3.1
+          - 3.0
+    name: ${{ matrix.ruby-version }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"
+        working-directory: releases
+        run: ./run.sh
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -16,6 +16,9 @@ Gemspec/RequiredRubyVersion:
 Lint/ConstantDefinitionInBlock:
   Exclude:
     - "**/*test.rb"
+Lint/EmptyBlock:
+  Exclude:
+    - "**/*test.rb"
 Lint/UnusedMethodArgument:
   Enabled: false
 Metrics/AbcSize:
@@ -24,8 +27,12 @@ Metrics/BlockLength:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
 Metrics/MethodLength:
-  Max: 25
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
 Naming/FileName:
   Exclude:
     - '**/opentelemetry-*'

diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml
@@ -203,3 +203,8 @@ gems:
     directory: resource_detectors
     version_rb_path: lib/opentelemetry/resource/detectors/version.rb
     version_constant: [OpenTelemetry, Resource, Detectors, VERSION]
+
+  - name: opentelemetry-resource-detector-container
+    directory: resources/container
+    version_rb_path: lib/opentelemetry/resource/detector/container/version.rb
+    version_constant: [OpenTelemetry, Resource, Detector, Container, VERSION]
diff --git a/Gemfile b/Gemfile
@@ -7,4 +7,4 @@
 source 'https://rubygems.org'
 
 gem 'rake', '~> 13.0'
-gem 'rubocop', '~> 1.54.1'
+gem 'rubocop', '~> 1.55.1'
diff --git a/README.md b/README.md
@@ -56,7 +56,10 @@ using OpenTelemetry with minimal changes to your application. See the
 This repository also contains libraries to aid with interoperablity with vendor specific tracing solutions:
 
 - [Context Propagation](propagator/): OTTrace and Amazon X-Ray
-- [Resource Detectors](resource_detectors/): Google Cloud Platform
+- [Resource Detectors](resource_detectors/):
+  - Azure
+  - Container
+  - Google Cloud Platform
 
 ## Versioning
 

diff --git a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rails', '>= 6'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.54.1'
+  spec.add_development_dependency 'rubocop', '~> 1.55.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.7.6'
   spec.add_development_dependency 'yard', '~> 0.9'

diff --git a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rails', '>= 6'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.54.1'
+  spec.add_development_dependency 'rubocop', '~> 1.55.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.7.6'
   spec.add_development_dependency 'yard', '~> 0.9'

diff --git a/instrumentation/active_job/CHANGELOG.md b/instrumentation/active_job/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-active_job
 
+### v0.5.2 / 2023-08-03
+
+* FIXED: Add code semconv attributes
+* FIXED: Remove inline linter rules
+
 ### v0.5.1 / 2023-06-05
 
 * FIXED: Base config options

diff --git a/...n/active_job/lib/opentelemetry/instrumentation/active_job/patches/active_job_callbacks.rb b/...n/active_job/lib/opentelemetry/instrumentation/active_job/patches/active_job_callbacks.rb
@@ -24,10 +24,10 @@ def self.prepended(base)
             end
           end
 
-          def perform_now # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def perform_now
             span_kind = self.class.queue_adapter_name == 'inline' ? :server : :consumer
             span_name = "#{otel_config[:span_naming] == :job_class ? self.class : queue_name} process"
-            span_attributes = job_attributes(self).merge('messaging.operation' => 'process')
+            span_attributes = job_attributes(self).merge('messaging.operation' => 'process', 'code.function' => 'perform_now')
             executions_count = (executions || 0) + 1 # because we run before the count is incremented in ActiveJob::Execution
 
             extracted_context = OpenTelemetry.propagation.extract(metadata)
@@ -67,6 +67,7 @@ def perform_now # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComple
 
           def job_attributes(job)
             otel_attributes = {
+              'code.namespace' => job.class.name,
               'messaging.destination_kind' => 'queue',
               'messaging.system' => job.class.queue_adapter_name,
               'messaging.destination' => job.queue_name,

diff --git a/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/version.rb b/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveJob
-      VERSION = '0.5.1'
+      VERSION = '0.5.2'
     end
   end
 end
diff --git a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.54.1'
+  spec.add_development_dependency 'rubocop', '~> 1.55.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.7.6'
   spec.add_development_dependency 'yard', '~> 0.9'

diff --git a/...mentation/active_job/test/instrumentation/active_job/patches/active_job_callbacks_test.rb b/...mentation/active_job/test/instrumentation/active_job/patches/active_job_callbacks_test.rb
@@ -52,6 +52,8 @@
 
       _(send_span).must_be_nil
       _(process_span).wont_be_nil
+      _(process_span.attributes['code.namespace']).must_equal('TestJob')
+      _(process_span.attributes['code.function']).must_equal('perform_now')
     end
   end
 
@@ -231,6 +233,7 @@
       job = TestJob.perform_later
 
       [send_span, process_span].each do |span|
+        _(span.attributes['code.namespace']).must_equal('TestJob')
         _(span.attributes['messaging.destination_kind']).must_equal('queue')
         _(span.attributes['messaging.system']).must_equal('async')
         _(span.attributes['messaging.message_id']).must_equal(job.job_id)
@@ -266,7 +269,7 @@
 
   describe 'force_flush option' do
     let(:mock_tracer_provider) do
-      mock_tracer_provider = MiniTest::Mock.new
+      mock_tracer_provider = Minitest::Mock.new
       mock_tracer_provider.expect(:force_flush, true)
 
       mock_tracer_provider

diff --git a/...n/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec b/...n/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rspec-mocks'
-  spec.add_development_dependency 'rubocop', '~> 1.54.1'
+  spec.add_development_dependency 'rubocop', '~> 1.55.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.7.6'
   spec.add_development_dependency 'yard', '~> 0.9'

diff --git a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.54.1'
+  spec.add_development_dependency 'rubocop', '~> 1.55.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.7.6'
   spec.add_development_dependency 'yard', '~> 0.9'

diff --git a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rails', '>= 6'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.54.1'
+  spec.add_development_dependency 'rubocop', '~> 1.55.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.7.6'
   spec.add_development_dependency 'yard', '~> 0.9'