Merge ecde56c into f82a2c3

st0012 · web-flow · commit 3af03abb8a4f · 2021-04-16T15:18:00.000Z
diff --git a/sentry-ruby/CHANGELOG.md b/sentry-ruby/CHANGELOG.md
@@ -18,6 +18,11 @@ The SDK now records a new `net.http` breadcrumb whenever the user makes a reques
 
 <img width="869" alt="net http breadcrumb" src="https://user-images.githubusercontent.com/5079556/114298326-5f7c3d80-9ae8-11eb-9108-222384a7f1a2.png">
 
+- Add the third tracing state [#1402](https://github.com/getsentry/sentry-ruby/pull/1402)
+  - `rate == 0` - Tracing enabled. Rejects all locally created transactions but  respects sentry-trace.
+  - `1 > rate > 0` - Tracing enabled. Samples locally created transactions  with the rate and respects sentry-trace.
+  - `rate < 0` or `rate > 1` - Tracine disabled.
+
 ### Refactorings
 
 - Let Transaction constructor take an optional hub argument [#1384](https://github.com/getsentry/sentry-ruby/pull/1384)
diff --git a/sentry-ruby/lib/sentry/configuration.rb b/sentry-ruby/lib/sentry/configuration.rb
@@ -288,7 +288,7 @@ def enabled_in_current_env?
     end
 
     def tracing_enabled?
-      !!((@traces_sample_rate && @traces_sample_rate > 0.0) || @traces_sampler)
+      !!((@traces_sample_rate && @traces_sample_rate >= 0.0 && @traces_sample_rate <= 1.0) || @traces_sampler)
     end
 
     def stacktrace_builder
diff --git a/sentry-ruby/spec/sentry/configuration_spec.rb b/sentry-ruby/spec/sentry/configuration_spec.rb
@@ -6,14 +6,22 @@
       expect(subject.tracing_enabled?).to eq(false)
     end
 
-    context "when traces_sample_rate == 0.0" do
+    context "when traces_sample_rate > 1.0" do
       it "returns false" do
-        subject.traces_sample_rate = 0
+        subject.traces_sample_rate = 1.1
 
         expect(subject.tracing_enabled?).to eq(false)
       end
     end
 
+    context "when traces_sample_rate == 0.0" do
+      it "returns true" do
+        subject.traces_sample_rate = 0
+
+        expect(subject.tracing_enabled?).to eq(true)
+      end
+    end
+
     context "when traces_sample_rate > 0" do
       it "returns true" do
         subject.traces_sample_rate = 0.1
diff --git a/sentry-ruby/spec/sentry/transaction_spec.rb b/sentry-ruby/spec/sentry/transaction_spec.rb
@@ -24,7 +24,7 @@
       Sentry.configuration
     end
 
-    context "when tracing is enabled" do
+    context "when tracing is enabled (> 0)" do
       before do
         configuration.traces_sample_rate = 1.0
       end
@@ -47,11 +47,28 @@
       end
     end
 
-    context "when tracing is disabled" do
+    context "when tracing is enabled (= 0)" do
       before do
         configuration.traces_sample_rate = 0.0
       end
 
+      it "returns correctly-formatted value" do
+        child_transaction = described_class.from_sentry_trace(sentry_trace, op: "child")
+
+        expect(child_transaction.trace_id).to eq(subject.trace_id)
+        expect(child_transaction.parent_span_id).to eq(subject.span_id)
+        expect(child_transaction.parent_sampled).to eq(true)
+        # doesn't set the sampled value
+        expect(child_transaction.sampled).to eq(nil)
+        expect(child_transaction.op).to eq("child")
+      end
+    end
+
+    context "when tracing is disabled" do
+      before do
+        configuration.traces_sample_rate = false
+      end
+
       it "returns nil" do
         expect(described_class.from_sentry_trace(sentry_trace, op: "child")).to be_nil
       end
