gitlab-labkit 1.3.3 → 1.3.4
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/.copier-answers.yml +1 -1
- data/lib/labkit/logging/field_validator/log_interceptor.rb +8 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a29bc2351fbe292697c582547316e370a7320826be10ecb9ef26580b1d5d3dce
|
|
4
|
+
data.tar.gz: f489a1fdd02e6a8ba3750c93bcab4baaa4907983abcaf81544e3ec300234a88e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f5b4397587a97aa9aadb2b8b4606c675337110ab65d410f211d0c33a0e89fc6b4c2b68f8d07d78906ccd680e31612439d4b316ba955b770a7074582d6b7f80e4
|
|
7
|
+
data.tar.gz: 521c43e11ede3e207218574c00b5644f2907deb19d876213c862818c0e3c12ff65f1eaeaa4c6b9b1afeb0a59f9d20a67552c7a8a7d8dbb48997d9cc7d55d30ac
|
data/.copier-answers.yml
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
# See the project for instructions on how to update the project
|
|
4
4
|
#
|
|
5
5
|
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
|
|
6
|
-
_commit: v1.
|
|
6
|
+
_commit: v1.39.0
|
|
7
7
|
_src_path: https://gitlab.com/gitlab-com/gl-infra/common-template-copier.git
|
|
8
8
|
ee_licensed: false
|
|
9
9
|
golang: false
|
|
@@ -18,6 +18,7 @@ module Labkit
|
|
|
18
18
|
class << self
|
|
19
19
|
def register_wrapper_pattern(pattern)
|
|
20
20
|
wrapper_patterns << pattern
|
|
21
|
+
@combined_ignore_pattern = nil
|
|
21
22
|
end
|
|
22
23
|
|
|
23
24
|
def wrapper_patterns
|
|
@@ -26,6 +27,11 @@ module Labkit
|
|
|
26
27
|
|
|
27
28
|
def reset_wrapper_patterns!
|
|
28
29
|
@wrapper_patterns = nil
|
|
30
|
+
@combined_ignore_pattern = nil
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
def combined_ignore_pattern
|
|
34
|
+
@combined_ignore_pattern ||= Regexp.union(IGNORE_PATHS + wrapper_patterns)
|
|
29
35
|
end
|
|
30
36
|
end
|
|
31
37
|
|
|
@@ -66,13 +72,13 @@ module Labkit
|
|
|
66
72
|
def determine_callsite
|
|
67
73
|
locations = caller_locations(INTERNAL_FRAMES_TO_SKIP, MAX_FRAMES_TO_INSPECT) || []
|
|
68
74
|
locations = caller_locations(1, MAX_FRAMES_TO_INSPECT) || [] if locations.empty?
|
|
75
|
+
ignore_pattern = LogInterceptor.combined_ignore_pattern
|
|
69
76
|
|
|
70
77
|
locations.find do |loc|
|
|
71
78
|
path = loc.path
|
|
72
79
|
|
|
73
80
|
next if path == __FILE__
|
|
74
|
-
next if
|
|
75
|
-
next if LogInterceptor.wrapper_patterns.any? { |pattern| pattern.match?(path) }
|
|
81
|
+
next if ignore_pattern.match?(path)
|
|
76
82
|
|
|
77
83
|
true
|
|
78
84
|
end
|