gitlab-labkit 0.13.0 → 0.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitlab-ci.yml +9 -0
- data/gitlab-labkit.gemspec +1 -1
- data/lib/labkit/tracing/jaeger_factory.rb +3 -0
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a70f566d4ed676fa90486f0117f74d52a839d2720103cf2c909ecfdb1e762b6e
|
|
4
|
+
data.tar.gz: 21614ae6e31149551dd15337957ff079c7c40536710d8911e697087e7a15bde3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 94946b83b7e1f15fbcbd641b44332a78a9c578a26d2261f22ceb916266bb5f5ddf14652ec7485cc774f03ab051c4e78de1380501a6e35517121e526c170caca3
|
|
7
|
+
data.tar.gz: 9feec573a60e49eea6e86bc9ed85b615a0ca60bca10228a49fdea2afbb9296b8bfbccac646dc3cecb4e1bd71e8bd8f53efe1c77305c2cf0098b5dff0ac808ae6
|
data/.gitlab-ci.yml
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
workflow:
|
|
2
|
+
rules:
|
|
3
|
+
# For merge requests, create a pipeline.
|
|
4
|
+
- if: '$CI_MERGE_REQUEST_IID'
|
|
5
|
+
# For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
|
|
6
|
+
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
|
7
|
+
# For tags, create a pipeline.
|
|
8
|
+
- if: '$CI_COMMIT_TAG'
|
|
9
|
+
|
|
1
10
|
.test_template: &test_definition
|
|
2
11
|
stage: test
|
|
3
12
|
script:
|
data/gitlab-labkit.gemspec
CHANGED
|
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
|
|
|
22
22
|
spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 6.1.0"
|
|
23
23
|
spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 6.1.0"
|
|
24
24
|
spec.add_runtime_dependency "grpc", "~> 1.19" # Be sure to update the "grpc-tools" dev_depenency too
|
|
25
|
-
spec.add_runtime_dependency "jaeger-client", "~>
|
|
25
|
+
spec.add_runtime_dependency "jaeger-client", "~> 1.1"
|
|
26
26
|
spec.add_runtime_dependency "opentracing", "~> 0.4"
|
|
27
27
|
spec.add_runtime_dependency "redis", ">3.0.0", "<5.0.0"
|
|
28
28
|
|
|
@@ -19,6 +19,9 @@ module Labkit
|
|
|
19
19
|
FLUSH_INTERVAL = 5
|
|
20
20
|
|
|
21
21
|
def self.create_tracer(service_name, options)
|
|
22
|
+
# The service_name parameter from GITLAB_TRACING takes precedence over the application one
|
|
23
|
+
service_name = options[:service_name] if options[:service_name]
|
|
24
|
+
|
|
22
25
|
kwargs = {
|
|
23
26
|
service_name: service_name,
|
|
24
27
|
sampler: get_sampler(options[:sampler], options[:sampler_param]),
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: gitlab-labkit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.13.
|
|
4
|
+
version: 0.13.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Andrew Newdigate
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-10-
|
|
11
|
+
date: 2020-10-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: actionpack
|
|
@@ -70,14 +70,14 @@ dependencies:
|
|
|
70
70
|
requirements:
|
|
71
71
|
- - "~>"
|
|
72
72
|
- !ruby/object:Gem::Version
|
|
73
|
-
version: '
|
|
73
|
+
version: '1.1'
|
|
74
74
|
type: :runtime
|
|
75
75
|
prerelease: false
|
|
76
76
|
version_requirements: !ruby/object:Gem::Requirement
|
|
77
77
|
requirements:
|
|
78
78
|
- - "~>"
|
|
79
79
|
- !ruby/object:Gem::Version
|
|
80
|
-
version: '
|
|
80
|
+
version: '1.1'
|
|
81
81
|
- !ruby/object:Gem::Dependency
|
|
82
82
|
name: opentracing
|
|
83
83
|
requirement: !ruby/object:Gem::Requirement
|