splunk-otel 0.2.0 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/main.yml +21 -14
  3. data/.gitignore +3 -0
  4. data/.rubocop.yml +1 -0
  5. data/Appraisals +11 -0
  6. data/CHANGELOG.md +13 -0
  7. data/docker-compose.yml +1 -1
  8. data/examples/basic/docker-compose.yml +1 -1
  9. data/examples/rails-7-barebones/Dockerfile +5 -2
  10. data/examples/rails-7-barebones/docker-compose.yml +1 -1
  11. data/lib/splunk/otel/version.rb +1 -1
  12. data/scripts/install-release-deps.sh +9 -1
  13. data/splunk-otel.gemspec +14 -12
  14. metadata +71 -38
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fcafe2c8c9d5df1735256ab1d088eba1679b07c55f7790dc1b90f24cce3cfa34
4
- data.tar.gz: a161059f434a56f484bb5b7e7c40da09c5333b067b18676bd6ac2c648ee5dbd4
3
+ metadata.gz: 22ebfcc16e49baa0feef01f353c7c50ce65dc28774bb3ee408c1e996feb5a87b
4
+ data.tar.gz: '082b71bf0cca5feb45251792308cd7ddf83995a41f3ffab01e2ba94dd75817d6'
5
5
  SHA512:
6
- metadata.gz: 807de3ed7cd3135b07a65bfc296f6930dfb2904e9b01e5baae0b20aeb1e7a121b6a55064d1d38ab633644b6dcb68bb2f0f4e567ca95e9b27bc47d98dee6d59b0
7
- data.tar.gz: b30aede6336990f2e73c4d525ec056fe37d63bf0191b865298cd01c89cfbe060f640c2a30645cf7c927702d32e8e4409475e4099a7b0c00b61a95921f241abd3
6
+ metadata.gz: fb2e7706f749a7f53866cc7f4d4fd05d2ae6c826b694a490d2bcd79ace5c6f46e9c74c0fa3fc65df53e0b28abdd72e5878d99f8f5f91732465ec24fc423a571b
7
+ data.tar.gz: 6fc797ae357239f04bb51aba388e2a161df6e6ea949dc27759ed9e037914cf422e6504e8ffc37986bfc2e1425bef20446a62831914a137d7283825808d1868e6
data/.github/workflows/main.yml CHANGED
@@ -8,33 +8,40 @@ on:
8
8
 
9
9
  jobs:
10
10
  test:
11
- runs-on: ubuntu-latest
11
+ runs-on: ubuntu-20.04
12
12
 
13
13
  strategy:
14
14
  matrix:
15
- ruby-version: [3.1, 3.0, 2.7, 2.6]
15
+ rubygems: [
16
+ { ruby: "3.1", appraisal: "rails-7.0" },
17
+ { ruby: "3.0", appraisal: "rails-7.0" },
18
+ { ruby: "2.7", appraisal: "rails-7.0" },
19
+ { ruby: "2.7", appraisal: "rails-6.1" },
20
+ { ruby: "2.6", appraisal: "rails-6.1" }
21
+ ]
16
22
 
17
23
  steps:
18
- - uses: actions/checkout@v3
24
+ - uses: actions/checkout@v3.0.2
19
25
 
20
26
  - name: Run Collector
21
27
  run: docker-compose up -d
22
28
 
23
- - name: Set up Ruby ${{ matrix.ruby-version }}
24
- uses: ruby/setup-ruby@v1
29
+ - name: Set up Ruby ${{ matrix.rubygems.ruby }}
30
+ uses: ruby/setup-ruby@v1.117.0
25
31
  with:
26
- ruby-version: ${{ matrix.ruby-version }}
27
- bundler-cache: true
32
+ ruby-version: ${{ matrix.rubygems.ruby }}
28
33
  - name: Apply RubyGems fixes
29
34
  run: gem update --system
30
35
  - name: Install dependencies
31
36
  run: bundle install
37
+ - name: Install appraisal dependencies
38
+ run: bundle exec appraisal install
32
39
  - name: Rubocop
33
40
  run: bundle exec rubocop
34
41
  - name: Run tests
35
- run: bundle exec rake test
42
+ run: bundle exec appraisal ${{ matrix.rubygems.appraisal }} rake test
36
43
  - name: Upload coverage to Codecov
37
- uses: codecov/codecov-action@v3
44
+ uses: codecov/codecov-action@v3.1.1
38
45
  - name: Run basic example e2e test
39
46
  run: ruby console.rb
40
47
  working-directory: ./examples/basic/
@@ -42,18 +49,18 @@ jobs:
42
49
  TEST: true
43
50
 
44
51
  test-e2e-rails-7-barebones:
45
- runs-on: ubuntu-latest
52
+ runs-on: ubuntu-20.04
46
53
  steps:
47
- - uses: actions/checkout@v3
54
+ - uses: actions/checkout@v3.0.2
48
55
  - name: Run e2e tests via Docker
49
56
  working-directory: ./examples/rails-7-barebones
50
57
  run: docker-compose up --build --exit-code-from tester
51
58
 
52
59
  linkChecker:
53
- runs-on: ubuntu-latest
60
+ runs-on: ubuntu-20.04
54
61
  steps:
55
- - uses: actions/checkout@v3
62
+ - uses: actions/checkout@v3.0.2
56
63
  - name: Link Checker
57
- uses: lycheeverse/lychee-action@v1.5.0
64
+ uses: lycheeverse/lychee-action@v1.5.1
58
65
  with:
59
66
  fail: true
data/.gitignore CHANGED
@@ -11,3 +11,6 @@ Gemfile.lock
11
11
 
12
12
  # allow private binstubs
13
13
  bin/
14
+
15
+ # appraisals
16
+ /gemfiles/
data/.rubocop.yml CHANGED
@@ -4,6 +4,7 @@ AllCops:
4
4
  Exclude:
5
5
  - 'bin/*'
6
6
  - 'examples/rails-7-barebones/bin/*'
7
+ - 'gemfiles/*'
7
8
 
8
9
  # github actions' weirdness
9
10
  # https://github.com/rubocop/rubocop/issues/9832#issuecomment-882111229
data/Appraisals ADDED
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
4
+ appraise "rails-7.0" do
5
+ gem "rails", "~> 7.0.0"
6
+ end
7
+ end
8
+
9
+ appraise "rails-6.1" do
10
+ gem "rails", "~> 6.1.0"
11
+ end
data/CHANGELOG.md CHANGED
@@ -7,6 +7,19 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
7
7
 
8
8
  ## Unreleased
9
9
 
10
+ ## v1.0.0 - 2022-09-29
11
+
12
+ ## v0.3.0 - 2022-09-28
13
+
14
+ ### Changed
15
+
16
+ - [Update opentelemetry-exporter-otlp requirement from ~> 0.21.0 to >= 0.21, <
17
+ 0.25](https://github.com/signalfx/splunk-otel-ruby/pull/60)
18
+ - [Update opentelemetry-propagator-b3 requirement from ~> 0.19.2 to >= 0.19.2, <
19
+ 0.21.0](https://github.com/signalfx/splunk-otel-ruby/pull/35)
20
+ - [Update opentelemetry-exporter-jaeger requirement from ~> 0.20.1 to >= 0.20.1,
21
+ < 0 .23.0](https://github.com/signalfx/splunk-otel-ruby/pull/61)
22
+
10
23
  ## v0.2.0 - 2022-09-06
11
24
 
12
25
  ### Added
data/docker-compose.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  version: "3"
2
2
  services:
3
3
  otel:
4
- image: quay.io/signalfx/splunk-otel-collector:latest
4
+ image: quay.io/signalfx/splunk-otel-collector:0.59.1
5
5
  command: ["--config=/conf/otel-collector-config.yaml"]
6
6
  privileged: true
7
7
  ports:
data/examples/basic/docker-compose.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  version: "3"
2
2
  services:
3
3
  splunk-otel-collector:
4
- image: quay.io/signalfx/splunk-otel-collector:latest
4
+ image: quay.io/signalfx/splunk-otel-collector:0.59.1
5
5
  environment:
6
6
  - SPLUNK_ACCESS_TOKEN=${SPLUNK_ACCESS_TOKEN}
7
7
  - SPLUNK_REALM=${SPLUNK_REALM}
data/examples/rails-7-barebones/Dockerfile CHANGED
@@ -1,5 +1,8 @@
1
- FROM ruby:3-buster
2
- RUN apt-get update -qq && apt-get install -y nodejs netcat
1
+ FROM ruby:3.1.2-buster
2
+ RUN apt-get update -qq
3
+ RUN apt-get install -y \
4
+ nodejs="10.24.0~dfsg-1~deb10u1" \
5
+ netcat=1.10-41.1
3
6
 
4
7
  # ruby comes with older versions of bundler sometimes
5
8
  RUN gem install bundler -v "2.3.14"
data/examples/rails-7-barebones/docker-compose.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  services:
2
2
  collector:
3
- image: quay.io/signalfx/splunk-otel-collector:latest
3
+ image: quay.io/signalfx/splunk-otel-collector:0.59.1
4
4
  command: ["--config=/conf/otel-collector-config.yaml"]
5
5
  ports:
6
6
  - 4318:4318
data/lib/splunk/otel/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Splunk
4
4
  module Otel
5
- VERSION = "0.2.0"
5
+ VERSION = "1.0.0"
6
6
  end
7
7
  end
data/scripts/install-release-deps.sh CHANGED
@@ -2,9 +2,17 @@
2
2
 
3
3
  set -e
4
4
 
5
+ # ensure certs, curl and gpg are available before running them to setup the github repo
6
+ apt-get update
7
+ apt-get -y install \
8
+ ca-certificates="20210119" \
9
+ curl="7.74.0-1.3+deb11u3" \
10
+ gnupg="2.2.27-2+deb11u2" \
11
+ lsb-release="11.1.0" \
12
+
5
13
  # instructions from https://github.com/cli/cli/blob/trunk/docs/install_linux.md#debian-ubuntu-linux-apt
6
14
  curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg
7
15
  echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
8
16
 
9
17
  apt-get update
10
- apt-get -y install ca-certificates curl gnupg lsb-release gh
18
+ apt-get -y install gh="2.16.1"
data/splunk-otel.gemspec CHANGED
@@ -26,25 +26,27 @@ Gem::Specification.new do |spec|
26
26
  spec.require_paths = ["lib"]
27
27
 
28
28
  spec.add_dependency "opentelemetry-api", "~> 1.0"
29
- spec.add_dependency "opentelemetry-exporter-jaeger", "~> 0.20.1"
30
- spec.add_dependency "opentelemetry-exporter-otlp", "~> 0.21.0"
29
+ spec.add_dependency "opentelemetry-exporter-jaeger", ">= 0.20.1", "< 0.23.0"
30
+ spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.21", "< 0.25"
31
31
  spec.add_dependency "opentelemetry-instrumentation-base", "~> 0.21.0"
32
- spec.add_dependency "opentelemetry-propagator-b3", "~> 0.19.2"
32
+ spec.add_dependency "opentelemetry-propagator-b3", ">= 0.19.2", "< 0.21.0"
33
33
  spec.add_dependency "opentelemetry-sdk", "~> 1.0"
34
34
 
35
- # development dependencies
36
- spec.add_development_dependency "rails"
37
- spec.add_development_dependency "rake", "~> 13.0"
38
- spec.add_development_dependency "rubocop", "~> 1.25"
39
- spec.add_development_dependency "rubocop-rake", "~> 0.6.0"
40
- spec.add_development_dependency "simplecov", "~> 0.21.2"
41
- spec.add_development_dependency "test-unit", "~> 3.0"
35
+ # development tooling
36
+ spec.add_development_dependency "appraisal", "2.4.1"
37
+ spec.add_development_dependency "rake", "13.0.6"
38
+ spec.add_development_dependency "rubocop", "1.36.0"
39
+ spec.add_development_dependency "rubocop-rake", "0.6.0"
40
+ spec.add_development_dependency "simplecov", "0.21.2"
41
+ spec.add_development_dependency "simplecov-cobertura", "2.1.0"
42
+ spec.add_development_dependency "test-unit", "3.5.3"
42
43
 
44
+ # development dependencies for integration testing
43
45
  spec.add_development_dependency "opentelemetry-instrumentation-action_pack", "~> 0.2.0"
44
- spec.add_development_dependency "opentelemetry-instrumentation-rack", "~> 0.21"
46
+ spec.add_development_dependency "opentelemetry-instrumentation-rack", "~> 0.21.0"
45
47
  spec.add_development_dependency "rack", "~> 2.2"
46
48
  spec.add_development_dependency "rack-test", "~> 2.0"
47
- spec.add_development_dependency "simplecov-cobertura", "~> 2.1.0"
49
+ spec.add_development_dependency "rails"
48
50
 
49
51
  spec.metadata = {
50
52
  "rubygems_mfa_required" => "true"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: splunk-otel
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Splunk
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-09-07 00:00:00.000000000 Z
11
+ date: 2022-09-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opentelemetry-api
@@ -28,30 +28,42 @@ dependencies:
28
28
  name: opentelemetry-exporter-jaeger
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.20.1
34
+ - - "<"
35
+ - !ruby/object:Gem::Version
36
+ version: 0.23.0
34
37
  type: :runtime
35
38
  prerelease: false
36
39
  version_requirements: !ruby/object:Gem::Requirement
37
40
  requirements:
38
- - - "~>"
41
+ - - ">="
39
42
  - !ruby/object:Gem::Version
40
43
  version: 0.20.1
44
+ - - "<"
45
+ - !ruby/object:Gem::Version
46
+ version: 0.23.0
41
47
  - !ruby/object:Gem::Dependency
42
48
  name: opentelemetry-exporter-otlp
43
49
  requirement: !ruby/object:Gem::Requirement
44
50
  requirements:
45
- - - "~>"
51
+ - - ">="
46
52
  - !ruby/object:Gem::Version
47
- version: 0.21.0
53
+ version: '0.21'
54
+ - - "<"
55
+ - !ruby/object:Gem::Version
56
+ version: '0.25'
48
57
  type: :runtime
49
58
  prerelease: false
50
59
  version_requirements: !ruby/object:Gem::Requirement
51
60
  requirements:
52
- - - "~>"
61
+ - - ">="
53
62
  - !ruby/object:Gem::Version
54
- version: 0.21.0
63
+ version: '0.21'
64
+ - - "<"
65
+ - !ruby/object:Gem::Version
66
+ version: '0.25'
55
67
  - !ruby/object:Gem::Dependency
56
68
  name: opentelemetry-instrumentation-base
57
69
  requirement: !ruby/object:Gem::Requirement
@@ -70,16 +82,22 @@ dependencies:
70
82
  name: opentelemetry-propagator-b3
71
83
  requirement: !ruby/object:Gem::Requirement
72
84
  requirements:
73
- - - "~>"
85
+ - - ">="
74
86
  - !ruby/object:Gem::Version
75
87
  version: 0.19.2
88
+ - - "<"
89
+ - !ruby/object:Gem::Version
90
+ version: 0.21.0
76
91
  type: :runtime
77
92
  prerelease: false
78
93
  version_requirements: !ruby/object:Gem::Requirement
79
94
  requirements:
80
- - - "~>"
95
+ - - ">="
81
96
  - !ruby/object:Gem::Version
82
97
  version: 0.19.2
98
+ - - "<"
99
+ - !ruby/object:Gem::Version
100
+ version: 0.21.0
83
101
  - !ruby/object:Gem::Dependency
84
102
  name: opentelemetry-sdk
85
103
  requirement: !ruby/object:Gem::Requirement
@@ -95,89 +113,103 @@ dependencies:
95
113
  - !ruby/object:Gem::Version
96
114
  version: '1.0'
97
115
  - !ruby/object:Gem::Dependency
98
- name: rails
116
+ name: appraisal
99
117
  requirement: !ruby/object:Gem::Requirement
100
118
  requirements:
101
- - - ">="
119
+ - - '='
102
120
  - !ruby/object:Gem::Version
103
- version: '0'
121
+ version: 2.4.1
104
122
  type: :development
105
123
  prerelease: false
106
124
  version_requirements: !ruby/object:Gem::Requirement
107
125
  requirements:
108
- - - ">="
126
+ - - '='
109
127
  - !ruby/object:Gem::Version
110
- version: '0'
128
+ version: 2.4.1
111
129
  - !ruby/object:Gem::Dependency
112
130
  name: rake
113
131
  requirement: !ruby/object:Gem::Requirement
114
132
  requirements:
115
- - - "~>"
133
+ - - '='
116
134
  - !ruby/object:Gem::Version
117
- version: '13.0'
135
+ version: 13.0.6
118
136
  type: :development
119
137
  prerelease: false
120
138
  version_requirements: !ruby/object:Gem::Requirement
121
139
  requirements:
122
- - - "~>"
140
+ - - '='
123
141
  - !ruby/object:Gem::Version
124
- version: '13.0'
142
+ version: 13.0.6
125
143
  - !ruby/object:Gem::Dependency
126
144
  name: rubocop
127
145
  requirement: !ruby/object:Gem::Requirement
128
146
  requirements:
129
- - - "~>"
147
+ - - '='
130
148
  - !ruby/object:Gem::Version
131
- version: '1.25'
149
+ version: 1.36.0
132
150
  type: :development
133
151
  prerelease: false
134
152
  version_requirements: !ruby/object:Gem::Requirement
135
153
  requirements:
136
- - - "~>"
154
+ - - '='
137
155
  - !ruby/object:Gem::Version
138
- version: '1.25'
156
+ version: 1.36.0
139
157
  - !ruby/object:Gem::Dependency
140
158
  name: rubocop-rake
141
159
  requirement: !ruby/object:Gem::Requirement
142
160
  requirements:
143
- - - "~>"
161
+ - - '='
144
162
  - !ruby/object:Gem::Version
145
163
  version: 0.6.0
146
164
  type: :development
147
165
  prerelease: false
148
166
  version_requirements: !ruby/object:Gem::Requirement
149
167
  requirements:
150
- - - "~>"
168
+ - - '='
151
169
  - !ruby/object:Gem::Version
152
170
  version: 0.6.0
153
171
  - !ruby/object:Gem::Dependency
154
172
  name: simplecov
155
173
  requirement: !ruby/object:Gem::Requirement
156
174
  requirements:
157
- - - "~>"
175
+ - - '='
158
176
  - !ruby/object:Gem::Version
159
177
  version: 0.21.2
160
178
  type: :development
161
179
  prerelease: false
162
180
  version_requirements: !ruby/object:Gem::Requirement
163
181
  requirements:
164
- - - "~>"
182
+ - - '='
165
183
  - !ruby/object:Gem::Version
166
184
  version: 0.21.2
185
+ - !ruby/object:Gem::Dependency
186
+ name: simplecov-cobertura
187
+ requirement: !ruby/object:Gem::Requirement
188
+ requirements:
189
+ - - '='
190
+ - !ruby/object:Gem::Version
191
+ version: 2.1.0
192
+ type: :development
193
+ prerelease: false
194
+ version_requirements: !ruby/object:Gem::Requirement
195
+ requirements:
196
+ - - '='
197
+ - !ruby/object:Gem::Version
198
+ version: 2.1.0
167
199
  - !ruby/object:Gem::Dependency
168
200
  name: test-unit
169
201
  requirement: !ruby/object:Gem::Requirement
170
202
  requirements:
171
- - - "~>"
203
+ - - '='
172
204
  - !ruby/object:Gem::Version
173
- version: '3.0'
205
+ version: 3.5.3
174
206
  type: :development
175
207
  prerelease: false
176
208
  version_requirements: !ruby/object:Gem::Requirement
177
209
  requirements:
178
- - - "~>"
210
+ - - '='
179
211
  - !ruby/object:Gem::Version
180
- version: '3.0'
212
+ version: 3.5.3
181
213
  - !ruby/object:Gem::Dependency
182
214
  name: opentelemetry-instrumentation-action_pack
183
215
  requirement: !ruby/object:Gem::Requirement
@@ -198,14 +230,14 @@ dependencies:
198
230
  requirements:
199
231
  - - "~>"
200
232
  - !ruby/object:Gem::Version
201
- version: '0.21'
233
+ version: 0.21.0
202
234
  type: :development
203
235
  prerelease: false
204
236
  version_requirements: !ruby/object:Gem::Requirement
205
237
  requirements:
206
238
  - - "~>"
207
239
  - !ruby/object:Gem::Version
208
- version: '0.21'
240
+ version: 0.21.0
209
241
  - !ruby/object:Gem::Dependency
210
242
  name: rack
211
243
  requirement: !ruby/object:Gem::Requirement
@@ -235,19 +267,19 @@ dependencies:
235
267
  - !ruby/object:Gem::Version
236
268
  version: '2.0'
237
269
  - !ruby/object:Gem::Dependency
238
- name: simplecov-cobertura
270
+ name: rails
239
271
  requirement: !ruby/object:Gem::Requirement
240
272
  requirements:
241
- - - "~>"
273
+ - - ">="
242
274
  - !ruby/object:Gem::Version
243
- version: 2.1.0
275
+ version: '0'
244
276
  type: :development
245
277
  prerelease: false
246
278
  version_requirements: !ruby/object:Gem::Requirement
247
279
  requirements:
248
- - - "~>"
280
+ - - ">="
249
281
  - !ruby/object:Gem::Version
250
- version: 2.1.0
282
+ version: '0'
251
283
  description:
252
284
  email:
253
285
  - splunk-oss@splunk.com
@@ -262,6 +294,7 @@ files:
262
294
  - ".gitlab-ci.yml"
263
295
  - ".lycheeignore"
264
296
  - ".rubocop.yml"
297
+ - Appraisals
265
298
  - CHANGELOG.md
266
299
  - CODE_OF_CONDUCT.md
267
300
  - CONTRIBUTING.md