fix: get API onto rubocop 1.3 (#1323)

* fix: get API onto rubocop 1.3

* go back to string concat

* move back to single quotes

* delete unneccessary disable

* Update api/lib/opentelemetry/baggage/propagation/text_map_propagator.rb

Co-authored-by: Francis Bogsanyi <[email protected]>
Co-authored-by: Robert <[email protected]>

Author: 3 people

api/.rubocop.yml

@@ -14,5 +14,13 @@ Metrics/ParameterLists:
 Naming/FileName:
   Exclude:
     - "lib/opentelemetry-api.rb"
+Lint/MissingSuper:
+  Enabled: false
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - "test/**/*"
+Style/StringConcatenation:
+  Exclude:
+    - "test/**/*"
 Style/ModuleFunction:
   Enabled: false

api/lib/opentelemetry.rb

@@ -28,7 +28,7 @@ module OpenTelemetry
 
   # @return [Object, Logger] configured Logger or a default STDOUT Logger.
   def logger
-    @logger ||= Logger.new(STDOUT, level: ENV['OTEL_LOG_LEVEL'] || Logger::INFO)
+    @logger ||= Logger.new($stdout, level: ENV['OTEL_LOG_LEVEL'] || Logger::INFO)
   end
 
   # @return [Callable] configured error handler or a default that logs the

api/lib/opentelemetry/context/propagation/composite_text_map_propagator.rb

@@ -14,7 +14,7 @@ module Propagation
       # initialization.
       class CompositeTextMapPropagator
         class << self
-          private :new # rubocop:disable Style/AccessModifierDeclarations
+          private :new
 
           # Returns a Propagator that extracts using the provided extractors
           # and injectors.

api/lib/opentelemetry/context/propagation/rack_env_getter.rb

@@ -32,15 +32,15 @@ def keys(carrier)
         private
 
         def to_rack_key(key)
-          ret = 'HTTP_' + key
+          ret = 'HTTP_' + key # rubocop:disable Style/StringConcatenation
           ret.tr!('-', '_')
           ret.upcase!
           ret
         end
 
         def from_rack_key(key)
           start = key.start_with?('HTTP_') ? 5 : 0
-          ret = key[start..-1]
+          ret = key[start..]
           ret.tr!('_', '-')
           ret.downcase!
           ret

api/lib/opentelemetry/trace/status.rb

@@ -10,7 +10,7 @@ module Trace
     # status code in conjunction with an optional descriptive message.
     class Status
       class << self
-        private :new # rubocop:disable Style/AccessModifierDeclarations
+        private :new
 
         # Returns a newly created {Status} with code == UNSET and an optional
         # description.

api/lib/opentelemetry/trace/trace_flags.rb

@@ -11,7 +11,7 @@ module Trace
     # boolean {sampled?} {https://www.w3.org/TR/trace-context/#trace-flags flag}.
     class TraceFlags
       class << self
-        private :new # rubocop:disable Style/AccessModifierDeclarations
+        private :new
 
         # Returns a newly created {TraceFlags} with the specified flags.
         #

api/lib/opentelemetry/trace/tracer.rb

@@ -23,10 +23,10 @@ class Tracer
       # span and reraised.
       # @yield [span, context] yields the newly created span and a context containing the
       #   span to the block.
-      def in_span(name, attributes: nil, links: nil, start_timestamp: nil, kind: nil)
+      def in_span(name, attributes: nil, links: nil, start_timestamp: nil, kind: nil, &block)
         span = nil
         span = start_span(name, attributes: attributes, links: links, start_timestamp: start_timestamp, kind: kind)
-        Trace.with_span(span) { |s, c| yield s, c }
+        Trace.with_span(span, &block)
       rescue Exception => e # rubocop:disable Lint/RescueException
         span&.record_exception(e)
         span&.status = Status.error("Unhandled exception of type: #{e.class}")

api/lib/opentelemetry/trace/tracestate.rb

@@ -11,7 +11,7 @@ module Trace
     # specification https://www.w3.org/TR/trace-context/
     class Tracestate
       class << self
-        private :new # rubocop:disable Style/AccessModifierDeclarations
+        private :new
 
         # Returns a newly created Tracestate parsed from the header provided.
         #

api/opentelemetry-api.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rubocop', '~> 0.73.0'
+  spec.add_development_dependency 'rubocop', '~> 1.30'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'