Skip to content
This repository was archived by the owner on Aug 20, 2024. It is now read-only.

fix DNS #91

Merged
merged 7 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/Docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ jobs:
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: dotnet nuget
run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }}
#- name: dotnet nuget
# run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }}
- name: Run './build.cmd Docker'
run: ./build.cmd Docker
env:
CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }}
#CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }}
Docker_Username: ${{ secrets.DOCKER_USERNAME }}
Docker_Password: ${{ secrets.DOCKER_PASSWORD }}
GITHUB_CONTEXT: ${{ toJSON(github) }}
85 changes: 26 additions & 59 deletions .github/workflows/pr_validation.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [CustomGitHubActions (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_pr_validation --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------

name: pr_validation
permissions:
secrets: read

on:
push:
Expand All @@ -27,61 +13,42 @@ on:
- dev

jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
build:
name: Build on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v1
- name: Make build.sh executable
run: chmod +x ./build.sh
- name: Make build.cmd executable
run: chmod +x ./build.cmd
- uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.*
- uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.*
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: dotnet nuget
run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }}
- name: Run './build.cmd All'
run: ./build.cmd All
env:
CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }}
GITHUB_CONTEXT: ${{ toJSON(github) }}
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Make build.sh executable
run: chmod +x ./build.sh
- name: Make build.cmd executable
run: chmod +x ./build.cmd
- uses: actions/setup-dotnet@v1
- uses: actions/checkout@v3

- name: Make build scripts executable
if: runner.os != 'Windows'
run: |
chmod +x ./build.sh
chmod +x ./build.cmd

- uses: actions/setup-dotnet@v2
with:
dotnet-version: 5.0.*
- uses: actions/setup-dotnet@v1

- uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.*

- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: dotnet nuget
run: dotnet nuget add source -n Phobos ${{ secrets.CUSTOMNUGETSOURCE }}

#- name: dotnet nuget
# run: dotnet nuget add source -n Phobos "${{ secrets.CUSTOMNUGETSOURCE }}"

- name: Run './build.cmd All'
run: ./build.cmd All
env:
CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }}
GITHUB_CONTEXT: ${{ toJSON(github) }}
#CustomNuGetSource: ${{ secrets.CUSTOMNUGETSOURCE }}
GITHUB_CONTEXT: ${{ toJSON(github) }}
1 change: 1 addition & 0 deletions k8s/local/services/local-services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ metadata:
labels:
app: frontend
spec:
publishNotReadyAddresses: true
clusterIP: None
ports:
- port: 9228
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" />

<PackageReference Include="Phobos.Hosting" />
<!--<PackageReference Include="Phobos.Hosting" />-->

<PackageReference Include="Microsoft.Extensions.Hosting" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
using Petabridge.Cmd.Cluster.Sharding;
using Petabridge.Cmd.Host;
using Petabridge.Cmd.Remote;
using Phobos.Hosting;

namespace AkkaDotNet.Infrastructure.Configuration;

Expand Down Expand Up @@ -175,10 +174,10 @@ public static AkkaConfigurationBuilder WithStressCluster(this AkkaConfigurationB
.WithRemoting("0.0.0.0", options.AkkaClusterOptions.Port, options.AkkaClusterOptions.Hostname)
.WithClustering(clusterOptions)
.AddPersistence(options.PersistenceOptions)
.WithPhobos(AkkaRunMode.AkkaCluster, _ =>
{

})
// .WithPhobos(AkkaRunMode.AkkaCluster, _ =>
// {
//
// })
.StartActors((system, _) =>
{
system.ActorOf(Props.Create(() => new DispatcherConfigLogger()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi

builder
.SetResourceBuilder(resource)
.AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces
//.AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces
.AddHttpClientInstrumentation()
.AddAspNetCoreInstrumentation(options =>
{
Expand All @@ -61,7 +61,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi
builder
.SetResourceBuilder(ResourceBuilder.CreateDefault()
.AddService(Assembly.GetEntryAssembly()?.GetName().Name ?? "OpenTelemetryMetrics", serviceInstanceId: $"{Dns.GetHostName()}"))
.AddPhobosInstrumentation()
//.AddPhobosInstrumentation()
.AddHttpClientInstrumentation()
.AddAspNetCoreInstrumentation()
.AddMeter(AkkaStressSource)
Expand Down
Loading