Skip to content

Commit fb72029

Browse files
committed
fix rubocop issues
1 parent 7d5214d commit fb72029

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

propagator/google_cloud_trace_context/lib/opentelemetry/propagator/google_cloud_trace_context/text_map_propagator.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module Propagator
1717
module GoogleCloudTraceContext
1818
# Provides a class for decoding and encoding x-cloud-trace-context header to/from into trace components
1919
class CloudTraceContext
20-
CLOUD_TRACE_CONTEXT_REGEX = /\A(?<trace_id>[a-f0-9]{32})\/(?<span_id>[0-9]+)(?:;o=(?<options>[01]))?\Z/i
20+
CLOUD_TRACE_CONTEXT_REGEX = %r{\A(?<trace_id>[a-f0-9]{32})\/(?<span_id>[0-9]+)(?:;o=(?<options>[01]))?\Z}i
2121

2222
private_constant :CLOUD_TRACE_CONTEXT_REGEX
2323

@@ -33,7 +33,8 @@ def from_span_context(ctx)
3333
# @param [String] string The serialized trace parent
3434
# @return [CloudTraceContext, nil] a trace_parent or nil if malformed
3535
def from_string(string)
36-
return unless matches = CLOUD_TRACE_CONTEXT_REGEX.match(string)
36+
matches = CLOUD_TRACE_CONTEXT_REGEX.match(string)
37+
return unless matches
3738

3839
trace_id = Array(matches[:trace_id].downcase).pack('H*')
3940
span_id = Array(matches[:span_id].to_i.to_s(16)).pack('H*')

propagator/google_cloud_trace_context/opentelemetry-propagator-google_cloud_trace_context.gemspec

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# frozen_string_literal: true
22

3-
# Copyright The OpenTelemetry Authors
3+
# Copyright OpenTelemetry Authors
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7-
require_relative 'lib/opentelemetry/propagator/google_cloud_trace_context/version'
7+
lib = File.expand_path('lib', __dir__)
8+
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
9+
10+
require 'opentelemetry/propagator/google_cloud_trace_context/version'
811

912
Gem::Specification.new do |spec|
10-
spec.name = 'opentelemetry-propagator-google_cloud_trace_context'
11-
spec.version = OpenTelemetry::Propagator::GoogleCloudTraceContext::VERSION
12-
spec.authors = ['OpenTelemetry Authors']
13-
spec.email = ['[email protected]']
13+
spec.name = 'opentelemetry-propagator-google_cloud_trace_context'
14+
spec.version = OpenTelemetry::Propagator::GoogleCloudTraceContext::VERSION
15+
spec.authors = ['OpenTelemetry Authors']
16+
spec.email = ['[email protected]']
1417

15-
spec.summary = 'GoogleCloudTraceContext Context Propagation Extension for the OpenTelemetry framework'
16-
spec.description = 'GoogleCloudTraceContext Context Propagation Extension for the OpenTelemetry framework'
18+
spec.summary = 'Google Cloud Trace Context Propagation Extension for the OpenTelemetry framework'
19+
spec.description = 'Google Cloud Trace Context Propagation Extension for the OpenTelemetry framework'
1720
spec.homepage = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib'
1821
spec.license = 'Apache-2.0'
1922

@@ -25,14 +28,6 @@ Gem::Specification.new do |spec|
2528

2629
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2730

28-
spec.add_development_dependency 'bundler', '~> 2.4'
29-
spec.add_development_dependency 'minitest', '~> 5.0'
30-
spec.add_development_dependency 'rake', '~> 13.0'
31-
spec.add_development_dependency 'rubocop', '~> 1.71.0'
32-
spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
33-
spec.add_development_dependency 'simplecov', '~> 0.22.0'
34-
spec.add_development_dependency 'yard', '~> 0.9'
35-
3631
if spec.respond_to?(:metadata)
3732
spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"
3833
spec.metadata['source_code_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/propagator/google_cloud_trace_context'

0 commit comments

Comments
 (0)