Skip to content

Commit e8b1433

Browse files
Merge branch 'main' into ruby-3.2
2 parents b9df1d8 + 8c02da8 commit e8b1433

File tree

7 files changed

+45
-22
lines changed

7 files changed

+45
-22
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,3 @@ updates:
8585
directory: "/semantic_conventions"
8686
schedule:
8787
interval: weekly
88-
- package-ecosystem: bundler
89-
directory: "/"
90-
schedule:
91-
interval: weekly

.github/renovate.json5

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:best-practices",
5+
"helpers:pinGitHubActionDigestsToSemver"
6+
],
7+
"packageRules": [
8+
{
9+
"groupName": "all patch versions",
10+
"matchUpdateTypes": ["patch"],
11+
"schedule": ["before 8am every weekday"]
12+
},
13+
{
14+
"matchUpdateTypes": ["minor", "major"],
15+
"schedule": ["before 8am on Monday"]
16+
}
17+
],
18+
"labels": [
19+
"dependencies"
20+
]
21+
}

.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -93,55 +93,55 @@ jobs:
9393
# Doesn't build on macos
9494
- os: macos-latest
9595
gem: opentelemetry-exporter-jaeger
96+
# Windows runs Ruby 3.4, which isn't compatible with this gem
97+
- os: windows-latest
98+
gem: opentelemetry-exporter-jaeger
9699
- os: windows-latest
97100
gem: opentelemetry-exporter-otlp-grpc
98101
name: ${{ matrix.gem }} / ${{ matrix.os }}
99102
runs-on: ${{ matrix.os }}
100103
steps:
101104
- uses: actions/checkout@v2
102105
- name: "Test Ruby 3.4"
106+
if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}"
103107
uses: ./.github/actions/test_gem
104108
with:
105109
gem: "${{ matrix.gem }}"
106110
ruby: "3.4"
107111
- name: "Test Ruby 3.3"
112+
if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}"
108113
uses: ./.github/actions/test_gem
109114
with:
110115
gem: "${{ matrix.gem }}"
111116
ruby: "3.3"
112117
- name: "Test Ruby 3.2"
118+
if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}"
113119
uses: ./.github/actions/test_gem
114120
with:
115121
gem: "${{ matrix.gem }}"
116122
ruby: "3.2"
117123
yard: true
118124
rubocop: true
119125
build: true
120-
- name: "JRuby Filter"
121-
id: jruby_skip
122-
shell: bash
123-
run: |
124-
echo "skip=false" >> $GITHUB_OUTPUT
125-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp" ]] && echo "skip=true" >> $GITHUB_OUTPUT
126-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-common" ]] && echo "skip=true" >> $GITHUB_OUTPUT
127-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
128-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-http" ]] && echo "skip=true" >> $GITHUB_OUTPUT
129-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-logs" ]] && echo "skip=true" >> $GITHUB_OUTPUT
130-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-metrics" ]] && echo "skip=true" >> $GITHUB_OUTPUT
131-
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
132-
true
133-
- name: "Test JRuby"
134-
if: "${{ matrix.os == 'ubuntu-latest' && steps.jruby_skip.outputs.skip == 'false' }}"
126+
- name: "Test Zipkin with JRuby"
127+
if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-zipkin' }}"
135128
uses: ./.github/actions/test_gem
136129
with:
137130
gem: "${{ matrix.gem }}"
138131
ruby: "jruby"
132+
- name: "Test Jaeger with JRuby"
133+
if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-jaeger' }}"
134+
uses: ./.github/actions/test_gem
135+
with:
136+
gem: "${{ matrix.gem }}"
137+
ruby: "jruby-9.4"
139138
- name: "Truffleruby Filter"
140139
id: truffleruby_skip
141140
shell: bash
142141
run: |
143142
echo "skip=false" >> $GITHUB_OUTPUT
144-
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
143+
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-otlp-grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
144+
[[ "${{ matrix.gem }}" == "opentelemetry-exporter-jaeger" ]] && echo "skip=true" >> $GITHUB_OUTPUT
145145
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
146146
true
147147
- name: "Test truffleruby"

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: Install Ruby 3.4
19-
uses: ruby/setup-ruby@v1.255.0
19+
uses: ruby/setup-ruby@v1.267.0
2020
with:
2121
ruby-version: 3.4
2222
- name: Generate Gemfile.lock

exporter/jaeger/.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ Metrics/BlockLength:
1919
Naming/FileName:
2020
Exclude:
2121
- "lib/opentelemetry-exporter-jaeger.rb"
22+
Gemspec/RequiredRubyVersion:
23+
Severity: info

exporter/jaeger/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ The `opentelemetry-exporter-jaeger` gem source is [on github][repo-github], alon
100100

101101
The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us in [GitHub Discussions][discussions-url] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
102102

103+
## Compatibility with JRuby
104+
105+
The `opentelemetry-exporter-jaeger` gem can only work with JRuby version less than 10.0.0.0 (e.g. <= jruby-9.4.14.0)
106+
103107
## License
104108

105109
The `opentelemetry-exporter-jaeger` gem is distributed under the Apache 2.0 license. See [LICENSE][license-github] for more information.

exporter/jaeger/opentelemetry-exporter-jaeger.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
2424
::Dir.glob('*.md') +
2525
['LICENSE', '.yardopts']
2626
spec.require_paths = ['lib']
27-
spec.required_ruby_version = '>= 3.2'
27+
spec.required_ruby_version = '< 3.2'
2828

2929
spec.add_dependency 'base64', '>= 0.2.0'
3030
spec.add_dependency 'opentelemetry-api', '~> 1.1'

0 commit comments

Comments
 (0)