Skip to content

Commit

Permalink
BREAKING CHANGE: Refactor to use OTEL messages (#11)
Browse files Browse the repository at this point in the history
* Modified to depend on opentelemetry-proto.
* Added `FlatSpan` to flatten out `TracesData`.
* Avoids having a separate, matching `Span` data structure.
  • Loading branch information
DoubleTK authored Oct 11, 2024
1 parent 02d3126 commit c7dd040
Show file tree
Hide file tree
Showing 16 changed files with 95 additions and 162 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@ FodyWeavers.xsd
**/.idea/shelf/*
**/.idea/dictionaries
**/.idea/httpRequests/
**/.idea/encodings.xml
**/.idea/indexLayout.xml
**/.idea/projectSettingsUpdater.xml

# Sensitive or high-churn files
**/.idea/**/dataSources/
Expand All @@ -422,4 +425,7 @@ FodyWeavers.xsd
**/.idea/**/modules.xml

# Mac stuff
.DS_Store
.DS_Store

# Protobuf selected output directory
out
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "submodules"]
path = submodules
url = https://github.com/open-telemetry/opentelemetry-proto.git
15 changes: 15 additions & 0 deletions .idea/protoeditor.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions odddotproto/proto/trace/v1/flat_span.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
syntax = "proto3";

package odddotnet.proto.trace.v1;

option csharp_namespace = "OddDotNet.Proto.Trace.V1";

import "opentelemetry/proto/trace/v1/trace.proto";
import "opentelemetry/proto/resource/v1/resource.proto";
import "opentelemetry/proto/common/v1/common.proto";

message FlatSpan {
opentelemetry.proto.trace.v1.Span span = 1;
opentelemetry.proto.resource.v1.Resource resource = 2;
opentelemetry.proto.common.v1.InstrumentationScope instrumentationScope = 3;
string resourceSchemaUrl = 4;
string instrumentationScopeSchemaUrl = 5;
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
syntax = "proto3";

package odddotnet.proto.spans.v1;
package odddotnet.proto.trace.v1;

option csharp_namespace = "OddDotNet.Proto.Spans.V1";
option java_multiple_files = true;
option java_package = "com.odddotnet.proto.spans.v1";
option java_outer_classname = "SpansProto";
option go_package = "go.odddotnet.com/proto/otlp/spans/v1";
option csharp_namespace = "OddDotNet.Proto.Trace.V1";

import "proto/spans/v1/span.proto";
import "opentelemetry/proto/trace/v1/trace.proto";

message SpanQueryRequest {
repeated WhereSpanFilter filters = 1;
Expand Down Expand Up @@ -119,12 +115,12 @@ message DoubleProperty {

message SpanStatusCodeProperty {
EnumCompareAsType compareAs = 1;
SpanStatusCode compare = 2;
opentelemetry.proto.trace.v1.Status.StatusCode compare = 2;
}

message SpanKindProperty {
EnumCompareAsType compareAs = 1;
SpanKind compare = 2;
opentelemetry.proto.trace.v1.Span.SpanKind compare = 2;
}

message KeyValueProperty {
Expand Down
11 changes: 11 additions & 0 deletions odddotproto/proto/trace/v1/span_query_response.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
syntax = "proto3";

package odddotnet.proto.trace.v1;

option csharp_namespace = "OddDotNet.Proto.Trace.V1";

import "flat_span.proto";

message SpanQueryResponse {
repeated FlatSpan spans = 1;
}
15 changes: 15 additions & 0 deletions odddotproto/proto/trace/v1/span_query_service.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
syntax = "proto3";

package odddotnet.proto.trace.v1;

option csharp_namespace = "OddDotNet.Proto.Trace.V1";

import "span_query_request.proto";
import "span_query_response.proto";
import "span_reset_request.proto";
import "span_reset_response.proto";

service SpanQueryService {
rpc Query(SpanQueryRequest) returns (SpanQueryResponse);
rpc Reset(SpanResetRequest) returns (SpanResetResponse);
}
7 changes: 7 additions & 0 deletions odddotproto/proto/trace/v1/span_reset_request.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
syntax = "proto3";

package odddotnet.proto.trace.v1;

option csharp_namespace = "OddDotNet.Proto.Trace.V1";

message SpanResetRequest{}
7 changes: 7 additions & 0 deletions odddotproto/proto/trace/v1/span_reset_response.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
syntax = "proto3";

package odddotnet.proto.trace.v1;

option csharp_namespace = "OddDotNet.Proto.Trace.V1";

message SpanResetResponse{}
96 changes: 0 additions & 96 deletions proto/spans/v1/span.proto

This file was deleted.

15 changes: 0 additions & 15 deletions proto/spans/v1/span_query_response.proto

This file was deleted.

19 changes: 0 additions & 19 deletions proto/spans/v1/span_query_service.proto

This file was deleted.

11 changes: 0 additions & 11 deletions proto/spans/v1/span_reset_request.proto

This file was deleted.

11 changes: 0 additions & 11 deletions proto/spans/v1/span_reset_response.proto

This file was deleted.

1 change: 1 addition & 0 deletions submodules
Submodule submodules added at a76fe9

0 comments on commit c7dd040

Please sign in to comment.