From 85d953f0a2741343a1a96d1dd92b165ca1a06919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Mon, 5 Sep 2022 10:07:48 +0200 Subject: [PATCH 1/4] Fix "License" header (#430) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe0122d8..7f01b346 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Compatibility between the versions of this project and Open Telemetry is specifi Please read [CONTRIBUTING.md](./CONTRIBUTING.md) for instructions on building, running tests, and so forth. -## License and versioning +## License The Splunk distribution of OpenTelemetry JavaScript Browser is a distribution of the [OpenTelemetry JavaScript From bb5cc430f5d6a99c25ee317fe5f47dd6f9158539 Mon Sep 17 00:00:00 2001 From: t2t2 Date: Mon, 12 Sep 2022 13:33:57 +0300 Subject: [PATCH 2/4] Call postload context hooks only if instrumentation has been loaded (#433) * Call postload context hooks only if instrumentation has been loaded * bump chromedriver * update lockfile --- .../resource-observer/resource-obs.spec.js | 8 ++++++++ .../resources-postload-disabled.ejs | 19 +++++++++++++++++++ package-lock.json | 14 +++++++------- package.json | 2 +- src/index.ts | 4 ++-- 5 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 integration-tests/tests/resource-observer/resources-postload-disabled.ejs diff --git a/integration-tests/tests/resource-observer/resource-obs.spec.js b/integration-tests/tests/resource-observer/resource-obs.spec.js index d423e81c..c4c64d1f 100644 --- a/integration-tests/tests/resource-observer/resource-obs.spec.js +++ b/integration-tests/tests/resource-observer/resource-obs.spec.js @@ -187,5 +187,13 @@ module.exports = { await browser.assert.not.ok(plScriptRootSpan.parentId); await browser.assert.equal(plScriptParentSpan.traceId, plScriptChildSpan.traceId); await browser.assert.equal(plScriptChildSpan.parentId, plScriptParentSpan.id); + }, + 'doesn\'t crash when postload instrumentation is disabled': async function(browser) { + await browser.url(browser.globals.getUrl('/resource-observer/resources-custom-context.ejs')); + await browser.click('#btn1'); + + const click = await browser.globals.findSpan(span => span.name === 'click'); + await browser.assert.ok(click); + await browser.global.assertNoErrorSpans(); } }; diff --git a/integration-tests/tests/resource-observer/resources-postload-disabled.ejs b/integration-tests/tests/resource-observer/resources-postload-disabled.ejs new file mode 100644 index 00000000..ef17c027 --- /dev/null +++ b/integration-tests/tests/resource-observer/resources-postload-disabled.ejs @@ -0,0 +1,19 @@ + + + + + Resource observer test + <%- renderAgent({ instrumentations: { postload: false }}) %> + + +

Resource observer test

+ + + + 

+  
+  
+
+
diff --git a/package-lock.json b/package-lock.json
index bea62e84..3473a774 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,7 @@
         "browserstack-local": "^1.4.8",
         "chai": "^4.3.4",
         "chrome-launcher": "^0.15.0",
-        "chromedriver": "^103.0.0",
+        "chromedriver": "^105.0.0",
         "codecov": "^3.8.2",
         "compression": "^1.7.4",
         "cors": "^2.8.5",
@@ -5261,9 +5261,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "103.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-103.0.0.tgz",
-      "integrity": "sha512-7BHf6HWt0PeOHCzWO8qlnD13sARzr5AKTtG8Csn+czsuAsajwPxdLNtry5GPh8HYFyl+i0M+yg3bT43AGfgU9w==",
+      "version": "105.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-105.0.0.tgz",
+      "integrity": "sha512-BX3GOUW5m6eiW9cVVF8hw+EFxvrGqYCxbwOqnpk8PjbNFqL5xjy7yel+e6ilJPjckAYFutMKs8XJvOs/W85vvg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -18745,9 +18745,9 @@
       }
     },
     "chromedriver": {
-      "version": "103.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-103.0.0.tgz",
-      "integrity": "sha512-7BHf6HWt0PeOHCzWO8qlnD13sARzr5AKTtG8Csn+czsuAsajwPxdLNtry5GPh8HYFyl+i0M+yg3bT43AGfgU9w==",
+      "version": "105.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-105.0.0.tgz",
+      "integrity": "sha512-BX3GOUW5m6eiW9cVVF8hw+EFxvrGqYCxbwOqnpk8PjbNFqL5xjy7yel+e6ilJPjckAYFutMKs8XJvOs/W85vvg==",
       "dev": true,
       "requires": {
         "@testim/chrome-version": "^1.1.2",
diff --git a/package.json b/package.json
index 123949d1..ade6f69b 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "browserstack-local": "^1.4.8",
     "chai": "^4.3.4",
     "chrome-launcher": "^0.15.0",
-    "chromedriver": "^103.0.0",
+    "chromedriver": "^105.0.0",
     "codecov": "^3.8.2",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
diff --git a/src/index.ts b/src/index.ts
index 7a51e8c4..daeb305e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -398,8 +398,8 @@ export const SplunkRum: SplunkOtelWebType = {
     provider.register({
       contextManager: new SplunkContextManager({
         ...processedOptions.context,
-        onBeforeContextStart: () => _postDocLoadInstrumentation.onBeforeContextChange(),
-        onBeforeContextEnd: () => _postDocLoadInstrumentation.onBeforeContextChange(),
+        onBeforeContextStart: () => _postDocLoadInstrumentation?.onBeforeContextChange(),
+        onBeforeContextEnd: () => _postDocLoadInstrumentation?.onBeforeContextChange(),
       })
     });
 

From fa774c9e5873bfee00b0cb16aa1339e4f0c08dc6 Mon Sep 17 00:00:00 2001
From: t2t2 
Date: Mon, 12 Sep 2022 14:06:46 +0300
Subject: [PATCH 3/4] release 0.12.2 (#436)

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 src/version.ts    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccacafb5..c847d479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ If the version of Open Telemetry is unspecified for a version, then it is the sa
 
 ## Unreleased
 
+## 0.12.2
+
+- Fix errors caused by disabled postload instrumentation ([#433](https://github.com/signalfx/splunk-otel-js-web/pull/433))
+
 ## 0.12.1
 
 - Add app version configuration option ([#419](https://github.com/signalfx/splunk-otel-js-web/pull/419))
diff --git a/package-lock.json b/package-lock.json
index 3473a774..3f9978da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@splunk/otel-web",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@splunk/otel-web",
-      "version": "0.12.1",
+      "version": "0.12.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "~7.18.3",
diff --git a/package.json b/package.json
index ade6f69b..5f291a79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@splunk/otel-web",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Splunk distribution of Open Telemetry for browser environment.",
   "repository": "github:signalfx/splunk-otel-js-browser",
   "scripts": {
diff --git a/src/version.ts b/src/version.ts
index 36c8af56..cb9d8470 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // this is an autogenerated file, see scripts/version-update.js
-export const VERSION = '0.12.1';
+export const VERSION = '0.12.2';

From 58f73ab346a7e9c9bad5961a664f0e63471c3081 Mon Sep 17 00:00:00 2001
From: t2t2 
Date: Mon, 12 Sep 2022 14:33:12 +0300
Subject: [PATCH 4/4] Update gh key & release 0.12.3 (#437)

---
 .gitlab-ci.yml    | 2 +-
 CHANGELOG.md      | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 src/version.ts    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5141f690..62858b84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ release_production:
   only:
     - /^v[0-9]+\..*/
   script:
-    - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0
+    - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key 23F3D4EA75716059
     - sudo apt-add-repository https://cli.github.com/packages
     - sudo apt update
     - sudo apt install gh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c847d479..f0644cec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ If the version of Open Telemetry is unspecified for a version, then it is the sa
 
 ## Unreleased
 
-## 0.12.2
+## 0.12.3 & 0.12.2
 
 - Fix errors caused by disabled postload instrumentation ([#433](https://github.com/signalfx/splunk-otel-js-web/pull/433))
 
diff --git a/package-lock.json b/package-lock.json
index 3f9978da..a931ae86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@splunk/otel-web",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@splunk/otel-web",
-      "version": "0.12.2",
+      "version": "0.12.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "~7.18.3",
diff --git a/package.json b/package.json
index 5f291a79..7f9079ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@splunk/otel-web",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "Splunk distribution of Open Telemetry for browser environment.",
   "repository": "github:signalfx/splunk-otel-js-browser",
   "scripts": {
diff --git a/src/version.ts b/src/version.ts
index cb9d8470..ccc1fe74 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // this is an autogenerated file, see scripts/version-update.js
-export const VERSION = '0.12.2';
+export const VERSION = '0.12.3';