BREAKING CHANGE: Refactor to use OTEL messages directly (#10)

* Pulling in specific branch of OddDotProto.

* Imported latest proto.
Fixed build errors.
Adjusted tests.

* Removing submodule to place in separate 'submodule' directory

* Update submodule directory.

* Pulled in updates to proto files.

* Updated OddDotProto submodule back to main.

* Bumped GitVersion.yml

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/OddDotCSharp/OddDotProto"]
-	path = src/OddDotCSharp/OddDotProto
+[submodule "src/OddDotCSharp/submodules/OddDotProto"]
+	path = src/OddDotCSharp/submodules/OddDotProto
 	url = https://github.com/OddDotNet/OddDotProto.git

GitVersion.yml

@@ -1,2 +1,2 @@
 workflow: GitHubFlow/v1
-next-version: 0.0.2
+next-version: 0.1.0

src/OddDotCSharp/OddDotCSharp.csproj

@@ -26,9 +26,10 @@
       </PackageReference>
     </ItemGroup>
 
-    <!-- Internal proto definitions -->
+    <!-- Proto definitions -->
     <ItemGroup>
-        <Protobuf Include="OddDotProto/**/*.proto" GrpcServices="Client" ProtoRoot="OddDotProto/"/>
+        <Protobuf Include="submodules/OddDotProto/submodules/opentelemetry/**/*.proto" GrpcServices="None" ProtoRoot="submodules/OddDotProto/submodules"/>
+        <Protobuf Include="submodules/OddDotProto/odddotproto/**/*.proto" GrpcServices="Client" ProtoRoot="submodules/OddDotProto/odddotproto/proto/trace/v1" AdditionalImportDirs="submodules/OddDotProto/submodules"/>
     </ItemGroup>
 
     <ItemGroup>

src/OddDotCSharp/SpanQueryRequestBuilder.cs

@@ -1,5 +1,5 @@
 using System;
-using OddDotNet.Proto.Spans.V1;
+using OddDotNet.Proto.Trace.V1;
 
 namespace OddDotCSharp
 {

src/OddDotCSharp/WhereSpanFilterConfigurator.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Google.Protobuf;
-using OddDotNet.Proto.Spans.V1;
+using OddDotNet.Proto.Trace.V1;
+using OpenTelemetry.Proto.Trace.V1;
+
 
 namespace OddDotCSharp
 {
@@ -84,7 +86,7 @@ public WhereSpanFilterConfigurator AddFilter(WhereSpanPropertyFilter.ValueOneofC
         /// <param name="compare">The <see cref="SpanStatusCode"/> to compare the property against.</param>
         /// <param name="compareAs">The type of comparison to do. See <see cref="EnumCompareAsType"/> for more details.</param>
         /// <returns>this <see cref="WhereSpanFilterConfigurator"/>.</returns>
-        public WhereSpanFilterConfigurator AddSpanStatusCodeFilter(SpanStatusCode compare,
+        public WhereSpanFilterConfigurator AddSpanStatusCodeFilter(Status.Types.StatusCode compare,
             EnumCompareAsType compareAs)
         {
             var spanStatusCodeProperty = new SpanStatusCodeProperty
@@ -100,10 +102,10 @@ public WhereSpanFilterConfigurator AddSpanStatusCodeFilter(SpanStatusCode compar
         /// <summary>
         /// Adds a <see cref="SpanKindProperty"/> filter to the list of filters.
         /// </summary>
-        /// <param name="compare">The <see cref="SpanKind"/> to compare the property against.</param>
+        /// <param name="compare">The <see cref="Span.Types.SpanKind"/> to compare the property against.</param>
         /// <param name="compareAs">The type of comparison to do. See <see cref="EnumCompareAsType"/> for more details.</param>
         /// <returns>this <see cref="WhereSpanFilterConfigurator"/>.</returns>
-        public WhereSpanFilterConfigurator AddSpanKindFilter(SpanKind compare,
+        public WhereSpanFilterConfigurator AddSpanKindFilter(Span.Types.SpanKind compare,
             EnumCompareAsType compareAs)
         {
             var spanKindProperty = new SpanKindProperty

tests/OddDotCSharp.Tests/SpanQueryRequestBuilderTests.cs

@@ -1,4 +1,5 @@
-using OddDotNet.Proto.Spans.V1;
+using OddDotNet.Proto.Trace.V1;
+using OpenTelemetry.Proto.Trace.V1;
 
 namespace OddDotCSharp.Tests;
 
@@ -176,7 +177,7 @@ public void AddUInt64PropertyFilter()
         public void AddSpanStatusCodePropertyFilter()
         {
             var builder = new SpanQueryRequestBuilder();
-            SpanStatusCode code = SpanStatusCode.Ok;
+            Status.Types.StatusCode code = Status.Types.StatusCode.Ok;
             builder.Where(filters =>
             {
                 filters.AddSpanStatusCodeFilter(code, EnumCompareAsType.Equals);
@@ -197,7 +198,7 @@ public void AddSpanStatusCodePropertyFilter()
         public void AddSpanKindPropertyFilter()
         {
             var builder = new SpanQueryRequestBuilder();
-            SpanKind kind = SpanKind.Internal;
+            Span.Types.SpanKind kind = Span.Types.SpanKind.Internal;
             builder.Where(filters =>
             {
                 filters.AddSpanKindFilter(kind, EnumCompareAsType.Equals);