From 1739f6e8ac8764d12eebc845c477659236cfb174 Mon Sep 17 00:00:00 2001 From: jagilber Date: Wed, 27 Nov 2024 10:36:06 -0500 Subject: [PATCH 01/11] add 'formatted' as a file status --- src/CollectSFDataDll/DataFile/FileManager.cs | 1 + src/CollectSFDataDll/DataFile/FileObjectStatus.cs | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/CollectSFDataDll/DataFile/FileManager.cs b/src/CollectSFDataDll/DataFile/FileManager.cs index e0c7d86d..142604f4 100644 --- a/src/CollectSFDataDll/DataFile/FileManager.cs +++ b/src/CollectSFDataDll/DataFile/FileManager.cs @@ -230,6 +230,7 @@ public FileObjectCollection PopulateCollection(FileObject fileObject) where T FileObjectCollection collection = new FileObjectCollection() { fileObject }; _instance.TotalFilesFormatted++; _instance.TotalRecords += fileObject.RecordCount; + fileObject.Status = FileStatus.formatted; if (_config.IsKustoConfigured()) { diff --git a/src/CollectSFDataDll/DataFile/FileObjectStatus.cs b/src/CollectSFDataDll/DataFile/FileObjectStatus.cs index 5dfc3e62..9eca345f 100644 --- a/src/CollectSFDataDll/DataFile/FileObjectStatus.cs +++ b/src/CollectSFDataDll/DataFile/FileObjectStatus.cs @@ -16,9 +16,10 @@ public enum FileStatus queued = 4, downloading = 8, formatting = 16, - uploading = 32, - failed = 64, - succeeded = 128, - all = 256 + formatted = 32, + uploading = 64, + failed = 128, + succeeded = 256, + all = 512 } } \ No newline at end of file From 2a02812400420e22cd02701b028238bddaa8a66c Mon Sep 17 00:00:00 2001 From: jagilber Date: Wed, 27 Nov 2024 10:47:35 -0500 Subject: [PATCH 02/11] remove deprecated ado artifacts feed --- NuGet.config | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 NuGet.config diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index 4f79d5ef..00000000 --- a/NuGet.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file From a42559b577d153663d676c5b734f891472a1e1cf Mon Sep 17 00:00:00 2001 From: jagilber Date: Wed, 27 Nov 2024 10:54:41 -0500 Subject: [PATCH 03/11] fix 1:Collect:exception: System.NullReferenceException: Object reference not set to an instance of an object. at CollectSFData.Collector.UploadCacheData() in C:\github\jagilber\CollectServiceFabricData\src\CollectSFDataDll\Collector.cs:line 444 at CollectSFData.Collector.Collect(ConfigurationOptions configurationOptions) in C:\github\jagilber\CollectServiceFabricData\src\CollectSFDataDll\Collector.cs:line 65 --- src/CollectSFDataDll/Collector.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CollectSFDataDll/Collector.cs b/src/CollectSFDataDll/Collector.cs index d8a3758c..37d41447 100644 --- a/src/CollectSFDataDll/Collector.cs +++ b/src/CollectSFDataDll/Collector.cs @@ -546,7 +546,8 @@ private List GetFilesWithNecessaryExtension(List files, string l default: Log.Warning($"configured filetype:{Config.FileType} not valid for cache upload. returning."); - return null; + + break; } return files; } From 729fb4896189e35e5070aeea3d178552bc58efd5 Mon Sep 17 00:00:00 2001 From: jagilber Date: Wed, 29 Jan 2025 12:15:22 -0500 Subject: [PATCH 04/11] add prefix in logging output --- src/CollectSFDataDll/Azure/BlobManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CollectSFDataDll/Azure/BlobManager.cs b/src/CollectSFDataDll/Azure/BlobManager.cs index 1c9136c4..ad86df27 100644 --- a/src/CollectSFDataDll/Azure/BlobManager.cs +++ b/src/CollectSFDataDll/Azure/BlobManager.cs @@ -170,7 +170,7 @@ public void DownloadFiles(string[] uris) public List EnumerateContainerBlobPages(BlobContainerClient containerClient, string prefix = "") { - Log.Info($"enter containerUri: {containerClient.Name}"); + Log.Info($"enter containerUri: {containerClient.Name} prefix: {prefix}"); string continuationToken = ""; bool moreResultsAvailable = true; List blobItems = new List(); @@ -253,7 +253,7 @@ private void DownloadBlobsFromContainer(BlobContainerClient containerClient) private void DownloadBlobsFromDirectory(BlobContainerClient containerDirectory, string prefix = "") { - Log.Info($"enumerating:{containerDirectory}", ConsoleColor.Cyan); + Log.Info($"enumerating:{containerDirectory.Name} prefix:{prefix}", ConsoleColor.Cyan); _blobTasks.QueueTaskAction(() => QueueBlobSegmentDownload(EnumerateContainerBlobPages(containerDirectory, prefix))); } From 739031e5c5776d0bfb8ced7406adbf1dfaa4994b Mon Sep 17 00:00:00 2001 From: jagilber Date: Fri, 31 Jan 2025 07:00:44 -0500 Subject: [PATCH 05/11] remove nuget.config mangement from script --- scripts/dotnet-build.ps1 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/dotnet-build.ps1 b/scripts/dotnet-build.ps1 index ef7a349d..c9aafa37 100644 --- a/scripts/dotnet-build.ps1 +++ b/scripts/dotnet-build.ps1 @@ -60,7 +60,7 @@ function main() { $csproj = create-tempProject -projectFile $csproj $dllcsproj = create-tempProject -projectFile $dllcsproj $nuspecFile = create-nuspec $targetFrameworks - rename-nugetConfig + # rename-nugetConfig $error.Clear() write-host "dotnet restore $csproj" -ForegroundColor Green @@ -119,8 +119,13 @@ function build-configuration($configuration) { dotnet publish $csproj -f $targetFrameworks -r $runtimeIdentifier -c $configuration --self-contained $true -p:PublishSingleFile=true -p:PublishedTrimmed=true } - $nugetFile = "$projectDir/bin/$configuration/*.nupkg" - $nugetFile = (resolve-path $nugetFile)[-1] + write-host "searching for nupkg in $projectDir/bin/$configuration/*.nupkg" -ForegroundColor Green + $nugetFile = @(get-childItem "$projectDir/bin/$configuration/*.nupkg") + write-host "nugetFile results: $($nugetFile | out-string)" -ForegroundColor Green + if (!$nugetFile) { + return + } + $nugetFile = (resolve-path $nugetFile)[-1].FullName $nugetFunctions = "$pwd/nuget-functions.ps1" if ((test-path $nugetFile)) { From 1cd1933dbc0d66ee768918485e55a5ca5c885043 Mon Sep 17 00:00:00 2001 From: jagilber Date: Fri, 31 Jan 2025 07:01:03 -0500 Subject: [PATCH 06/11] add log when finished --- scripts/post-build-events.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/post-build-events.ps1 b/scripts/post-build-events.ps1 index 8b60bbb6..f1e92695 100644 --- a/scripts/post-build-events.ps1 +++ b/scripts/post-build-events.ps1 @@ -60,6 +60,9 @@ function main() { write-host "copying default options file $defaultOptionsFile" Copy-Item $defaultOptionsFile $outDir } + + write-host "finished post-build-event.ps1" + return 0 } main \ No newline at end of file From 245ae4aab44fdcf24c6539b97d6dfc783b0aa11c Mon Sep 17 00:00:00 2001 From: jagilber Date: Fri, 31 Jan 2025 07:10:10 -0500 Subject: [PATCH 07/11] =?UTF-8?q?dependency=20vulnerabilities=20updates=20?= =?UTF-8?q?=20CollectSFDataDll=20net8.0=20succeeded=20with=203=20warning(s?= =?UTF-8?q?)=20(0.6s)=20=E2=86=92=20src\bin\Debug\net8.0\CollectSFDataDll.?= =?UTF-8?q?dll?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit warning NU1902: Package 'Azure.Identity' 1.11.0 has a known moderate severity vulnerability, https://github.com/advisories/GHSA-m5vv-6r4h-3vj9 warning NU1902: Package 'Microsoft.Identity.Client' 4.60.1 has a known moderate severity vulnerability, https://github.com/advisories/GHSA-m5vv-6r4h-3vj9 : warning NU1901: Package 'Microsoft.Identity.Client' 4.60.1 has a known low severity vulnerability, https://github.com/advisories/GHSA-x674-v45j-fwxw --- src/CollectSFData/CollectSFData.nuspec | 24 ++++++++++---------- src/CollectSFDataDll/CollectSFDataDll.csproj | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/CollectSFData/CollectSFData.nuspec b/src/CollectSFData/CollectSFData.nuspec index a865aba9..ebe91821 100644 --- a/src/CollectSFData/CollectSFData.nuspec +++ b/src/CollectSFData/CollectSFData.nuspec @@ -21,15 +21,15 @@ - + - - + + @@ -38,15 +38,15 @@ - + - - + + @@ -56,15 +56,15 @@ - + - - + + @@ -73,15 +73,15 @@ - + - - + + diff --git a/src/CollectSFDataDll/CollectSFDataDll.csproj b/src/CollectSFDataDll/CollectSFDataDll.csproj index 81f738e9..3ea8890f 100644 --- a/src/CollectSFDataDll/CollectSFDataDll.csproj +++ b/src/CollectSFDataDll/CollectSFDataDll.csproj @@ -53,15 +53,15 @@ 1.1.1 - 1.11.0 + 1.11.4 true - 4.60.1 + 4.61.3 true - 4.60.1 + 4.61.3 true From 4a2b4476ee7418720b4079fc6b933c68e7183c23 Mon Sep 17 00:00:00 2001 From: jagilber Date: Sun, 23 Feb 2025 08:53:41 -0500 Subject: [PATCH 08/11] fix incorrect Roff programming language tag in github repo --- .gitattributes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index cdbbcf3b..778a3eba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ # fix incorrect Roff programming language tag in github repo -*.man -linguist-language -#*.man linguist-language=xml \ No newline at end of file +manifests/**/* linguist-vendored=true From 7dd47584e397f518e392d62e1feb700be1c9fda0 Mon Sep 17 00:00:00 2001 From: jagilber Date: Wed, 20 Aug 2025 07:46:04 -0400 Subject: [PATCH 09/11] release 3.0.2508.120 --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cd5fed1..bf3bec72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ # Change log +## 08/20/2025 + +- update GitHub Actions dependency: bump actions/download-artifact from 1 to 4.1.7 in /.github/workflows +- fix incorrect Roff programming language tag in github repo + +## 01/31/2025 + +- dependency vulnerabilities updates for .NET 8.0 target framework +- add log when collection is finished +- remove nuget.config management from script +- add prefix in logging output + +## 11/27/2024 + +- fix NullReferenceException in Collector.UploadCacheData() method +- remove deprecated Azure DevOps artifacts feed +- add 'formatted' as a file status + +## 09/03/2024 + +- update GitHub Actions workflow dependencies for security compliance + +## 08/12/2024 v3.0.2408.11213 + +- release version 3.0.2408.11213 + ## 08/11/2024 - (vchin) add support for 'LocalPath' ingestion into kusto emulator for testing From 8a963ca6b7697a8aef292b528c4b8803c5e9aaa7 Mon Sep 17 00:00:00 2001 From: jagilber Date: Wed, 20 Aug 2025 07:59:50 -0400 Subject: [PATCH 10/11] fix deprecated workflow --- .github/workflows/workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0ac2d7da..3b7c9b7e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -24,7 +24,7 @@ jobs: runs-on: windows-latest steps: - name: checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: environment shell: cmd @@ -73,7 +73,7 @@ jobs: run: dir "$($env:artifacts_path)" -recurse - name: upload artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: Release path: ${{ env.artifacts_path }} @@ -88,7 +88,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: environment shell: cmd From c093813f24c1b6689b7452ac67278fc2ed1e431c Mon Sep 17 00:00:00 2001 From: jagilber Date: Wed, 20 Aug 2025 08:00:53 -0400 Subject: [PATCH 11/11] release 3.0.2508.120 v2 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf3bec72..ab3f4939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 08/20/2025 +- fix deprecated GitHub Actions: upgrade upload-artifact from v1 to v4 and checkout from v1 to v4 - update GitHub Actions dependency: bump actions/download-artifact from 1 to 4.1.7 in /.github/workflows - fix incorrect Roff programming language tag in github repo