From 1878064c0daaac78a2fd67fdc1e01df68feee3d6 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 25 Oct 2023 15:22:00 -0400 Subject: [PATCH] Reverts otel package upgrade Refs: https://github.com/open-telemetry/opentelemetry-js/issues/4216 --- CHANGELOG.md | 4 ++ ThirdPartyNotices.txt | 4 +- package.json | 4 +- yarn.lock | 150 +++++++++++++++++++++--------------------- 4 files changed, 83 insertions(+), 79 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 269d7570e9923..32c136941d8bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Fixed + +- Fixes Otel library regressions + ## [14.4.0] - 2023-10-13 ### Added diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index ea8988ae6e39e..389b38d70c91c 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -8,8 +8,8 @@ This project incorporates components from the projects listed below. 3. @octokit/graphql version 7.0.2 (https://github.com/octokit/graphql.js) 4. @octokit/request version 8.1.4 (https://github.com/octokit/request.js) 5. @opentelemetry/api version 1.6.0 (https://github.com/open-telemetry/opentelemetry-js) -6. @opentelemetry/exporter-trace-otlp-http version 0.44.0 (https://github.com/open-telemetry/opentelemetry-js) -7. @opentelemetry/sdk-trace-base version 1.17.1 (https://github.com/open-telemetry/opentelemetry-js) +6. @opentelemetry/exporter-trace-otlp-http version 0.43.0 (https://github.com/open-telemetry/opentelemetry-js) +7. @opentelemetry/sdk-trace-base version 1.17.0 (https://github.com/open-telemetry/opentelemetry-js) 8. @vscode/codicons version 0.0.33 (https://github.com/microsoft/vscode-codicons) 9. @vscode/webview-ui-toolkit version 1.2.2 (https://github.com/microsoft/vscode-webview-ui-toolkit) 10. ansi-regex version 6.0.1 (https://github.com/chalk/ansi-regex) diff --git a/package.json b/package.json index 882760f969713..c1e901e798d60 100644 --- a/package.json +++ b/package.json @@ -14850,8 +14850,8 @@ "@octokit/graphql": "7.0.2", "@octokit/request": "8.1.4", "@opentelemetry/api": "1.6.0", - "@opentelemetry/exporter-trace-otlp-http": "0.44.0", - "@opentelemetry/sdk-trace-base": "1.17.1", + "@opentelemetry/exporter-trace-otlp-http": "0.43.0", + "@opentelemetry/sdk-trace-base": "1.17.0", "@vscode/codicons": "0.0.33", "@vscode/webview-ui-toolkit": "1.2.2", "ansi-regex": "6.0.1", diff --git a/yarn.lock b/yarn.lock index 832f6bffd3848..d912e6a90c0c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -480,10 +480,10 @@ dependencies: "@octokit/openapi-types" "^19.0.0" -"@opentelemetry/api-logs@0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.44.0.tgz#4bbb04e9043234c240b3a9129732281f1ceae759" - integrity sha512-OctojdKGmXHKAJa4/Ml+Nf7MD9jtYXvZyP64xTh0pNTmtgaTdWW3FURri2DdB/+l7YxRy0tYYZS3/tYEM1pj3w== +"@opentelemetry/api-logs@0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.43.0.tgz#472dacbf91488ad6f6b9de39a6f5038b450bdbc6" + integrity sha512-0CXMOYPXgAdLM2OzVkiUfAL6QQwWVhnMfUXCqLsITY42FZ9TxAhZIHkoc4mfVxvPuXsBnRYGR8UQZX86p87z4A== dependencies: "@opentelemetry/api" "^1.0.0" @@ -492,81 +492,81 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.6.0.tgz#de2c6823203d6f319511898bb5de7e70f5267e19" integrity sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g== -"@opentelemetry/core@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.17.1.tgz#10c5e09c63aeb1836b34d80baf7113760fb19d96" - integrity sha512-I6LrZvl1FF97FQXPR0iieWQmKnGxYtMbWA1GrAXnLUR+B1Hn2m8KqQNEIlZAucyv00GBgpWkpllmULmZfG8P3g== - dependencies: - "@opentelemetry/semantic-conventions" "1.17.1" - -"@opentelemetry/exporter-trace-otlp-http@0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.44.0.tgz#1dfe24b87fa3e1f5edd2109da28d489029f90171" - integrity sha512-RkorGE6wf6PF5OjMUGBnbUDyaVgmN+vL7OgClJJUTxqbE7WqgbW8dkU04O+1mcB1znXZ1Aej1uDm0pS+eW/upA== - dependencies: - "@opentelemetry/core" "1.17.1" - "@opentelemetry/otlp-exporter-base" "0.44.0" - "@opentelemetry/otlp-transformer" "0.44.0" - "@opentelemetry/resources" "1.17.1" - "@opentelemetry/sdk-trace-base" "1.17.1" - -"@opentelemetry/otlp-exporter-base@0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.44.0.tgz#10563cbe3ed89d7c8d422b513b819026f00ba038" - integrity sha512-DKQqRrfVMe96aSLZiCgIesLcMLfnWH8d4bTpLB1JbU+SAQJ7nVCAfS9U36mjFCVhvNDD7gwfCNrxqFMCHq6FUw== - dependencies: - "@opentelemetry/core" "1.17.1" - -"@opentelemetry/otlp-transformer@0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.44.0.tgz#4f7eb2f6e4624b2110dfb3a5dda8cfebbd80225a" - integrity sha512-1/KC+aHM1oGEsXyNy7QoxpvErxGdzt26bg9VHyNb4TDILkUFdwrnywnxPc6lXZ6h/8T8Mt718UWOKjNHC514kQ== - dependencies: - "@opentelemetry/api-logs" "0.44.0" - "@opentelemetry/core" "1.17.1" - "@opentelemetry/resources" "1.17.1" - "@opentelemetry/sdk-logs" "0.44.0" - "@opentelemetry/sdk-metrics" "1.17.1" - "@opentelemetry/sdk-trace-base" "1.17.1" - -"@opentelemetry/resources@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.17.1.tgz#932f70f58c0e03fb1d38f0cba12672fd70804d99" - integrity sha512-M2e5emqg5I7qRKqlzKx0ROkcPyF8PbcSaWEdsm72od9txP7Z/Pl8PDYOyu80xWvbHAWk5mDxOF6v3vNdifzclA== - dependencies: - "@opentelemetry/core" "1.17.1" - "@opentelemetry/semantic-conventions" "1.17.1" - -"@opentelemetry/sdk-logs@0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.44.0.tgz#a46e0a013432f266fb7ef16d703c968898ae89c5" - integrity sha512-UN3ofh9Jj54gIgrSXNRWAoaH6iPvrrjed5YAtqO9cW65U+5QPzk1Rv95vjAcY9VTrmMWvuqgEK1CYObG6Hu4OQ== - dependencies: - "@opentelemetry/core" "1.17.1" - "@opentelemetry/resources" "1.17.1" - -"@opentelemetry/sdk-metrics@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.17.1.tgz#9c4d13d845bcc82be8684050d9db7cce10f61580" - integrity sha512-eHdpsMCKhKhwznxvEfls8Wv3y4ZBWkkXlD3m7vtHIiWBqsMHspWSfie1s07mM45i/bBCf6YBMgz17FUxIXwmZA== - dependencies: - "@opentelemetry/core" "1.17.1" - "@opentelemetry/resources" "1.17.1" +"@opentelemetry/core@1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.17.0.tgz#6a72425f5f953dc68b4c7c66d947c018173d30d2" + integrity sha512-tfnl3h+UefCgx1aeN2xtrmr6BmdWGKXypk0pflQR0urFS40aE88trnkOMc2HTJZbMrqEEl4HsaBeFhwLVXsrJg== + dependencies: + "@opentelemetry/semantic-conventions" "1.17.0" + +"@opentelemetry/exporter-trace-otlp-http@0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.43.0.tgz#4d0a3587a1d372d19c883d9a4720f6eeb7dc9671" + integrity sha512-X6RGl4RTWC13EBrFstAbTh4vKqVqf6afpvFcud9qYhvl2A53OZ5RTAQP+9MrAMhthiKQaftNsEDdB2/0Sq+Xkw== + dependencies: + "@opentelemetry/core" "1.17.0" + "@opentelemetry/otlp-exporter-base" "0.43.0" + "@opentelemetry/otlp-transformer" "0.43.0" + "@opentelemetry/resources" "1.17.0" + "@opentelemetry/sdk-trace-base" "1.17.0" + +"@opentelemetry/otlp-exporter-base@0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.43.0.tgz#3ac36e959897050ceba8838bb2af7145a9e73d2c" + integrity sha512-LXNtRFVuPRXB9q0qdvrLikQ3NtT9Jmv255Idryz3RJPhOh/Fa03sBASQoj3D55OH3xazmA90KFHfhJ/d8D8y4A== + dependencies: + "@opentelemetry/core" "1.17.0" + +"@opentelemetry/otlp-transformer@0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.43.0.tgz#d4b12ba52d5193a35840d9e1a5e646c4e7e06a5b" + integrity sha512-KXYmgzWdVBOD5NvPmGW1nEMJjyQ8gK3N8r6pi4HvmEhTp0v4T13qDSax4q0HfsqmbPJR355oqQSJUnu1dHNutw== + dependencies: + "@opentelemetry/api-logs" "0.43.0" + "@opentelemetry/core" "1.17.0" + "@opentelemetry/resources" "1.17.0" + "@opentelemetry/sdk-logs" "0.43.0" + "@opentelemetry/sdk-metrics" "1.17.0" + "@opentelemetry/sdk-trace-base" "1.17.0" + +"@opentelemetry/resources@1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.17.0.tgz#ee29144cfd7d194c69698c8153dbadec7fe6819f" + integrity sha512-+u0ciVnj8lhuL/qGRBPeVYvk7fL+H/vOddfvmOeJaA1KC+5/3UED1c9KoZQlRsNT5Kw1FaK8LkY2NVLYfOVZQw== + dependencies: + "@opentelemetry/core" "1.17.0" + "@opentelemetry/semantic-conventions" "1.17.0" + +"@opentelemetry/sdk-logs@0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.43.0.tgz#ad40803f0e8893d1839af3a32756d5f46f0f7bbe" + integrity sha512-JyJ2BBRKm37Mc4cSEhFmsMl5ASQn1dkGhEWzAAMSlhPtLRTv5PfvJwhR+Mboaic/eDLAlciwsgijq8IFlf6IgQ== + dependencies: + "@opentelemetry/core" "1.17.0" + "@opentelemetry/resources" "1.17.0" + +"@opentelemetry/sdk-metrics@1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.17.0.tgz#e51d39e0bb749780d17f9b1df12f0490438dec1a" + integrity sha512-HlWM27yGmYuwCoVRe3yg2PqKnIsq0kEF0HQgvkeDWz2NYkq9fFaSspR6kvjxUTbghAlZrabiqbgyKoYpYaXS3w== + dependencies: + "@opentelemetry/core" "1.17.0" + "@opentelemetry/resources" "1.17.0" lodash.merge "^4.6.2" -"@opentelemetry/sdk-trace-base@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.1.tgz#8ede213df8b0c957028a869c66964e535193a4fd" - integrity sha512-pfSJJSjZj5jkCJUQZicSpzN8Iz9UKMryPWikZRGObPnJo6cUSoKkjZh6BM3j+D47G4olMBN+YZKYqkFM1L6zNA== +"@opentelemetry/sdk-trace-base@1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.0.tgz#05a21763c9efa72903c20b8930293cdde344b681" + integrity sha512-2T5HA1/1iE36Q9eg6D4zYlC4Y4GcycI1J6NsHPKZY9oWfAxWsoYnRlkPfUqyY5XVtocCo/xHpnJvGNHwzT70oQ== dependencies: - "@opentelemetry/core" "1.17.1" - "@opentelemetry/resources" "1.17.1" - "@opentelemetry/semantic-conventions" "1.17.1" + "@opentelemetry/core" "1.17.0" + "@opentelemetry/resources" "1.17.0" + "@opentelemetry/semantic-conventions" "1.17.0" -"@opentelemetry/semantic-conventions@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.17.1.tgz#93d219935e967fbb9aa0592cc96b2c0ec817a56f" - integrity sha512-xbR2U+2YjauIuo42qmE8XyJK6dYeRMLJuOlUP5SO4auET4VtOHOzgkRVOq+Ik18N+Xf3YPcqJs9dZMiDddz1eQ== +"@opentelemetry/semantic-conventions@1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.17.0.tgz#af10baa9f05ce1e64a14065fc138b5739bfb65f6" + integrity sha512-+fguCd2d8d2qruk0H0DsCEy2CTK3t0Tugg7MhZ/UQMvmewbZLNnJ6heSYyzIZWG5IPfAXzoj4f4F/qpM7l4VBA== "@pkgjs/parseargs@^0.11.0": version "0.11.0"