v8.9.7

dist/index.js

@@ -9458,9 +9458,9 @@ const setupRepo_1 = __nccwpck_require__(13501);
 const cliArgs_1 = __nccwpck_require__(54597);
 const options_1 = __nccwpck_require__(15162);
 const runSequentially_1 = __nccwpck_require__(47649);
-let apmTransaction;
-async function backportRun({ processArgs, optionsFromModule = {}, exitCodeOnFailure, }) {
-    apmTransaction = elastic_apm_node_1.default.startTransaction('cli backport');
+let _apmTransaction;
+async function backportRun({ processArgs, optionsFromModule = {}, exitCodeOnFailure, apmTransaction, }) {
+    _apmTransaction = apmTransaction;
     const { interactive, logFilePath } = (0, cliArgs_1.getRuntimeArguments)(processArgs, optionsFromModule);
     const logger = (0, logger_1.initLogger)({ interactive, logFilePath });
     let optionsFromCliArgs;
@@ -9583,21 +9583,21 @@ let didFlush = false;
 process.on('exit', () => {
     if (!didFlush) {
         didFlush = true;
-        apmTransaction?.end('exit');
+        _apmTransaction?.end('exit');
         elastic_apm_node_1.default.flush(() => process.exit());
     }
 });
 process.on('uncaughtException', () => {
     if (!didFlush) {
         didFlush = true;
-        apmTransaction?.end('exit');
+        _apmTransaction?.end('exit');
         elastic_apm_node_1.default.flush(() => process.exit());
     }
 });
 process.on('SIGINT', () => {
     if (!didFlush) {
         didFlush = true;
-        apmTransaction?.end('SIGINT');
+        _apmTransaction?.end('SIGINT');
         elastic_apm_node_1.default.flush(() => process.exit());
     }
 });
@@ -9614,7 +9614,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.apmStartTransaction = exports.getCommits = exports.backportRun = exports.getOptionsFromGithub = exports.getLocalGlobalConfig = exports.BackportError = exports.getTargetBranchFromLabel = void 0;
+exports.getCommits = exports.backportRun = exports.getOptionsFromGithub = exports.getLocalGlobalConfig = exports.BackportError = exports.getTargetBranchFromLabel = void 0;
 __nccwpck_require__(97462);
 const elastic_apm_node_1 = __importDefault(__nccwpck_require__(20740));
 const backportRun_1 = __nccwpck_require__(47272);
@@ -9633,11 +9633,12 @@ Object.defineProperty(exports, "BackportError", ({ enumerable: true, get: functi
 var globalConfig_1 = __nccwpck_require__(14520);
 Object.defineProperty(exports, "getLocalGlobalConfig", ({ enumerable: true, get: function () { return globalConfig_1.getGlobalConfig; } }));
 async function backportRun({ options = {}, processArgs = [], exitCodeOnFailure = true, }) {
-    elastic_apm_node_1.default.startTransaction('API: backportRun');
+    const apmTransaction = elastic_apm_node_1.default.startTransaction('API: backportRun');
     const res = await (0, backportRun_1.backportRun)({
         optionsFromModule: (0, excludeUndefined_1.excludeUndefined)(options),
         processArgs,
         exitCodeOnFailure,
+        apmTransaction,
     });
     elastic_apm_node_1.default.endTransaction(res.status);
     return res;
@@ -9698,7 +9699,6 @@ async function apmStartTransaction(transactionName, cb) {
         throw e;
     }
 }
-exports.apmStartTransaction = apmStartTransaction;
 //# sourceMappingURL=entrypoint.api.js.map
 
 /***/ }),
@@ -14274,7 +14274,7 @@ exports.maybe = maybe;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.PACKAGE_VERSION = void 0;
-exports.PACKAGE_VERSION = '8.9.6';
+exports.PACKAGE_VERSION = '8.9.7';
 //# sourceMappingURL=packageVersion.js.map
 
 /***/ }),
@@ -176264,6 +176264,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const core = __importStar(__nccwpck_require__(42186));
 const github_1 = __nccwpck_require__(95438);
 const run_1 = __nccwpck_require__(7764);
+// set environment for APM
+process.env['NODE_ENV'] = 'production-github-action';
 (0, run_1.run)({
     context: github_1.context,
     inputs: {
@@ -176331,7 +176333,6 @@ const core = __importStar(__nccwpck_require__(42186));
 const backport_1 = __nccwpck_require__(76253);
 async function run({ context, inputs, }) {
     core.info('Initiate backport');
-    process.env['NODE_ENV'] = 'production-github-action';
     const { payload, repo, runId } = context;
     const pullRequest = payload.pull_request;
     if (!pullRequest) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "backport-github-action",
-  "version": "8.9.6",
+  "version": "8.9.7",
   "private": true,
   "scripts": {
     "build": "yarn ncc build src/index.ts",
@@ -15,7 +15,7 @@
     "@actions/github": "^5.1.1",
     "@octokit/action": "^4.0.8",
     "@octokit/graphql": "^5.0.1",
-    "backport": "^8.9.6",
+    "backport": "^8.9.7",
     "husky": "^8.0.1"
   },
   "devDependencies": {

src/index.ts

@@ -2,6 +2,9 @@ import * as core from '@actions/core';
 import { context } from '@actions/github';
 import { getFailureMessage, run } from './run';
 
+// set environment for APM
+process.env['NODE_ENV'] = 'production-github-action';
+
 run({
   context,
   inputs: {

src/run.ts

@@ -15,7 +15,6 @@ export async function run({
   };
 }) {
   core.info('Initiate backport');
-  process.env['NODE_ENV'] = 'production-github-action';
 
   const { payload, repo, runId } = context;
   const pullRequest = payload.pull_request;

yarn.lock

@@ -1482,10 +1482,10 @@ babel-preset-jest@^29.0.2:
     babel-plugin-jest-hoist "^29.0.2"
     babel-preset-current-node-syntax "^1.0.0"
 
-backport@^8.9.6:
-  version "8.9.6"
-  resolved "https://registry.yarnpkg.com/backport/-/backport-8.9.6.tgz#721bca3279590ade2e21906c8cb023bf8124a950"
-  integrity sha512-RrC4pV/BSGg1oEJ4Y00ZpqISNLWvFB/LUkByqUlPFGPsQcYyda+18MbeZZ/VvSU9l3eNK6ZaPGEhz2piyZCBDg==
+backport@^8.9.7:
+  version "8.9.7"
+  resolved "https://registry.yarnpkg.com/backport/-/backport-8.9.7.tgz#52b4b4f49e57278e171e99568a3a8b1b06649115"
+  integrity sha512-TNToeh+3QSvlywc1tUu8Hs+7L8ibyj3Y+LC/Ict+Qrb6wNVQMn+8KgNL99l3kcD7ynvin6Q34f6MGJ5c0KhHzQ==
   dependencies:
     "@octokit/rest" "^19.0.4"
     axios "^1.1.2"