Skip to content

Commit fb63205

Browse files
committed
test(otlp-http): add span flags to trace exporter test expectations
Add SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK flag with sampled bit (1) to all span assertions in trace_exporter_test.rb to align test expectations with actual span flag behavior. - Add flags field to 6 span test assertions - Set flags to SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK | 1 (sampled) - Ensures test expectations match the span flags set during export Signed-off-by: Arjun Rajappa <arjun.rajappa@ibm.com>
1 parent eecd167 commit fb63205

2 files changed

Lines changed: 26 additions & 2 deletions

File tree

exporter/otlp-common/test/opentelemetry/exporter/otlp/common/common_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@
510510

511511
resource_attrs = etsr.resource_spans.first.resource.attributes
512512
_(resource_attrs.length).must_equal(3)
513-
attr_map = resource_attrs.each_with_object({}) { |kv, hash| hash[kv.key] = kv.value.string_value }
513+
attr_map = resource_attrs.to_h { |kv| [kv.key, kv.value.string_value] }
514514
_(attr_map['service.name']).must_equal('my-service')
515515
_(attr_map['service.version']).must_equal('1.2.3')
516516
_(attr_map['deployment.environment']).must_equal('production')

exporter/otlp-http/test/opentelemetry/exporter/otlp/http/trace_exporter_test.rb

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,10 @@
741741
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
742742
status: Opentelemetry::Proto::Trace::V1::Status.new(
743743
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_OK
744+
),
745+
flags: (
746+
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
747+
1
744748
)
745749
),
746750
Opentelemetry::Proto::Trace::V1::Span.new(
@@ -753,6 +757,10 @@
753757
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
754758
status: Opentelemetry::Proto::Trace::V1::Status.new(
755759
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_UNSET
760+
),
761+
flags: (
762+
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
763+
1
756764
)
757765
),
758766
Opentelemetry::Proto::Trace::V1::Span.new(
@@ -765,6 +773,10 @@
765773
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
766774
status: Opentelemetry::Proto::Trace::V1::Status.new(
767775
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_UNSET
776+
),
777+
flags: (
778+
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
779+
1
768780
)
769781
),
770782
Opentelemetry::Proto::Trace::V1::Span.new(
@@ -807,11 +819,19 @@
807819
span_id: root_span_id,
808820
attributes: [
809821
Opentelemetry::Proto::Common::V1::KeyValue.new(key: 'attr', value: Opentelemetry::Proto::Common::V1::AnyValue.new(int_value: 4))
810-
]
822+
],
823+
flags: (
824+
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
825+
1
826+
)
811827
)
812828
],
813829
status: Opentelemetry::Proto::Trace::V1::Status.new(
814830
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_ERROR
831+
),
832+
flags: (
833+
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
834+
1
815835
)
816836
)
817837
]
@@ -831,6 +851,10 @@
831851
end_time_unix_nano: (end_timestamp.to_r * 1_000_000_000).to_i,
832852
status: Opentelemetry::Proto::Trace::V1::Status.new(
833853
code: Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_UNSET
854+
),
855+
flags: (
856+
Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK |
857+
1
834858
)
835859
)
836860
]

0 commit comments

Comments
 (0)