diff --git a/tests/event_samples/api-gateway-non-proxy-async.json b/tests/event_samples/api-gateway-non-proxy-async.json index 46ca9d9a..09d388d2 100644 --- a/tests/event_samples/api-gateway-non-proxy-async.json +++ b/tests/event_samples/api-gateway-non-proxy-async.json @@ -10,7 +10,7 @@ "CloudFront-Is-SmartTV-Viewer": "false", "CloudFront-Is-Tablet-Viewer": "false", "CloudFront-Viewer-Country": "US", - "Host": "lgxbo6a518.execute-api.sa-east-1.amazonaws.com", + "Host": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com", "User-Agent": "curl/7.64.1", "Via": "2.0 a1882a601559755135741e91a9f86c28.cloudfront.net (CloudFront)", "X-Amz-Cf-Id": "dHMNSBrMT0Xjg3rtMrI0Ie9BDg3D_OIPoj7m0mTuIOpTujrU0Ob8_A==", @@ -46,7 +46,7 @@ "US" ], "Host": [ - "lgxbo6a518.execute-api.sa-east-1.amazonaws.com" + "lgxbo6a518.execute-api.eu-west-1.amazonaws.com" ], "User-Agent": [ "curl/7.64.1" @@ -101,7 +101,7 @@ "userAgent": "curl/7.64.1", "user": null }, - "domainName": "lgxbo6a518.execute-api.sa-east-1.amazonaws.com", + "domainName": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com", "apiId": "lgxbo6a518" }, "body": null, diff --git a/tests/event_samples/api-gateway-non-proxy.json b/tests/event_samples/api-gateway-non-proxy.json index 500351a1..978492b5 100644 --- a/tests/event_samples/api-gateway-non-proxy.json +++ b/tests/event_samples/api-gateway-non-proxy.json @@ -10,7 +10,7 @@ "CloudFront-Is-SmartTV-Viewer": "false", "CloudFront-Is-Tablet-Viewer": "false", "CloudFront-Viewer-Country": "US", - "Host": "lgxbo6a518.execute-api.sa-east-1.amazonaws.com", + "Host": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com", "User-Agent": "curl/7.64.1", "Via": "2.0 a1882a601559755135741e91a9f86c28.cloudfront.net (CloudFront)", "X-Amz-Cf-Id": "dHMNSBrMT0Xjg3rtMrI0Ie9BDg3D_OIPoj7m0mTuIOpTujrU0Ob8_A==", @@ -45,7 +45,7 @@ "US" ], "Host": [ - "lgxbo6a518.execute-api.sa-east-1.amazonaws.com" + "lgxbo6a518.execute-api.eu-west-1.amazonaws.com" ], "User-Agent": [ "curl/7.64.1" @@ -100,7 +100,7 @@ "userAgent": "curl/7.64.1", "user": null }, - "domainName": "lgxbo6a518.execute-api.sa-east-1.amazonaws.com", + "domainName": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com", "apiId": "lgxbo6a518" }, "body": null, diff --git a/tests/event_samples/api-gateway-websocket-connect.json b/tests/event_samples/api-gateway-websocket-connect.json index 73ccea31..c54600fa 100644 --- a/tests/event_samples/api-gateway-websocket-connect.json +++ b/tests/event_samples/api-gateway-websocket-connect.json @@ -1,6 +1,6 @@ { "headers": { - "Host": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "Host": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", "Sec-WebSocket-Extensions": "permessage-deflate; client_max_window_bits", "Sec-WebSocket-Key": "cdxrfyi/jZ7kKMSRkIgBjg==", "Sec-WebSocket-Version": "13", @@ -14,7 +14,7 @@ }, "multiValueHeaders": { "Host": [ - "p62c47itsb.execute-api.sa-east-1.amazonaws.com" + "p62c47itsb.execute-api.eu-west-1.amazonaws.com" ], "Sec-WebSocket-Extensions": [ "permessage-deflate; client_max_window_bits" @@ -51,7 +51,7 @@ "sourceIp": "38.122.226.210" }, "requestId": "Fc2tgH1RmjQFnOg=", - "domainName": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "domainName": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", "connectionId": "Fc2tgfl3mjQCJfA=", "apiId": "p62c47itsb" }, diff --git a/tests/event_samples/api-gateway-websocket-default.json b/tests/event_samples/api-gateway-websocket-default.json index 7fc07e1c..8ec748ea 100644 --- a/tests/event_samples/api-gateway-websocket-default.json +++ b/tests/event_samples/api-gateway-websocket-default.json @@ -1,6 +1,6 @@ { "headers": { - "Host": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "Host": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", "x-api-key": "", "X-Forwarded-For": "", "x-restapi": "", @@ -10,7 +10,7 @@ }, "multiValueHeaders": { "Host": [ - "p62c47itsb.execute-api.sa-east-1.amazonaws.com" + "p62c47itsb.execute-api.eu-west-1.amazonaws.com" ], "x-api-key": [ "" @@ -36,7 +36,7 @@ "sourceIp": "38.122.226.210" }, "requestId": "Fc5S3EvdGjQFtsQ=", - "domainName": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "domainName": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", "connectionId": "Fc5SzcoYGjQCJlg=", "apiId": "p62c47itsb" }, diff --git a/tests/event_samples/api-gateway-websocket-disconnect.json b/tests/event_samples/api-gateway-websocket-disconnect.json index d518c030..416aec13 100644 --- a/tests/event_samples/api-gateway-websocket-disconnect.json +++ b/tests/event_samples/api-gateway-websocket-disconnect.json @@ -1,6 +1,6 @@ { "headers": { - "Host": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "Host": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", "x-api-key": "", "X-Forwarded-For": "", "x-restapi": "", @@ -10,7 +10,7 @@ }, "multiValueHeaders": { "Host": [ - "p62c47itsb.execute-api.sa-east-1.amazonaws.com" + "p62c47itsb.execute-api.eu-west-1.amazonaws.com" ], "x-api-key": [ "" @@ -37,7 +37,7 @@ "sourceIp": "38.122.226.210" }, "requestId": "Fc2ydE4LmjQFhdg=", - "domainName": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "domainName": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", "connectionId": "Fc2tgfl3mjQCJfA=", "apiId": "p62c47itsb" }, diff --git a/tests/event_samples/authorizer-request-api-gateway-v1-cached.json b/tests/event_samples/authorizer-request-api-gateway-v1-cached.json index 937e94b6..6bcfe19b 100644 --- a/tests/event_samples/authorizer-request-api-gateway-v1-cached.json +++ b/tests/event_samples/authorizer-request-api-gateway-v1-cached.json @@ -15,7 +15,7 @@ "CloudFront-Is-Tablet-Viewer": "false", "CloudFront-Viewer-ASN": "12271", "CloudFront-Viewer-Country": "US", - "Host": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "Host": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "Postman-Token": "5ddd364a-4191-4dbc-9831-09f1bf46bca8", "User-Agent": "PostmanRuntime/7.29.2", "Via": "1.1 x.cloudfront.net (CloudFront)", @@ -38,7 +38,7 @@ "CloudFront-Is-Tablet-Viewer": ["false"], "CloudFront-Viewer-ASN": ["12271"], "CloudFront-Viewer-Country": ["US"], - "Host": ["amddr1rix9.execute-api.sa-east-1.amazonaws.com"], + "Host": ["amddr1rix9.execute-api.eu-west-1.amazonaws.com"], "Postman-Token": ["5ddd364a-4191-4dbc-9831-09f1bf46bca8"], "User-Agent": ["PostmanRuntime/7.29.2"], "Via": ["1.1 x.cloudfront.net (CloudFront)"], @@ -85,7 +85,7 @@ "userAgent": "PostmanRuntime/7.29.2", "user": null }, - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "apiId": "amddr1rix9" }, "body": null, diff --git a/tests/event_samples/authorizer-request-api-gateway-v1.json b/tests/event_samples/authorizer-request-api-gateway-v1.json index 00818eac..d14b7aa0 100644 --- a/tests/event_samples/authorizer-request-api-gateway-v1.json +++ b/tests/event_samples/authorizer-request-api-gateway-v1.json @@ -15,7 +15,7 @@ "CloudFront-Is-Tablet-Viewer": "false", "CloudFront-Viewer-ASN": "12271", "CloudFront-Viewer-Country": "US", - "Host": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "Host": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "Postman-Token": "75a5e2b0-d8e8-4370-ad2c-7209761c3f43", "User-Agent": "PostmanRuntime/7.29.2", "Via": "1.1 ed4584f7c263c11cf4adf75ba3a25764.cloudfront.net (CloudFront)", @@ -38,7 +38,7 @@ "CloudFront-Is-Tablet-Viewer": ["false"], "CloudFront-Viewer-ASN": ["12271"], "CloudFront-Viewer-Country": ["US"], - "Host": ["amddr1rix9.execute-api.sa-east-1.amazonaws.com"], + "Host": ["amddr1rix9.execute-api.eu-west-1.amazonaws.com"], "Postman-Token": ["75a5e2b0-d8e8-4370-ad2c-7209761c3f43"], "User-Agent": ["PostmanRuntime/7.29.2"], "Via": ["1.1 ed4584f7c263c11cf4adf75ba3a25764.cloudfront.net (CloudFront)"], @@ -85,7 +85,7 @@ "userAgent": "PostmanRuntime/7.29.2", "user": null }, - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "apiId": "amddr1rix9" }, "body": null, diff --git a/tests/event_samples/authorizer-request-api-gateway-v2-cached.json b/tests/event_samples/authorizer-request-api-gateway-v2-cached.json index 53ee1624..f9ac874c 100644 --- a/tests/event_samples/authorizer-request-api-gateway-v2-cached.json +++ b/tests/event_samples/authorizer-request-api-gateway-v2-cached.json @@ -10,7 +10,7 @@ "authorizationtoken": "secretT0k3n", "cache-control": "no-cache", "content-length": "0", - "host": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "host": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "postman-token": "f901530c-cc2f-475f-8634-d9156e9cd9d7", "user-agent": "PostmanRuntime/7.29.2", "userid": "1236", @@ -28,7 +28,7 @@ "scope": "this is just a string" } }, - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "domainPrefix": "amddr1rix9", "http": { "method": "GET", diff --git a/tests/event_samples/authorizer-request-api-gateway-v2.json b/tests/event_samples/authorizer-request-api-gateway-v2.json index 92ce09ba..2984e14e 100644 --- a/tests/event_samples/authorizer-request-api-gateway-v2.json +++ b/tests/event_samples/authorizer-request-api-gateway-v2.json @@ -10,7 +10,7 @@ "authorizationtoken": "secretT0k3n", "cache-control": "no-cache", "content-length": "0", - "host": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "host": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "postman-token": "5e0efdb2-d93f-4d44-8792-45404d40dae2", "user": "12345", "user-agent": "curl/7.64.1", @@ -28,7 +28,7 @@ "scope": "this is just a string" } }, - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "domainPrefix": "amddr1rix9", "http": { "method": "GET", diff --git a/tests/event_samples/authorizer-request-api-gateway-websocket-connect.json b/tests/event_samples/authorizer-request-api-gateway-websocket-connect.json index 1875097d..ab4fb104 100644 --- a/tests/event_samples/authorizer-request-api-gateway-websocket-connect.json +++ b/tests/event_samples/authorizer-request-api-gateway-websocket-connect.json @@ -1,7 +1,7 @@ { "headers": { "Auth": "secretT0k3n", - "Host": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "Host": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "Sec-WebSocket-Extensions": "permessage-deflate; client_max_window_bits", "Sec-WebSocket-Key": "j9g8xXvniFqyyA+34vQ/Lg==", "Sec-WebSocket-Version": "13", @@ -12,7 +12,7 @@ }, "multiValueHeaders": { "Auth": ["secretT0k3n"], - "Host": ["amddr1rix9.execute-api.sa-east-1.amazonaws.com"], + "Host": ["amddr1rix9.execute-api.eu-west-1.amazonaws.com"], "Sec-WebSocket-Extensions": ["permessage-deflate; client_max_window_bits"], "Sec-WebSocket-Key": ["j9g8xXvniFqyyA+34vQ/Lg=="], "Sec-WebSocket-Version": ["13"], @@ -40,7 +40,7 @@ "sourceIp": "38.122.226.210" }, "requestId": "abc123", - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "connectionId": "ZLr9QeNLmjQCIZA=", "apiId": "amddr1rix9" }, diff --git a/tests/event_samples/authorizer-request-api-gateway-websocket-message.json b/tests/event_samples/authorizer-request-api-gateway-websocket-message.json index 8ac5d2e9..576b1625 100644 --- a/tests/event_samples/authorizer-request-api-gateway-websocket-message.json +++ b/tests/event_samples/authorizer-request-api-gateway-websocket-message.json @@ -18,7 +18,7 @@ "sourceIp": "38.122.226.210" }, "requestId": "abc123", - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "connectionId": "ZLwtceO1mjQCI8Q=", "apiId": "amddr1rix9" }, diff --git a/tests/event_samples/authorizer-token-api-gateway-v1-cached.json b/tests/event_samples/authorizer-token-api-gateway-v1-cached.json index 18ade248..f7b30faa 100644 --- a/tests/event_samples/authorizer-token-api-gateway-v1-cached.json +++ b/tests/event_samples/authorizer-token-api-gateway-v1-cached.json @@ -15,7 +15,7 @@ "CloudFront-Is-Tablet-Viewer": "false", "CloudFront-Viewer-ASN": "174", "CloudFront-Viewer-Country": "US", - "Host": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "Host": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "Postman-Token": "bb30e418-d4ee-45b6-a659-89f4dbd41c84", "User-Agent": "PostmanRuntime/7.29.2", "Via": "1.1 x.cloudfront.net (CloudFront)", @@ -38,7 +38,7 @@ "CloudFront-Is-Tablet-Viewer": ["false"], "CloudFront-Viewer-ASN": ["174"], "CloudFront-Viewer-Country": ["US"], - "Host": ["amddr1rix9.execute-api.sa-east-1.amazonaws.com"], + "Host": ["amddr1rix9.execute-api.eu-west-1.amazonaws.com"], "Postman-Token": ["bb30e418-d4ee-45b6-a659-89f4dbd41c84"], "User-Agent": ["PostmanRuntime/7.29.2"], "Via": ["1.1 x.cloudfront.net (CloudFront)"], @@ -85,7 +85,7 @@ "userAgent": "PostmanRuntime/7.29.2", "user": null }, - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "apiId": "amddr1rix9" }, "body": null, diff --git a/tests/event_samples/authorizer-token-api-gateway-v1.json b/tests/event_samples/authorizer-token-api-gateway-v1.json index 1edba05e..c31da278 100644 --- a/tests/event_samples/authorizer-token-api-gateway-v1.json +++ b/tests/event_samples/authorizer-token-api-gateway-v1.json @@ -15,7 +15,7 @@ "CloudFront-Is-Tablet-Viewer": "false", "CloudFront-Viewer-ASN": "174", "CloudFront-Viewer-Country": "US", - "Host": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "Host": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "Postman-Token": "791b2f79-1732-4877-abc1-5c538daf4642", "User-Agent": "PostmanRuntime/7.29.2", "Via": "1.1 d58463d219ef6ca0331e7200a6667c18.cloudfront.net (CloudFront)", @@ -38,7 +38,7 @@ "CloudFront-Is-Tablet-Viewer": ["false"], "CloudFront-Viewer-ASN": ["174"], "CloudFront-Viewer-Country": ["US"], - "Host": ["amddr1rix9.execute-api.sa-east-1.amazonaws.com"], + "Host": ["amddr1rix9.execute-api.eu-west-1.amazonaws.com"], "Postman-Token": ["791b2f79-1732-4877-abc1-5c538daf4642"], "User-Agent": ["PostmanRuntime/7.29.2"], "Via": ["1.1 d58463d219ef6ca0331e7200a6667c18.cloudfront.net (CloudFront)"], @@ -85,7 +85,7 @@ "userAgent": "PostmanRuntime/7.29.2", "user": null }, - "domainName": "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "domainName": "amddr1rix9.execute-api.eu-west-1.amazonaws.com", "apiId": "amddr1rix9" }, "body": null, diff --git a/tests/event_samples/eventbridge-custom.json b/tests/event_samples/eventbridge-custom.json index 456980f8..c24d21ca 100644 --- a/tests/event_samples/eventbridge-custom.json +++ b/tests/event_samples/eventbridge-custom.json @@ -5,7 +5,7 @@ "source": "eventbridge.custom.event.sender", "account": "601427279990", "time": "2021-11-04T01:37:45Z", - "region": "sa-east-1", + "region": "eu-west-1", "resources": [], "detail": { "foo": "bar", diff --git a/tests/event_samples/http-api.json b/tests/event_samples/http-api.json index 602e795b..2968c1b5 100644 --- a/tests/event_samples/http-api.json +++ b/tests/event_samples/http-api.json @@ -6,7 +6,7 @@ "headers": { "accept": "*/*", "content-length": "0", - "host": "x02yirxc7a.execute-api.sa-east-1.amazonaws.com", + "host": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com", "user-agent": "curl/7.64.1", "x-amzn-trace-id": "Root=1-613a52fb-4c43cfc95e0241c1471bfa05", "x-forwarded-for": "38.122.226.210", @@ -19,7 +19,7 @@ "requestContext": { "accountId": "601427279990", "apiId": "x02yirxc7a", - "domainName": "x02yirxc7a.execute-api.sa-east-1.amazonaws.com", + "domainName": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com", "domainPrefix": "x02yirxc7a", "http": { "method": "GET", diff --git a/tests/event_samples/kinesis-batch.json b/tests/event_samples/kinesis-batch.json index e1d0833a..9c645a46 100644 --- a/tests/event_samples/kinesis-batch.json +++ b/tests/event_samples/kinesis-batch.json @@ -12,9 +12,9 @@ "eventVersion": "1.0", "eventID": "shardId-000000000002:49624230154685806402418173680709770494154422022871973922", "eventName": "aws:kinesis:record", - "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-sa-east-1-lambdaRole", - "awsRegion": "sa-east-1", - "eventSourceARN": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream" + "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-eu-west-1-lambdaRole", + "awsRegion": "eu-west-1", + "eventSourceARN": "arn:aws:kinesis:eu-west-1:601427279990:stream/kinesisStream" }, { "kinesis": { @@ -28,9 +28,9 @@ "eventVersion": "1.0", "eventID": "shardId-000000000002:49624230154685806402418173680709770494154422022871973922", "eventName": "aws:kinesis:record", - "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-sa-east-1-lambdaRole", - "awsRegion": "sa-east-1", - "eventSourceARN": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream" + "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-eu-west-1-lambdaRole", + "awsRegion": "eu-west-1", + "eventSourceARN": "arn:aws:kinesis:eu-west-1:601427279990:stream/kinesisStream" } ] } diff --git a/tests/event_samples/kinesis.json b/tests/event_samples/kinesis.json index 7b9f444f..a320fc44 100644 --- a/tests/event_samples/kinesis.json +++ b/tests/event_samples/kinesis.json @@ -12,9 +12,9 @@ "eventVersion": "1.0", "eventID": "shardId-000000000002:49624230154685806402418173680709770494154422022871973922", "eventName": "aws:kinesis:record", - "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-sa-east-1-lambdaRole", - "awsRegion": "sa-east-1", - "eventSourceARN": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream" + "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-eu-west-1-lambdaRole", + "awsRegion": "eu-west-1", + "eventSourceARN": "arn:aws:kinesis:eu-west-1:601427279990:stream/kinesisStream" } ] } diff --git a/tests/event_samples/sns-b64-msg-attribute.json b/tests/event_samples/sns-b64-msg-attribute.json index 586ec56f..ce67e19b 100644 --- a/tests/event_samples/sns-b64-msg-attribute.json +++ b/tests/event_samples/sns-b64-msg-attribute.json @@ -3,18 +3,18 @@ { "EventSource": "aws:sns", "EventVersion": "1.0", - "EventSubscriptionArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "EventSubscriptionArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "Sns": { "Type": "Notification", "MessageId": "87056a47-f506-5d77-908b-303605d3b197", - "TopicArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "TopicArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", "Subject": null, "Message": "Asynchronously invoking a Lambda function with SNS.", "Timestamp": "2022-01-31T14:13:41.637Z", "SignatureVersion": "1", "Signature": "BmwnJb0Ku2KgQef9QOgaSSTwLyUsbkRq90lzD5Vn4mAcRUOq2ForfMOYbxMB6idljWIWy9t/jK4AIMxPGk/eOGiRcENx3BvAcGcoDayBRFY13+xUGaPn5Lfoht/ZJ7/hmCgFWKRa8ooATZL+AwGAw6Id8qzf0R3M3k2asy5Vxa4ODKiFW9OzWY/zFgsYJhddR3JrQl9YOMRyIobNNHT96o1TwjGsSUTEemrxA6jQtb3QbardEKO+2SuataLEZki7gE2D2sA300WqZecumI339q7la+OIj6VDGDwFoppE2sh8hzJYXAH7oo11giwltE0V3/eLFCVhsE8Y1KD/yDPPsA==", - "SigningCertUrl": "https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", - "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "SigningCertUrl": "https://sns.eu-west-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", + "UnsubscribeUrl": "https://sns.eu-west-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "MessageAttributes": { "_datadog": { "Type": "Binary", diff --git a/tests/event_samples/sns-batch.json b/tests/event_samples/sns-batch.json index c84da297..4b5fdb34 100644 --- a/tests/event_samples/sns-batch.json +++ b/tests/event_samples/sns-batch.json @@ -3,18 +3,18 @@ { "EventSource": "aws:sns", "EventVersion": "1.0", - "EventSubscriptionArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "EventSubscriptionArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "Sns": { "Type": "Notification", "MessageId": "87056a47-f506-5d77-908b-303605d3b197", - "TopicArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "TopicArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", "Subject": null, "Message": "Asynchronously invoking a Lambda function with SNS.", "Timestamp": "2022-01-31T14:13:41.637Z", "SignatureVersion": "1", "Signature": "BmwnJb0Ku2KgQef9QOgaSSTwLyUsbkRq90lzD5Vn4mAcRUOq2ForfMOYbxMB6idljWIWy9t/jK4AIMxPGk/eOGiRcENx3BvAcGcoDayBRFY13+xUGaPn5Lfoht/ZJ7/hmCgFWKRa8ooATZL+AwGAw6Id8qzf0R3M3k2asy5Vxa4ODKiFW9OzWY/zFgsYJhddR3JrQl9YOMRyIobNNHT96o1TwjGsSUTEemrxA6jQtb3QbardEKO+2SuataLEZki7gE2D2sA300WqZecumI339q7la+OIj6VDGDwFoppE2sh8hzJYXAH7oo11giwltE0V3/eLFCVhsE8Y1KD/yDPPsA==", - "SigningCertUrl": "https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", - "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "SigningCertUrl": "https://sns.eu-west-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", + "UnsubscribeUrl": "https://sns.eu-west-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "MessageAttributes": { "_datadog": { "Type": "String", @@ -26,18 +26,18 @@ { "EventSource": "aws:sns", "EventVersion": "1.0", - "EventSubscriptionArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "EventSubscriptionArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "Sns": { "Type": "Notification", "MessageId": "87056a47-f506-5d77-908b-303605d3b197", - "TopicArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "TopicArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", "Subject": null, "Message": "Asynchronously invoking a Lambda function with SNS.", "Timestamp": "2022-01-31T14:13:41.637Z", "SignatureVersion": "1", "Signature": "BmwnJb0Ku2KgQef9QOgaSSTwLyUsbkRq90lzD5Vn4mAcRUOq2ForfMOYbxMB6idljWIWy9t/jK4AIMxPGk/eOGiRcENx3BvAcGcoDayBRFY13+xUGaPn5Lfoht/ZJ7/hmCgFWKRa8ooATZL+AwGAw6Id8qzf0R3M3k2asy5Vxa4ODKiFW9OzWY/zFgsYJhddR3JrQl9YOMRyIobNNHT96o1TwjGsSUTEemrxA6jQtb3QbardEKO+2SuataLEZki7gE2D2sA300WqZecumI339q7la+OIj6VDGDwFoppE2sh8hzJYXAH7oo11giwltE0V3/eLFCVhsE8Y1KD/yDPPsA==", - "SigningCertUrl": "https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", - "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "SigningCertUrl": "https://sns.eu-west-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", + "UnsubscribeUrl": "https://sns.eu-west-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "MessageAttributes": { "_datadog": { "Type": "String", diff --git a/tests/event_samples/sns-string-msg-attribute.json b/tests/event_samples/sns-string-msg-attribute.json index b9be446c..8bdacaea 100644 --- a/tests/event_samples/sns-string-msg-attribute.json +++ b/tests/event_samples/sns-string-msg-attribute.json @@ -3,18 +3,18 @@ { "EventSource": "aws:sns", "EventVersion": "1.0", - "EventSubscriptionArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "EventSubscriptionArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "Sns": { "Type": "Notification", "MessageId": "87056a47-f506-5d77-908b-303605d3b197", - "TopicArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "TopicArn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", "Subject": null, "Message": "Asynchronously invoking a Lambda function with SNS.", "Timestamp": "2022-01-31T14:13:41.637Z", "SignatureVersion": "1", "Signature": "BmwnJb0Ku2KgQef9QOgaSSTwLyUsbkRq90lzD5Vn4mAcRUOq2ForfMOYbxMB6idljWIWy9t/jK4AIMxPGk/eOGiRcENx3BvAcGcoDayBRFY13+xUGaPn5Lfoht/ZJ7/hmCgFWKRa8ooATZL+AwGAw6Id8qzf0R3M3k2asy5Vxa4ODKiFW9OzWY/zFgsYJhddR3JrQl9YOMRyIobNNHT96o1TwjGsSUTEemrxA6jQtb3QbardEKO+2SuataLEZki7gE2D2sA300WqZecumI339q7la+OIj6VDGDwFoppE2sh8hzJYXAH7oo11giwltE0V3/eLFCVhsE8Y1KD/yDPPsA==", - "SigningCertUrl": "https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", - "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "SigningCertUrl": "https://sns.eu-west-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", + "UnsubscribeUrl": "https://sns.eu-west-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "MessageAttributes": { "_datadog": { "Type": "String", diff --git a/tests/event_samples/sqs-batch.json b/tests/event_samples/sqs-batch.json index d3687dcf..9ec6cba1 100644 --- a/tests/event_samples/sqs-batch.json +++ b/tests/event_samples/sqs-batch.json @@ -21,8 +21,8 @@ "md5OfMessageAttributes": "14b3b4a81d5ddeb96af62963d703c528", "md5OfBody": "24933a8beabe72088d7576cab1a59142", "eventSource": "aws:sqs", - "eventSourceARN": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", - "awsRegion": "sa-east-1" + "eventSourceARN": "arn:aws:sqs:eu-west-1:601427279990:InferredSpansQueueNode", + "awsRegion": "eu-west-1" }, { "messageId": "2fcbad66-372a-4b1c-87da-26b2cea13937", @@ -45,8 +45,8 @@ "md5OfMessageAttributes": "14b3b4a81d5ddeb96af62963d703c528", "md5OfBody": "24933a8beabe72088d7576cab1a59142", "eventSource": "aws:sqs", - "eventSourceARN": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", - "awsRegion": "sa-east-1" + "eventSourceARN": "arn:aws:sqs:eu-west-1:601427279990:InferredSpansQueueNode", + "awsRegion": "eu-west-1" } ] } diff --git a/tests/event_samples/sqs-string-msg-attribute.json b/tests/event_samples/sqs-string-msg-attribute.json index c182704b..2bde2ce5 100644 --- a/tests/event_samples/sqs-string-msg-attribute.json +++ b/tests/event_samples/sqs-string-msg-attribute.json @@ -21,8 +21,8 @@ "md5OfMessageAttributes": "14b3b4a81d5ddeb96af62963d703c528", "md5OfBody": "24933a8beabe72088d7576cab1a59142", "eventSource": "aws:sqs", - "eventSourceARN": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", - "awsRegion": "sa-east-1" + "eventSourceARN": "arn:aws:sqs:eu-west-1:601427279990:InferredSpansQueueNode", + "awsRegion": "eu-west-1" } ] } diff --git a/tests/integration/input_events/eventbridge-custom.json b/tests/integration/input_events/eventbridge-custom.json index 549bb96a..04184fef 100644 --- a/tests/integration/input_events/eventbridge-custom.json +++ b/tests/integration/input_events/eventbridge-custom.json @@ -5,7 +5,7 @@ "source": "eventbridge.custom.event.sender", "account": "601427279990", "time": "2021-11-04T01:37:45Z", - "region": "sa-east-1", + "region": "eu-west-1", "resources": [], "detail": { "foo": "bar" diff --git a/tests/integration/input_events/http-api.json b/tests/integration/input_events/http-api.json index fe1bbece..83de330f 100644 --- a/tests/integration/input_events/http-api.json +++ b/tests/integration/input_events/http-api.json @@ -6,7 +6,7 @@ "headers": { "accept": "*/*", "content-length": "0", - "host": "x02yirxc7a.execute-api.sa-east-1.amazonaws.com", + "host": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com", "user-agent": "curl/7.64.1", "x-amzn-trace-id": "Root=1-613a52fb-4c43cfc95e0241c1471bfa05", "x-forwarded-for": "38.122.226.210", @@ -16,7 +16,7 @@ "requestContext": { "accountId": "601427279990", "apiId": "x02yirxc7a", - "domainName": "x02yirxc7a.execute-api.sa-east-1.amazonaws.com", + "domainName": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com", "domainPrefix": "x02yirxc7a", "http": { "method": "GET", diff --git a/tests/integration/input_events/websocket.json b/tests/integration/input_events/websocket.json index 7ad3bafd..24215c63 100644 --- a/tests/integration/input_events/websocket.json +++ b/tests/integration/input_events/websocket.json @@ -13,7 +13,7 @@ "sourceIp": "38.122.226.210" }, "requestId": "Fc5S3EvdGjQFtsQ=", - "domainName": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "domainName": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", "connectionId": "Fc5SzcoYGjQCJlg=", "apiId": "p62c47itsb" }, diff --git a/tests/integration/serverless.yml b/tests/integration/serverless.yml index 7ad6f4b0..9bb8a79b 100644 --- a/tests/integration/serverless.yml +++ b/tests/integration/serverless.yml @@ -3,7 +3,7 @@ service: integration-tests-python provider: name: aws - region: sa-east-1 + region: eu-west-1 tracing: lambda: "PassThrough" environment: @@ -13,10 +13,10 @@ provider: DD_TRACE_MANAGED_SERVICES: true timeout: 15 deploymentBucket: - name: integration-tests-deployment-bucket + name: integration-tests-serververless-deployment-bucket iam: # IAM permissions require that all functions are deployed with this role - role: "arn:aws:iam::601427279990:role/serverless-integration-test-lambda-role" + role: "arn:aws:iam::425362996713:role/serverless-integration-test-lambda-role" layers: python: diff --git a/tests/integration/snapshots/logs/async-metrics_python37.log b/tests/integration/snapshots/logs/async-metrics_python37.log index 602708d8..606b229d 100644 --- a/tests/integration/snapshots/logs/async-metrics_python37.log +++ b/tests/integration/snapshots/logs/async-metrics_python37.log @@ -4,7 +4,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -88,7 +88,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "true", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -162,7 +162,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -245,7 +245,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -315,7 +315,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -392,7 +392,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -461,7 +461,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -501,7 +501,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "GET /httpapi/get", "name": "aws.httpapi", "error": 0, @@ -512,7 +512,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "_dd.origin": "lambda", "operation_name": "aws.httpapi", "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com/httpapi/get", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.protocol": "HTTP/1.1", "http.source_ip": "XXXX", @@ -548,7 +548,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -558,7 +558,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/httpapi/get", "http.method": "GET", "http.status_code": "200" @@ -622,7 +622,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -705,7 +705,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -775,7 +775,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -855,7 +855,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -925,7 +925,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -1006,7 +1006,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -1076,7 +1076,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -1156,7 +1156,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -1226,7 +1226,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python37", "resource:integration-tests-python-XXXX-async-metrics_python37", @@ -1266,7 +1266,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "$default", "name": "aws.apigateway.websocket", "error": 0, @@ -1276,7 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "runtime-id": "XXXX", "_dd.origin": "lambda", "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com$default", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", "resource_names": "$default", "apiid": "XXXX", @@ -1312,7 +1312,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python37", @@ -1322,7 +1322,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.status_code": "200" }, "metrics": { diff --git a/tests/integration/snapshots/logs/async-metrics_python38.log b/tests/integration/snapshots/logs/async-metrics_python38.log index 0232331c..a708d67f 100644 --- a/tests/integration/snapshots/logs/async-metrics_python38.log +++ b/tests/integration/snapshots/logs/async-metrics_python38.log @@ -4,7 +4,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -88,7 +88,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "true", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -162,7 +162,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -245,7 +245,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -315,7 +315,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -392,7 +392,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -461,7 +461,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -501,7 +501,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "GET /httpapi/get", "name": "aws.httpapi", "error": 0, @@ -512,7 +512,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "_dd.origin": "lambda", "operation_name": "aws.httpapi", "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com/httpapi/get", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.protocol": "HTTP/1.1", "http.source_ip": "XXXX", @@ -548,7 +548,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -558,7 +558,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/httpapi/get", "http.method": "GET", "http.status_code": "200" @@ -622,7 +622,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -705,7 +705,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -775,7 +775,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -855,7 +855,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -925,7 +925,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -1006,7 +1006,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -1076,7 +1076,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -1156,7 +1156,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -1226,7 +1226,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python38", "resource:integration-tests-python-XXXX-async-metrics_python38", @@ -1266,7 +1266,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "$default", "name": "aws.apigateway.websocket", "error": 0, @@ -1276,7 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "runtime-id": "XXXX", "_dd.origin": "lambda", "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com$default", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", "resource_names": "$default", "apiid": "XXXX", @@ -1312,7 +1312,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python38", @@ -1322,7 +1322,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.status_code": "200" }, "metrics": { diff --git a/tests/integration/snapshots/logs/async-metrics_python39.log b/tests/integration/snapshots/logs/async-metrics_python39.log index cae1234c..1e8ddb9d 100644 --- a/tests/integration/snapshots/logs/async-metrics_python39.log +++ b/tests/integration/snapshots/logs/async-metrics_python39.log @@ -4,7 +4,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -88,7 +88,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "true", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -162,7 +162,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -245,7 +245,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -315,7 +315,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -392,7 +392,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -461,7 +461,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -501,7 +501,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "GET /httpapi/get", "name": "aws.httpapi", "error": 0, @@ -512,7 +512,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "_dd.origin": "lambda", "operation_name": "aws.httpapi", "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com/httpapi/get", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.protocol": "HTTP/1.1", "http.source_ip": "XXXX", @@ -548,7 +548,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -558,7 +558,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/httpapi/get", "http.method": "GET", "http.status_code": "200" @@ -622,7 +622,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -705,7 +705,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -775,7 +775,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -855,7 +855,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -925,7 +925,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -1006,7 +1006,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -1076,7 +1076,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -1156,7 +1156,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -1226,7 +1226,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-async-metrics_python39", "resource:integration-tests-python-XXXX-async-metrics_python39", @@ -1266,7 +1266,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "$default", "name": "aws.apigateway.websocket", "error": 0, @@ -1276,7 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "runtime-id": "XXXX", "_dd.origin": "lambda", "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com$default", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", "resource_names": "$default", "apiid": "XXXX", @@ -1312,7 +1312,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-async-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-async-metrics_python39", @@ -1322,7 +1322,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.status_code": "200" }, "metrics": { diff --git a/tests/integration/snapshots/logs/sync-metrics_python37.log b/tests/integration/snapshots/logs/sync-metrics_python37.log index b1d4bd21..bc2e5c40 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python37.log +++ b/tests/integration/snapshots/logs/sync-metrics_python37.log @@ -4,7 +4,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -68,7 +68,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "true", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -177,7 +177,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -240,7 +240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -345,7 +345,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -402,7 +402,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -506,7 +506,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -526,7 +526,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "GET /httpapi/get", "name": "aws.httpapi", "error": 0, @@ -537,7 +537,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "_dd.origin": "lambda", "operation_name": "aws.httpapi", "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com/httpapi/get", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.protocol": "HTTP/1.1", "http.source_ip": "XXXX", @@ -573,7 +573,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -583,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/httpapi/get", "http.method": "GET", "http.status_code": "200" @@ -682,7 +682,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -745,7 +745,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -850,7 +850,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -910,7 +910,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -1015,7 +1015,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -1076,7 +1076,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -1181,7 +1181,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -1241,7 +1241,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -1346,7 +1346,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python37", "resource:integration-tests-python-XXXX-sync-metrics_python37", @@ -1366,7 +1366,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "$default", "name": "aws.apigateway.websocket", "error": 0, @@ -1376,7 +1376,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "runtime-id": "XXXX", "_dd.origin": "lambda", "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com$default", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", "resource_names": "$default", "apiid": "XXXX", @@ -1412,7 +1412,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python37", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", @@ -1422,7 +1422,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.status_code": "200" }, "metrics": { diff --git a/tests/integration/snapshots/logs/sync-metrics_python38.log b/tests/integration/snapshots/logs/sync-metrics_python38.log index db94f2d6..5c3acbd9 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python38.log +++ b/tests/integration/snapshots/logs/sync-metrics_python38.log @@ -4,7 +4,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -68,7 +68,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "true", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -177,7 +177,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -240,7 +240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -345,7 +345,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -402,7 +402,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -506,7 +506,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -526,7 +526,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "GET /httpapi/get", "name": "aws.httpapi", "error": 0, @@ -537,7 +537,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "_dd.origin": "lambda", "operation_name": "aws.httpapi", "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com/httpapi/get", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.protocol": "HTTP/1.1", "http.source_ip": "XXXX", @@ -573,7 +573,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -583,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/httpapi/get", "http.method": "GET", "http.status_code": "200" @@ -682,7 +682,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -745,7 +745,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -850,7 +850,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -910,7 +910,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1015,7 +1015,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -1076,7 +1076,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1181,7 +1181,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -1241,7 +1241,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1346,7 +1346,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python38", "resource:integration-tests-python-XXXX-sync-metrics_python38", @@ -1366,7 +1366,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "$default", "name": "aws.apigateway.websocket", "error": 0, @@ -1376,7 +1376,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "runtime-id": "XXXX", "_dd.origin": "lambda", "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com$default", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", "resource_names": "$default", "apiid": "XXXX", @@ -1412,7 +1412,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python38", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1422,7 +1422,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.status_code": "200" }, "metrics": { diff --git a/tests/integration/snapshots/logs/sync-metrics_python39.log b/tests/integration/snapshots/logs/sync-metrics_python39.log index fb7dd5b7..ac3fdfa7 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python39.log +++ b/tests/integration/snapshots/logs/sync-metrics_python39.log @@ -4,7 +4,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -68,7 +68,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "true", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -177,7 +177,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -240,7 +240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -345,7 +345,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -402,7 +402,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -506,7 +506,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -526,7 +526,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "GET /httpapi/get", "name": "aws.httpapi", "error": 0, @@ -537,7 +537,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "_dd.origin": "lambda", "operation_name": "aws.httpapi", "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com/httpapi/get", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.protocol": "HTTP/1.1", "http.source_ip": "XXXX", @@ -573,7 +573,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -583,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/httpapi/get", "http.method": "GET", "http.status_code": "200" @@ -682,7 +682,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -745,7 +745,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -850,7 +850,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -910,7 +910,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1015,7 +1015,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -1076,7 +1076,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1181,7 +1181,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -1241,7 +1241,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1346,7 +1346,7 @@ START "v": 1, "e": XXXX, "t": [ - "region:sa-east-1", + "region:eu-west-1", "account_id:XXXX", "functionname:integration-tests-python-XXXX-sync-metrics_python39", "resource:integration-tests-python-XXXX-sync-metrics_python39", @@ -1366,7 +1366,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "XXXX.execute-api.sa-east-1.amazonaws.com", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "resource": "$default", "name": "aws.apigateway.websocket", "error": 0, @@ -1376,7 +1376,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "runtime-id": "XXXX", "_dd.origin": "lambda", "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com$default", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", "resource_names": "$default", "apiid": "XXXX", @@ -1412,7 +1412,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "meta": { "_dd.origin": "lambda", "cold_start": "false", - "function_arn": "arn:aws:lambda:sa-east-1:XXXX:sa-east-1-tests-python-XXXX-sync-metrics_python39", + "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1422,7 +1422,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.sa-east-1.amazonaws.com", + "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", "http.status_code": "200" }, "metrics": { diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 47a028da..fed90588 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -716,11 +716,11 @@ def _basic_common_checks( self.assertEqual(span.span_type, span_type) self.assertEqual( span.service, - "amddr1rix9.execute-api.sa-east-1.amazonaws.com", + "amddr1rix9.execute-api.eu-west-1.amazonaws.com", ) self.assertEqual( span.get_tag("http.url"), - "amddr1rix9.execute-api.sa-east-1.amazonaws.com" + route_key, + "amddr1rix9.execute-api.eu-west-1.amazonaws.com" + route_key, ) self.assertEqual(span.get_tag("endpoint"), route_key) self.assertEqual(span.get_tag("http.method"), http_method) @@ -777,11 +777,11 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_async(self): self.assertEqual(span.get_tag("operation_name"), "aws.apigateway.rest") self.assertEqual( span.service, - "lgxbo6a518.execute-api.sa-east-1.amazonaws.com", + "lgxbo6a518.execute-api.eu-west-1.amazonaws.com", ) self.assertEqual( span.get_tag("http.url"), - "lgxbo6a518.execute-api.sa-east-1.amazonaws.com/http/get", + "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get", ) self.assertEqual(span.get_tag("endpoint"), "/http/get") self.assertEqual(span.get_tag("http.method"), "GET") @@ -811,11 +811,11 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_sync(self): self.assertEqual(span.get_tag("operation_name"), "aws.apigateway.rest") self.assertEqual( span.service, - "lgxbo6a518.execute-api.sa-east-1.amazonaws.com", + "lgxbo6a518.execute-api.eu-west-1.amazonaws.com", ) self.assertEqual( span.get_tag("http.url"), - "lgxbo6a518.execute-api.sa-east-1.amazonaws.com/http/get", + "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get", ) self.assertEqual(span.get_tag("endpoint"), "/http/get") self.assertEqual(span.get_tag("http.method"), "GET") @@ -845,11 +845,11 @@ def test_create_inferred_span_from_http_api_event(self): self.assertEqual(span.get_tag("operation_name"), "aws.httpapi") self.assertEqual( span.service, - "x02yirxc7a.execute-api.sa-east-1.amazonaws.com", + "x02yirxc7a.execute-api.eu-west-1.amazonaws.com", ) self.assertEqual( span.get_tag("http.url"), - "x02yirxc7a.execute-api.sa-east-1.amazonaws.com/httpapi/get", + "x02yirxc7a.execute-api.eu-west-1.amazonaws.com/httpapi/get", ) self.assertEqual(span.get_tag("endpoint"), "/httpapi/get") self.assertEqual(span.get_tag("http.method"), "GET") @@ -880,11 +880,11 @@ def test_create_inferred_span_from_api_gateway_websocket_default_event(self): self.assertEqual(span.get_tag("operation_name"), "aws.apigateway.websocket") self.assertEqual( span.service, - "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "p62c47itsb.execute-api.eu-west-1.amazonaws.com", ) self.assertEqual( span.get_tag("http.url"), - "p62c47itsb.execute-api.sa-east-1.amazonaws.com$default", + "p62c47itsb.execute-api.eu-west-1.amazonaws.com$default", ) self.assertEqual(span.get_tag("endpoint"), "$default") self.assertEqual(span.get_tag("http.method"), None) @@ -915,11 +915,11 @@ def test_create_inferred_span_from_api_gateway_websocket_connect_event(self): self.assertEqual(span.get_tag("operation_name"), "aws.apigateway.websocket") self.assertEqual( span.service, - "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "p62c47itsb.execute-api.eu-west-1.amazonaws.com", ) self.assertEqual( span.get_tag("http.url"), - "p62c47itsb.execute-api.sa-east-1.amazonaws.com$connect", + "p62c47itsb.execute-api.eu-west-1.amazonaws.com$connect", ) self.assertEqual(span.get_tag("endpoint"), "$connect") self.assertEqual(span.get_tag("http.method"), None) @@ -950,11 +950,11 @@ def test_create_inferred_span_from_api_gateway_websocket_disconnect_event(self): self.assertEqual(span.get_tag("operation_name"), "aws.apigateway.websocket") self.assertEqual( span.service, - "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "p62c47itsb.execute-api.eu-west-1.amazonaws.com", ) self.assertEqual( span.get_tag("http.url"), - "p62c47itsb.execute-api.sa-east-1.amazonaws.com$disconnect", + "p62c47itsb.execute-api.eu-west-1.amazonaws.com$disconnect", ) self.assertEqual(span.get_tag("endpoint"), "$disconnect") self.assertEqual(span.get_tag("http.method"), None) @@ -1001,7 +1001,7 @@ def test_create_inferred_span_from_sqs_event_string_msg_attr(self): self.assertEqual(span.get_tag("queuename"), "InferredSpansQueueNode") self.assertEqual( span.get_tag("event_source_arn"), - "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", + "arn:aws:sqs:eu-west-1:601427279990:InferredSpansQueueNode", ) self.assertEqual( span.get_tag("sender_id"), @@ -1038,7 +1038,7 @@ def test_create_inferred_span_from_sns_event_string_msg_attr(self): self.assertEqual(span.get_tag("topicname"), "serverlessTracingTopicPy") self.assertEqual( span.get_tag("topic_arn"), - "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", ) self.assertEqual( span.get_tag("message_id"), "87056a47-f506-5d77-908b-303605d3b197" @@ -1076,7 +1076,7 @@ def test_create_inferred_span_from_sns_event_b64_msg_attr(self): self.assertEqual(span.get_tag("topicname"), "serverlessTracingTopicPy") self.assertEqual( span.get_tag("topic_arn"), - "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", ) self.assertEqual( span.get_tag("message_id"), "87056a47-f506-5d77-908b-303605d3b197" @@ -1116,7 +1116,7 @@ def test_create_inferred_span_from_kinesis_event(self): self.assertEqual(span.get_tag("shardid"), "shardId-000000000002") self.assertEqual( span.get_tag("event_source_arn"), - "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream", + "arn:aws:kinesis:eu-west-1:601427279990:stream/kinesisStream", ) self.assertEqual( span.get_tag("event_id"), diff --git a/tests/test_trigger.py b/tests/test_trigger.py index 560e9f4e..2f514811 100644 --- a/tests/test_trigger.py +++ b/tests/test_trigger.py @@ -190,7 +190,7 @@ def test_event_source_kinesis(self): self.assertEqual(event_source.to_string(), event_sample_source) self.assertEqual( event_source_arn, - "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream", + "arn:aws:kinesis:eu-west-1:601427279990:stream/kinesisStream", ) def test_event_source_s3(self): @@ -216,7 +216,7 @@ def test_event_source_sns(self): self.assertEqual(event_source.to_string(), event_sample_source) self.assertEqual( event_source_arn, - "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", ) def test_event_source_sqs(self): @@ -231,7 +231,7 @@ def test_event_source_sqs(self): self.assertEqual(event_source.to_string(), event_sample_source) self.assertEqual( event_source_arn, - "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", + "arn:aws:sqs:eu-west-1:601427279990:InferredSpansQueueNode", ) def test_event_source_unsupported(self): @@ -277,7 +277,7 @@ def test_extract_trigger_tags_api_gateway_non_proxy(self): { "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/lgxbo6a518/stages/dev", - "http.url": "lgxbo6a518.execute-api.sa-east-1.amazonaws.com", + "http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/dev/http/get", "http.method": "GET", }, @@ -295,7 +295,7 @@ def test_extract_trigger_tags_api_gateway_websocket_connect(self): { "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/p62c47itsb/stages/dev", - "http.url": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", }, ) @@ -311,7 +311,7 @@ def test_extract_trigger_tags_api_gateway_websocket_default(self): { "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/p62c47itsb/stages/dev", - "http.url": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", }, ) @@ -327,7 +327,7 @@ def test_extract_trigger_tags_api_gateway_websocket_disconnect(self): { "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/p62c47itsb/stages/dev", - "http.url": "p62c47itsb.execute-api.sa-east-1.amazonaws.com", + "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com", }, ) @@ -343,7 +343,7 @@ def test_extract_trigger_tags_api_gateway_http_api(self): { "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/x02yirxc7a/stages/$default", - "http.url": "x02yirxc7a.execute-api.sa-east-1.amazonaws.com", + "http.url": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com", "http.url_details.path": "/httpapi/get", "http.method": "GET", }, @@ -437,7 +437,7 @@ def test_extract_trigger_tags_kinesis(self): tags, { "function_trigger.event_source": "kinesis", - "function_trigger.event_source_arn": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream", + "function_trigger.event_source_arn": "arn:aws:kinesis:eu-west-1:601427279990:stream/kinesisStream", }, ) @@ -467,7 +467,7 @@ def test_extract_trigger_tags_sns(self): tags, { "function_trigger.event_source": "sns", - "function_trigger.event_source_arn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "function_trigger.event_source_arn": "arn:aws:sns:eu-west-1:601427279990:serverlessTracingTopicPy", }, ) @@ -482,7 +482,7 @@ def test_extract_trigger_tags_sqs(self): tags, { "function_trigger.event_source": "sqs", - "function_trigger.event_source_arn": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", + "function_trigger.event_source_arn": "arn:aws:sqs:eu-west-1:601427279990:InferredSpansQueueNode", }, )