Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-08-20 10:59:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.22127 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue Aug 20 10:59:54 2019 rev:205 rq:724699 version:20190816.a1d076d0
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-08-19 21:38:54.944326951 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.22127/openSUSE-release-tools.changes
2019-08-20 11:00:04.232647783 +0200
@@ -1,0 +2,23 @@
+Fri Aug 16 22:51:21 UTC 2019 - [email protected]
+
+- Update to version 20190816.a1d076d0:
+ * Revert "userscript/origin: hide request card when no OSRT:OriginConfig."
+
+-------------------------------------------------------------------
+Fri Aug 16 21:54:42 UTC 2019 - [email protected]
+
+- Update to version 20190816.a7d8e044:
+ * gocd: include :NonFree in OS.Origin.Manager.Update.
+
+-------------------------------------------------------------------
+Fri Aug 16 21:34:05 UTC 2019 - [email protected]
+
+- Update to version 20190816.74b9714a:
+ * osclib/sentry: expose environment configuration.
+ * obs_operator: provide sentry_sdk integration.
+ * osc-origin: provide sentry_sdk integration.
+ * osc-staging: provide sentry_sdk integration.
+ * ReviewBot: provide sentry_sdk integration.
+ * osclib/sentry: provide initial sentry_sdk handling.
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20190816.723e45f3.obscpio
New:
----
openSUSE-release-tools-20190816.a1d076d0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.kNWMh0/_old 2019-08-20 11:00:05.356647549 +0200
+++ /var/tmp/diff_new_pack.kNWMh0/_new 2019-08-20 11:00:05.380647544 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20190816.723e45f3
+Version: 20190816.a1d076d0
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.kNWMh0/_old 2019-08-20 11:00:05.592647500 +0200
+++ /var/tmp/diff_new_pack.kNWMh0/_new 2019-08-20 11:00:05.596647499 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">723e45f35304da5732fc2aaff21bff634198bbd9</param>
+ <param
name="changesrevision">7bd839f1f061bab5441883bed9a7c18f23cfb2dd</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20190816.723e45f3.obscpio ->
openSUSE-release-tools-20190816.a1d076d0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190816.723e45f3/ReviewBot.py
new/openSUSE-release-tools-20190816.a1d076d0/ReviewBot.py
--- old/openSUSE-release-tools-20190816.723e45f3/ReviewBot.py 2019-08-16
22:03:11.000000000 +0200
+++ new/openSUSE-release-tools-20190816.a1d076d0/ReviewBot.py 2019-08-17
00:37:28.000000000 +0200
@@ -17,6 +17,7 @@
from osclib.core import request_action_key
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
@@ -34,6 +35,9 @@
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
"""
@@ -179,13 +183,15 @@
else:
try:
good = self.check_one_request(req)
- except:
+ except Exception as e:
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':
@@ -424,6 +430,12 @@
elif action.tgt_repository is not None:
method_suffix = 'repository'
+ with sentry_sdk.configure_scope() as scope:
+ scope.set_extra('request_type', '_'.join([method_type,
method_suffix]))
+ else:
+ with sentry_sdk.configure_scope() as scope:
+ scope.set_extra('request_type', method_type)
+
if method_suffix:
method = '_'.join([method_prefix, method_type, method_suffix])
if hasattr(self, method):
@@ -816,6 +828,11 @@
if self.options.fallback_group:
self.checker.fallback_group = self.options.fallback_group
+ globals()['sentry_sdk'] = 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']
@@ -905,6 +922,8 @@
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-20190816.723e45f3/gocd/checkers.opensuse.gocd.yaml
new/openSUSE-release-tools-20190816.a1d076d0/gocd/checkers.opensuse.gocd.yaml
---
old/openSUSE-release-tools-20190816.723e45f3/gocd/checkers.opensuse.gocd.yaml
2019-08-16 22:03:11.000000000 +0200
+++
new/openSUSE-release-tools-20190816.a1d076d0/gocd/checkers.opensuse.gocd.yaml
2019-08-17 00:37:28.000000000 +0200
@@ -270,4 +270,5 @@
ln -s $PWD/osc-origin.py $tempdir/.osc-plugins
ln -s $PWD/osclib $tempdir/.osc-plugins
HOME=$tempdir osc -A https://api.opensuse.org origin -p
openSUSE:Leap:15.2 update
+ HOME=$tempdir osc -A https://api.opensuse.org origin -p
openSUSE:Leap:15.2:NonFree update
rm -rf $tempdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190816.723e45f3/obs_operator.py
new/openSUSE-release-tools-20190816.a1d076d0/obs_operator.py
--- old/openSUSE-release-tools-20190816.723e45f3/obs_operator.py
2019-08-16 22:03:11.000000000 +0200
+++ new/openSUSE-release-tools-20190816.a1d076d0/obs_operator.py
2019-08-17 00:37:28.000000000 +0200
@@ -10,7 +10,10 @@
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
@@ -161,8 +164,14 @@
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',
@@ -337,6 +346,9 @@
pass
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-20190816.723e45f3/osc-origin.py
new/openSUSE-release-tools-20190816.a1d076d0/osc-origin.py
--- old/openSUSE-release-tools-20190816.723e45f3/osc-origin.py 2019-08-16
22:03:11.000000000 +0200
+++ new/openSUSE-release-tools-20190816.a1d076d0/osc-origin.py 2019-08-17
00:37:28.000000000 +0200
@@ -20,6 +20,7 @@
from osclib.origin import origin_potentials
from osclib.origin import origin_revision_state
from osclib.origin import origin_update
+from osclib.sentry import sentry_init
from osclib.util import mail_send
from shutil import copyfile
import sys
@@ -90,6 +91,8 @@
if not config:
raise oscerr.WrongArgs('OSRT:OriginConfig attribute missing from
{}'.format(opts.project))
+ sentry_init(apiurl, {'osc_plugin': subcmd})
+
function = 'osrt_origin_{}'.format(command)
globals()[function](apiurl, opts, *args[1:])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190816.723e45f3/osc-staging.py
new/openSUSE-release-tools-20190816.a1d076d0/osc-staging.py
--- old/openSUSE-release-tools-20190816.723e45f3/osc-staging.py 2019-08-16
22:03:11.000000000 +0200
+++ new/openSUSE-release-tools-20190816.a1d076d0/osc-staging.py 2019-08-17
00:37:28.000000000 +0200
@@ -36,6 +36,7 @@
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
@@ -430,6 +431,8 @@
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-20190816.723e45f3/osclib/sentry.py
new/openSUSE-release-tools-20190816.a1d076d0/osclib/sentry.py
--- old/openSUSE-release-tools-20190816.723e45f3/osclib/sentry.py
1970-01-01 01:00:00.000000000 +0100
+++ new/openSUSE-release-tools-20190816.a1d076d0/osclib/sentry.py
2019-08-17 00:37:28.000000000 +0200
@@ -0,0 +1,47 @@
+from osc import conf
+from osclib.common import VERSION
+
+def sentry_init(obs_apiurl=None, tags=None):
+ try:
+ import sentry_sdk
+ except ImportError:
+ 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:
+ 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
+
+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
+
+def nop_func(*args, **kw):
+ pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190816.723e45f3/userscript/origin.user.js
new/openSUSE-release-tools-20190816.a1d076d0/userscript/origin.user.js
--- old/openSUSE-release-tools-20190816.723e45f3/userscript/origin.user.js
2019-08-16 22:03:11.000000000 +0200
+++ new/openSUSE-release-tools-20190816.a1d076d0/userscript/origin.user.js
2019-08-17 00:37:28.000000000 +0200
@@ -84,7 +84,6 @@
if (origin.endsWith('failed')) {
if (origin.startsWith('OSRT:OriginConfig attribute missing')) {
item.innerHTML = '';
- $(element).hide();
} else {
item.innerHTML = '<i class="fas fa-bug text-warning"></i>
Origin: failed to load';
}
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.kNWMh0/_old 2019-08-20 11:00:06.748647259 +0200
+++ /var/tmp/diff_new_pack.kNWMh0/_new 2019-08-20 11:00:06.752647258 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20190816.723e45f3
-mtime: 1565985791
-commit: 723e45f35304da5732fc2aaff21bff634198bbd9
+version: 20190816.a1d076d0
+mtime: 1565995048
+commit: a1d076d0670b2ca74c052d2c977724cc7aa79437
