From 2eac6e42959fbdb47a1de8c22a8810962b34b528 Mon Sep 17 00:00:00 2001 From: Kayla Reopelle Date: Fri, 21 Nov 2025 15:53:27 -0800 Subject: [PATCH 1/2] ci: Fix indentation on ci.yml --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1170be113..1a62b925d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,17 +130,17 @@ jobs: rubocop: true build: true - name: "Test Zipkin with JRuby" - if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-zipkin' }}" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "jruby" + if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-zipkin' }}" + uses: ./.github/actions/test_gem + with: + gem: "${{ matrix.gem }}" + ruby: "jruby" - name: "Test Jaeger with JRuby" - if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-jaeger' }}" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "jruby-9.4" + if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-jaeger' }}" + uses: ./.github/actions/test_gem + with: + gem: "${{ matrix.gem }}" + ruby: "jruby-9.4" - name: "Truffleruby Filter" id: truffleruby_skip shell: bash From 4db07ed506a4024b2d4d5e4f98dc19db4a7b1cdb Mon Sep 17 00:00:00 2001 From: Kayla Reopelle Date: Fri, 21 Nov 2025 15:57:37 -0800 Subject: [PATCH 2/2] ci: exclude jaeger exporter from all runs except ruby 3.1, jruby --- .github/workflows/ci.yml | 13 ++++++++++--- exporter/jaeger/.rubocop.yml | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a62b925d..f59d27f57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,6 +99,9 @@ jobs: # Doesn't build on macos - os: macos-latest gem: opentelemetry-exporter-jaeger + # Windows runs Ruby 3.4, which isn't compatible with this gem + - os: windows-latest + gem: opentelemetry-exporter-jaeger - os: windows-latest gem: opentelemetry-exporter-otlp-grpc name: ${{ matrix.gem }} / ${{ matrix.os }} @@ -106,16 +109,19 @@ jobs: steps: - uses: actions/checkout@v2 - name: "Test Ruby 3.4" + if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" ruby: "3.4" - name: "Test Ruby 3.3" + if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" ruby: "3.3" - name: "Test Ruby 3.2" + if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" @@ -139,14 +145,15 @@ jobs: if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-jaeger' }}" uses: ./.github/actions/test_gem with: - gem: "${{ matrix.gem }}" - ruby: "jruby-9.4" + gem: "${{ matrix.gem }}" + ruby: "jruby-9.4" - name: "Truffleruby Filter" id: truffleruby_skip shell: bash run: | echo "skip=false" >> $GITHUB_OUTPUT - [[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT + [[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT + [[ "${{ matrix.gem }}" == "opentelemetry-exporter-jaeger" ]] && echo "skip=true" >> $GITHUB_OUTPUT # This is essentially a bash script getting evaluated, so we need to return true or the whole job fails. true - name: "Test truffleruby" diff --git a/exporter/jaeger/.rubocop.yml b/exporter/jaeger/.rubocop.yml index eb2cbe128..2001fb1ee 100644 --- a/exporter/jaeger/.rubocop.yml +++ b/exporter/jaeger/.rubocop.yml @@ -19,3 +19,5 @@ Metrics/BlockLength: Naming/FileName: Exclude: - "lib/opentelemetry-exporter-jaeger.rb" +Gemspec/RequiredRubyVersion: + Severity: info