8000 BREAKING CHANGE: Refactor to use OTEL messages directly (#53) · OddDotNet/OddDotNet@d26f97b · GitHub
[go: up one dir, main page]
Skip to content

Commit d26f97b

Browse files
DoubleTKDoubleTK
authored
BREAKING CHANGE: Refactor to use OTEL messages directly (#53)
* In-progress commit of proto updates. * Added proto back in the submodule directory. * Pulled in `OddDotProto` updates and refactored. * BREAKING CHANGE: bumping version to 0.1.0 as still not v1.
1 parent 17ea0ca commit d26f97b

26 files changed

+128
-212
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "src/OddDotNet/OpenTelemetry"]
2-
path = src/OddDotNet/OpenTelemetry
3-
url = https://github.com/open-telemetry/opentelemetry-proto.git
4-
[submodule "src/OddDotNet/OddDotProto"]
5-
path = src/OddDotNet/OddDotProto
1+
[submodule "src/OddDotNet/submodules/OddDotProto"]
2+
path = src/OddDotNet/submodules/OddDotProto
63
url = https://github.com/OddDotNet/OddDotProto.git

‎.idea/.idea.OddDotNet/.idea/vcs.xml‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GitVersion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
workflow: GitHubFlow/v1
2-
next-version: 0.0.1
2+
next-version: 0.1.0

‎src/OddDotNet/OddDotNet.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@
99

1010
<!-- Internal proto definitions -->
1111
<ItemGroup>
12-
<Protobuf Include="OddDotProto/**/*.proto" GrpcServices="Both" ProtoRoot="OddDotProto/"/>
13-
</ItemGroup>
14-
15-
<!-- OpenTelemetry proto definitions -->
16-
<ItemGroup>
17-
<Protobuf Include="OpenTelemetry/**/*.proto" GrpcServices="Both" ProtoRoot="OpenTelemetry/"/>
12+
<Protobuf Include="submodules/OddDotProto/submodules/opentelemetry/**/*.proto" GrpcServices="Both" ProtoRoot="submodules/OddDotProto/submodules"/>
13+
<Protobuf Include="submodules/OddDotProto/odddotproto/**/*.proto" GrpcServices="Both" ProtoRoot="submodules/OddDotProto/odddotproto/proto/trace/v1" AdditionalImportDirs="submodules/OddDotProto/submodules"/>
1814
</ItemGroup>
1915

2016
<ItemGroup>

‎src/OddDotNet/OddDotProto‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/OddDotNet/OpenTelemetry‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/OddDotNet/Program.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OddDotNet;
2-
using OddDotNet.Proto.Spans.V1;
2+
using OddDotNet.Proto.Trace.V1;
33
using OddDotNet.Services;
44
using SpanQueryService = OddDotNet.Services.SpanQueryService;
55

@@ -12,8 +12,8 @@
1212
builder.Services.AddSwaggerGen();
1313
builder.Services.AddHealthChecks();
1414

15-
builder.Services.AddScoped<ISignalList<Span>, SpanSignalList>();
16-
builder.Services.AddScoped<IChannelManager<Span>, SpanChannelManager>();
15+
builder.Services.AddScoped<ISignalList<FlatSpan>, SpanSignalList>();
16+
builder.Services.AddScoped<IChannelManager<FlatSpan>, SpanChannelManager>();
1717
builder.Services.AddSingleton(TimeProvider.System);
1818

1919
var app = builder.Build();

‎src/OddDotNet/Proto/Spans/V1/SpanQueryRequest.cs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/OddDotNet/Proto/Spans/V1/SpanResetRequest.cs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/OddDotNet/Proto/Trace/V1/SpanQueryRequest.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using OpenTelemetry.Proto.Trace.V1;
2+
3+
namespace OddDotNet.Proto.Trace.V1;
4+
5+
public sealed partial class SpanQueryRequest : IQueryRequest<FlatSpan>
6+
{
7+
8+
}

0 commit comments

Comments
 (0)
0