Skip to content

Commit ee78547

Browse files
committed
Update to 6.2.0, replace Jaeger with OpenTelemetry
Updated project versions to 6.2.0 and replaced Jaeger tracing with OpenTelemetry across various projects. Enhanced Swagger configuration, improved null safety with nullable reference types, and refactored code for better readability and maintainability. Removed unnecessary metadata from project files and updated package references to specific versions.
2 parents 24589b4 + 328f67e commit ee78547

File tree

152 files changed

+1669
-1310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+1669
-1310
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# These are supported funding model platforms
22
open_collective: genocs
3-
custom: ['https://www.buymeacoffee.com/genocs']
3+
custom: ["https://www.buymeacoffee.com/genocs"]

.github/workflows/build_and_test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build test and pack
22

33
on:
44
push:
5-
branches: [ main, develop ]
5+
branches: [main, develop]
66
pull_request:
7-
branches: [ main, develop ]
7+
branches: [main, develop]
88

99
jobs:
1010
build:
@@ -14,20 +14,20 @@ jobs:
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v4
17-
17+
1818
- name: Setup .NET
1919
uses: actions/setup-dotnet@v4
2020
with:
2121
dotnet-version: 8.0.x
22-
22+
2323
- name: Restore dependencies
2424
run: dotnet restore
25-
25+
2626
- name: Build
2727
run: dotnet build -c Debug --no-restore
28-
28+
2929
- name: Test
3030
run: dotnet test -c Debug --no-build --verbosity normal
31-
31+
3232
- name: Pack
3333
run: dotnet pack -c Debug --no-build --verbosity normal

.github/workflows/dockerhub-publish.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ on:
1313
description: "Image Version"
1414

1515
# Default value if no value is explicitly provided
16-
default: "6.0.0"
16+
default: "6.2.0"
1717

1818
# Input has to be provided for the workflow to run
1919
required: true
2020

21-
2221
jobs:
2322
build:
2423
name: Publish Docker Image
@@ -27,21 +26,21 @@ jobs:
2726
steps:
2827
- name: Checkout
2928
uses: actions/checkout@v4
30-
29+
3130
- name: Setup .NET
3231
uses: actions/setup-dotnet@v4
3332
with:
3433
dotnet-version: 8.0.x
35-
34+
3635
- name: Restore dependencies
3736
run: dotnet restore
38-
37+
3938
- name: Build
4039
run: dotnet build -c Debug --no-restore
41-
40+
4241
- name: Test
4342
run: dotnet test --no-build --verbosity normal
44-
43+
4544
- name: Pack
4645
run: dotnet pack --no-build --verbosity normal
4746

.github/workflows/nuget-publish.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ on:
1313
description: "Packages Version"
1414

1515
# Default value if no value is explicitly provided
16-
default: "6.0.0"
16+
default: "6.2.0"
1717

1818
# Input has to be provided for the workflow to run
1919
required: true
2020

21-
2221
jobs:
2322
build:
2423
name: Update NuGet packages

CHANGELOG.md

Lines changed: 302 additions & 22 deletions
Large diffs are not rendered by default.

Directory.Build.props

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,19 @@
99
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)dotnet.ruleset</CodeAnalysisRuleSet>
1010
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1111
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
12-
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
12+
<LangVersion>10.0</LangVersion>
13+
<Company>Genocs</Company>
14+
<Copyright>Genocs 2024</Copyright>
15+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16+
<PackageProjectUrl>https://github.com/Genocs/genocs-library</PackageProjectUrl>
17+
<RepositoryUrl>https://github.com/Genocs/genocs-library.git</RepositoryUrl>
18+
<PackageIcon>icon.png</PackageIcon>
19+
<RepositoryType>git</RepositoryType>
20+
<EnableNETAnalyzers>True</EnableNETAnalyzers>
1321
</PropertyGroup>
1422

1523
<ItemGroup>
16-
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
24+
<PackageReference Include="Roslynator.Analyzers" Version="4.12.8">
1725
<PrivateAssets>all</PrivateAssets>
1826
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1927
</PackageReference>

README.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ docker compose -f ./infrastructure-security.yml --env-file ./.env --project-name
8282
# Use this file only in case you want to setup sqlserver database (no need if you use postgres)
8383
docker compose -f ./infrastructure-sqlserver.yml --env-file ./.env --project-name genocs up -d
8484

85+
# Use this file only in case you want to setup mySql database (no need if you use postgres)
86+
docker compose -f ./infrastructure-mysql.yml --env-file ./.env --project-name genocs up -d
87+
88+
# Use this file only in case you want to setup oracle database (no need if you use postgres)
89+
docker compose -f ./infrastructure-oracle.yml --env-file ./.env --project-name genocs up -d
90+
8591
# Use this file only in case you want to setup elk stack
8692
docker compose -f ./infrastructure-elk.yml --env-file ./.env --project-name genocs up -d
8793

@@ -233,13 +239,15 @@ Use [**api-workbench**](./api-workbench.rest) inside Visual Studio code with [RE
233239
"tags": {}
234240
},
235241
"jaeger": {
236-
"enabled": false,
237-
"serviceName": "users",
238-
"udpHost": "localhost",
239-
"udpPort": 6831,
240-
"maxPacketSize": 65000,
241-
"sampler": "const",
242-
"excludePaths": [ "/", "/ping", "/metrics" ]
242+
"enabled": true,
243+
"serviceName": "orders",
244+
"endpoint": "http://localhost:4317",
245+
"protocol": "Grpc",
246+
"processorType": "Batch",
247+
"maxQueueSize": 2048,
248+
"scheduledDelayMilliseconds": 5000,
249+
"exporterTimeoutMilliseconds": 30000,
250+
"maxExportBatchSize": 512
243251
},
244252
"jwt": {
245253
"certificate": {
@@ -547,6 +555,3 @@ Become a financial contributor and help me sustain the project. [Support the Pro
547555
## Acknowledgements
548556
- [devmentors](https://github.com/devmentors)
549557
- [abp](https://github.com/abpframework)
550-
551-
552-
- simple changes
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Get the resource group location
2+
param location string = 'East US'
3+
4+
@description('The name of you Web Site.')
5+
param webSiteName string = 'gnx-website'
6+
7+
param uniqueString string = '{uniqueString(resourceGroup().id)}'
8+
9+
// Generate a unique storage account name
10+
param storageAccountName string = 'helloworldstorage${uniqueString}'
11+
12+
// Create a storage account
13+
resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
14+
name: storageAccountName
15+
location: location
16+
sku: {
17+
name: 'Standard_LRS'
18+
}
19+
kind: 'StorageV2'
20+
properties: {
21+
accessTier: 'Hot'
22+
}
23+
}
24+
25+
// Create an App Service Plan
26+
resource appServicePlan 'Microsoft.Web/serverfarms@2023-12-01' = {
27+
name: 'asp-${uniqueString}'
28+
location: location
29+
sku: {
30+
name: 'F1'
31+
tier: 'Free'
32+
}
33+
}
34+
35+
// Create a web app
36+
resource webApp 'Microsoft.Web/sites@2023-12-01' = {
37+
name: webSiteName
38+
location: location
39+
properties: {
40+
serverFarmId: appServicePlan.id
41+
siteConfig: {
42+
appSettings: [
43+
{
44+
name: 'STORAGE_ACCOUNT_NAME'
45+
value: storageAccount.name
46+
}
47+
]
48+
}
49+
}
50+
}

containers/infrastructure-monitoring.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ services:
3535
- 9411:9411
3636
- 14268:14268
3737
- 16686:16686
38+
- 4317:4317
3839
# network_mode: host
3940
networks:
4041
- genocs
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
services:
2+
mysqldb:
3+
image: mysql
4+
hostname: mysqldb
5+
container_name: mysqldb
6+
ports:
7+
- 3306:3306
8+
9+
environment:
10+
MYSQL_ROOT_PASSWORD: MySect3tPassw!
11+
volumes:
12+
- mysqlsystem:/var/lib/mysql
13+
networks:
14+
- genocs
15+
16+
networks:
17+
genocs:
18+
name: genocs-network
19+
external: true
20+
21+
volumes:
22+
mysqlsystem:
23+
driver: local

0 commit comments

Comments
 (0)