Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up code that is no longer used #493

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Clean up code that is no longer used #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 0 additions & 57 deletions sample/Sky.Apm.Sample.Logging/Controllers/WeatherForecastController.cs
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions sample/Sky.Apm.Sample.Logging/Program.cs
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions sample/Sky.Apm.Sample.Logging/Properties/launchSettings.json
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions sample/Sky.Apm.Sample.Logging/Sky.Apm.Sample.Logging.csproj
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions sample/Sky.Apm.Sample.Logging/Test.cs
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions sample/Sky.Apm.Sample.Logging/WeatherForecast.cs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions sample/Sky.Apm.Sample.Logging/appsettings.Development.json
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions sample/Sky.Apm.Sample.Logging/appsettings.json
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions sample/Sky.Apm.Sample.Logging/skyapm.json
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions skyapm-dotnet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Diagnostics.FreeSql"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkyApm.Sample.FreeSqlSqlite", "sample\SkyApm.Sample.FreeSql\SkyApm.Sample.FreeSqlSqlite.csproj", "{B1EF3295-4BF0-489F-8063-C9E3DAE20AA9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sky.Apm.Sample.Logging", "sample\Sky.Apm.Sample.Logging\Sky.Apm.Sample.Logging.csproj", "{D35905EC-EB46-4A3D-BD2B-02C4C868BC65}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyApm.Diagnostics.Logging", "src\SkyApm.Diagnostics.Logging\SkyApm.Diagnostics.Logging.csproj", "{DDF18F43-E1D2-4854-AC97-DFC321EF6563}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -247,14 +243,6 @@ Global
{B1EF3295-4BF0-489F-8063-C9E3DAE20AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1EF3295-4BF0-489F-8063-C9E3DAE20AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1EF3295-4BF0-489F-8063-C9E3DAE20AA9}.Release|Any CPU.Build.0 = Release|Any CPU
{D35905EC-EB46-4A3D-BD2B-02C4C868BC65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D35905EC-EB46-4A3D-BD2B-02C4C868BC65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D35905EC-EB46-4A3D-BD2B-02C4C868BC65}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D35905EC-EB46-4A3D-BD2B-02C4C868BC65}.Release|Any CPU.Build.0 = Release|Any CPU
{DDF18F43-E1D2-4854-AC97-DFC321EF6563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DDF18F43-E1D2-4854-AC97-DFC321EF6563}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDF18F43-E1D2-4854-AC97-DFC321EF6563}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDF18F43-E1D2-4854-AC97-DFC321EF6563}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -301,8 +289,6 @@ Global
{8D3C5573-C282-45F5-A7F4-2E323F322CB7} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
{82580A47-9DBC-43E8-B581-0C35147B4FAD} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
{B1EF3295-4BF0-489F-8063-C9E3DAE20AA9} = {844CEACD-4C85-4B15-9E2B-892B01FDA4BB}
{D35905EC-EB46-4A3D-BD2B-02C4C868BC65} = {844CEACD-4C85-4B15-9E2B-892B01FDA4BB}
{DDF18F43-E1D2-4854-AC97-DFC321EF6563} = {B5E677CF-2920-4B0A-A056-E73F6B2CF2BC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {94C0DA2C-CCCB-4314-93A2-9809B5DD0583}
Expand Down
2 changes: 1 addition & 1 deletion src/SkyApm.Core/Service/PingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken)
await _pingCaller.PingAsync(
new PingRequest
{
ServiceName = _instrumentConfig.ServiceName ?? _instrumentConfig.ApplicationCode,
ServiceName = _instrumentConfig.ServiceName,
InstanceId = _instrumentConfig.ServiceInstanceName
}, cancellationToken);
Logger.Information($"Ping server @{DateTimeOffset.UtcNow}");
Expand Down
2 changes: 1 addition & 1 deletion src/SkyApm.Core/Service/RegisterService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private async Task ReportServiceInstancePropertiesAsync(CancellationToken cancel
};
var request = new ServiceInstancePropertiesRequest
{
ServiceId = _config.ServiceName ?? _config.ApplicationCode,
ServiceId = _config.ServiceName,
ServiceInstanceId = _config.ServiceInstanceName,
Properties = properties
};
Expand Down
6 changes: 3 additions & 3 deletions src/SkyApm.Core/Tracing/SegmentContextFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public SegmentContext CreateEntrySegment(string operationName, ICarrier carrier,
var segmentId = GetSegmentId();
var sampled = GetSampled(carrier, operationName);
var segmentContext = new SegmentContext(traceId, segmentId, sampled,
_instrumentConfig.ServiceName ?? _instrumentConfig.ApplicationCode,
_instrumentConfig.ServiceName,
_instrumentConfig.ServiceInstanceName,
operationName, SpanType.Entry, startTimeMilliseconds);

Expand Down Expand Up @@ -90,7 +90,7 @@ public SegmentContext CreateLocalSegment(string operationName, long startTimeMil
var segmentId = GetSegmentId();
var sampled = GetSampled(parentSegmentContext, operationName);
var segmentContext = new SegmentContext(traceId, segmentId, sampled,
_instrumentConfig.ServiceName ?? _instrumentConfig.ApplicationCode,
_instrumentConfig.ServiceName,
_instrumentConfig.ServiceInstanceName,
operationName, SpanType.Local, startTimeMilliseconds);

Expand Down Expand Up @@ -125,7 +125,7 @@ public SegmentContext CreateExitSegment(string operationName, StringOrIntValue n
var segmentId = GetSegmentId();
var sampled = GetSampled(parentSegmentContext, operationName, networkAddress);
var segmentContext = new SegmentContext(traceId, segmentId, sampled,
_instrumentConfig.ServiceName ?? _instrumentConfig.ApplicationCode,
_instrumentConfig.ServiceName,
_instrumentConfig.ServiceInstanceName,
operationName, SpanType.Exit, startTimeMilliseconds);

Expand Down
11 changes: 0 additions & 11 deletions src/SkyApm.Diagnostics.Logging/ISkyApmLogger.cs
View file
Open in desktop

This file was deleted.

Loading