Skip to content

Commit 4e03157

Browse files
eamodioeamodio
committed
Updates dependencies
1 parent 83591f6 commit 4e03157

File tree

4 files changed

+338
-143
lines changed

4 files changed

+338
-143
lines changed

‎ThirdPartyNotices.txt

Lines changed: 229 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,28 @@ This project incorporates components from the projects listed below.
1111
6. @octokit/request version 9.1.1 (https://github.com/octokit/request.js)
1212
7. @octokit/types version 13.5.0 (https://github.com/octokit/types.ts)
1313
8. @opentelemetry/api version 1.9.0 (https://github.com/open-telemetry/opentelemetry-js)
14-
9. @opentelemetry/exporter-trace-otlp-http version 0.52.1 (https://github.com/open-telemetry/opentelemetry-js)
15-
10. @opentelemetry/sdk-trace-base version 1.25.1 (https://github.com/open-telemetry/opentelemetry-js)
16-
11. @shoelace-style/shoelace version 2.15.1 (https://github.com/shoelace-style/shoelace)
17-
12. @vscode/codicons version 0.0.36 (https://github.com/microsoft/vscode-codicons)
18-
13. @vscode/webview-ui-toolkit version 1.4.0 (https://github.com/microsoft/vscode-webview-ui-toolkit)
19-
14. ansi-regex version 6.0.1 (https://github.com/chalk/ansi-regex)
20-
15. billboard.js version 3.12.4 (https://github.com/naver/billboard.js)
21-
16. fast-string-truncated-width version 1.1.0 (https://github.com/fabiospampinato/fast-string-truncated-width)
22-
17. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
23-
18. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
24-
19. lit version 3.1.4 (https://github.com/lit/lit)
25-
20. marked version 12.0.2 (https://github.com/markedjs/marked)
26-
21. microsoft/vscode (https://github.com/microsoft/vscode)
27-
22. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
28-
23. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)
29-
24. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify)
30-
25. react-dom version 16.8.4 (https://github.com/facebook/react)
31-
26. react version 16.8.4 (https://github.com/facebook/react)
32-
27. sindresorhus/is-fullwidth-code-point (https://github.com/sindresorhus/is-fullwidth-code-point)
33-
28. sindresorhus/string-width (https://github.com/sindresorhus/string-width)
34-
29. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable)
14+
9. @opentelemetry/exporter-trace-otlp-http version 0.53.0 (https://github.com/open-telemetry/opentelemetry-js)
15+
10. @opentelemetry/sdk-trace-base version 1.26.0 (https://github.com/open-telemetry/opentelemetry-js)
16+
11. @opentelemetry/semantic-conventions version 1.27.0 (https://github.com/open-telemetry/opentelemetry-js)
17+
12. @shoelace-style/shoelace version 2.16.0 (https://github.com/shoelace-style/shoelace)
18+
13. @vscode/codicons version 0.0.36 (https://github.com/microsoft/vscode-codicons)
19+
14. @vscode/webview-ui-toolkit version 1.4.0 (https://github.com/microsoft/vscode-webview-ui-toolkit)
20+
15. ansi-regex version 6.1.0 (https://github.com/chalk/ansi-regex)
21+
16. billboard.js version 3.13.0 (https://github.com/naver/billboard.js)
22+
17. fast-string-truncated-width version 1.1.0 (https://github.com/fabiospampinato/fast-string-truncated-width)
23+
18. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
24+
19. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
25+
20. lit version 3.2.0 (https://github.com/lit/lit)
26+
21. marked version 12.0.2 (https://github.com/markedjs/marked)
27+
22. microsoft/vscode (https://github.com/microsoft/vscode)
28+
23. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
29+
24. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)
30+
25. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify)
31+
26. react-dom version 16.8.4 (https://github.com/facebook/react)
32+
27. react version 16.8.4 (https://github.com/facebook/react)
33+
28. sindresorhus/is-fullwidth-code-point (https://github.com/sindresorhus/is-fullwidth-code-point)
34+
29. sindresorhus/string-width (https://github.com/sindresorhus/string-width)
35+
30. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable)
3536

3637
%% @lit/context NOTICES AND INFORMATION BEGIN HERE
3738
=========================================
@@ -888,6 +889,213 @@ END OF @opentelemetry/exporter-trace-otlp-http NOTICES AND INFORMATION
888889
=========================================
889890
END OF @opentelemetry/sdk-trace-base NOTICES AND INFORMATION
890891

892+
%% @opentelemetry/semantic-conventions NOTICES AND INFORMATION BEGIN HERE
893+
=========================================
894+
Apache License
895+
Version 2.0, January 2004
896+
http://www.apache.org/licenses/
897+
898+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
899+
900+
1. Definitions.
901+
902+
"License" shall mean the terms and conditions for use, reproduction,
903+
and distribution as defined by Sections 1 through 9 of this document.
904+
905+
"Licensor" shall mean the copyright owner or entity authorized by
906+
the copyright owner that is granting the License.
907+
908+
"Legal Entity" shall mean the union of the acting entity and all
909+
other entities that control, are controlled by, or are under common
910+
control with that entity. For the purposes of this definition,
911+
"control" means (i) the power, direct or indirect, to cause the
912+
direction or management of such entity, whether by contract or
913+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
914+
outstanding shares, or (iii) beneficial ownership of such entity.
915+
916+
"You" (or "Your") shall mean an individual or Legal Entity
917+
exercising permissions granted by this License.
918+
919+
"Source" form shall mean the preferred form for making modifications,
920+
including but not limited to software source code, documentation
921+
source, and configuration files.
922+
923+
"Object" form shall mean any form resulting from mechanical
924+
transformation or translation of a Source form, including but
925+
not limited to compiled object code, generated documentation,
926+
and conversions to other media types.
927+
928+
"Work" shall mean the work of authorship, whether in Source or
929+
Object form, made available under the License, as indicated by a
930+
copyright notice that is included in or attached to the work
931+
(an example is provided in the Appendix below).
932+
933+
"Derivative Works" shall mean any work, whether in Source or Object
934+
form, that is based on (or derived from) the Work and for which the
935+
editorial revisions, annotations, elaborations, or other modifications
936+
represent, as a whole, an original work of authorship. For the purposes
937+
of this License, Derivative Works shall not include works that remain
938+
separable from, or merely link (or bind by name) to the interfaces of,
939+
the Work and Derivative Works thereof.
940+
941+
"Contribution" shall mean any work of authorship, including
942+
the original version of the Work and any modifications or additions
943+
to that Work or Derivative Works thereof, that is intentionally
944+
submitted to Licensor for inclusion in the Work by the copyright owner
945+
or by an individual or Legal Entity authorized to submit on behalf of
946+
the copyright owner. For the purposes of this definition, "submitted"
947+
means any form of electronic, verbal, or written communication sent
948+
to the Licensor or its representatives, including but not limited to
949+
communication on electronic mailing lists, source code control systems,
950+
and issue tracking systems that are managed by, or on behalf of, the
951+
Licensor for the purpose of discussing and improving the Work, but
952+
excluding communication that is conspicuously marked or otherwise
953+
designated in writing by the copyright owner as "Not a Contribution."
954+
955+
"Contributor" shall mean Licensor and any individual or Legal Entity
956+
on behalf of whom a Contribution has been received by Licensor and
957+
subsequently incorporated within the Work.
958+
959+
2. Grant of Copyright License. Subject to the terms and conditions of
960+
this License, each Contributor hereby grants to You a perpetual,
961+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
962+
copyright license to reproduce, prepare Derivative Works of,
963+
publicly display, publicly perform, sublicense, and distribute the
964+
Work and such Derivative Works in Source or Object form.
965+
966+
3. Grant of Patent License. Subject to the terms and conditions of
967+
this License, each Contributor hereby grants to You a perpetual,
968+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
969+
(except as stated in this section) patent license to make, have made,
970+
use, offer to sell, sell, import, and otherwise transfer the Work,
971+
where such license applies only to those patent claims licensable
972+
by such Contributor that are necessarily infringed by their
973+
Contribution(s) alone or by combination of their Contribution(s)
974+
with the Work to which such Contribution(s) was submitted. If You
975+
institute patent litigation against any entity (including a
976+
cross-claim or counterclaim in a lawsuit) alleging that the Work
977+
or a Contribution incorporated within the Work constitutes direct
978+
or contributory patent infringement, then any patent licenses
979+
granted to You under this License for that Work shall terminate
980+
as of the date such litigation is filed.
981+
982+
4. Redistribution. You may reproduce and distribute copies of the
983+
Work or Derivative Works thereof in any medium, with or without
984+
modifications, and in Source or Object form, provided that You
985+
meet the following conditions:
986+
987+
(a) You must give any other recipients of the Work or
988+
Derivative Works a copy of this License; and
989+
990+
(b) You must cause any modified files to carry prominent notices
991+
stating that You changed the files; and
992+
993+
(c) You must retain, in the Source form of any Derivative Works
994+
that You distribute, all copyright, patent, trademark, and
995+
attribution notices from the Source form of the Work,
996+
excluding those notices that do not pertain to any part of
997+
the Derivative Works; and
998+
999+
(d) If the Work includes a "NOTICE" text file as part of its
1000+
distribution, then any Derivative Works that You distribute must
1001+
include a readable copy of the attribution notices contained
1002+
within such NOTICE file, excluding those notices that do not
1003+
pertain to any part of the Derivative Works, in at least one
1004+
of the following places: within a NOTICE text file distributed
1005+
as part of the Derivative Works; within the Source form or
1006+
documentation, if provided along with the Derivative Works; or,
1007+
within a display generated by the Derivative Works, if and
1008+
wherever such third-party notices normally appear. The contents
1009+
of the NOTICE file are for informational purposes only and
1010+
do not modify the License. You may add Your own attribution
1011+
notices within Derivative Works that You distribute, alongside
1012+
or as an addendum to the NOTICE text from the Work, provided
1013+
that such additional attribution notices cannot be construed
1014+
as modifying the License.
1015+
1016+
You may add Your own copyright statement to Your modifications and
1017+
may provide additional or different license terms and conditions
1018+
for use, reproduction, or distribution of Your modifications, or
1019+
for any such Derivative Works as a whole, provided Your use,
1020+
reproduction, and distribution of the Work otherwise complies with
1021+
the conditions stated in this License.
1022+
1023+
5. Submission of Contributions. Unless You explicitly state otherwise,
1024+
any Contribution intentionally submitted for inclusion in the Work
1025+
by You to the Licensor shall be under the terms and conditions of
1026+
this License, without any additional terms or conditions.
1027+
Notwithstanding the above, nothing herein shall supersede or modify
1028+
the terms of any separate license agreement you may have executed
1029+
with Licensor regarding such Contributions.
1030+
1031+
6. Trademarks. This License does not grant permission to use the trade
1032+
names, trademarks, service marks, or product names of the Licensor,
1033+
except as required for reasonable and customary use in describing the
1034+
origin of the Work and reproducing the content of the NOTICE file.
1035+
1036+
7. Disclaimer of Warranty. Unless required by applicable law or
1037+
agreed to in writing, Licensor provides the Work (and each
1038+
Contributor provides its Contributions) on an "AS IS" BASIS,
1039+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
1040+
implied, including, without limitation, any warranties or conditions
1041+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
1042+
PARTICULAR PURPOSE. You are solely responsible for determining the
1043+
appropriateness of using or redistributing the Work and assume any
1044+
risks associated with Your exercise of permissions under this License.
1045+
1046+
8. Limitation of Liability. In no event and under no legal theory,
1047+
whether in tort (including negligence), contract, or otherwise,
1048+
unless required by applicable law (such as deliberate and grossly
1049+
negligent acts) or agreed to in writing, shall any Contributor be
1050+
liable to You for damages, including any direct, indirect, special,
1051+
incidental, or consequential damages of any character arising as a
1052+
result of this License or out of the use or inability to use the
1053+
Work (including but not limited to damages for loss of goodwill,
1054+
work stoppage, computer failure or malfunction, or any and all
1055+
other commercial damages or losses), even if such Contributor
1056+
has been advised of the possibility of such damages.
1057+
1058+
9. Accepting Warranty or Additional Liability. While redistributing
1059+
the Work or Derivative Works thereof, You may choose to offer,
1060+
and charge a fee for, acceptance of support, warranty, indemnity,
1061+
or other liability obligations and/or rights consistent with this
1062+
License. However, in accepting such obligations, You may act only
1063+
on Your own behalf and on Your sole responsibility, not on behalf
1064+
of any other Contributor, and only if You agree to indemnify,
1065+
defend, and hold each Contributor harmless for any liability
1066+
incurred by, or claims asserted against, such Contributor by reason
1067+
of your accepting any such warranty or additional liability.
1068+
1069+
END OF TERMS AND CONDITIONS
1070+
1071+
APPENDIX: How to apply the Apache License to your work.
1072+
1073+
To apply the Apache License to your work, attach the following
1074+
boilerplate notice, with the fields enclosed by brackets "[]"
1075+
replaced with your own identifying information. (Don't include
1076+
the brackets!) The text should be enclosed in the appropriate
1077+
comment syntax for the file format. We also recommend that a
1078+
file or class name and description of purpose be included on the
1079+
same "printed page" as the copyright notice for easier
1080+
identification within third-party archives.
1081+
1082+
Copyright [yyyy] [name of copyright owner]
1083+
1084+
Licensed under the Apache License, Version 2.0 (the "License");
1085+
you may not use this file except in compliance with the License.
1086+
You may obtain a copy of the License at
1087+
1088+
http://www.apache.org/licenses/LICENSE-2.0
1089+
1090+
Unless required by applicable law or agreed to in writing, software
1091+
distributed under the License is distributed on an "AS IS" BASIS,
1092+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1093+
See the License for the specific language governing permissions and
1094+
limitations under the License.
1095+
1096+
=========================================
1097+
END OF @opentelemetry/semantic-conventions NOTICES AND INFORMATION
1098+
8911099
%% @shoelace-style/shoelace NOTICES AND INFORMATION BEGIN HERE
8921100
=========================================
8931101
Copyright (c) 2020 A Beautiful Site, LLC

‎package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17989,17 +17989,18 @@
1798917989
"@octokit/request": "9.1.1",
1799017990
"@octokit/types": "13.5.0",
1799117991
"@opentelemetry/api": "1.9.0",
17992-
"@opentelemetry/exporter-trace-otlp-http": "0.52.1",
17993-
"@opentelemetry/sdk-trace-base": "1.25.1",
17994-
"@shoelace-style/shoelace": "2.15.1",
17992+
"@opentelemetry/exporter-trace-otlp-http": "0.53.0",
17993+
"@opentelemetry/sdk-trace-base": "1.26.0",
17994+
"@opentelemetry/semantic-conventions": "1.27.0",
17995+
"@shoelace-style/shoelace": "2.16.0",
1799517996
"@vscode/codicons": "0.0.36",
1799617997
"@vscode/webview-ui-toolkit": "1.4.0",
17997-
"ansi-regex": "6.0.1",
17998-
"billboard.js": "3.12.4",
17998+
"ansi-regex": "6.1.0",
17999+
"billboard.js": "3.13.0",
1799918000
"fast-string-truncated-width": "1.1.0",
1800018001
"https-proxy-agent": "5.0.1",
1800118002
"iconv-lite": "0.6.3",
18002-
"lit": "3.1.4",
18003+
"lit": "3.2.0",
1800318004
"marked": "12.0.2",
1800418005
"node-fetch": "2.7.0",
1800518006
"os-browserify": "0.3.0",

‎src/telemetry/openTelemetryProvider.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import {
1010
// ConsoleSpanExporter,
1111
SimpleSpanProcessor,
1212
} from '@opentelemetry/sdk-trace-base';
13+
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
1314
import {
14-
SEMRESATTRS_DEPLOYMENT_ENVIRONMENT,
15-
SEMRESATTRS_DEVICE_ID,
16-
SEMRESATTRS_OS_TYPE,
17-
SEMRESATTRS_SERVICE_NAME,
18-
SEMRESATTRS_SERVICE_VERSION,
19-
} from '@opentelemetry/semantic-conventions';
15+
ATTR_DEPLOYMENT_ENVIRONMENT,
16+
ATTR_DEPLOYMENT_ENVIRONMENT_NAME,
17+
ATTR_DEVICE_ID,
18+
ATTR_OS_TYPE,
19+
} from '@opentelemetry/semantic-conventions/incubating';
2020
import type { HttpsProxyAgent } from 'https-proxy-agent';
2121
import type { TelemetryContext, TelemetryProvider } from './telemetry';
2222

@@ -29,11 +29,12 @@ export class OpenTelemetryProvider implements TelemetryProvider {
2929
constructor(context: TelemetryContext, agent?: HttpsProxyAgent, debugging?: boolean) {
3030
this.provider = new BasicTracerProvider({
3131
resource: new Resource({
32-
[SEMRESATTRS_SERVICE_NAME]: 'gitlens',
33-
[SEMRESATTRS_SERVICE_VERSION]: context.extensionVersion,
34-
[SEMRESATTRS_DEPLOYMENT_ENVIRONMENT]: context.env,
35-
[SEMRESATTRS_DEVICE_ID]: context.machineId,
36-
[SEMRESATTRS_OS_TYPE]: context.platform,
32+
[ATTR_SERVICE_NAME]: 'gitlens',
33+
[ATTR_SERVICE_VERSION]: context.extensionVersion,
34+
[ATTR_DEPLOYMENT_ENVIRONMENT]: context.env,
35+
[ATTR_DEPLOYMENT_ENVIRONMENT_NAME]: context.env,
36+
[ATTR_DEVICE_ID]: context.machineId,
37+
[ATTR_OS_TYPE]: context.platform,
3738
'extension.id': context.extensionId,
3839
'session.id': context.sessionId,
3940
language: context.language,

0 commit comments

Comments
 (0)