Skip to content

Commit c88f6f4

Browse files
pwelter34pwelter34
committed
updates
1 parent d4d75d0 commit c88f6f4

File tree

5 files changed

+24
-62
lines changed

5 files changed

+24
-62
lines changed

‎samples/EntityFramework/data/Tracker.Database/Tracker.Database.sqlproj‎

Lines changed: 5 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build">
3+
<Sdk Name="Microsoft.Build.Sql" Version="1.0.0" />
34
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<Name>Tracker.Database</Name>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectVersion>4.1</ProjectVersion>
5+
<Name>Tracker</Name>
96
<ProjectGuid>{0210d856-b45c-49d0-a208-1eb435cbb3f1}</ProjectGuid>
107
<DSP>Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider</DSP>
11-
<OutputType>Database</OutputType>
12-
<RootPath>
13-
</RootPath>
14-
<RootNamespace>Tracker.Database</RootNamespace>
15-
<AssemblyName>Tracker.Database</AssemblyName>
168
<ModelCollation>1033, CI</ModelCollation>
17-
<DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
18-
<DeployToDatabase>True</DeployToDatabase>
19-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
20-
<TargetLanguage>CS</TargetLanguage>
21-
<AppDesignerFolder>Properties</AppDesignerFolder>
22-
<SqlServerVerification>False</SqlServerVerification>
23-
<IncludeCompositeObjects>True</IncludeCompositeObjects>
249
<TargetDatabaseSet>True</TargetDatabaseSet>
25-
<DefaultSchema>dbo</DefaultSchema>
26-
<AllowSnapshotIsolation>True</AllowSnapshotIsolation>
27-
<IsChangeTrackingOn>True</IsChangeTrackingOn>
2810
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<OutputPath>bin\Release\</OutputPath>
31-
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
32-
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
33-
<DebugType>pdbonly</DebugType>
34-
<Optimize>true</Optimize>
35-
<DefineDebug>false</DefineDebug>
36-
<DefineTrace>true</DefineTrace>
37-
<ErrorReport>prompt</ErrorReport>
38-
<WarningLevel>4</WarningLevel>
39-
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
41-
<OutputPath>bin\Debug\</OutputPath>
42-
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
43-
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
44-
<DebugSymbols>true</DebugSymbols>
45-
<DebugType>full</DebugType>
46-
<Optimize>false</Optimize>
47-
<DefineDebug>true</DefineDebug>
48-
<DefineTrace>true</DefineTrace>
49-
<ErrorReport>prompt</ErrorReport>
50-
<WarningLevel>4</WarningLevel>
51-
</PropertyGroup>
52-
<PropertyGroup>
53-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
54-
<!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
55-
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
56-
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
57-
</PropertyGroup>
58-
<Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
59-
<Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
6011
<ItemGroup>
61-
<Folder Include="Properties" />
6212
<Folder Include="Tables" />
6313
<Folder Include="Seed" />
6414
</ItemGroup>
65-
<ItemGroup>
66-
<Build Include="Tables\Priority.sql" />
67-
<Build Include="Tables\Status.sql" />
68-
<Build Include="Tables\Tenant.sql" />
69-
<Build Include="Tables\User.sql" />
70-
<Build Include="Tables\Task.sql" />
71-
</ItemGroup>
7215
<ItemGroup>
7316
<None Include="local.publish.xml" />
7417
<None Include="Seed\Priority.sql" />
@@ -80,4 +23,4 @@
8023
<ItemGroup>
8124
<PostDeploy Include="Script.PostDeployment.sql" />
8225
</ItemGroup>
83-
</Project>
26+
</Project>

‎samples/EntityFramework/data/Tracker.Database/local.publish.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<IncludeCompositeObjects>True</IncludeCompositeObjects>
5+
<TargetDatabaseName>Tracker</TargetDatabaseName>
6+
<DeployScriptFileName>Tracker.sql</DeployScriptFileName>
7+
<TargetConnectionString>Data Source=(local);Integrated Security=True;Persist Security Info=False;Pooling=False;Multiple Active Result Sets=False;Connect Timeout=60;Encrypt=True;Trust Server Certificate=True;Command Timeout=0</TargetConnectionString>
8+
<ProfileVersionNumber>1</ProfileVersionNumber>
9+
<BlockOnPossibleDataLoss>False</BlockOnPossibleDataLoss>
10+
<DatabaseEdition>Basic</DatabaseEdition>
11+
<DatabaseServiceObjective>Basic</DatabaseServiceObjective>
12+
<DatabaseMaximumSize>2</DatabaseMaximumSize>
13+
<GenerateSmartDefaults>True</GenerateSmartDefaults>
14+
</PropertyGroup>
15+
</Project>

‎samples/EntityFramework/src/Tracker.Web/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ private static void ConfigureLogging(WebApplicationBuilder builder)
4444
.AddAspNetCoreInstrumentation()
4545
.AddHttpClientInstrumentation()
4646
.AddRuntimeInstrumentation()
47+
.AddSqlClientInstrumentation()
4748
.AddMediatorInstrumentation()
4849
)
4950
.WithTracing(tracing =>
5051
tracing
5152
.AddSource(builder.Environment.ApplicationName)
5253
.AddAspNetCoreInstrumentation()
5354
.AddHttpClientInstrumentation()
55+
.AddSqlClientInstrumentation()
5456
.AddMediatorInstrumentation()
5557
);
5658

‎samples/EntityFramework/src/Tracker.Web/Tracker.Web.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
2424
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
2525
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
26+
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.11.0-beta.2" />
2627
</ItemGroup>
2728

2829
</Project>

‎src/Arbiter.Mediation.OpenTelemetry/MediatorDiagnostic.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public void ActivityError(IDisposable? activity, Exception? exception, object? r
144144
var tagList = new TagList
145145
{
146146
{ RequestTypeTag, requestType },
147+
{ CallerTag, memberName },
147148
};
148149

149150
_errorsCounter.Add(1, tagList);

0 commit comments

Comments
 (0)