bug-1908543: drop support for AWS #6669
Conversation
relud
force-pushed
the
relud-bug-1908543-drop-aws
branch
2 times, most recently
from
b4a1134
to
65b13e9
Compare
relud
force-pushed
the
relud-bug-1908543-drop-aws
branch
8 times, most recently
from
a6159f3
to
fccda40
Compare
relud
force-pushed
the
relud-bug-1908543-drop-aws
branch
from
fccda40
to
fca266e
Compare
relud
force-pushed
the
relud-bug-1908543-drop-aws
branch
from
fca266e
to
1e71a03
Compare
| @@ -1,7 +1,5 @@ | |||
| attrs==23.2.0 | |||
| awscli==1.32.95 | |||
| @@ -30,7 +30,6 @@ | |||
| import psutil | |||
| import sentry_sdk | |||
| from sentry_sdk.integrations.atexit import AtexitIntegration | |||
| from sentry_sdk.integrations.boto3 import Boto3Integration | |||
There was a problem hiding this comment.
I checked this time. There are no general gcp integrations. There's one for google cloud functions and one for grpcio, but nothing for google-cloud-pubsub/storage.
There was a problem hiding this comment.
I completely missed what you said about this in the equivalent Antenna PR. We came to the same conclusion, so that's cool. Sorry about that!
| @@ -238,7 +238,7 @@ def test_crash_size_capture(self): | |||
| processed_crash=processed_crash, | |||
| ) | |||
|
|
|||
| mm.assert_histogram("processor.es.crash_document_size", value=169) | |||
| mm.assert_histogram("socorro.processor.es.crash_document_size", value=169) | |||
There was a problem hiding this comment.
For my notes: What's going on here is that this ran in the AWS context, but not the GCP context before. We set up the metrics interface in AWS without the "socorro" because that was set in configuration as a prefix in telegraf. In GCP, we set that as a prefix in the metrics interface. Or something like that. It's covered in bug 1898345.
Ergo, all the key names changed in the tests because we're now testing everything in the GCP context. So this is expected.
| records = metricsmock.filter_records( | ||
| "incr", stat="socorro.processor.sentry_scrub_error", value=1 | ||
| ) | ||
| assert len(records) == 1 | ||
| assert {"service:cachemanager"}.issubset(records[0].tags) |
There was a problem hiding this comment.
Markus 5.0 has an AnyTagValue that will make this easier. The issue here is that there's a host tag and it changes run-to-run. (If I understand this correctly.)
| @@ -68,9 +67,6 @@ def dockerflow_version(requst): | |||
|
|
|||
| """ | |||
| version_info = get_version_info(settings.SOCORRO_ROOT) | |||
| # FIXME(willkg): Remove "cloud" after we finish the GCP migration. We use the | |||
| # environment variable here because settings doesn't have this variable. | |||
| version_info["cloud"] = os.environ.get("CLOUD_PROVIDER", "AWS") | |||
|
Also, removing awscli unblocks updating Sphinx. We can do that in a future PR, too. |
blocked by #6671 and #6672