Skip to content

Commit ccf0a2d

Browse files
Aaalibaba42Aaalibaba42
committed
feat(ddtelemetry): filled windows version kernel info
1 parent 22dac62 commit ccf0a2d

File tree

4 files changed

+285
-2
lines changed

4 files changed

+285
-2
lines changed

‎Cargo.lock‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSE-3rdparty.yml‎

Lines changed: 258 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32952,6 +32952,237 @@ third_party_libraries:
3295232952
text: NOT FOUND
3295332953
- license: Apache-2.0
3295432954
text: NOT FOUND
32955+
- package_name: windows
32956+
package_version: 0.48.0
32957+
repository: https://github.com/microsoft/windows-rs
32958+
license: MIT OR Apache-2.0
32959+
licenses:
32960+
- license: MIT
32961+
text: |2
32962+
MIT License
32963+
32964+
Copyright (c) Microsoft Corporation.
32965+
32966+
Permission is hereby granted, free of charge, to any person obtaining a copy
32967+
of this software and associated documentation files (the "Software"), to deal
32968+
in the Software without restriction, including without limitation the rights
32969+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
32970+
copies of the Software, and to permit persons to whom the Software is
32971+
furnished to do so, subject to the following conditions:
32972+
32973+
The above copyright notice and this permission notice shall be included in all
32974+
copies or substantial portions of the Software.
32975+
32976+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
32977+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32978+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32979+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
32980+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
32981+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
32982+
SOFTWARE
32983+
- license: Apache-2.0
32984+
text: |2
32985+
Apache License
32986+
Version 2.0, January 2004
32987+
http://www.apache.org/licenses/
32988+
32989+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
32990+
32991+
1. Definitions.
32992+
32993+
"License" shall mean the terms and conditions for use, reproduction,
32994+
and distribution as defined by Sections 1 through 9 of this document.
32995+
32996+
"Licensor" shall mean the copyright owner or entity authorized by
32997+
the copyright owner that is granting the License.
32998+
32999+
"Legal Entity" shall mean the union of the acting entity and all
33000+
other entities that control, are controlled by, or are under common
33001+
control with that entity. For the purposes of this definition,
33002+
"control" means (i) the power, direct or indirect, to cause the
33003+
direction or management of such entity, whether by contract or
33004+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
33005+
outstanding shares, or (iii) beneficial ownership of such entity.
33006+
33007+
"You" (or "Your") shall mean an individual or Legal Entity
33008+
exercising permissions granted by this License.
33009+
33010+
"Source" form shall mean the preferred form for making modifications,
33011+
including but not limited to software source code, documentation
33012+
source, and configuration files.
33013+
33014+
"Object" form shall mean any form resulting from mechanical
33015+
transformation or translation of a Source form, including but
33016+
not limited to compiled object code, generated documentation,
33017+
and conversions to other media types.
33018+
33019+
"Work" shall mean the work of authorship, whether in Source or
33020+
Object form, made available under the License, as indicated by a
33021+
copyright notice that is included in or attached to the work
33022+
(an example is provided in the Appendix below).
33023+
33024+
"Derivative Works" shall mean any work, whether in Source or Object
33025+
form, that is based on (or derived from) the Work and for which the
33026+
editorial revisions, annotations, elaborations, or other modifications
33027+
represent, as a whole, an original work of authorship. For the purposes
33028+
of this License, Derivative Works shall not include works that remain
33029+
separable from, or merely link (or bind by name) to the interfaces of,
33030+
the Work and Derivative Works thereof.
33031+
33032+
"Contribution" shall mean any work of authorship, including
33033+
the original version of the Work and any modifications or additions
33034+
to that Work or Derivative Works thereof, that is intentionally
33035+
submitted to Licensor for inclusion in the Work by the copyright owner
33036+
or by an individual or Legal Entity authorized to submit on behalf of
33037+
the copyright owner. For the purposes of this definition, "submitted"
33038+
means any form of electronic, verbal, or written communication sent
33039+
to the Licensor or its representatives, including but not limited to
33040+
communication on electronic mailing lists, source code control systems,
33041+
and issue tracking systems that are managed by, or on behalf of, the
33042+
Licensor for the purpose of discussing and improving the Work, but
33043+
excluding communication that is conspicuously marked or otherwise
33044+
designated in writing by the copyright owner as "Not a Contribution."
33045+
33046+
"Contributor" shall mean Licensor and any individual or Legal Entity
33047+
on behalf of whom a Contribution has been received by Licensor and
33048+
subsequently incorporated within the Work.
33049+
33050+
2. Grant of Copyright License. Subject to the terms and conditions of
33051+
this License, each Contributor hereby grants to You a perpetual,
33052+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
33053+
copyright license to reproduce, prepare Derivative Works of,
33054+
publicly display, publicly perform, sublicense, and distribute the
33055+
Work and such Derivative Works in Source or Object form.
33056+
33057+
3. Grant of Patent License. Subject to the terms and conditions of
33058+
this License, each Contributor hereby grants to You a perpetual,
33059+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
33060+
(except as stated in this section) patent license to make, have made,
33061+
use, offer to sell, sell, import, and otherwise transfer the Work,
33062+
where such license applies only to those patent claims licensable
33063+
by such Contributor that are necessarily infringed by their
33064+
Contribution(s) alone or by combination of their Contribution(s)
33065+
with the Work to which such Contribution(s) was submitted. If You
33066+
institute patent litigation against any entity (including a
33067+
cross-claim or counterclaim in a lawsuit) alleging that the Work
33068+
or a Contribution incorporated within the Work constitutes direct
33069+
or contributory patent infringement, then any patent licenses
33070+
granted to You under this License for that Work shall terminate
33071+
as of the date such litigation is filed.
33072+
33073+
4. Redistribution. You may reproduce and distribute copies of the
33074+
Work or Derivative Works thereof in any medium, with or without
33075+
modifications, and in Source or Object form, provided that You
33076+
meet the following conditions:
33077+
33078+
(a) You must give any other recipients of the Work or
33079+
Derivative Works a copy of this License; and
33080+
33081+
(b) You must cause any modified files to carry prominent notices
33082+
stating that You changed the files; and
33083+
33084+
(c) You must retain, in the Source form of any Derivative Works
33085+
that You distribute, all copyright, patent, trademark, and
33086+
attribution notices from the Source form of the Work,
33087+
excluding those notices that do not pertain to any part of
33088+
the Derivative Works; and
33089+
33090+
(d) If the Work includes a "NOTICE" text file as part of its
33091+
distribution, then any Derivative Works that You distribute must
33092+
include a readable copy of the attribution notices contained
33093+
within such NOTICE file, excluding those notices that do not
33094+
pertain to any part of the Derivative Works, in at least one
33095+
of the following places: within a NOTICE text file distributed
33096+
as part of the Derivative Works; within the Source form or
33097+
documentation, if provided along with the Derivative Works; or,
33098+
within a display generated by the Derivative Works, if and
33099+
wherever such third-party notices normally appear. The contents
33100+
of the NOTICE file are for informational purposes only and
33101+
do not modify the License. You may add Your own attribution
33102+
notices within Derivative Works that You distribute, alongside
33103+
or as an addendum to the NOTICE text from the Work, provided
33104+
that such additional attribution notices cannot be construed
33105+
as modifying the License.
33106+
33107+
You may add Your own copyright statement to Your modifications and
33108+
may provide additional or different license terms and conditions
33109+
for use, reproduction, or distribution of Your modifications, or
33110+
for any such Derivative Works as a whole, provided Your use,
33111+
reproduction, and distribution of the Work otherwise complies with
33112+
the conditions stated in this License.
33113+
33114+
5. Submission of Contributions. Unless You explicitly state otherwise,
33115+
any Contribution intentionally submitted for inclusion in the Work
33116+
by You to the Licensor shall be under the terms and conditions of
33117+
this License, without any additional terms or conditions.
33118+
Notwithstanding the above, nothing herein shall supersede or modify
33119+
the terms of any separate license agreement you may have executed
33120+
with Licensor regarding such Contributions.
33121+
33122+
6. Trademarks. This License does not grant permission to use the trade
33123+
names, trademarks, service marks, or product names of the Licensor,
33124+
except as required for reasonable and customary use in describing the
33125+
origin of the Work and reproducing the content of the NOTICE file.
33126+
33127+
7. Disclaimer of Warranty. Unless required by applicable law or
33128+
agreed to in writing, Licensor provides the Work (and each
33129+
Contributor provides its Contributions) on an "AS IS" BASIS,
33130+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
33131+
implied, including, without limitation, any warranties or conditions
33132+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
33133+
PARTICULAR PURPOSE. You are solely responsible for determining the
33134+
appropriateness of using or redistributing the Work and assume any
33135+
risks associated with Your exercise of permissions under this License.
33136+
33137+
8. Limitation of Liability. In no event and under no legal theory,
33138+
whether in tort (including negligence), contract, or otherwise,
33139+
unless required by applicable law (such as deliberate and grossly
33140+
negligent acts) or agreed to in writing, shall any Contributor be
33141+
liable to You for damages, including any direct, indirect, special,
33142+
incidental, or consequential damages of any character arising as a
33143+
result of this License or out of the use or inability to use the
33144+
Work (including but not limited to damages for loss of goodwill,
33145+
work stoppage, computer failure or malfunction, or any and all
33146+
other commercial damages or losses), even if such Contributor
33147+
has been advised of the possibility of such damages.
33148+
33149+
9. Accepting Warranty or Additional Liability. While redistributing
33150+
the Work or Derivative Works thereof, You may choose to offer,
33151+
and charge a fee for, acceptance of support, warranty, indemnity,
33152+
or other liability obligations and/or rights consistent with this
33153+
License. However, in accepting such obligations, You may act only
33154+
on Your own behalf and on Your sole responsibility, not on behalf
33155+
of any other Contributor, and only if You agree to indemnify,
33156+
defend, and hold each Contributor harmless for any liability
33157+
incurred by, or claims asserted against, such Contributor by reason
33158+
of your accepting any such warranty or additional liability.
33159+
33160+
END OF TERMS AND CONDITIONS
33161+
33162+
APPENDIX: How to apply the Apache License to your work.
33163+
33164+
To apply the Apache License to your work, attach the following
33165+
boilerplate notice, with the fields enclosed by brackets "[]"
33166+
replaced with your own identifying information. (Don't include
33167+
the brackets!) The text should be enclosed in the appropriate
33168+
comment syntax for the file format. We also recommend that a
33169+
file or class name and description of purpose be included on the
33170+
same "printed page" as the copyright notice for easier
33171+
identification within third-party archives.
33172+
33173+
Copyright (c) Microsoft Corporation.
33174+
33175+
Licensed under the Apache License, Version 2.0 (the "License");
33176+
you may not use this file except in compliance with the License.
33177+
You may obtain a copy of the License at
33178+
33179+
http://www.apache.org/licenses/LICENSE-2.0
33180+
33181+
Unless required by applicable law or agreed to in writing, software
33182+
distributed under the License is distributed on an "AS IS" BASIS,
33183+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
33184+
See the License for the specific language governing permissions and
33185+
limitations under the License.
3295533186
- package_name: windows
3295633187
package_version: 0.51.1
3295733188
repository: https://github.com/microsoft/windows-rs
@@ -43628,6 +43859,33 @@ third_party_libraries:
4362843859
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
4362943860
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
4363043861
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
43862+
- package_name: winver
43863+
package_version: 1.0.0
43864+
repository: https://github.com/rhysd/winver
43865+
license: MIT
43866+
licenses:
43867+
- license: MIT
43868+
text: |
43869+
the MIT License
43870+
43871+
Copyright (c) 2023 rhysd
43872+
43873+
Permission is hereby granted, free of charge, to any person obtaining a copy
43874+
of this software and associated documentation files (the "Software"), to deal
43875+
in the Software without restriction, including without limitation the rights
43876+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
43877+
of the Software, and to permit persons to whom the Software is furnished to do so,
43878+
subject to the following conditions:
43879+
43880+
The above copyright notice and this permission notice shall be included in all
43881+
copies or substantial portions of the Software.
43882+
43883+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
43884+
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
43885+
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
43886+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
43887+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
43888+
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4363143889
- package_name: wit-bindgen-rt
4363243890
package_version: 0.39.0
4363343891
repository: https://github.com/bytecodealliance/wit-bindgen

‎ddtelemetry/Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ hashbrown = "0.15"
3333

3434
ddcommon = { path = "../ddcommon", default-features = false }
3535
datadog-ddsketch = { path = "../ddsketch" }
36+
37+
[target."cfg(unix)".dependencies]
3638
libc = "0.2.176"
39+
[target."cfg(windows)".dependencies]
40+
winver = "1.0.0"
3741

3842
[dev-dependencies]
3943
tracing-subscriber = "0.3.18"

‎ddtelemetry/src/lib.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ pub fn build_host() -> data::Host {
4141
kernel_release: info::os::os_release(),
4242
#[cfg(unix)]
4343
kernel_version: unsafe { info::os::uname() },
44-
// TODO Figure it out
45-
#[cfg(not(unix))]
44+
#[cfg(windows)]
45+
kernel_version: winver::WindowsVersion::detect()
46+
.map_or_default(|wv| Some(format!("{}.{}.{}", wv.major, wv.minor, wv.build))),
47+
#[cfg(not(any(windows, unix)))]
4648
kernel_version: None,
4749
}
4850
}

0 commit comments

Comments
 (0)