SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Update build paths, add Datadog tracing, and adjust versions

Browse source 
Corrected Dockerfile paths for Elsa.Server and Elsa.Studio, and added Datadog tracing and related environment variables. Included Datadog.Trace package in Elsa.Server.Web project and updated Elsa.Studio package versions to 3.3.0-preview.466.
This commit is contained in:
Sipke Schoorstra 2024-07-19 23:36:31 +02:00
parent 107d660210
commit 6924bd0770
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Directory.Build.props
View file

@ -30,6 +30,6 @@
<NoWarn>$(NoWarn);CS0162;CS1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<ElsaStudioVersion>3.2.0-rc3.443</ElsaStudioVersion>
<ElsaStudioVersion>3.2.0-rc3</ElsaStudioVersion>
</PropertyGroup>
</Project>

16
Directory.Packages.props
View file

@ -23,9 +23,9 @@
<PackageVersion Include="DistributedLock.Postgres" Version="1.2.0" />
<PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.14.6" />
<PackageVersion Include="Elsa.Studio" Version="$(ElsaStudioVersion)" />
<PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="$(ElsaStudioVersion)" />
<PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="$(ElsaStudioVersion)" />
<PackageVersion Include="Elsa.Studio" Version="3.3.0-preview.466" />
<PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="3.3.0-preview.466" />
<PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="3.3.0-preview.466" />
<PackageVersion Include="FastEndpoints" Version="5.27.0" />
<PackageVersion Include="FastEndpoints.Security" Version="5.27.0" />
<PackageVersion Include="FastEndpoints.Swagger" Version="5.27.0" />
@ -72,7 +72,7 @@
<PackageVersion Include="Proto.Cluster.CodeGen" Version="1.6.0" />
<PackageVersion Include="Proto.Cluster.TestProvider" Version="1.6.0" />
<PackageVersion Include="Proto.Cluster.AzureContainerApps" Version="1.6.0" />
<PackageVersion Include="Proto.OpenTelemetry" Version="1.6.0"/>
<PackageVersion Include="Proto.OpenTelemetry" Version="1.6.0" />
<PackageVersion Include="Proto.Persistence" Version="1.6.0" />
<PackageVersion Include="Proto.Persistence.Sqlite" Version="1.6.0" />
<PackageVersion Include="Proto.Persistence.SqlServer" Version="1.6.0" />
@ -170,9 +170,9 @@
<PackageVersion Include="Polly" Version="8.4.1" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="OpenTelemetry.AutoInstrumentation" Version="1.7.0"/>
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.15"/>
<PackageVersion Include="OpenTelemetry.AutoInstrumentation" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.15" />
</ItemGroup>
</Project>

2
docker/ElsaServer-Datadog.Dockerfile
View file

@ -15,7 +15,7 @@ COPY ./NuGet.Config ./
COPY *.props ./
# restore packages.
RUN dotnet restore "./src/bundles/Elsa.Server.Web/Elsa.Server.Web.csproj"
RUN dotnet restore "./src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj"
# build and publish (UseAppHost=false creates platform independent binaries).
WORKDIR /source/src/apps/Elsa.Server.Web

2
docker/ElsaStudio.Dockerfile
View file

@ -11,7 +11,7 @@ RUN dotnet restore "./src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.cspro
RUN dotnet restore "./src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj"
# build and publish (UseAppHost=false creates platform independent binaries).
WORKDIR /source/src/bundles/Elsa.Studio.Web
WORKDIR /source/src/apps/Elsa.Studio.Web
RUN dotnet build "Elsa.Studio.Web.csproj" -c Release -o /app/build
RUN dotnet publish "Elsa.Studio.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0

7
src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs
View file

@ -102,14 +102,17 @@ public class ProtoActorFeature : FeatureBase
if (_enableMetrics)
actorSystemConfig = actorSystemConfig.WithMetrics();
if (_enableTracing)
actorSystemConfig = actorSystemConfig.WithConfigureProps(props => props.WithTracing());
ConfigureActorSystemConfig(sp, actorSystemConfig);
var clusterProvider = CreateClusterProvider(sp);
var system = new ActorSystem(actorSystemConfig).WithServiceProvider(sp);
var workflowGrainProps = system.DI().PropsFor<WorkflowInstanceActor>();
if (_enableTracing)
workflowGrainProps = workflowGrainProps.WithTracing();
// if (_enableTracing)
// workflowGrainProps = workflowGrainProps.WithTracing();
var clusterConfig = ClusterConfig
.Setup(_clusterName, clusterProvider, new PartitionIdentityLookup())