JENKINS-36481# Rollbar and it.pluginVersion() removed (#369)
* JENKINS-36481# Rollbar and it.pluginVersion() removed BlueOceanUI is a bootstrap and core infrastructure class, we do want to keep it fiarly abstract and indepedent of direct Jenkins dependency. Rollbar or any such analytics tool integration should be done out of blueocean-web possibly inside a separate plugin or some place else that makes sense. Footer version to display the commitId/branch * Handle the case when revisionInfo is not there, returning null for now
This commit is contained in:
vivek
GitHub
parent
2a7baee0d9
commit
b71a48c31d
|
|
@ -1,8 +1,6 @@
|
|||
package io.jenkins.blueocean;
|
||||
|
||||
import hudson.ExtensionList;
|
||||
import hudson.model.UsageStatistics;
|
||||
import jenkins.model.Jenkins;
|
||||
|
||||
/**
|
||||
* Root of Blue Ocean UI
|
||||
|
|
@ -36,19 +34,4 @@ public class BlueOceanUI {
|
|||
public String getUrlBase() {
|
||||
return urlBase;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return True if jenkins reports usage statistics.
|
||||
*/
|
||||
public boolean includeRollbar() {
|
||||
return false;
|
||||
// return Jenkins.getInstance().isUsageStatisticsCollected() && !UsageStatistics.DISABLED;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Version on the plugin e.g 1.0-SNAPSHOT (private-f9a14d3e-jenkins)
|
||||
*/
|
||||
public String getPluginVersion() {
|
||||
return Jenkins.getInstance().getPlugin("blueocean-web").getWrapper().getVersion();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,10 @@ import revisionInfo from '../../../target/classes/io/jenkins/blueocean/revisionI
|
|||
export class DevelopmentFooter extends Component {
|
||||
render() {
|
||||
if (!revisionInfo || !revisionInfo.name) {
|
||||
var blueOceanVersion = document.getElementsByTagName('head')[0].getAttribute('data-blue-ocean-version');
|
||||
return (
|
||||
<div className="development-footer">
|
||||
<span>Blue Ocean UI v{blueOceanVersion}</span>
|
||||
</div>
|
||||
);
|
||||
// TODO: At minimum we should return Jenkins version. Jenkins version is always present
|
||||
// in X-Hudson HTTP header. Something to be handled elsewhere during load time by
|
||||
// inspecting HTTP response headers
|
||||
return null;
|
||||
}
|
||||
return (
|
||||
<div className="development-footer">
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@
|
|||
<head data-rooturl="${rootURL}"
|
||||
data-resurl="${resURL}"
|
||||
data-appurl="${rootURL}/${it.urlBase}"
|
||||
data-adjuncturl="${rootURL}/${j.getAdjuncts('').rootURL}"
|
||||
data-blue-ocean-version="${it.getPluginVersion()}">
|
||||
data-adjuncturl="${rootURL}/${j.getAdjuncts('').rootURL}">
|
||||
|
||||
<title>Jenkins Blue Ocean</title>
|
||||
|
||||
|
|
@ -30,37 +29,6 @@
|
|||
<link rel="stylesheet"
|
||||
href="${resURL}/plugin/blueocean-web/assets/css/jenkins-design-language.css"
|
||||
type="text/css"/>
|
||||
|
||||
<j:if test="${it.includeRollbar()}">
|
||||
<script>
|
||||
function normalizeURL(location) {
|
||||
var normalizedUrl = 'http://anon.blueocean.io' + location;
|
||||
var headElements = document.getElementsByTagName('head');
|
||||
if (headElements.length == 1) {
|
||||
var rootUrl = headElements[0].getAttribute('data-rooturl');
|
||||
if (location.startsWith(rootUrl)) {
|
||||
normalizedUrl = 'http://anon.blueocean.io' + location.substring(rootUrl.length -1, location.length);
|
||||
}
|
||||
}
|
||||
return normalizedUrl;
|
||||
}
|
||||
var transformer = function(payload) {
|
||||
payload.data.request.user_ip = '0.0.0.0';
|
||||
payload.data.request.url = normalizeURL(window.location.pathname);
|
||||
};
|
||||
var _rollbarConfig = {
|
||||
accessToken: "81f3134dedf44871b9cc0a347b1313df",
|
||||
captureUncaught: true,
|
||||
code_version: "${it.getPluginVersion()}",
|
||||
source_map_enabled: true,
|
||||
guess_uncaught_frames: true,
|
||||
transform: transformer
|
||||
};
|
||||
<![CDATA[
|
||||
!function(r){function e(t){if(o[t])return o[t].exports;var n=o[t]={exports:{},id:t,loaded:!1};return r[t].call(n.exports,n,n.exports,e),n.loaded=!0,n.exports}var o={};return e.m=r,e.c=o,e.p="",e(0)}([function(r,e,o){"use strict";var t=o(1).Rollbar,n=o(2);_rollbarConfig.rollbarJsUrl=_rollbarConfig.rollbarJsUrl||"https://d37gvrvc0wt4s1.cloudfront.net/js/v1.9/rollbar.min.js";var a=t.init(window,_rollbarConfig),i=n(a,_rollbarConfig);a.loadFull(window,document,!_rollbarConfig.async,_rollbarConfig,i)},function(r,e){"use strict";function o(r){return function(){try{return r.apply(this,arguments)}catch(e){try{console.error("[Rollbar]: Internal error",e)}catch(o){}}}}function t(r,e,o){window._rollbarWrappedError&&(o[4]||(o[4]=window._rollbarWrappedError),o[5]||(o[5]=window._rollbarWrappedError._rollbarContext),window._rollbarWrappedError=null),r.uncaughtError.apply(r,o),e&&e.apply(window,o)}function n(r){var e=function(){var e=Array.prototype.slice.call(arguments,0);t(r,r._rollbarOldOnError,e)};return e.belongsToShim=!0,e}function a(r){this.shimId=++c,this.notifier=null,this.parentShim=r,this._rollbarOldOnError=null}function i(r){var e=a;return o(function(){if(this.notifier)return this.notifier[r].apply(this.notifier,arguments);var o=this,t="scope"===r;t&&(o=new e(this));var n=Array.prototype.slice.call(arguments,0),a={shim:o,method:r,args:n,ts:new Date};return window._rollbarShimQueue.push(a),t?o:void 0})}function l(r,e){if(e.hasOwnProperty&&e.hasOwnProperty("addEventListener")){var o=e.addEventListener;e.addEventListener=function(e,t,n){o.call(this,e,r.wrap(t),n)};var t=e.removeEventListener;e.removeEventListener=function(r,e,o){t.call(this,r,e&&e._wrapped?e._wrapped:e,o)}}}var c=0;a.init=function(r,e){var t=e.globalAlias||"Rollbar";if("object"==typeof r[t])return r[t];r._rollbarShimQueue=[],r._rollbarWrappedError=null,e=e||{};var i=new a;return o(function(){if(i.configure(e),e.captureUncaught){i._rollbarOldOnError=r.onerror,r.onerror=n(i);var o,a,c="EventTarget,Window,Node,ApplicationCache,AudioTrackList,ChannelMergerNode,CryptoOperation,EventSource,FileReader,HTMLUnknownElement,IDBDatabase,IDBRequest,IDBTransaction,KeyOperation,MediaController,MessagePort,ModalWindow,Notification,SVGElementInstance,Screen,TextTrack,TextTrackCue,TextTrackList,WebSocket,WebSocketWorker,Worker,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload".split(",");for(o=0;o<c.length;++o)a=c[o],r[a]&&r[a].prototype&&l(i,r[a].prototype)}return e.captureUnhandledRejections&&(i._unhandledRejectionHandler=function(r){var e=r.reason,o=r.promise,t=r.detail;!e&&t&&(e=t.reason,o=t.promise),i.unhandledRejection(e,o)},r.addEventListener("unhandledrejection",i._unhandledRejectionHandler)),r[t]=i,i})()},a.prototype.loadFull=function(r,e,t,n,a){var i=function(){var e;if(void 0===r._rollbarPayloadQueue){var o,t,n,i;for(e=new Error("rollbar.js did not load");o=r._rollbarShimQueue.shift();)for(n=o.args,i=0;i<n.length;++i)if(t=n[i],"function"==typeof t){t(e);break}}"function"==typeof a&&a(e)},l=!1,c=e.createElement("script"),d=e.getElementsByTagName("script")[0],p=d.parentNode;c.crossOrigin="",c.src=n.rollbarJsUrl,c.async=!t,c.onload=c.onreadystatechange=o(function(){if(!(l||this.readyState&&"loaded"!==this.readyState&&"complete"!==this.readyState)){c.onload=c.onreadystatechange=null;try{p.removeChild(c)}catch(r){}l=!0,i()}}),p.insertBefore(c,d)},a.prototype.wrap=function(r,e){try{var o;if(o="function"==typeof e?e:function(){return e||{}},"function"!=typeof r)return r;if(r._isWrap)return r;if(!r._wrapped){r._wrapped=function(){try{return r.apply(this,arguments)}catch(e){throw e._rollbarContext=o()||{},e._rollbarContext._wrappedSource=r.toString(),window._rollbarWrappedError=e,e}},r._wrapped._isWrap=!0;for(var t in r)r.hasOwnProperty(t)&&(r._wrapped[t]=r[t])}return r._wrapped}catch(n){return r}};for(var d="log,debug,info,warn,warning,error,critical,global,configure,scope,uncaughtError,unhandledRejection".split(","),p=0;p<d.length;++p)a.prototype[d[p]]=i(d[p]);r.exports={Rollbar:a,_rollbarWindowOnError:t}},function(r,e){"use strict";r.exports=function(r,e){return function(o){if(!o&&!window._rollbarInitialized){var t=window.RollbarNotifier,n=e||{},a=n.globalAlias||"Rollbar",i=window.Rollbar.init(n,r);i._processShimQueue(window._rollbarShimQueue||[]),window[a]=i,window._rollbarInitialized=!0,t.processPayloads()}}}}]);
|
||||
]]>
|
||||
</script>
|
||||
</j:if>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
Loading…
Reference in New Issue