Remove codecovopentelem integration (#1212)

Author: Swatinem

api/internal/tests/test_charts.py

@@ -6,14 +6,17 @@
 
 import pytest
 from dateutil.relativedelta import relativedelta
-from ddf import G
 from django.test import TestCase, override_settings
 from django.utils import timezone
 from factory.faker import faker
 from pytz import UTC
 from rest_framework.exceptions import ValidationError
 from rest_framework.reverse import reverse
-from shared.django_apps.core.tests.factories import OwnerFactory, RepositoryFactory
+from shared.django_apps.core.tests.factories import (
+    CommitFactory,
+    OwnerFactory,
+    RepositoryFactory,
+)
 
 from api.internal.chart.filters import apply_default_filters, apply_simple_filters
 from api.internal.chart.helpers import (
@@ -84,8 +87,7 @@ def setup_commits(
         ci_passed = True if meets_default_filters else False
         deleted = False if meets_default_filters else True
 
-        G(
-            Commit,
+        CommitFactory(
             repository=repo,
             branch=branch,
             timestamp=timestamp,
@@ -340,8 +342,7 @@ def test_apply_simple_filters_branch_filtering(self):
 
     def test_annotate_commits_with_totals(self):
         with_complexity_commitid = "i230tky2"
-        G(
-            Commit,
+        CommitFactory(
             commitid=with_complexity_commitid,
             totals={"n": 0, "h": 0, "p": 0, "m": 0, "c": 0, "C": 0, "N": 1},
         )
@@ -361,8 +362,7 @@ def test_annotate_commits_with_totals(self):
 
     def test_annotate_commit_with_totals_no_complexity_sets_ratio_to_None(self):
         no_complexity_commitid = "sdfkjwepj42"
-        G(
-            Commit,
+        CommitFactory(
             commitid=no_complexity_commitid,
             totals={"n": 0, "h": 0, "p": 0, "m": 0, "c": 0, "C": 0, "N": 0},
         )
@@ -524,22 +524,19 @@ def setUp(self):
                 self.repo4.repoid,
             ]
         )
-        self.commit1 = G(
-            model=Commit,
+        self.commit1 = CommitFactory(
             repository=self.repo1,
             totals={"h": 100, "n": 120, "p": 10, "m": 10},
             branch=self.repo1.branch,
             state="complete",
         )
-        self.commit2 = G(
-            model=Commit,
+        self.commit2 = CommitFactory(
             repository=self.repo2,
             totals={"h": 14, "n": 25, "p": 6, "m": 5},
             branch=self.repo2.branch,
             state="complete",
         )
-        self.commit3 = G(
-            model=Commit,
+        self.commit3 = CommitFactory(
             repository=self.repo3,
             totals={"h": 14, "n": 25, "p": 6, "m": 5},
             branch=self.repo3.branch,
@@ -751,21 +748,19 @@ def test_first_complete_commit_date_returns_date_of_first_complete_commit_in_rep
         )
         self.user.permission = [repo1.repoid, repo2.repoid]
         self.user.save()
-        G(
-            model=Commit,
+        CommitFactory(
             repository=repo1,
             branch=repo1.branch,
             state="pending",
             timestamp=timezone.now() - timedelta(days=7),
         )
-        commit1 = G(
-            model=Commit,
+        commit1 = CommitFactory(
             repository=repo1,
             branch=repo1.branch,
             state="complete",
             timestamp=timezone.now() - timedelta(days=3),
         )
-        G(model=Commit, repository=repo2, branch=repo2.branch, state="complete")
+        CommitFactory(repository=repo2, branch=repo2.branch, state="complete")
 
         qr = ChartQueryRunner(
             self.user,
@@ -795,8 +790,7 @@ def test_start_date(self):
             repo = RepositoryFactory(author=self.org, active=True)
             self.user.permission = [repo.repoid]
             self.user.save()
-            commit = G(
-                model=Commit,
+            commit = CommitFactory(
                 repository=repo,
                 branch=repo.branch,
                 state="complete",
@@ -957,15 +951,13 @@ def setUp(self):
         self.current_owner = OwnerFactory(
             permission=[self.repo1.repoid, self.repo2.repoid]
         )
-        self.commit1 = G(
-            model=Commit,
+        self.commit1 = CommitFactory(
             repository=self.repo1,
             totals={"h": 100, "n": 120, "p": 10, "m": 10},
             branch=self.repo1.branch,
             state="complete",
         )
-        self.commit2 = G(
-            model=Commit,
+        self.commit2 = CommitFactory(
             repository=self.repo2,
             totals={"h": 14, "n": 25, "p": 6, "m": 5},
             branch=self.repo2.branch,

api/public/v2/compare/views.py

@@ -1,4 +1,3 @@
-from distutils.util import strtobool
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import OpenApiParameter, extend_schema
 from rest_framework import mixins
@@ -15,6 +14,7 @@
 )
 from services.components import ComponentComparison, commit_components
 from services.decorators import torngit_safe
+from utils import strtobool
 
 from .serializers import ComparisonSerializer, ComponentComparisonSerializer
 

codecov/wsgi.py

@@ -14,13 +14,5 @@
 from utils.config import get_settings_module
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", get_settings_module())
-if (
-    os.getenv("OPENTELEMETRY_ENDPOINT")
-    and os.getenv("OPENTELEMETRY_TOKEN")
-    and os.getenv("OPENTELEMETRY_CODECOV_RATE")
-):
-    from open_telemetry import instrument
-
-    instrument()
 
 application = get_wsgi_application()

codecov_auth/views/bitbucket_server.py

@@ -3,7 +3,6 @@
 import threading
 from urllib.parse import urlencode
 
-import oauth2 as oauth
 from asgiref.sync import async_to_sync
 from django.conf import settings
 from django.shortcuts import redirect
@@ -28,7 +27,7 @@ async def fetch_user_data(self, token):
                 key=settings.BITBUCKET_SERVER_CLIENT_ID,
                 secret=settings.BITBUCKET_SERVER_CLIENT_SECRET,
             ),
-            token=oauth.Token(token["key"], token["secret"]),
+            token=token,
         )
         # Whoami? Get the user
         # https://answers.atlassian.com/questions/9379031/answers/9379803
@@ -103,7 +102,7 @@ async def actual_login_step(self, request):
         cookie_key, cookie_secret = [
             base64.b64decode(i).decode() for i in request_cookie.split("|")
         ]
-        token = oauth.Token(cookie_key, cookie_secret)
+        token = {"key": cookie_key, "secret": cookie_secret}
         repo_service = BitbucketServer(
             oauth_consumer_token=dict(
                 key=settings.BITBUCKET_SERVER_CLIENT_ID,

graphql_api/types/config/config.py

@@ -2,12 +2,12 @@
 
 from ariadne import ObjectType
 from asgiref.sync import sync_to_async
-from distutils.util import strtobool
 from django.conf import settings
 from graphql.type.definition import GraphQLResolveInfo
 
 import services.self_hosted as self_hosted
 from graphql_api.types.enums.enums import LoginProvider, SyncProvider
+from utils import strtobool
 
 config_bindable = ObjectType("Config")
 

open_telemetry.py

@@ -15,7 +15,6 @@ dependencies = [
     "django-cors-headers==3.7.0",
     "django-csp==3.8.0",
     "django-cursor-pagination==0.3.0",
-    "django-dynamic-fixture==3.1.1",
     "django-filter==2.4.0",
     "django-model-utils==4.5.1",
     "django-postgres-extra>=2.0.8",
@@ -30,9 +29,6 @@ dependencies = [
     "idna>=3.7",
     "minio==7.1.13",
     "multidict>=6.1.0",
-    "oauth2==1.9.0.post1",
-    "opentelemetry-instrumentation-django>=0.45b0",
-    "opentelemetry-sdk>=1.24.0",
     "polars==1.12.0",
     "psycopg2-binary>=2.9.10",
     "pydantic>=2.9.0",

pyproject.toml

@@ -7,7 +7,6 @@
 import pytest
 import requests
 import rest_framework
-from ddf import G
 from django.core.exceptions import MultipleObjectsReturned
 from django.test import TestCase, override_settings
 from django.utils import timezone
@@ -17,16 +16,21 @@
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 from shared.api_archive.archive import ArchiveService
-from shared.django_apps.core.tests.factories import OwnerFactory
+from shared.django_apps.codecov_auth.tests.factories import PlanFactory, TierFactory
+from shared.django_apps.core.tests.factories import (
+    CommitFactory,
+    OwnerFactory,
+    RepositoryFactory,
+)
+from shared.plan.constants import TierName
 from shared.torngit.exceptions import (
     TorngitClientGeneralError,
     TorngitObjectNotFoundError,
     TorngitRateLimitError,
 )
 from simplejson import JSONDecodeError
 
-from codecov_auth.models import Owner
-from core.models import Commit, Repository
+from core.models import Commit
 from reports.tests.factories import CommitReportFactory, UploadFactory
 from upload.helpers import (
     determine_repo_for_upload,
@@ -297,8 +301,8 @@ def test_get_global_tokens(self, mock_get_config):
 
     def test_determine_repo_upload(self):
         with self.subTest("token found"):
-            org = G(Owner)
-            repo = G(Repository, author=org)
+            org = OwnerFactory()
+            repo = RepositoryFactory(author=org)
 
             params = {
                 "version": "v4",
@@ -309,8 +313,8 @@ def test_determine_repo_upload(self):
             assert repo == determine_repo_for_upload(params)
 
         with self.subTest("token not found"):
-            org = G(Owner)
-            repo = G(Repository, author=org)
+            org = OwnerFactory()
+            repo = RepositoryFactory(author=org)
 
             params = {
                 "version": "v4",
@@ -329,8 +333,8 @@ def test_determine_repo_upload(self):
 
     @patch.object(requests, "get")
     def test_determine_repo_upload_tokenless(self, mock_get):
-        org = G(Owner, username="codecov", service="github")
-        repo = G(Repository, author=org)
+        org = OwnerFactory(username="codecov", service="github")
+        repo = RepositoryFactory(author=org)
         expected_response = {
             "id": 732059764,
             "finishTime": f"{datetime.now()}",
@@ -498,12 +502,11 @@ def test_determine_upload_commit_to_use(
         }
 
         with self.subTest("not a github commit"):
-            org = G(
-                Owner,
+            org = OwnerFactory(
                 service="bitbucket",
                 oauth_token=encryptor.encode("hahahahaha").decode(),
             )
-            repo = G(Repository, author=org)
+            repo = RepositoryFactory(author=org)
             upload_params = {
                 "service": "bitbucket",
                 "commit": "3be5c52bd748c508a7e96993c02cf3518c816e84",
@@ -514,12 +517,11 @@ def test_determine_upload_commit_to_use(
             )
 
         with self.subTest("merge commit"):
-            org = G(
-                Owner,
+            org = OwnerFactory(
                 service="github",
                 oauth_token=encryptor.encode("hahahahaha").decode(),
             )
-            repo = G(Repository, author=org)
+            repo = RepositoryFactory(author=org)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -531,8 +533,8 @@ def test_determine_upload_commit_to_use(
             )
 
         with self.subTest("just no bot available"):
-            org = G(Owner, service="github", oauth_token=None)
-            repo = G(Repository, author=org, private=True)
+            org = OwnerFactory(service="github", oauth_token=None)
+            repo = RepositoryFactory(author=org, private=True)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -544,12 +546,11 @@ def test_determine_upload_commit_to_use(
             )
 
         with self.subTest("merge commit with did_change_merge_commit argument"):
-            org = G(
-                Owner,
+            org = OwnerFactory(
                 service="github",
                 oauth_token=encryptor.encode("hahahahaha").decode(),
             )
-            repo = G(Repository, author=org)
+            repo = RepositoryFactory(author=org)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -563,8 +564,8 @@ def test_determine_upload_commit_to_use(
 
         with self.subTest("use repo bot token when available"):
             bot = OwnerFactory()
-            org = G(Owner, service="github")
-            repo = G(Repository, author=org, bot=bot)
+            org = OwnerFactory(service="github")
+            repo = RepositoryFactory(author=org, bot=bot)
 
             upload_params = {
                 "service": "github",
@@ -581,8 +582,8 @@ def test_determine_upload_commit_to_use(
         mock_async.side_effect = [TorngitClientGeneralError(500, None, None)]
 
         with self.subTest("HTTP error"):
-            org = G(Owner, service="github")
-            repo = G(Repository, author=org)
+            org = OwnerFactory(service="github")
+            repo = RepositoryFactory(author=org)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -596,8 +597,8 @@ def test_determine_upload_commit_to_use(
         mock_async.side_effect = [TorngitObjectNotFoundError(500, None)]
 
         with self.subTest("HTTP error"):
-            org = G(Owner, service="github")
-            repo = G(Repository, author=org)
+            org = OwnerFactory(service="github")
+            repo = RepositoryFactory(author=org)
             upload_params = {
                 "service": "github",
                 "commit": "3084886b7ff869dcf327ad1d28a8b7d34adc7584",
@@ -609,8 +610,8 @@ def test_determine_upload_commit_to_use(
             )
 
     def test_insert_commit(self):
-        org = G(Owner)
-        repo = G(Repository, author=org)
+        org = OwnerFactory()
+        repo = RepositoryFactory(author=org)
 
         with self.subTest("newly created"):
             insert_commit(
@@ -628,8 +629,7 @@ def test_insert_commit(self):
             assert commit.parent_commit_id is None
 
         with self.subTest("commit already in database"):
-            G(
-                Commit,
+            CommitFactory(
                 commitid="1c78206f1a46dc6db8412a491fc770eb7d0f8a47",
                 branch="apples",
                 pullid="456",
@@ -656,7 +656,7 @@ def test_insert_commit(self):
             assert commit.parent_commit_id == "different_parent_commit"
 
         with self.subTest("parent provided"):
-            parent = G(Commit)
+            parent = CommitFactory()
             insert_commit(
                 "8458a8c72aafb5fb4c5cd58f467a2f71298f1b61",
                 "test",
@@ -715,9 +715,9 @@ def test_parse_request_headers(self):
 
     def test_validate_upload_repository_moved(self):
         redis = MockRedis()
-        owner = G(Owner, plan="users-free")
-        repo = G(Repository, author=owner, name="")
-        commit = G(Commit)
+        owner = OwnerFactory(plan="users-free")
+        repo = RepositoryFactory(author=owner, name="")
+        commit = CommitFactory()
 
         with self.assertRaises(ValidationError) as err:
             validate_upload({"commit": commit.commitid}, repo, redis)
@@ -729,9 +729,9 @@ def test_validate_upload_repository_moved(self):
 
     def test_validate_upload_empty_totals(self):
         redis = MockRedis()
-        owner = G(Owner, plan="5m")
-        repo = G(Repository, author=owner)
-        commit = G(Commit, totals=None, repository=repo)
+        owner = OwnerFactory(plan="5m")
+        repo = RepositoryFactory(author=owner)
+        commit = CommitFactory(totals=None, repository=repo)
 
         validate_upload({"commit": commit.commitid}, repo, redis)
         repo.refresh_from_db()
@@ -741,9 +741,9 @@ def test_validate_upload_empty_totals(self):
 
     def test_validate_upload_too_many_uploads_for_commit(self):
         redis = MockRedis()
-        owner = G(Owner, plan="users-free")
-        repo = G(Repository, author=owner)
-        commit = G(Commit, totals={"s": 151}, repository=repo)
+        owner = OwnerFactory(plan="users-free")
+        repo = RepositoryFactory(author=owner)
+        commit = CommitFactory(totals={"s": 151}, repository=repo)
         report = CommitReportFactory.create(commit=commit)
         for i in range(151):
             UploadFactory.create(report=report)
@@ -754,9 +754,9 @@ def test_validate_upload_too_many_uploads_for_commit(self):
 
     def test_validate_upload_repository_blacklisted(self):
         redis = MockRedis(blacklisted=True)
-        owner = G(Owner, plan="users-free")
-        repo = G(Repository, author=owner)
-        commit = G(Commit)
+        owner = OwnerFactory(plan="users-free")
+        repo = RepositoryFactory(author=owner)
+        commit = CommitFactory()
 
         with self.assertRaises(ValidationError) as err:
             validate_upload({"commit": commit.commitid}, repo, redis)
@@ -767,10 +767,12 @@ def test_validate_upload_repository_blacklisted(self):
 
     def test_validate_upload_per_repo_billing_invalid(self):
         redis = MockRedis()
-        owner = G(Owner, plan="1m")
-        G(Repository, author=owner, private=True, activated=True, active=True)
-        repo = G(Repository, author=owner, private=True, activated=False, active=False)
-        commit = G(Commit)
+        owner = OwnerFactory(plan="1m")
+        RepositoryFactory(author=owner, private=True, activated=True, active=True)
+        repo = RepositoryFactory(
+            author=owner, private=True, activated=False, active=False
+        )
+        commit = CommitFactory()
 
         with self.assertRaises(ValidationError) as err:
             validate_upload({"commit": commit.commitid}, repo, redis)
@@ -781,22 +783,22 @@ def test_validate_upload_per_repo_billing_invalid(self):
 
     def test_validate_upload_gitlab_subgroups(self):
         redis = MockRedis()
-        parent_group = G(Owner, plan="1m", parent_service_id=None, service="gitlab")
-        top_subgroup = G(
-            Owner,
+        parent_group = OwnerFactory(plan="1m", parent_service_id=None, service="gitlab")
+        top_subgroup = OwnerFactory(
             plan="1m",
             parent_service_id=parent_group.service_id,
             service="gitlab",
         )
-        bottom_subgroup = G(
-            Owner,
+        bottom_subgroup = OwnerFactory(
             plan="1m",
             parent_service_id=top_subgroup.service_id,
             service="gitlab",
         )
-        G(Repository, author=parent_group, private=True, activated=True, active=True)
-        repo = G(Repository, author=bottom_subgroup, private=True, activated=False)
-        commit = G(Commit)
+        RepositoryFactory(
+            author=parent_group, private=True, activated=True, active=True
+        )
+        repo = RepositoryFactory(author=bottom_subgroup, private=True, activated=False)
+        commit = CommitFactory()
 
         with self.assertRaises(ValidationError) as err:
             validate_upload({"commit": commit.commitid}, repo, redis)
@@ -807,16 +809,15 @@ def test_validate_upload_gitlab_subgroups(self):
 
     def test_validate_upload_valid_upload_repo_not_activated(self):
         redis = MockRedis()
-        owner = G(Owner, plan="users-free")
-        repo = G(
-            Repository,
+        owner = OwnerFactory(plan="users-free")
+        repo = RepositoryFactory(
             author=owner,
             private=True,
             activated=False,
             deleted=False,
             active=False,
         )
-        commit = G(Commit)
+        commit = CommitFactory()
 
         with patch(
             "services.analytics.AnalyticsService.account_activated_repository_on_upload"
@@ -831,9 +832,9 @@ def test_validate_upload_valid_upload_repo_not_activated(self):
 
     def test_validate_upload_valid_upload_repo_activated(self):
         redis = MockRedis()
-        owner = G(Owner, plan="5m")
-        repo = G(Repository, author=owner, private=True, activated=True)
-        commit = G(Commit)
+        owner = OwnerFactory(plan="5m")
+        repo = RepositoryFactory(author=owner, private=True, activated=True)
+        commit = CommitFactory()
 
         with patch(
             "services.analytics.AnalyticsService.account_activated_repository_on_upload"
@@ -849,7 +850,7 @@ def test_validate_upload_valid_upload_repo_activated(self):
     @freeze_time("2023-01-01T00:00:00")
     @patch("services.task.TaskService.upload")
     def test_dispatch_upload_task(self, upload):
-        repo = G(Repository)
+        repo = RepositoryFactory()
         task_arguments = {
             "commit": "commit123",
             "version": "v4",
@@ -914,9 +915,12 @@ def _post_slash(
         return self.client.post(url, data=data, content_type=content_type, **headers)
 
     def setUp(self):
-        self.org = G(Owner, username="codecovtest", service="github")
-        self.repo = G(
-            Repository,
+        tier = TierFactory(tier_name=TierName.BASIC.value)
+        plan = PlanFactory(tier=tier, is_active=True)
+        self.org = OwnerFactory(
+            plan=plan.name, username="codecovtest", service="github"
+        )
+        self.repo = RepositoryFactory(
             author=self.org,
             name="upload-test-repo",
             upload_token="a03e5d02-9495-4413-b0d8-05651bb2e842",

upload/tests/test_upload.py

@@ -1,11 +1,11 @@
 from unittest.mock import patch
 
 import minio
-from ddf import G
 from rest_framework.test import APITestCase
+from shared.django_apps.codecov_auth.tests.factories import OwnerFactory
+from shared.django_apps.core.tests.factories import RepositoryFactory
 
-from codecov_auth.models import Owner
-from core.models import Repository
+from utils.test_utils import Client
 
 
 class UploadDownloadHelperTest(APITestCase):
@@ -14,16 +14,17 @@ def _get(self, kwargs={}, data={}):
         return self.client.get(path, data=data)
 
     def setUp(self):
-        self.org = G(Owner, username="codecovtest", service="github")
-        self.repo = G(
-            Repository,
+        self.org = OwnerFactory(username="codecovtest", service="github")
+        self.repo = RepositoryFactory(
             author=self.org,
             name="upload-test-repo",
             upload_token="a03e5d02-9495-4413-b0d8-05651bb2e842",
         )
-        self.repo = G(
-            Repository, author=self.org, name="private-upload-test-repo", private=True
+        self.repo = RepositoryFactory(
+            author=self.org, name="private-upload-test-repo", private=True
         )
+        self.client = Client()
+        self.client.force_login_owner(self.org)
 
     def test_no_path_param(self):
         response = self._get(

upload/tests/test_upload_download.py

@@ -24,3 +24,20 @@ def round_decimals_down(number: float, decimals: int = 2) -> float:
 
     factor = 10**decimals
     return math.floor(number * factor) / factor
+
+
+# Copied from <https://github.com/python/cpython/blob/v3.11.2/Lib/distutils/util.py#L308>
+def strtobool(val: Any) -> int:
+    """Convert a string representation of truth to true (1) or false (0).
+
+    True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
+    are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
+    'val' is anything else.
+    """
+    val = val.lower()
+    if val in ("y", "yes", "t", "true", "on", "1"):
+        return 1
+    elif val in ("n", "no", "f", "false", "off", "0"):
+        return 0
+    else:
+        raise ValueError("invalid truth value %r" % (val,))