Regenerate proto bindings with ProtoBuf.jl 1.3

src/proto/Project.toml

@@ -1,7 +1,7 @@
 name = "OpenTelemetryProto"
 uuid = "cc651e92-2989-4f95-bcc3-32e6fb6ac025"
 authors = ["Jun Tian <tianjun.cpp@gmail.com>"]
-version = "0.20.0"
+version = "0.20.1"
 
 [deps]
 ProtoBuf = "3349acd9-ac6a-5e09-bcdb-63829b23a429"

src/proto/dev/Project.toml

@@ -1,2 +1,5 @@
 [deps]
+CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
+Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 ProtoBuf = "3349acd9-ac6a-5e09-bcdb-63829b23a429"
+Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"

src/proto/src/OpenTelemetryProto.jl

@@ -1,5 +1,19 @@
 module OpenTelemetryProto
 
+import ProtoBuf
+
+# Compat shim: ProtoBuf 1.3 changed the decoder helper signature from
+# `message_done(d)` to `message_done(d, endpos, group)`. Regenerated code
+# uses the 3-arg form; provide a fallback when running against ProtoBuf <1.3
+# so the package keeps working across the full `ProtoBuf = "1"` compat range.
+# OTLP is proto3 (no groups) and all length-delimited sub-messages are decoded
+# through ProtoBuf.decode!, which constructs a LengthDelimitedProtoDecoder on
+# older ProtoBuf releases, so the `endpos`/`group` parameters are unused there.
+if !hasmethod(ProtoBuf.message_done, Tuple{ProtoBuf.AbstractProtoDecoder,Int,Bool})
+    ProtoBuf.message_done(d::ProtoBuf.AbstractProtoDecoder, ::Int, ::Bool) =
+        ProtoBuf.message_done(d)
+end
+
 include("opentelemetry/opentelemetry.jl")
 
 end

src/proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb.jl

@@ -1,27 +1,27 @@
-# Autogenerated using ProtoBuf.jl v1.0.9 on 2023-03-01T12:24:55.830
-# original file: /home/tj/workspace/git/OpenTelemetry.jl/src/proto/dev/opentelemetry-proto-0.19.0/opentelemetry/proto/collector/logs/v1/logs_service.proto (proto3 syntax)
+# Autogenerated using ProtoBuf.jl v1.3.0
+# original file: opentelemetry/proto/collector/logs/v1/logs_service.proto (proto3 syntax)
 
 import ProtoBuf as PB
 using ProtoBuf: OneOf
 using ProtoBuf.EnumX: @enumx
 
 export ExportLogsServiceRequest, ExportLogsPartialSuccess, ExportLogsServiceResponse
-export LogsService
+
 
 struct ExportLogsServiceRequest
     resource_logs::Vector{opentelemetry.proto.logs.v1.ResourceLogs}
 end
 PB.default_values(::Type{ExportLogsServiceRequest}) = (;resource_logs = Vector{opentelemetry.proto.logs.v1.ResourceLogs}())
 PB.field_numbers(::Type{ExportLogsServiceRequest}) = (;resource_logs = 1)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportLogsServiceRequest})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportLogsServiceRequest}, _endpos::Int=0, _group::Bool=false)
     resource_logs = PB.BufferedVector{opentelemetry.proto.logs.v1.ResourceLogs}()
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, resource_logs)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportLogsServiceRequest(resource_logs[])
@@ -45,17 +45,17 @@ end
 PB.default_values(::Type{ExportLogsPartialSuccess}) = (;rejected_log_records = zero(Int64), error_message = "")
 PB.field_numbers(::Type{ExportLogsPartialSuccess}) = (;rejected_log_records = 1, error_message = 2)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportLogsPartialSuccess})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportLogsPartialSuccess}, _endpos::Int=0, _group::Bool=false)
     rejected_log_records = zero(Int64)
     error_message = ""
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             rejected_log_records = PB.decode(d, Int64)
         elseif field_number == 2
             error_message = PB.decode(d, String)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportLogsPartialSuccess(rejected_log_records, error_message)
@@ -80,14 +80,14 @@ end
 PB.default_values(::Type{ExportLogsServiceResponse}) = (;partial_success = nothing)
 PB.field_numbers(::Type{ExportLogsServiceResponse}) = (;partial_success = 1)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportLogsServiceResponse})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportLogsServiceResponse}, _endpos::Int=0, _group::Bool=false)
     partial_success = Ref{Union{Nothing,ExportLogsPartialSuccess}}(nothing)
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, partial_success)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportLogsServiceResponse(partial_success[])
@@ -104,5 +104,5 @@ function PB._encoded_size(x::ExportLogsServiceResponse)
     return encoded_size
 end
 
-# TODO: SERVICE
+# SERVICE: No codegen handlers registered
 #    LogsService

src/proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb.jl

@@ -1,27 +1,28 @@
-# Autogenerated using ProtoBuf.jl v1.0.9 on 2023-03-01T12:24:36.205
-# original file: /home/tj/workspace/git/OpenTelemetry.jl/src/proto/dev/opentelemetry-proto-0.19.0/opentelemetry/proto/collector/metrics/v1/metrics_service.proto (proto3 syntax)
+# Autogenerated using ProtoBuf.jl v1.3.0
+# original file: opentelemetry/proto/collector/metrics/v1/metrics_service.proto (proto3 syntax)
 
 import ProtoBuf as PB
 using ProtoBuf: OneOf
 using ProtoBuf.EnumX: @enumx
 
 export ExportMetricsServiceRequest, ExportMetricsPartialSuccess
-export ExportMetricsServiceResponse, MetricsService
+export ExportMetricsServiceResponse
+
 
 struct ExportMetricsServiceRequest
     resource_metrics::Vector{opentelemetry.proto.metrics.v1.ResourceMetrics}
 end
 PB.default_values(::Type{ExportMetricsServiceRequest}) = (;resource_metrics = Vector{opentelemetry.proto.metrics.v1.ResourceMetrics}())
 PB.field_numbers(::Type{ExportMetricsServiceRequest}) = (;resource_metrics = 1)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportMetricsServiceRequest})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportMetricsServiceRequest}, _endpos::Int=0, _group::Bool=false)
     resource_metrics = PB.BufferedVector{opentelemetry.proto.metrics.v1.ResourceMetrics}()
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, resource_metrics)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportMetricsServiceRequest(resource_metrics[])
@@ -45,17 +46,17 @@ end
 PB.default_values(::Type{ExportMetricsPartialSuccess}) = (;rejected_data_points = zero(Int64), error_message = "")
 PB.field_numbers(::Type{ExportMetricsPartialSuccess}) = (;rejected_data_points = 1, error_message = 2)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportMetricsPartialSuccess})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportMetricsPartialSuccess}, _endpos::Int=0, _group::Bool=false)
     rejected_data_points = zero(Int64)
     error_message = ""
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             rejected_data_points = PB.decode(d, Int64)
         elseif field_number == 2
             error_message = PB.decode(d, String)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportMetricsPartialSuccess(rejected_data_points, error_message)
@@ -80,14 +81,14 @@ end
 PB.default_values(::Type{ExportMetricsServiceResponse}) = (;partial_success = nothing)
 PB.field_numbers(::Type{ExportMetricsServiceResponse}) = (;partial_success = 1)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportMetricsServiceResponse})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportMetricsServiceResponse}, _endpos::Int=0, _group::Bool=false)
     partial_success = Ref{Union{Nothing,ExportMetricsPartialSuccess}}(nothing)
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, partial_success)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportMetricsServiceResponse(partial_success[])
@@ -104,5 +105,5 @@ function PB._encoded_size(x::ExportMetricsServiceResponse)
     return encoded_size
 end
 
-# TODO: SERVICE
+# SERVICE: No codegen handlers registered
 #    MetricsService

src/proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb.jl

@@ -1,12 +1,12 @@
-# Autogenerated using ProtoBuf.jl v1.0.9 on 2023-03-01T12:14:45.357
-# original file: /home/tj/workspace/git/OpenTelemetry.jl/src/proto/dev/opentelemetry-proto-0.19.0/opentelemetry/proto/collector/trace/v1/trace_service.proto (proto3 syntax)
+# Autogenerated using ProtoBuf.jl v1.3.0
+# original file: opentelemetry/proto/collector/trace/v1/trace_service.proto (proto3 syntax)
 
 import ProtoBuf as PB
 using ProtoBuf: OneOf
 using ProtoBuf.EnumX: @enumx
 
 export ExportTracePartialSuccess, ExportTraceServiceRequest, ExportTraceServiceResponse
-export TraceService
+
 
 struct ExportTracePartialSuccess
     rejected_spans::Int64
@@ -15,17 +15,17 @@ end
 PB.default_values(::Type{ExportTracePartialSuccess}) = (;rejected_spans = zero(Int64), error_message = "")
 PB.field_numbers(::Type{ExportTracePartialSuccess}) = (;rejected_spans = 1, error_message = 2)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportTracePartialSuccess})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportTracePartialSuccess}, _endpos::Int=0, _group::Bool=false)
     rejected_spans = zero(Int64)
     error_message = ""
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             rejected_spans = PB.decode(d, Int64)
         elseif field_number == 2
             error_message = PB.decode(d, String)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportTracePartialSuccess(rejected_spans, error_message)
@@ -50,14 +50,14 @@ end
 PB.default_values(::Type{ExportTraceServiceRequest}) = (;resource_spans = Vector{opentelemetry.proto.trace.v1.ResourceSpans}())
 PB.field_numbers(::Type{ExportTraceServiceRequest}) = (;resource_spans = 1)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportTraceServiceRequest})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportTraceServiceRequest}, _endpos::Int=0, _group::Bool=false)
     resource_spans = PB.BufferedVector{opentelemetry.proto.trace.v1.ResourceSpans}()
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, resource_spans)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportTraceServiceRequest(resource_spans[])
@@ -80,14 +80,14 @@ end
 PB.default_values(::Type{ExportTraceServiceResponse}) = (;partial_success = nothing)
 PB.field_numbers(::Type{ExportTraceServiceResponse}) = (;partial_success = 1)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportTraceServiceResponse})
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:ExportTraceServiceResponse}, _endpos::Int=0, _group::Bool=false)
     partial_success = Ref{Union{Nothing,ExportTracePartialSuccess}}(nothing)
-    while !PB.message_done(d)
+    while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, partial_success)
         else
-            PB.skip(d, wire_type)
+            Base.skip(d, wire_type)
         end
     end
     return ExportTraceServiceResponse(partial_success[])
@@ -104,5 +104,5 @@ function PB._encoded_size(x::ExportTraceServiceResponse)
     return encoded_size
 end
 
-# TODO: SERVICE
+# SERVICE: No codegen handlers registered
 #    TraceService