Skip to content

Commit 7c8efc1

Browse files
fix: replace magic number with SAMPLED constant
1 parent 9cdd2f1 commit 7c8efc1

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

exporter/otlp/lib/opentelemetry/exporter/otlp/exporter.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ def shutdown(timeout: nil)
107107
# This follows the OTLP specification for span flags.
108108
def build_span_flags(parent_span_is_remote, base_flags)
109109
# Extract integer value from TraceFlags object if needed
110-
if base_flags.is_a?(OpenTelemetry::Trace::TraceFlags)
111-
base_flags_int = base_flags.instance_variable_get(:@flags)
112-
else
113-
base_flags_int = base_flags
114-
end
110+
base_flags_int = if base_flags.is_a?(OpenTelemetry::Trace::TraceFlags)
111+
base_flags.instance_variable_get(:@flags)
112+
else
113+
base_flags
114+
end
115115

116116
has_remote_mask = Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
117117
is_remote_mask = Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK

exporter/otlp/test/opentelemetry/exporter/otlp/exporter_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@
674674
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
675675
flags: (
676676
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
677-
0x01
677+
OpenTelemetry::Trace::TraceFlags::SAMPLED.instance_variable_get(:@flags)
678678
),
679679
status: Opentelemetry::Proto::Trace::V1::Status.new(
680680
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_OK
@@ -690,7 +690,7 @@
690690
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
691691
flags: (
692692
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
693-
0x01
693+
OpenTelemetry::Trace::TraceFlags::SAMPLED.instance_variable_get(:@flags)
694694
),
695695
status: Opentelemetry::Proto::Trace::V1::Status.new(
696696
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_UNSET
@@ -706,7 +706,7 @@
706706
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
707707
flags: (
708708
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
709-
0x01
709+
OpenTelemetry::Trace::TraceFlags::SAMPLED.instance_variable_get(:@flags)
710710
),
711711
status: Opentelemetry::Proto::Trace::V1::Status.new(
712712
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_UNSET
@@ -755,7 +755,7 @@
755755
],
756756
flags: (
757757
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
758-
0x01
758+
OpenTelemetry::Trace::TraceFlags::SAMPLED.instance_variable_get(:@flags)
759759
)
760760
)
761761
],
@@ -764,7 +764,7 @@
764764
),
765765
flags: (
766766
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
767-
0x01
767+
OpenTelemetry::Trace::TraceFlags::SAMPLED.instance_variable_get(:@flags)
768768
)
769769
)
770770
]
@@ -784,7 +784,7 @@
784784
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
785785
flags: (
786786
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
787-
0x01
787+
OpenTelemetry::Trace::TraceFlags::SAMPLED.instance_variable_get(:@flags)
788788
),
789789
status: Opentelemetry::Proto::Trace::V1::Status.new(
790790
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_UNSET

0 commit comments

Comments
 (0)