replace wilson/protos with PEERDIR to contrib/libs/opentelemetry-proto

remove duplicate protos

16 files changed, 22 insertions, 828 deletions

diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt
index 6d3a2ddc54..1003ca94c5 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt
@@ -56,6 +56,7 @@ target_proto_addincls(example_02_discovery
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_SOURCE_DIR}/contrib/libs/opentelemetry-proto
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt
index 8bfd344301..564892d9f7 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt
@@ -59,6 +59,7 @@ target_proto_addincls(example_02_discovery
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_SOURCE_DIR}/contrib/libs/opentelemetry-proto
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt
index 34d2610a7d..aed3404cb8 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt
@@ -60,6 +60,7 @@ target_proto_addincls(example_02_discovery
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_SOURCE_DIR}/contrib/libs/opentelemetry-proto
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt
index 2168520e19..6bf59ae8c9 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt
@@ -49,6 +49,7 @@ target_proto_addincls(example_02_discovery
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_SOURCE_DIR}/contrib/libs/opentelemetry-proto
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt
index 5e21c8ffc3..92afc01bb4 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt
@@ -6,91 +6,10 @@
 # original buildsystem will not be accepted.
 
 
-get_built_tool_path(
-  TOOL_grpc_cpp_bin
-  TOOL_grpc_cpp_dependency
-  contrib/tools/protoc/plugins/grpc_cpp
-  grpc_cpp
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
 
-add_library(actors-wilson-protos)
-set_property(TARGET actors-wilson-protos PROPERTY
-  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
-)
-target_link_libraries(actors-wilson-protos PUBLIC
+add_library(actors-wilson-protos INTERFACE)
+target_link_libraries(actors-wilson-protos INTERFACE
   contrib-libs-cxxsupp
   yutil
-  contrib-libs-grpc
-  contrib-libs-protobuf
-)
-target_proto_messages(actors-wilson-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/common.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/resource.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/service.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/trace.proto
-)
-target_proto_addincls(actors-wilson-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(actors-wilson-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
-target_proto_plugin(actors-wilson-protos
-  grpc_cpp
-  grpc_cpp
+  contrib-libs-opentelemetry-proto
 )
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.linux-aarch64.txt b/library/cpp/actors/wilson/protos/CMakeLists.linux-aarch64.txt
index d12c55767a..101316f4fc 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.linux-aarch64.txt
@@ -6,92 +6,11 @@
 # original buildsystem will not be accepted.
 
 
-get_built_tool_path(
-  TOOL_grpc_cpp_bin
-  TOOL_grpc_cpp_dependency
-  contrib/tools/protoc/plugins/grpc_cpp
-  grpc_cpp
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
 
-add_library(actors-wilson-protos)
-set_property(TARGET actors-wilson-protos PROPERTY
-  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
-)
-target_link_libraries(actors-wilson-protos PUBLIC
+add_library(actors-wilson-protos INTERFACE)
+target_link_libraries(actors-wilson-protos INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  contrib-libs-grpc
-  contrib-libs-protobuf
-)
-target_proto_messages(actors-wilson-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/common.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/resource.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/service.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/trace.proto
-)
-target_proto_addincls(actors-wilson-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(actors-wilson-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
-target_proto_plugin(actors-wilson-protos
-  grpc_cpp
-  grpc_cpp
+  contrib-libs-opentelemetry-proto
 )
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt b/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt
index d12c55767a..101316f4fc 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt
@@ -6,92 +6,11 @@
 # original buildsystem will not be accepted.
 
 
-get_built_tool_path(
-  TOOL_grpc_cpp_bin
-  TOOL_grpc_cpp_dependency
-  contrib/tools/protoc/plugins/grpc_cpp
-  grpc_cpp
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
 
-add_library(actors-wilson-protos)
-set_property(TARGET actors-wilson-protos PROPERTY
-  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
-)
-target_link_libraries(actors-wilson-protos PUBLIC
+add_library(actors-wilson-protos INTERFACE)
+target_link_libraries(actors-wilson-protos INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  contrib-libs-grpc
-  contrib-libs-protobuf
-)
-target_proto_messages(actors-wilson-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/common.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/resource.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/service.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/trace.proto
-)
-target_proto_addincls(actors-wilson-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(actors-wilson-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
-target_proto_plugin(actors-wilson-protos
-  grpc_cpp
-  grpc_cpp
+  contrib-libs-opentelemetry-proto
 )
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.windows-x86_64.txt b/library/cpp/actors/wilson/protos/CMakeLists.windows-x86_64.txt
index 5e21c8ffc3..92afc01bb4 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.windows-x86_64.txt
@@ -6,91 +6,10 @@
 # original buildsystem will not be accepted.
 
 
-get_built_tool_path(
-  TOOL_grpc_cpp_bin
-  TOOL_grpc_cpp_dependency
-  contrib/tools/protoc/plugins/grpc_cpp
-  grpc_cpp
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
 
-add_library(actors-wilson-protos)
-set_property(TARGET actors-wilson-protos PROPERTY
-  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
-)
-target_link_libraries(actors-wilson-protos PUBLIC
+add_library(actors-wilson-protos INTERFACE)
+target_link_libraries(actors-wilson-protos INTERFACE
   contrib-libs-cxxsupp
   yutil
-  contrib-libs-grpc
-  contrib-libs-protobuf
-)
-target_proto_messages(actors-wilson-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/common.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/resource.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/service.proto
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/wilson/protos/trace.proto
-)
-target_proto_addincls(actors-wilson-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(actors-wilson-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
-target_proto_plugin(actors-wilson-protos
-  grpc_cpp
-  grpc_cpp
+  contrib-libs-opentelemetry-proto
 )
diff --git a/library/cpp/actors/wilson/protos/common.proto b/library/cpp/actors/wilson/protos/common.proto
deleted file mode 100644
index 8562ee6d1e..0000000000
--- a/library/cpp/actors/wilson/protos/common.proto
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.common.v1;
-
-// AnyValue is used to represent any type of attribute value. AnyValue may contain a
-// primitive value such as a string or integer or it may contain an arbitrary nested
-// object containing arrays, key-value lists and primitives.
-message AnyValue {
-  // The value is one of the listed fields. It is valid for all values to be unspecified
-  // in which case this AnyValue is considered to be "empty".
-  oneof value {
-    string string_value = 1;
-    bool bool_value = 2;
-    int64 int_value = 3;
-    double double_value = 4;
-    ArrayValue array_value = 5;
-    KeyValueList kvlist_value = 6;
-    bytes bytes_value = 7;
-  }
-}
-
-// ArrayValue is a list of AnyValue messages. We need ArrayValue as a message
-// since oneof in AnyValue does not allow repeated fields.
-message ArrayValue {
-  // Array of values. The array may be empty (contain 0 elements).
-  repeated AnyValue values = 1;
-}
-
-// KeyValueList is a list of KeyValue messages. We need KeyValueList as a message
-// since `oneof` in AnyValue does not allow repeated fields. Everywhere else where we need
-// a list of KeyValue messages (e.g. in Span) we use `repeated KeyValue` directly to
-// avoid unnecessary extra wrapping (which slows down the protocol). The 2 approaches
-// are semantically equivalent.
-message KeyValueList {
-  // A collection of key/value pairs of key-value pairs. The list may be empty (may
-  // contain 0 elements).
-  // The keys MUST be unique (it is not allowed to have more than one
-  // value with the same key).
-  repeated KeyValue values = 1;
-}
-
-// KeyValue is a key-value pair that is used to store Span attributes, Link
-// attributes, etc.
-message KeyValue {
-  string key = 1;
-  AnyValue value = 2;
-}
-
-// InstrumentationLibrary is a message representing the instrumentation library information
-// such as the fully qualified name and version.
-// InstrumentationLibrary is wire-compatible with InstrumentationScope for binary
-// Protobuf format.
-// This message is deprecated and will be removed on June 15, 2022.
-message InstrumentationLibrary {
-  option deprecated = true;
-
-  // An empty instrumentation library name means the name is unknown.
-  string name = 1;
-  string version = 2;
-}
-
-// InstrumentationScope is a message representing the instrumentation scope information
-// such as the fully qualified name and version. 
-message InstrumentationScope {
-  // An empty instrumentation scope name means the name is unknown.
-  string name = 1;
-  string version = 2;
-  repeated KeyValue attributes = 3;
-  uint32 dropped_attributes_count = 4;
-}
diff --git a/library/cpp/actors/wilson/protos/resource.proto b/library/cpp/actors/wilson/protos/resource.proto
deleted file mode 100644
index 752bf287ea..0000000000
--- a/library/cpp/actors/wilson/protos/resource.proto
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.resource.v1;
-
-import "library/cpp/actors/wilson/protos/common.proto";
-
-// Resource information.
-message Resource {
-  // Set of attributes that describe the resource.
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
-
-  // dropped_attributes_count is the number of dropped attributes. If the value is 0, then
-  // no attributes were dropped.
-  uint32 dropped_attributes_count = 2;
-}
diff --git a/library/cpp/actors/wilson/protos/service.proto b/library/cpp/actors/wilson/protos/service.proto
deleted file mode 100644
index 7a40af39c8..0000000000
--- a/library/cpp/actors/wilson/protos/service.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.collector.trace.v1;
-
-import "library/cpp/actors/wilson/protos/trace.proto";
-
-// Service that can be used to push spans between one Application instrumented with
-// OpenTelemetry and a collector, or between a collector and a central collector (in this
-// case spans are sent/received to/from multiple Applications).
-service TraceService {
-  // For performance reasons, it is recommended to keep this RPC
-  // alive for the entire life of the application.
-  rpc Export(ExportTraceServiceRequest) returns (ExportTraceServiceResponse) {}
-}
-
-message ExportTraceServiceRequest {
-  // An array of ResourceSpans.
-  // For data coming from a single resource this array will typically contain one
-  // element. Intermediary nodes (such as OpenTelemetry Collector) that receive
-  // data from multiple origins typically batch the data before forwarding further and
-  // in that case this array will contain multiple elements.
-  repeated opentelemetry.proto.trace.v1.ResourceSpans resource_spans = 1;
-}
-
-message ExportTraceServiceResponse {
-}
diff --git a/library/cpp/actors/wilson/protos/trace.proto b/library/cpp/actors/wilson/protos/trace.proto
deleted file mode 100644
index 0b645cf8ad..0000000000
--- a/library/cpp/actors/wilson/protos/trace.proto
+++ /dev/null
@@ -1,326 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.trace.v1;
-
-import "library/cpp/actors/wilson/protos/common.proto";
-import "library/cpp/actors/wilson/protos/resource.proto";
-
-// TracesData represents the traces data that can be stored in a persistent storage,
-// OR can be embedded by other protocols that transfer OTLP traces data but do
-// not implement the OTLP protocol.
-//
-// The main difference between this message and collector protocol is that
-// in this message there will not be any "control" or "metadata" specific to
-// OTLP protocol.
-//
-// When new fields are added into this message, the OTLP request MUST be updated
-// as well.
-message TracesData {
-  // An array of ResourceSpans.
-  // For data coming from a single resource this array will typically contain
-  // one element. Intermediary nodes that receive data from multiple origins
-  // typically batch the data before forwarding further and in that case this
-  // array will contain multiple elements.
-  repeated ResourceSpans resource_spans = 1;
-}
-
-// A collection of ScopeSpans from a Resource.
-message ResourceSpans {
-  // The resource for the spans in this message.
-  // If this field is not set then no resource info is known.
-  opentelemetry.proto.resource.v1.Resource resource = 1;
-
-  // A list of ScopeSpans that originate from a resource.
-  repeated ScopeSpans scope_spans = 2;
-
-  // A list of InstrumentationLibrarySpans that originate from a resource.
-  // This field is deprecated and will be removed after grace period expires on June 15, 2022.
-  //
-  // During the grace period the following rules SHOULD be followed:
-  //
-  // For Binary Protobufs
-  // ====================
-  // Binary Protobuf senders SHOULD NOT set instrumentation_library_spans. Instead
-  // scope_spans SHOULD be set.
-  //
-  // Binary Protobuf receivers SHOULD check if instrumentation_library_spans is set
-  // and scope_spans is not set then the value in instrumentation_library_spans
-  // SHOULD be used instead by converting InstrumentationLibrarySpans into ScopeSpans.
-  // If scope_spans is set then instrumentation_library_spans SHOULD be ignored.
-  //
-  // For JSON
-  // ========
-  // JSON senders that set instrumentation_library_spans field MAY also set
-  // scope_spans to carry the same spans, essentially double-publishing the same data.
-  // Such double-publishing MAY be controlled by a user-settable option.
-  // If double-publishing is not used then the senders SHOULD set scope_spans and
-  // SHOULD NOT set instrumentation_library_spans.
-  //
-  // JSON receivers SHOULD check if instrumentation_library_spans is set and
-  // scope_spans is not set then the value in instrumentation_library_spans
-  // SHOULD be used instead by converting InstrumentationLibrarySpans into ScopeSpans.
-  // If scope_spans is set then instrumentation_library_spans field SHOULD be ignored.
-  repeated InstrumentationLibrarySpans instrumentation_library_spans = 1000 [deprecated = true];
-
-  // This schema_url applies to the data in the "resource" field. It does not apply
-  // to the data in the "scope_spans" field which have their own schema_url field.
-  string schema_url = 3;
-}
-
-// A collection of Spans produced by an InstrumentationScope.
-message ScopeSpans {
-  // The instrumentation scope information for the spans in this message.
-  // Semantically when InstrumentationScope isn't set, it is equivalent with
-  // an empty instrumentation scope name (unknown).
-  opentelemetry.proto.common.v1.InstrumentationScope scope = 1;
-
-  // A list of Spans that originate from an instrumentation scope.
-  repeated Span spans = 2;
-
-  // This schema_url applies to all spans and span events in the "spans" field.
-  string schema_url = 3;
-}
-
-// A collection of Spans produced by an InstrumentationLibrary.
-// InstrumentationLibrarySpans is wire-compatible with ScopeSpans for binary
-// Protobuf format.
-// This message is deprecated and will be removed on June 15, 2022.
-message InstrumentationLibrarySpans {
-  option deprecated = true;
-
-  // The instrumentation library information for the spans in this message.
-  // Semantically when InstrumentationLibrary isn't set, it is equivalent with
-  // an empty instrumentation library name (unknown).
-  opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = 1;
-
-  // A list of Spans that originate from an instrumentation library.
-  repeated Span spans = 2;
-
-  // This schema_url applies to all spans and span events in the "spans" field.
-  string schema_url = 3;
-}
-
-// Span represents a single operation within a trace. Spans can be
-// nested to form a trace tree. Spans may also be linked to other spans
-// from the same or different trace and form graphs. Often, a trace
-// contains a root span that describes the end-to-end latency, and one
-// or more subspans for its sub-operations. A trace can also contain
-// multiple root spans, or none at all. Spans do not need to be
-// contiguous - there may be gaps or overlaps between spans in a trace.
-//
-// The next available field id is 17.
-message Span {
-  // A unique identifier for a trace. All spans from the same trace share
-  // the same `trace_id`. The ID is a 16-byte array. An ID with all zeroes
-  // is considered invalid.
-  //
-  // This field is semantically required. Receiver should generate new
-  // random trace_id if empty or invalid trace_id was received.
-  //
-  // This field is required.
-  bytes trace_id = 1;
-
-  // A unique identifier for a span within a trace, assigned when the span
-  // is created. The ID is an 8-byte array. An ID with all zeroes is considered
-  // invalid.
-  //
-  // This field is semantically required. Receiver should generate new
-  // random span_id if empty or invalid span_id was received.
-  //
-  // This field is required.
-  bytes span_id = 2;
-
-  // trace_state conveys information about request position in multiple distributed tracing graphs.
-  // It is a trace_state in w3c-trace-context format: https://www.w3.org/TR/trace-context/#tracestate-header
-  // See also https://github.com/w3c/distributed-tracing for more details about this field.
-  string trace_state = 3;
-
-  // The `span_id` of this span's parent span. If this is a root span, then this
-  // field must be empty. The ID is an 8-byte array.
-  bytes parent_span_id = 4;
-
-  // A description of the span's operation.
-  //
-  // For example, the name can be a qualified method name or a file name
-  // and a line number where the operation is called. A best practice is to use
-  // the same display name at the same call point in an application.
-  // This makes it easier to correlate spans in different traces.
-  //
-  // This field is semantically required to be set to non-empty string.
-  // Empty value is equivalent to an unknown span name.
-  //
-  // This field is required.
-  string name = 5;
-
-  // SpanKind is the type of span. Can be used to specify additional relationships between spans
-  // in addition to a parent/child relationship.
-  enum SpanKind {
-    // Unspecified. Do NOT use as default.
-    // Implementations MAY assume SpanKind to be INTERNAL when receiving UNSPECIFIED.
-    SPAN_KIND_UNSPECIFIED = 0;
-
-    // Indicates that the span represents an internal operation within an application,
-    // as opposed to an operation happening at the boundaries. Default value.
-    SPAN_KIND_INTERNAL = 1;
-
-    // Indicates that the span covers server-side handling of an RPC or other
-    // remote network request.
-    SPAN_KIND_SERVER = 2;
-
-    // Indicates that the span describes a request to some remote service.
-    SPAN_KIND_CLIENT = 3;
-
-    // Indicates that the span describes a producer sending a message to a broker.
-    // Unlike CLIENT and SERVER, there is often no direct critical path latency relationship
-    // between producer and consumer spans. A PRODUCER span ends when the message was accepted
-    // by the broker while the logical processing of the message might span a much longer time.
-    SPAN_KIND_PRODUCER = 4;
-
-    // Indicates that the span describes consumer receiving a message from a broker.
-    // Like the PRODUCER kind, there is often no direct critical path latency relationship
-    // between producer and consumer spans.
-    SPAN_KIND_CONSUMER = 5;
-  }
-
-  // Distinguishes between spans generated in a particular context. For example,
-  // two spans with the same name may be distinguished using `CLIENT` (caller)
-  // and `SERVER` (callee) to identify queueing latency associated with the span.
-  SpanKind kind = 6;
-
-  // start_time_unix_nano is the start time of the span. On the client side, this is the time
-  // kept by the local machine where the span execution starts. On the server side, this
-  // is the time when the server's application handler starts running.
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January 1970.
-  //
-  // This field is semantically required and it is expected that end_time >= start_time.
-  fixed64 start_time_unix_nano = 7;
-
-  // end_time_unix_nano is the end time of the span. On the client side, this is the time
-  // kept by the local machine where the span execution ends. On the server side, this
-  // is the time when the server application handler stops running.
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January 1970.
-  //
-  // This field is semantically required and it is expected that end_time >= start_time.
-  fixed64 end_time_unix_nano = 8;
-
-  // attributes is a collection of key/value pairs. Note, global attributes
-  // like server name can be set using the resource API. Examples of attributes:
-  //
-  //     "/http/user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"
-  //     "/http/server_latency": 300
-  //     "abc.com/myattribute": true
-  //     "abc.com/score": 10.239
-  //
-  // The OpenTelemetry API specification further restricts the allowed value types:
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/common.md#attributes
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
-
-  // dropped_attributes_count is the number of attributes that were discarded. Attributes
-  // can be discarded because their keys are too long or because there are too many
-  // attributes. If this value is 0, then no attributes were dropped.
-  uint32 dropped_attributes_count = 10;
-
-  // Event is a time-stamped annotation of the span, consisting of user-supplied
-  // text description and key-value pairs.
-  message Event {
-    // time_unix_nano is the time the event occurred.
-    fixed64 time_unix_nano = 1;
-
-    // name of the event.
-    // This field is semantically required to be set to non-empty string.
-    string name = 2;
-
-    // attributes is a collection of attribute key/value pairs on the event.
-    // Attribute keys MUST be unique (it is not allowed to have more than one
-    // attribute with the same key).
-    repeated opentelemetry.proto.common.v1.KeyValue attributes = 3;
-
-    // dropped_attributes_count is the number of dropped attributes. If the value is 0,
-    // then no attributes were dropped.
-    uint32 dropped_attributes_count = 4;
-  }
-
-  // events is a collection of Event items.
-  repeated Event events = 11;
-
-  // dropped_events_count is the number of dropped events. If the value is 0, then no
-  // events were dropped.
-  uint32 dropped_events_count = 12;
-
-  // A pointer from the current span to another span in the same trace or in a
-  // different trace. For example, this can be used in batching operations,
-  // where a single batch handler processes multiple requests from different
-  // traces or when the handler receives a request from a different project.
-  message Link {
-    // A unique identifier of a trace that this linked span is part of. The ID is a
-    // 16-byte array.
-    bytes trace_id = 1;
-
-    // A unique identifier for the linked span. The ID is an 8-byte array.
-    bytes span_id = 2;
-
-    // The trace_state associated with the link.
-    string trace_state = 3;
-
-    // attributes is a collection of attribute key/value pairs on the link.
-    // Attribute keys MUST be unique (it is not allowed to have more than one
-    // attribute with the same key).
-    repeated opentelemetry.proto.common.v1.KeyValue attributes = 4;
-
-    // dropped_attributes_count is the number of dropped attributes. If the value is 0,
-    // then no attributes were dropped.
-    uint32 dropped_attributes_count = 5;
-  }
-
-  // links is a collection of Links, which are references from this span to a span
-  // in the same or different trace.
-  repeated Link links = 13;
-
-  // dropped_links_count is the number of dropped links after the maximum size was
-  // enforced. If this value is 0, then no links were dropped.
-  uint32 dropped_links_count = 14;
-
-  // An optional final status for this span. Semantically when Status isn't set, it means
-  // span's status code is unset, i.e. assume STATUS_CODE_UNSET (code = 0).
-  Status status = 15;
-}
-
-// The Status type defines a logical error model that is suitable for different
-// programming environments, including REST APIs and RPC APIs.
-message Status {
-  reserved 1;
-
-  // A developer-facing human readable error message.
-  string message = 2;
-
-  // For the semantics of status codes see
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/api.md#set-status
-  enum StatusCode {
-    // The default status.
-    STATUS_CODE_UNSET               = 0;
-    // The Span has been validated by an Application developers or Operator to have
-    // completed successfully.
-    STATUS_CODE_OK                  = 1;
-    // The Span contains an error.
-    STATUS_CODE_ERROR               = 2;
-  };
-
-  // The status code.
-  StatusCode code = 3;
-}
diff --git a/library/cpp/actors/wilson/protos/ya.make b/library/cpp/actors/wilson/protos/ya.make
index 9a756e8da0..e9db290efd 100644
--- a/library/cpp/actors/wilson/protos/ya.make
+++ b/library/cpp/actors/wilson/protos/ya.make
@@ -1,12 +1,7 @@
 PROTO_LIBRARY()
 
-    GRPC()
-
-    SRCS(
-        common.proto
-        resource.proto
-        service.proto
-        trace.proto
+    PEERDIR(
+        contrib/libs/opentelemetry-proto
     )
 
     EXCLUDE_TAGS(
diff --git a/library/cpp/actors/wilson/wilson_span.h b/library/cpp/actors/wilson/wilson_span.h
index d470c02c0e..bf9b5bcf61 100644
--- a/library/cpp/actors/wilson/wilson_span.h
+++ b/library/cpp/actors/wilson/wilson_span.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/actors/core/actor.h>
 #include <library/cpp/actors/core/actorsystem.h>
-#include <library/cpp/actors/wilson/protos/trace.pb.h>
+#include <opentelemetry/proto/trace/v1/trace.pb.h>
 #include <util/generic/hash.h>
 #include <util/datetime/cputimer.h>
 
diff --git a/library/cpp/actors/wilson/wilson_uploader.cpp b/library/cpp/actors/wilson/wilson_uploader.cpp
index 3a08eb4205..2390d5a376 100644
--- a/library/cpp/actors/wilson/wilson_uploader.cpp
+++ b/library/cpp/actors/wilson/wilson_uploader.cpp
@@ -2,8 +2,8 @@
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
 #include <library/cpp/actors/core/log.h>
-#include <library/cpp/actors/wilson/protos/service.pb.h>
-#include <library/cpp/actors/wilson/protos/service.grpc.pb.h>
+#include <opentelemetry/proto/collector/trace/v1/trace_service.pb.h>
+#include <opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h>
 #include <util/stream/file.h>
 #include <util/string/hex.h>
 #include <grpc++/grpc++.h>
diff --git a/library/cpp/actors/wilson/wilson_uploader.h b/library/cpp/actors/wilson/wilson_uploader.h
index bc02fc1aaa..86c23ccefe 100644
--- a/library/cpp/actors/wilson/wilson_uploader.h
+++ b/library/cpp/actors/wilson/wilson_uploader.h
@@ -3,7 +3,7 @@
 #include <library/cpp/actors/core/actor.h>
 #include <library/cpp/actors/core/event_local.h>
 #include <library/cpp/actors/core/events.h>
-#include <library/cpp/actors/wilson/protos/trace.pb.h>
+#include <opentelemetry/proto/trace/v1/trace.pb.h>
 
 namespace NWilson {