Fixed E2E tests

Author: Robert Bartoszewski

features/default/attributes.feature

@@ -2,10 +2,9 @@ Feature: Spans with custom attributes
 
   Scenario: Set attributes in a span
     Given I run "SetAttributesScenario"
-    And I wait to receive at least 1 span
-    * the trace "Bugsnag-Span-Sampling" header equals "1:1"
+    And I wait to receive a span named "SetAttributesScenario"
+    * the trace "Bugsnag-Span-Sampling" header matches the regex "^1:\d{1,2}$"
     * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
-    * a span field "name" equals "SetAttributesScenario"
     * a span string attribute "a" equals "xyz"
     * every span bool attribute "b" does not exist
     * every span bool attribute "d" does not exist
@@ -19,10 +18,9 @@ Feature: Spans with custom attributes
 
   Scenario: Set attributes in a span with limits set
     Given I run "SetAttributesWithLimitsScenario"
-    And I wait to receive at least 1 span
-    * the trace "Bugsnag-Span-Sampling" header equals "1:1"
+    And I wait to receive a span named "SetAttributesWithLimitsScenario"
+    * the trace "Bugsnag-Span-Sampling" header matches the regex "^1:\d{1,2}$"
     * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
-    * a span field "name" equals "SetAttributesWithLimitsScenario"
     * a span string attribute "a" equals "1234567890*** 1 CHARS TRUNCATED"
     * a span array attribute "b" contains the integer value 1 at index 0
     * a span array attribute "b" contains the integer value 2 at index 1
@@ -31,8 +29,7 @@ Feature: Spans with custom attributes
 
   Scenario: Set attributes in a span with an attribute count limit set
     Given I run "SetAttributeCountLimitScenario"
-    And I wait to receive at least 1 span
-    * the trace "Bugsnag-Span-Sampling" header equals "1:1"
+    And I wait to receive a span named "SetAttributeCountLimitScenario"
+    * the trace "Bugsnag-Span-Sampling" header matches the regex "^1:\d{1,2}$"
     * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
-    * a span field "name" equals "SetAttributeCountLimitScenario"
     * every span string attribute "a" does not exist

features/default/automatic/automatic_network.feature

@@ -86,11 +86,10 @@ Feature: Automatic network instrumentation spans
 
   Scenario: Automatically start a network span that has a null URL
     Given I run "AutoInstrumentNetworkNullURLScenario"
-    And I wait to receive at least 1 span
+    And I wait to receive a span named "[HTTP/GET]"
     Then the trace "Content-Type" header equals "application/json"
     * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
     * every span field "parentSpanId" does not exist
-    * a span field "name" equals "[HTTP/GET]"
     * a span string attribute "http.flavor" exists
 #    * a span string attribute "http.url" matches the regex "http://.*:9[0-9]{3}/reflect\?status=200"
     * a span string attribute "http.method" equals "GET"
@@ -109,11 +108,10 @@ Feature: Automatic network instrumentation spans
   Scenario: Automatically start a network span triggered by AVAssetDownloadURLSession (must not crash)
     Given I run "AutoInstrumentAVAssetScenario"
     And I wait for 2 seconds
-    And I wait to receive at least 2 spans
+    And I wait to receive a span named "[HTTP/GET]"
     Then the trace "Content-Type" header equals "application/json"
     * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
     * every span field "parentSpanId" does not exist
-    * a span field "name" equals "[HTTP/GET]"
     * every span field "spanId" matches the regex "^[A-Fa-f0-9]{16}$"
     * every span field "traceId" matches the regex "^[A-Fa-f0-9]{32}$"
     * a span field "kind" equals 1
@@ -198,10 +196,9 @@ Feature: Automatic network instrumentation spans
     # Wait for a long time because there can be a LOT of maze-runner related URL requests before the scenario starts.
     And I wait for 20 seconds
     # There will actually be any number of requests by this point since we're not filtering at all.
-    And I wait to receive at least 1 span
+    And I wait to receive a span named "[HTTP/GET]"
     Then the trace "Content-Type" header equals "application/json"
     * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
-    * a span field "name" equals "[HTTP/GET]"
     * every span field "spanId" matches the regex "^[A-Fa-f0-9]{16}$"
     * every span field "traceId" matches the regex "^[A-Fa-f0-9]{32}$"
     * every span field "kind" equals 3