From d5d1b52e01bd6f147f7f2e686ccaf066221a4c0a Mon Sep 17 00:00:00 2001 From: MartenH <72463136+mhennoch@users.noreply.github.com> Date: Mon, 28 Jun 2021 18:26:45 +0300 Subject: [PATCH] Update contrib and core to 0.22 (#196) --- integration-tests/tests/cdn/index.spec.js | 2 +- .../tests/user-interaction/mouse.spec.js | 4 +- package-lock.json | 322 +++++++++--------- package.json | 24 +- src/SplunkUserInteractionInstrumentation.ts | 2 +- 5 files changed, 177 insertions(+), 177 deletions(-) diff --git a/integration-tests/tests/cdn/index.spec.js b/integration-tests/tests/cdn/index.spec.js index 75e50f29..56389847 100644 --- a/integration-tests/tests/cdn/index.spec.js +++ b/integration-tests/tests/cdn/index.spec.js @@ -45,6 +45,6 @@ module.exports = { const cdnUrl = 'https://cdn.signalfx.com/o11y-gdi-rum/latest/splunk-otel-web.js'; await browser.assert.strictEqual(rumScriptFetchSpan.tags['http.url'], cdnUrl); - await browser.assert.strictEqual(rumScriptFetchSpan.tags['splunk.rumVersion'], '0.5.0'); + await browser.assert.strictEqual(rumScriptFetchSpan.tags['splunk.rumVersion'], '0.6.0'); }, }; diff --git a/integration-tests/tests/user-interaction/mouse.spec.js b/integration-tests/tests/user-interaction/mouse.spec.js index 2834cb55..09391c1e 100644 --- a/integration-tests/tests/user-interaction/mouse.spec.js +++ b/integration-tests/tests/user-interaction/mouse.spec.js @@ -91,8 +91,8 @@ module.exports = { await browser.assert.strictEqual(clickSpan.tags['component'], 'user-interaction'); await browser.assert.strictEqual(clickSpan.tags['event_type'], 'click'); - await browser.assert.strictEqual(clickSpan.tags['target_element'], 'HTML'); - await browser.assert.strictEqual(clickSpan.tags['target_xpath'], '//html'); + await browser.assert.strictEqual(clickSpan.tags['target_element'], 'BUTTON'); + await browser.assert.strictEqual(clickSpan.tags['target_xpath'], '//*[@id="btn1"]'); await browser.assert.strictEqual(clickSpan.tags['ot.status_code'], 'UNSET'); await browser.globals.assertNoErrorSpans(); diff --git a/package-lock.json b/package-lock.json index 38ce5924..4cc702ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,18 +10,18 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "~7.14.0", - "@opentelemetry/api": "0.21.0", - "@opentelemetry/api-metrics": "0.21.0", - "@opentelemetry/core": "0.21.0", - "@opentelemetry/exporter-zipkin": "0.21.0", - "@opentelemetry/instrumentation": "0.21.0", - "@opentelemetry/instrumentation-document-load": "0.21.0", - "@opentelemetry/instrumentation-fetch": "0.21.0", - "@opentelemetry/instrumentation-user-interaction": "0.21.0", - "@opentelemetry/instrumentation-xml-http-request": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/tracing": "0.21.0", - "@opentelemetry/web": "0.21.0", + "@opentelemetry/api": "1.0.0", + "@opentelemetry/api-metrics": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-zipkin": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/instrumentation-document-load": "0.22.0", + "@opentelemetry/instrumentation-fetch": "0.22.0", + "@opentelemetry/instrumentation-user-interaction": "0.22.0", + "@opentelemetry/instrumentation-xml-http-request": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0", + "@opentelemetry/web": "0.22.0", "shimmer": "~1.2.1", "web-vitals": "~1.1.2" }, @@ -2755,37 +2755,37 @@ } }, "node_modules/@opentelemetry/api": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.21.0.tgz", - "integrity": "sha512-Q7hHb3nidPgnBS2fi+y3K64F3EV48d9v09/6EtigIgVF43NFNhw/dboDKC7gECEkbTwuvFeLCbwKs9JaC8LDEw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.0.tgz", + "integrity": "sha512-TcdhrGy+ehLIFs79/TcWiHiPujishrhSgQ7wxvWvk8WY2YT8Np/pYXmRP94voG3N8GJ/5nIVyzacfViwhN50AQ==", "engines": { "node": ">=8.0.0" } }, "node_modules/@opentelemetry/api-metrics": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.21.0.tgz", - "integrity": "sha512-s3mhqJdV04DFL59lhp7wR5UMCpJu6BN7PWJRokjXs/St5NIsYjWt5G0OlsrN58/OgSIVl2pdPbVG2QhASvhSpw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.22.0.tgz", + "integrity": "sha512-hrErhb+JphdErB1WuBwpCnO1FjiKfKzO9DjhvquzzM8SYL2bBpYEvTpBTU9cenRnRHUbUAfHI1X384vm37HKeQ==", "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/core": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.21.0.tgz", - "integrity": "sha512-sZZQThBuqhCdBPgzPq4y9L4dhnpXXCCEqNsR6IUmMc/kQ8Bcw3lmI5fymLlliSt+lnTc26xJPVKZlwoQfwhThg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.22.0.tgz", + "integrity": "sha512-x6JxuQ4rY2x39GEXJSqMgyf8XZPNNiZrGcCMhZSrtypq/WXlsJuxMNnUAl2hj2rpSGGukhhWn5cMpCmMJJz1hw==", "dependencies": { - "@opentelemetry/semantic-conventions": "0.21.0", + "@opentelemetry/semantic-conventions": "0.22.0", "semver": "^7.1.3" }, "engines": { "node": ">=8.5.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/core/node_modules/lru-cache": { @@ -2819,103 +2819,103 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@opentelemetry/exporter-zipkin": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.21.0.tgz", - "integrity": "sha512-Y97AVc2aMJXsBgIzzLJgXxZA8pBFoO1GIr8O9KW9TftY/X/BaZyNRV2uLc3nvHB3GLCHRKqWPt3B15Zodjdodw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.22.0.tgz", + "integrity": "sha512-X1CLoS9m8jIejrgwE1xNK4I3lmgr5cjouoXa8VkRxuAIKPka38ALu5J8It3AbIVHZNO7hMbwRD11Sgc7XKYdpg==", "dependencies": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/resources": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/tracing": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/instrumentation": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.21.0.tgz", - "integrity": "sha512-OeV6wobxPjYQxEoeepliV4OyAAfoCseO66BP6Rr20nItTcjR0ZKZtpyPoDa0XVWXLtl0N/aMnzZ6I4o08KQNrQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.22.0.tgz", + "integrity": "sha512-/NT3+mZO9Bll6UZPjqemrD2VhkI7wRrMto884+wKGK8LIC+EKlg5EKk9y9ym4Vtnlis8/hVxNrFSeaS29N2NLw==", "dependencies": { - "@opentelemetry/api-metrics": "0.21.0", + "@opentelemetry/api-metrics": "0.22.0", "require-in-the-middle": "^5.0.3", "semver": "^7.3.2", "shimmer": "^1.2.1" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/instrumentation-document-load": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.21.0.tgz", - "integrity": "sha512-LqjvCPusw67mcCzVFOQ97O+0Q9fCbj9Vf7tOvQqp9rNLppnzDFpfUrgEJ7+4/AquElN6nkTYas5eafWFKAMVDw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.22.0.tgz", + "integrity": "sha512-5Da1uixeOa41/iHnrvzBmYwliOo2vk4YTuEFIwV75s0yqrnGWpV00eCNd6aUZE1DMuRLDAn0kDykpsu//uUxjg==", "dependencies": { - "@opentelemetry/core": "^0.21.0", - "@opentelemetry/instrumentation": "^0.21.0", - "@opentelemetry/semantic-conventions": "^0.21.0", - "@opentelemetry/tracing": "^0.21.0", - "@opentelemetry/web": "^0.21.0" + "@opentelemetry/core": "^0.22.0", + "@opentelemetry/instrumentation": "^0.22.0", + "@opentelemetry/semantic-conventions": "^0.22.0", + "@opentelemetry/tracing": "^0.22.0", + "@opentelemetry/web": "^0.22.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/instrumentation-fetch": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.21.0.tgz", - "integrity": "sha512-N+v7K7AWdWlRR5qaO2cFkc2Z54nPlJ0QS1+UsgUaymO+hUH7bXwyMmTILXIYbxFAX0W4H8lT7OxIEejQ9d4xVw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.22.0.tgz", + "integrity": "sha512-w4cx2owk6cz3gBlTbrHeuNkka7u8Aqz/4YgJjR06qchY6oL3RcCgBTUAZTXV+/JfESYSCBP2ysyQm6AWmCVgDw==", "dependencies": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/instrumentation": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/web": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/web": "0.22.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/instrumentation-user-interaction": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.21.0.tgz", - "integrity": "sha512-rQVfIkiS0aoFYoPmlHqsosBAr8rjzUUcnWRydXWxlKWb/OWvWffZ/HTar4Tgwax2+KeFrl8umhOkH5elDP5r/g==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.22.0.tgz", + "integrity": "sha512-G4IaMEWz8fB/+LRxLUqfwS15aFnsRI5mis7sbTRH++2OSlM23xM4PqMc845/k24NHvtkU0V98QN44Y3h4NhhwQ==", "dependencies": { - "@opentelemetry/core": "^0.21.0", - "@opentelemetry/instrumentation": "^0.21.0", - "@opentelemetry/web": "^0.21.0" + "@opentelemetry/core": "^0.22.0", + "@opentelemetry/instrumentation": "^0.22.0", + "@opentelemetry/web": "^0.22.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0", + "@opentelemetry/api": "^1.0.0", "zone.js": "0.11.4" } }, "node_modules/@opentelemetry/instrumentation-xml-http-request": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.21.0.tgz", - "integrity": "sha512-SULzz4SXyA893adxVBvC2cYPSWWghZjNo/oLa3sAp33kH80p7z2jpJej8E08uh3FEzlw9YP7N8nBoXE765QnxA==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.22.0.tgz", + "integrity": "sha512-a5swTJ/2g/9Lon/oWOKZWCSPFF/lF54RtrV9BmGUT7amU7IkaYMsinTgKW5TsJkJfzGJdnC94RtW0jYCf6HV6g==", "dependencies": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/instrumentation": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/web": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/web": "0.22.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/instrumentation/node_modules/lru-cache": { @@ -2949,59 +2949,59 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@opentelemetry/resources": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.21.0.tgz", - "integrity": "sha512-xQUL2/2npP/isH8sbOSdynIRWmlM6p02L9Ex8x/BhUuSkGrMoxO2ezLPPYnfYam1py6ubaz8m1C54O2IRCmgQQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.22.0.tgz", + "integrity": "sha512-LiX6/JyuD2eHi7Ewrq/PUP79azDqshd0r2oksNTJ+VwgbGfMlq79ykd4FhiEEk23fFbajGt+9ginadXoRk17dg==", "dependencies": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/semantic-conventions": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.21.0.tgz", - "integrity": "sha512-qQtZJ8Q+bO/gemBELsZbz5s//tNnyc+mQD/0RHc77XhI6ZBb+tprU6KN/7l0fl5z29smmai0hcJ9UNILC/7nIw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.22.0.tgz", + "integrity": "sha512-t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg==", "engines": { "node": ">=8.0.0" } }, "node_modules/@opentelemetry/tracing": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.21.0.tgz", - "integrity": "sha512-6+2pfFpu7Yo2DwmBK9sHDUSIL7UshcEMwDF6+LghGK68ILRaEMqqBPgKarjhFH9ERgJB9GOkJ2snK96qIzMZNA==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.22.0.tgz", + "integrity": "sha512-EFrKTFndiEdh/KnzwDgo/EcphG/5z/NyLck8oiUUY+YMP7hskXNYHjTWSAv9UxtYe1MzgLbjmAateTuMmFIVNw==", "dependencies": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/resources": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", "lodash.merge": "^4.6.2" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@opentelemetry/web": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/web/-/web-0.21.0.tgz", - "integrity": "sha512-xz7vRpz6WWr0gocwKgoBB4wD3yIXDp5Ho9rcvx6OOP/mIl1/uqH1NSOS5c5n6zAr+98Yk4G9gTp4w6N2cv45mQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/web/-/web-0.22.0.tgz", + "integrity": "sha512-y4M91eG4eZVznr9NOwY+yCTuZXokAba6bauNvGySB6UdxNJYv4D2TIQXZFre9IA21VNGuv3cbPoCbHLwg+ddeg==", "dependencies": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/tracing": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0" }, "engines": { "node": ">=8.0.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.21.0" + "@opentelemetry/api": "^1.0.0" } }, "node_modules/@rollup/plugin-babel": { @@ -16130,22 +16130,22 @@ } }, "@opentelemetry/api": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.21.0.tgz", - "integrity": "sha512-Q7hHb3nidPgnBS2fi+y3K64F3EV48d9v09/6EtigIgVF43NFNhw/dboDKC7gECEkbTwuvFeLCbwKs9JaC8LDEw==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.0.tgz", + "integrity": "sha512-TcdhrGy+ehLIFs79/TcWiHiPujishrhSgQ7wxvWvk8WY2YT8Np/pYXmRP94voG3N8GJ/5nIVyzacfViwhN50AQ==" }, "@opentelemetry/api-metrics": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.21.0.tgz", - "integrity": "sha512-s3mhqJdV04DFL59lhp7wR5UMCpJu6BN7PWJRokjXs/St5NIsYjWt5G0OlsrN58/OgSIVl2pdPbVG2QhASvhSpw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.22.0.tgz", + "integrity": "sha512-hrErhb+JphdErB1WuBwpCnO1FjiKfKzO9DjhvquzzM8SYL2bBpYEvTpBTU9cenRnRHUbUAfHI1X384vm37HKeQ==", "requires": {} }, "@opentelemetry/core": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.21.0.tgz", - "integrity": "sha512-sZZQThBuqhCdBPgzPq4y9L4dhnpXXCCEqNsR6IUmMc/kQ8Bcw3lmI5fymLlliSt+lnTc26xJPVKZlwoQfwhThg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.22.0.tgz", + "integrity": "sha512-x6JxuQ4rY2x39GEXJSqMgyf8XZPNNiZrGcCMhZSrtypq/WXlsJuxMNnUAl2hj2rpSGGukhhWn5cMpCmMJJz1hw==", "requires": { - "@opentelemetry/semantic-conventions": "0.21.0", + "@opentelemetry/semantic-conventions": "0.22.0", "semver": "^7.1.3" }, "dependencies": { @@ -16173,22 +16173,22 @@ } }, "@opentelemetry/exporter-zipkin": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.21.0.tgz", - "integrity": "sha512-Y97AVc2aMJXsBgIzzLJgXxZA8pBFoO1GIr8O9KW9TftY/X/BaZyNRV2uLc3nvHB3GLCHRKqWPt3B15Zodjdodw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-0.22.0.tgz", + "integrity": "sha512-X1CLoS9m8jIejrgwE1xNK4I3lmgr5cjouoXa8VkRxuAIKPka38ALu5J8It3AbIVHZNO7hMbwRD11Sgc7XKYdpg==", "requires": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/resources": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/tracing": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0" } }, "@opentelemetry/instrumentation": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.21.0.tgz", - "integrity": "sha512-OeV6wobxPjYQxEoeepliV4OyAAfoCseO66BP6Rr20nItTcjR0ZKZtpyPoDa0XVWXLtl0N/aMnzZ6I4o08KQNrQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.22.0.tgz", + "integrity": "sha512-/NT3+mZO9Bll6UZPjqemrD2VhkI7wRrMto884+wKGK8LIC+EKlg5EKk9y9ym4Vtnlis8/hVxNrFSeaS29N2NLw==", "requires": { - "@opentelemetry/api-metrics": "0.21.0", + "@opentelemetry/api-metrics": "0.22.0", "require-in-the-middle": "^5.0.3", "semver": "^7.3.2", "shimmer": "^1.2.1" @@ -16218,82 +16218,82 @@ } }, "@opentelemetry/instrumentation-document-load": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.21.0.tgz", - "integrity": "sha512-LqjvCPusw67mcCzVFOQ97O+0Q9fCbj9Vf7tOvQqp9rNLppnzDFpfUrgEJ7+4/AquElN6nkTYas5eafWFKAMVDw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-document-load/-/instrumentation-document-load-0.22.0.tgz", + "integrity": "sha512-5Da1uixeOa41/iHnrvzBmYwliOo2vk4YTuEFIwV75s0yqrnGWpV00eCNd6aUZE1DMuRLDAn0kDykpsu//uUxjg==", "requires": { - "@opentelemetry/core": "^0.21.0", - "@opentelemetry/instrumentation": "^0.21.0", - "@opentelemetry/semantic-conventions": "^0.21.0", - "@opentelemetry/tracing": "^0.21.0", - "@opentelemetry/web": "^0.21.0" + "@opentelemetry/core": "^0.22.0", + "@opentelemetry/instrumentation": "^0.22.0", + "@opentelemetry/semantic-conventions": "^0.22.0", + "@opentelemetry/tracing": "^0.22.0", + "@opentelemetry/web": "^0.22.0" } }, "@opentelemetry/instrumentation-fetch": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.21.0.tgz", - "integrity": "sha512-N+v7K7AWdWlRR5qaO2cFkc2Z54nPlJ0QS1+UsgUaymO+hUH7bXwyMmTILXIYbxFAX0W4H8lT7OxIEejQ9d4xVw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.22.0.tgz", + "integrity": "sha512-w4cx2owk6cz3gBlTbrHeuNkka7u8Aqz/4YgJjR06qchY6oL3RcCgBTUAZTXV+/JfESYSCBP2ysyQm6AWmCVgDw==", "requires": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/instrumentation": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/web": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/web": "0.22.0" } }, "@opentelemetry/instrumentation-user-interaction": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.21.0.tgz", - "integrity": "sha512-rQVfIkiS0aoFYoPmlHqsosBAr8rjzUUcnWRydXWxlKWb/OWvWffZ/HTar4Tgwax2+KeFrl8umhOkH5elDP5r/g==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-user-interaction/-/instrumentation-user-interaction-0.22.0.tgz", + "integrity": "sha512-G4IaMEWz8fB/+LRxLUqfwS15aFnsRI5mis7sbTRH++2OSlM23xM4PqMc845/k24NHvtkU0V98QN44Y3h4NhhwQ==", "requires": { - "@opentelemetry/core": "^0.21.0", - "@opentelemetry/instrumentation": "^0.21.0", - "@opentelemetry/web": "^0.21.0" + "@opentelemetry/core": "^0.22.0", + "@opentelemetry/instrumentation": "^0.22.0", + "@opentelemetry/web": "^0.22.0" } }, "@opentelemetry/instrumentation-xml-http-request": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.21.0.tgz", - "integrity": "sha512-SULzz4SXyA893adxVBvC2cYPSWWghZjNo/oLa3sAp33kH80p7z2jpJej8E08uh3FEzlw9YP7N8nBoXE765QnxA==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.22.0.tgz", + "integrity": "sha512-a5swTJ/2g/9Lon/oWOKZWCSPFF/lF54RtrV9BmGUT7amU7IkaYMsinTgKW5TsJkJfzGJdnC94RtW0jYCf6HV6g==", "requires": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/instrumentation": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/web": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/web": "0.22.0" } }, "@opentelemetry/resources": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.21.0.tgz", - "integrity": "sha512-xQUL2/2npP/isH8sbOSdynIRWmlM6p02L9Ex8x/BhUuSkGrMoxO2ezLPPYnfYam1py6ubaz8m1C54O2IRCmgQQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.22.0.tgz", + "integrity": "sha512-LiX6/JyuD2eHi7Ewrq/PUP79azDqshd0r2oksNTJ+VwgbGfMlq79ykd4FhiEEk23fFbajGt+9ginadXoRk17dg==", "requires": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0" } }, "@opentelemetry/semantic-conventions": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.21.0.tgz", - "integrity": "sha512-qQtZJ8Q+bO/gemBELsZbz5s//tNnyc+mQD/0RHc77XhI6ZBb+tprU6KN/7l0fl5z29smmai0hcJ9UNILC/7nIw==" + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.22.0.tgz", + "integrity": "sha512-t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg==" }, "@opentelemetry/tracing": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.21.0.tgz", - "integrity": "sha512-6+2pfFpu7Yo2DwmBK9sHDUSIL7UshcEMwDF6+LghGK68ILRaEMqqBPgKarjhFH9ERgJB9GOkJ2snK96qIzMZNA==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.22.0.tgz", + "integrity": "sha512-EFrKTFndiEdh/KnzwDgo/EcphG/5z/NyLck8oiUUY+YMP7hskXNYHjTWSAv9UxtYe1MzgLbjmAateTuMmFIVNw==", "requires": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/resources": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/resources": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", "lodash.merge": "^4.6.2" } }, "@opentelemetry/web": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/web/-/web-0.21.0.tgz", - "integrity": "sha512-xz7vRpz6WWr0gocwKgoBB4wD3yIXDp5Ho9rcvx6OOP/mIl1/uqH1NSOS5c5n6zAr+98Yk4G9gTp4w6N2cv45mQ==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/web/-/web-0.22.0.tgz", + "integrity": "sha512-y4M91eG4eZVznr9NOwY+yCTuZXokAba6bauNvGySB6UdxNJYv4D2TIQXZFre9IA21VNGuv3cbPoCbHLwg+ddeg==", "requires": { - "@opentelemetry/core": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/tracing": "0.21.0" + "@opentelemetry/core": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0" } }, "@rollup/plugin-babel": { diff --git a/package.json b/package.json index 8c842991..88da48a1 100644 --- a/package.json +++ b/package.json @@ -35,18 +35,18 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "~7.14.0", - "@opentelemetry/api": "0.21.0", - "@opentelemetry/api-metrics": "0.21.0", - "@opentelemetry/core": "0.21.0", - "@opentelemetry/exporter-zipkin": "0.21.0", - "@opentelemetry/instrumentation": "0.21.0", - "@opentelemetry/instrumentation-document-load": "0.21.0", - "@opentelemetry/instrumentation-fetch": "0.21.0", - "@opentelemetry/instrumentation-user-interaction": "0.21.0", - "@opentelemetry/instrumentation-xml-http-request": "0.21.0", - "@opentelemetry/semantic-conventions": "0.21.0", - "@opentelemetry/tracing": "0.21.0", - "@opentelemetry/web": "0.21.0", + "@opentelemetry/api": "1.0.0", + "@opentelemetry/api-metrics": "0.22.0", + "@opentelemetry/core": "0.22.0", + "@opentelemetry/exporter-zipkin": "0.22.0", + "@opentelemetry/instrumentation": "0.22.0", + "@opentelemetry/instrumentation-document-load": "0.22.0", + "@opentelemetry/instrumentation-fetch": "0.22.0", + "@opentelemetry/instrumentation-user-interaction": "0.22.0", + "@opentelemetry/instrumentation-xml-http-request": "0.22.0", + "@opentelemetry/semantic-conventions": "0.22.0", + "@opentelemetry/tracing": "0.22.0", + "@opentelemetry/web": "0.22.0", "shimmer": "~1.2.1", "web-vitals": "~1.1.2" }, diff --git a/src/SplunkUserInteractionInstrumentation.ts b/src/SplunkUserInteractionInstrumentation.ts index 53668624..0ebb65ac 100644 --- a/src/SplunkUserInteractionInstrumentation.ts +++ b/src/SplunkUserInteractionInstrumentation.ts @@ -110,7 +110,7 @@ export class SplunkUserInteractionInstrumentation extends UserInteractionInstrum this._unwrap(Node.prototype, 'removeEventListener'); diag.debug('removing previous patch from method removeEventListener'); } - this._wrap(Node.prototype, 'addEventListener', (this as any)._patchElement()); + this._wrap(Node.prototype, 'addEventListener', (this as any)._patchAddEventListener()); this._wrap(Node.prototype, 'removeEventListener', (this as any)._patchRemoveEventListener()); this._patchHistoryApi();