diff --git a/tracer/build/_build/UpdateVendors/VendoredDependency.cs b/tracer/build/_build/UpdateVendors/VendoredDependency.cs index 15a082e3c2d1..dce8b4e2e49a 100644 --- a/tracer/build/_build/UpdateVendors/VendoredDependency.cs +++ b/tracer/build/_build/UpdateVendors/VendoredDependency.cs @@ -88,9 +88,9 @@ static VendoredDependency() Add( libraryName: "Datadog.Sketches", - version: "1.0.0", - downloadUrl: "https://github.com/DataDog/sketches-dotnet/archive/v1.0.0.zip", - pathToSrc: new[] { "sketches-dotnet-1.0.0", "src", "Datadog.Sketches" }, + version: "main", + downloadUrl: "https://github.com/DataDog/sketches-dotnet/archive/refs/heads/main.zip", + pathToSrc: new[] { "sketches-dotnet-main", "src", "Datadog.Sketches" }, // Perform standard CS file transform with additional '#nullable enable' directive at the beginning of the files, since the vendored project was built with enable transform: filePath => RewriteCsFileWithStandardTransform(filePath, originalNamespace: "Datadog.Sketches", AddNullableDirectiveTransform)); diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/AssemblyInfo.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/AssemblyInfo.cs index 3e55c1c24c7e..766a55dccdce 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/AssemblyInfo.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/AssemblyInfo.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/BinaryPrimatives.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/BinaryPrimitives.cs similarity index 92% rename from tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/BinaryPrimatives.cs rename to tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/BinaryPrimitives.cs index ffccbec015cc..016d34adf819 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/BinaryPrimatives.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/BinaryPrimitives.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/DDSketch.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/DDSketch.cs index 35aff7aa9179..35dc5b62b3ad 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/DDSketch.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/DDSketch.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Helpers.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Helpers.cs index d7697361a778..9b22a1e25c2e 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Helpers.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Helpers.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/IIndexMapping.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/IIndexMapping.cs index 34ab3e240ba2..0d6d0f1332cc 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/IIndexMapping.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/IIndexMapping.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/LogarithmicMapping.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/LogarithmicMapping.cs index 3e0f09785337..fdbfbde6f7ce 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/LogarithmicMapping.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Mappings/LogarithmicMapping.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/ISerializable.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/ISerializable.cs index d44f6fc8baee..9667cd24069b 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/ISerializable.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/ISerializable.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/Serializer.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/Serializer.cs index f26f3559db72..f11c1c2efcb7 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/Serializer.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Serialization/Serializer.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Bin.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Bin.cs index 18f10abc75f0..d4321158b710 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Bin.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Bin.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingDenseStore.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingDenseStore.cs index 5a82f87ebfcc..67fc9623012f 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingDenseStore.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingDenseStore.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingHighestDenseStore.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingHighestDenseStore.cs index a1dddfd1544d..22c096b2b86d 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingHighestDenseStore.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingHighestDenseStore.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. @@ -39,7 +40,7 @@ public override void MergeWith(Store store) } else { - foreach (var bin in EnumerateAscending()) + foreach (var bin in store.EnumerateAscending()) { Add(bin); } diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingLowestDenseStore.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingLowestDenseStore.cs index aad0ab51564f..f07573c78803 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingLowestDenseStore.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/CollapsingLowestDenseStore.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. @@ -42,7 +43,7 @@ public override void MergeWith(Store store) } else { - foreach (var bin in EnumerateDescending()) + foreach (var bin in store.EnumerateDescending()) { Add(bin); } diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/DenseStore.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/DenseStore.cs index 14d8801bf029..46be6fa6a1dc 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/DenseStore.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/DenseStore.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Store.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Store.cs index b48be69e4fd8..819fbf6dd99d 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Store.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/Store.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/UnboundedSizeDenseStore.cs b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/UnboundedSizeDenseStore.cs index b8ff90957d86..d696cbb35f27 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/UnboundedSizeDenseStore.cs +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/Stores/UnboundedSizeDenseStore.cs @@ -1,7 +1,8 @@ //------------------------------------------------------------------------------ // -// This file was automatically generated by the UpdateVendors tool. +// This file was automatically generated by the UpdateVendoredCode tool. //------------------------------------------------------------------------------ +#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032 #nullable enable // // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. diff --git a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/_last_downloaded_source_url.txt b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/_last_downloaded_source_url.txt index 07a3e274930e..7646c1c672a3 100644 --- a/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/_last_downloaded_source_url.txt +++ b/tracer/src/Datadog.Trace/Vendors/Datadog.Sketches/_last_downloaded_source_url.txt @@ -1 +1 @@ -https://github.com/DataDog/sketches-dotnet/archive/v1.0.0.zip \ No newline at end of file +https://github.com/DataDog/sketches-dotnet/archive/refs/heads/main.zip \ No newline at end of file