From 394a49cbbd2135e6512d317767403ef82979ef4e Mon Sep 17 00:00:00 2001
From: Robb Kidd <robbkidd@honeycomb.io>
Date: Fri, 7 Jul 2023 18:59:45 -0400
Subject: [PATCH] ci: AWS specs updated to use include() instead of match()
 (#229)

## Which problem is this PR solving?

- The AWS gem/API starting returning a new field,
`x_amz_request_charged`. A new field made the spec matcher freak out in
the nightly.

## Short description of the changes

- Swap out `match()` for `include()` in the AWS specs
    - Match is strict and expects *only* what it has been told.
- Include is fine with new key/values appearing so long as the existing
ones are as expected.
---
 spec/honeycomb/integrations/aws_spec.rb | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/honeycomb/integrations/aws_spec.rb b/spec/honeycomb/integrations/aws_spec.rb
index ad5ecf68..12d01858 100644
--- a/spec/honeycomb/integrations/aws_spec.rb
+++ b/spec/honeycomb/integrations/aws_spec.rb
@@ -95,7 +95,7 @@ def version_of(service)
       let(:api) { event_data.first }
 
       it "sends the expected aws-sdk span" do
-        expect(sdk).to match(
+        expect(sdk).to include(
           "name" => "aws-sdk",
           "service_name" => "example",
           "service.name" => "example",
@@ -120,7 +120,7 @@ def version_of(service)
       end
 
       it "sends the expected aws-api span" do
-        expect(api).to match(
+        expect(api).to include(
           "name" => "aws-api",
           "service_name" => "example",
           "service.name" => "example",
@@ -186,7 +186,7 @@ def version_of(service)
       let(:api) { event_data.first }
 
       it "sends the expected aws-sdk span" do
-        expect(sdk).to match(
+        expect(sdk).to include(
           "name" => "aws-sdk",
           "service_name" => "example",
           "service.name" => "example",
@@ -214,7 +214,7 @@ def version_of(service)
       end
 
       it "sends the expected aws-api span" do
-        expect(api).to match(
+        expect(api).to include(
           "name" => "aws-api",
           "service_name" => "example",
           "service.name" => "example",
@@ -279,7 +279,7 @@ def version_of(service)
       let(:api) { event_data.first }
 
       it "sends the expected aws-sdk span" do
-        expect(sdk).to match(
+        expect(sdk).to include(
           "name" => "aws-sdk",
           "service_name" => "example",
           "service.name" => "example",
@@ -305,7 +305,7 @@ def version_of(service)
       end
 
       it "sends the expected aws-api span" do
-        expect(api).to match(
+        expect(api).to include(
           "name" => "aws-api",
           "service_name" => "example",
           "service.name" => "example",
@@ -366,7 +366,7 @@ def version_of(service)
       let(:sdk) { event_data[2] }
 
       it "sends the expected aws-sdk span" do
-        expect(sdk).to match(
+        expect(sdk).to include(
           "name" => "aws-sdk",
           "service_name" => "example",
           "service.name" => "example",
@@ -395,7 +395,7 @@ def version_of(service)
       end
 
       it "sends an aws-api span for the original request" do
-        expect(api_failure).to match(
+        expect(api_failure).to include(
           "name" => "aws-api",
           "service_name" => "example",
           "service.name" => "example",
@@ -432,7 +432,7 @@ def version_of(service)
       end
 
       it "sends an aws-api span for the retried request" do
-        expect(api_success).to match(
+        expect(api_success).to include(
           "name" => "aws-api",
           "service_name" => "example",
           "service.name" => "example",
@@ -508,7 +508,7 @@ def version_of(service)
       let(:apis) { event_data.take(4) }
 
       it "sends the expected aws-sdk span" do
-        expect(sdk).to match(
+        expect(sdk).to include(
           "name" => "aws-sdk",
           "service_name" => "example",
           "service.name" => "example",
@@ -569,10 +569,10 @@ def version_of(service)
       end
 
       it "sends the expected aws-api span for each request" do
-        expect(apis[0]).to match(api.merge("aws.attempt" => 1))
-        expect(apis[1]).to match(api.merge("aws.attempt" => 2))
-        expect(apis[2]).to match(api.merge("aws.attempt" => 3))
-        expect(apis[3]).to match(api.merge("aws.attempt" => 4))
+        expect(apis[0]).to include(api.merge("aws.attempt" => 1))
+        expect(apis[1]).to include(api.merge("aws.attempt" => 2))
+        expect(apis[2]).to include(api.merge("aws.attempt" => 3))
+        expect(apis[3]).to include(api.merge("aws.attempt" => 4))
       end
     end