Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2022-02-22 21:18:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue Feb 22 21:18:10 2022 rev:381 rq:956616 version:20220222.d8ef5897
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-02-21 17:49:02.291637569 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958/openSUSE-release-tools.changes
2022-02-22 21:18:45.134292416 +0100
@@ -1,0 +2,6 @@
+Tue Feb 22 07:43:39 UTC 2022 - opensuse-releaset...@opensuse.org
+
+- Update to version 20220222.d8ef5897:
+ * Remove sentry integration
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220221.3e14e55f.obscpio
New:
----
openSUSE-release-tools-20220222.d8ef5897.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.nlXGtl/_old 2022-02-22 21:18:46.014292577 +0100
+++ /var/tmp/diff_new_pack.nlXGtl/_new 2022-02-22 21:18:46.018292578 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220221.3e14e55f
+Version: 20220222.d8ef5897
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
@@ -238,8 +238,6 @@
Requires: %{name} = %{version}
Requires: osc >= 0.165.1
Requires: python3-osc
-# internal API change related to accessing DSN in osclib/sentry.py
-Suggests: python3-sentry-sdk >= 0.11.0
BuildArch: noarch
%description -n osclib
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.nlXGtl/_old 2022-02-22 21:18:46.062292586 +0100
+++ /var/tmp/diff_new_pack.nlXGtl/_new 2022-02-22 21:18:46.062292586 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">3e14e55fdee2392f011f3b2c90c786263b13bf62</param>
+ <param
name="changesrevision">d6fb5d680c010d572094a57bdefe3f4fe4f5492b</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220221.3e14e55f.obscpio ->
openSUSE-release-tools-20220222.d8ef5897.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220221.3e14e55f/ReviewBot.py
new/openSUSE-release-tools-20220222.d8ef5897/ReviewBot.py
--- old/openSUSE-release-tools-20220221.3e14e55f/ReviewBot.py 2022-02-21
12:28:02.000000000 +0100
+++ new/openSUSE-release-tools-20220222.d8ef5897/ReviewBot.py 2022-02-22
08:41:46.000000000 +0100
@@ -18,7 +18,6 @@
from osclib.core import request_age
from osclib.memoize import memoize
from osclib.memoize import memoize_session_reset
-from osclib.sentry import sentry_init
from osclib.stagingapi import StagingAPI
import signal
import datetime
@@ -32,9 +31,6 @@
from itertools import count
-# In-case not properly initialized via the CommandLineInterface.
-sentry_sdk = sentry_init()
-
class PackageLookup(object):
""" helper class to manage 00Meta/lookup.yml
@@ -186,8 +182,6 @@
for req in self.requests:
self.logger.info("checking %s" % req.reqid)
self.request = req
- with sentry_sdk.configure_scope() as scope:
- scope.set_extra('request.id', self.request.reqid)
# XXX: this is a hack. Annotating the request with staging_project.
# OBS itself should provide an API for that but that's currently
not the case
@@ -202,15 +196,13 @@
try:
good = self.check_one_request(req)
- except Exception as e:
+ except Exception:
good = None
import traceback
traceback.print_exc()
return_value = 1
- sentry_sdk.capture_exception(e)
-
if self.review_mode == 'no':
good = None
elif self.review_mode == 'accept':
@@ -439,8 +431,6 @@
# Store in-case sub-classes need direct access to original values.
self.action = a
key = request_action_key(a)
- with sentry_sdk.configure_scope() as scope:
- scope.set_extra('action.key', key)
override = self.request_override_check()
if override is not None:
@@ -897,11 +887,6 @@
if self.options.fallback_group:
self.checker.fallback_group = self.options.fallback_group
- sentry_init(conf.config['apiurl'], {
- 'review_bot': self.clazz.__name__,
- 'review_user': self.checker.review_user,
- })
-
def setup_checker(self):
""" reimplement this """
apiurl = conf.config['apiurl']
@@ -991,8 +976,6 @@
self.logger.info("sleeping %d minutes." % interval)
time.sleep(interval * 60)
- sentry_sdk.flush()
-
# Reset all memoize session caches which are designed for single
# tool run and not extended usage.
memoize_session_reset()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220221.3e14e55f/dist/package/openSUSE-release-tools.spec
new/openSUSE-release-tools-20220222.d8ef5897/dist/package/openSUSE-release-tools.spec
---
old/openSUSE-release-tools-20220221.3e14e55f/dist/package/openSUSE-release-tools.spec
2022-02-21 12:28:02.000000000 +0100
+++
new/openSUSE-release-tools-20220222.d8ef5897/dist/package/openSUSE-release-tools.spec
2022-02-22 08:41:46.000000000 +0100
@@ -238,8 +238,6 @@
Requires: %{name} = %{version}
Requires: osc >= 0.165.1
Requires: python3-osc
-# internal API change related to accessing DSN in osclib/sentry.py
-Suggests: python3-sentry-sdk >= 0.11.0
BuildArch: noarch
%description -n osclib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220221.3e14e55f/obs_operator.py
new/openSUSE-release-tools-20220222.d8ef5897/obs_operator.py
--- old/openSUSE-release-tools-20220221.3e14e55f/obs_operator.py
2022-02-21 12:28:02.000000000 +0100
+++ new/openSUSE-release-tools-20220222.d8ef5897/obs_operator.py
2022-02-22 08:41:46.000000000 +0100
@@ -11,10 +11,7 @@
import json
import tempfile
import os
-from osc import conf
from osclib import common
-from osclib.sentry import sentry_client
-from osclib.sentry import sentry_init
import subprocess
import sys
import time
@@ -27,15 +24,10 @@
# https://stackoverflow.com/a/47012250, workaround by making EVERYTHING LEGAL!
http.cookies._is_legal_key = lambda _: True
-sentry_sdk = sentry_init()
-
-# Available in python 3.7.
-
class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
def handle_error(self, request, client_address):
super().handle_error(request, client_address)
- sentry_sdk.capture_exception()
class RequestHandler(BaseHTTPRequestHandler):
@@ -179,14 +171,9 @@
return None
def oscrc_create(self, oscrc_file, apiurl, cookiejar_file, user):
- sentry_dsn = sentry_client().dsn
- sentry_environment = sentry_client().options.get('environment')
oscrc_file.write('\n'.join([
'[general]',
- # Passthru sentry_sdk options to allow for reporting on
subcommands.
- 'sentry_sdk.dsn = {}'.format(sentry_dsn) if sentry_dsn else '',
- 'sentry_sdk.environment = {}'.format(sentry_environment) if
sentry_environment else '',
'apiurl = {}'.format(apiurl),
'cookiejar = {}'.format(cookiejar_file.name),
'staging.color = 0',
@@ -371,9 +358,6 @@
def main(args):
- conf.get_config() # Allow sentry DSN to be available.
- sentry_init()
-
RequestHandler.apiurl = args.apiurl
RequestHandler.session = args.session
RequestHandler.debug = args.debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220221.3e14e55f/osc-origin.py
new/openSUSE-release-tools-20220222.d8ef5897/osc-origin.py
--- old/openSUSE-release-tools-20220221.3e14e55f/osc-origin.py 2022-02-21
12:28:02.000000000 +0100
+++ new/openSUSE-release-tools-20220222.d8ef5897/osc-origin.py 2022-02-22
08:41:46.000000000 +0100
@@ -25,7 +25,6 @@
from osclib.origin import origin_updatable
from osclib.origin import origin_updatable_initial
from osclib.origin import origin_update
-from osclib.sentry import sentry_init
from osclib.util import mail_send
from shutil import copyfile
import sys
@@ -101,14 +100,8 @@
if not config:
raise oscerr.WrongArgs('OSRT:OriginConfig attribute missing from
{}'.format(opts.project))
- sentry_sdk = sentry_init(apiurl, {'osc_plugin': subcmd})
- try:
- function = 'osrt_origin_{}'.format(command)
- globals()[function](apiurl, opts, *args[1:])
- except Exception as e:
- # Capture exception as osc.babysitter will consume any plugin
exception.
- sentry_sdk.capture_exception(e)
- raise e
+ function = 'osrt_origin_{}'.format(command)
+ globals()[function](apiurl, opts, *args[1:])
def osrt_origin_config(apiurl, opts, *args):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220221.3e14e55f/osc-staging.py
new/openSUSE-release-tools-20220222.d8ef5897/osc-staging.py
--- old/openSUSE-release-tools-20220221.3e14e55f/osc-staging.py 2022-02-21
12:28:02.000000000 +0100
+++ new/openSUSE-release-tools-20220222.d8ef5897/osc-staging.py 2022-02-22
08:41:46.000000000 +0100
@@ -32,7 +32,6 @@
from osclib.repair_command import RepairCommand
from osclib.rebuild_command import RebuildCommand
from osclib.request_splitter import RequestSplitter
-from osclib.sentry import sentry_init
from osclib.supersede_command import SupersedeCommand
from osclib.prio_command import PrioCommand
@@ -392,8 +391,6 @@
if value:
setattr(Fore, name, ansi.code_to_chars(value))
- sentry_init(opts.apiurl, {'osc_plugin': subcmd})
-
if opts.wipe_cache:
Cache.delete_all()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220221.3e14e55f/osclib/sentry.py
new/openSUSE-release-tools-20220222.d8ef5897/osclib/sentry.py
--- old/openSUSE-release-tools-20220221.3e14e55f/osclib/sentry.py
2022-02-21 12:28:02.000000000 +0100
+++ new/openSUSE-release-tools-20220222.d8ef5897/osclib/sentry.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-from osc import conf
-from osc import core
-from osclib.common import VERSION
-
-
-def sentry_init(obs_apiurl=None, tags=None):
- try:
- import sentry_sdk
- except ImportError:
- sentry_init.client = sentry_client_dummy()
- return sentry_sdk_dummy()
-
- sentry_init.client = sentry_sdk.init(
- conf.config.get('sentry_sdk.dsn'),
- environment=conf.config.get('sentry_sdk.environment'),
- release=VERSION)
-
- with sentry_sdk.configure_scope() as scope:
- scope.set_tag('osc', core.__version__)
-
- if obs_apiurl:
- scope.set_tag('obs_apiurl', obs_apiurl)
- scope.user = {'username': conf.get_apiurl_usr(obs_apiurl)}
-
- if tags:
- for key, value in tags.items():
- scope.set_tag(key, value)
-
- return sentry_sdk
-
-
-def sentry_client():
- return sentry_init.client._client
-
-
-class sentry_sdk_dummy:
- def configure_scope(*args, **kw):
- return nop_class()
-
- def __getattr__(self, _):
- return nop_func
-
-
-class nop_class:
- def __enter__(self):
- return nop_class()
-
- def __exit__(self, exc_type, exc_val, exc_tb):
- pass
-
- def __getattr__(self, _):
- return nop_func
-
-
-class sentry_client_dummy(nop_class):
- options = {}
-
-
-def nop_func(*args, **kw):
- pass
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.nlXGtl/_old 2022-02-22 21:18:46.678292699 +0100
+++ /var/tmp/diff_new_pack.nlXGtl/_new 2022-02-22 21:18:46.682292699 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20220221.3e14e55f
-mtime: 1645442882
-commit: 3e14e55fdee2392f011f3b2c90c786263b13bf62
+version: 20220222.d8ef5897
+mtime: 1645515706
+commit: d8ef5897d562c2c855ef1710abab079e3c6393b8
