Skip to content

Commit 31ade05

Browse files
authored
fix codeql warning and error (#192)
1 parent 1ff8283 commit 31ade05

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ Metrics/BlockNesting:
5252
Lint/ConstantDefinitionInBlock:
5353
Exclude:
5454
- 'test/api/custom_instrumentation_test.rb'
55+
Style/StringLiterals:
56+
Exclude:
57+
- 'Gemfile'

gemfiles/test_gems.gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ group :development, :test do
4646

4747
gem 'opentelemetry-resource-detector-azure'
4848
# aws resource detector requires ruby >= 3.1.0
49-
if RUBY_VERSION >= '3.1.0'
50-
gem 'opentelemetry-resource-detector-aws'
51-
end
49+
gem 'opentelemetry-resource-detector-aws' if RUBY_VERSION >= '3.1.0'
5250
gem 'opentelemetry-resource-detector-container'
5351
end

lib/solarwinds_apm/api/current_trace_info.rb

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,16 @@ def hash_for_log
111111
private
112112

113113
def current_span
114-
span = ::OpenTelemetry::Trace.current_span if defined?(::OpenTelemetry::Trace)
115-
trace_id = span.context.hex_trace_id
116-
span_id = span.context.hex_span_id
117-
trace_flags = span.context.trace_flags.sampled? ? '01' : '00'
118-
tracestring = "00-#{trace_id}-#{span_id}-#{trace_flags}"
119-
[trace_id, span_id, trace_flags, tracestring]
114+
if defined?(::OpenTelemetry::Trace)
115+
span = ::OpenTelemetry::Trace.current_span
116+
trace_id = span.context.hex_trace_id
117+
span_id = span.context.hex_span_id
118+
trace_flags = span.context.trace_flags.sampled? ? '01' : '00'
119+
tracestring = "00-#{trace_id}-#{span_id}-#{trace_flags}"
120+
[trace_id, span_id, trace_flags, tracestring]
121+
else
122+
%w[00000000000000000000000000000000 00000000 00 00-00000000000000000000000000000000-00000000-00]
123+
end
120124
end
121125

122126
# if true the trace info should be added to the log message

lib/solarwinds_apm/opentelemetry/otlp_processor.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ def calculate_transaction_names(span)
108108
trans_name = span.attributes[HTTP_ROUTE] || nil
109109
trans_name = span.name if trans_name.to_s.empty? && span.name
110110
end
111-
trans_name = trans_name.to_s.slice(0, SolarWindsAPM::Constants::MAX_TXN_NAME_LENGTH)
112-
trans_name
111+
trans_name.to_s.slice(0, SolarWindsAPM::Constants::MAX_TXN_NAME_LENGTH)
113112
end
114113

115114
def record_request_metrics(span)

0 commit comments

Comments
 (0)