Fix OpenTelemetry Conflicts (#1383)

* Remove old pb2 files

* Add protos for opentelemetry-python 1.32.1

* Edit paths in opentelemetry proto files

* Generate new opentelemetry pb2 files

Author: TimPansino

newrelic/packages/opentelemetry_proto/common.proto

@@ -0,0 +1,89 @@
+// 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.
+
+// =============================================================================
+// WARNING: Manually edited with the following changes.
+// 1. Replace listed .proto file paths with newrelic/packages/opentelemetry_proto/
+// 2. Replace listed __module__ paths with newrelic.packages.opentelemetry_proto
+// This prevents conflicts with other packages using different versions
+// of opentelemetry's pb2 files.
+// =============================================================================
+
+syntax = "proto3";
+
+package newrelic.packages.opentelemetry_proto;
+
+option csharp_namespace = "OpenTelemetry.Proto.Common.V1";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.common.v1";
+option java_outer_classname = "CommonProto";
+option go_package = "go.opentelemetry.io/proto/otlp/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;
+}
+
+// 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;
+
+  // Additional attributes that describe the scope. [Optional].
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated KeyValue attributes = 3;
+  uint32 dropped_attributes_count = 4;
+}

newrelic/packages/opentelemetry_proto/common_pb2.py

@@ -1,87 +1,42 @@
 # -*- coding: utf-8 -*-
+# =============================================================================
+# WARNING: Generated from proto files edited with the following changes.
+# 1. Replace listed .proto file paths with newrelic/packages/opentelemetry_proto/
+# 2. Replace listed __module__ paths with newrelic.packages.opentelemetry_proto
+# This prevents conflicts with other packages using different versions
+# of opentelemetry's pb2 files.
+# =============================================================================
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: opentelemetry/proto/common/v1/common.proto
+# source: newrelic/packages/opentelemetry_proto/common.proto
+# Protobuf Python Version: 5.26.1
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n*opentelemetry/proto/common/v1/common.proto\x12\x1dopentelemetry.proto.common.v1\"\x8c\x02\n\x08\x41nyValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x04 \x01(\x01H\x00\x12@\n\x0b\x61rray_value\x18\x05 \x01(\x0b\x32).opentelemetry.proto.common.v1.ArrayValueH\x00\x12\x43\n\x0ckvlist_value\x18\x06 \x01(\x0b\x32+.opentelemetry.proto.common.v1.KeyValueListH\x00\x12\x15\n\x0b\x62ytes_value\x18\x07 \x01(\x0cH\x00\x42\x07\n\x05value\"E\n\nArrayValue\x12\x37\n\x06values\x18\x01 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.AnyValue\"G\n\x0cKeyValueList\x12\x37\n\x06values\x18\x01 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\"O\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x36\n\x05value\x18\x02 \x01(\x0b\x32\'.opentelemetry.proto.common.v1.AnyValue\";\n\x16InstrumentationLibrary\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t:\x02\x18\x01\"5\n\x14InstrumentationScope\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\tB[\n io.opentelemetry.proto.common.v1B\x0b\x43ommonProtoP\x01Z(go.opentelemetry.io/proto/otlp/common/v1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n2newrelic/packages/opentelemetry_proto/common.proto\x12%newrelic.packages.opentelemetry_proto\"\x9c\x02\n\x08\x41nyValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x04 \x01(\x01H\x00\x12H\n\x0b\x61rray_value\x18\x05 \x01(\x0b\x32\x31.newrelic.packages.opentelemetry_proto.ArrayValueH\x00\x12K\n\x0ckvlist_value\x18\x06 \x01(\x0b\x32\x33.newrelic.packages.opentelemetry_proto.KeyValueListH\x00\x12\x15\n\x0b\x62ytes_value\x18\x07 \x01(\x0cH\x00\x42\x07\n\x05value\"M\n\nArrayValue\x12?\n\x06values\x18\x01 \x03(\x0b\x32/.newrelic.packages.opentelemetry_proto.AnyValue\"O\n\x0cKeyValueList\x12?\n\x06values\x18\x01 \x03(\x0b\x32/.newrelic.packages.opentelemetry_proto.KeyValue\"W\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12>\n\x05value\x18\x02 \x01(\x0b\x32/.newrelic.packages.opentelemetry_proto.AnyValue\"\x9c\x01\n\x14InstrumentationScope\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x43\n\nattributes\x18\x03 \x03(\x0b\x32/.newrelic.packages.opentelemetry_proto.KeyValue\x12 \n\x18\x64ropped_attributes_count\x18\x04 \x01(\rB{\n io.opentelemetry.proto.common.v1B\x0b\x43ommonProtoP\x01Z(go.opentelemetry.io/proto/otlp/common/v1\xaa\x02\x1dOpenTelemetry.Proto.Common.V1b\x06proto3')
 
-
-
-_ANYVALUE = DESCRIPTOR.message_types_by_name['AnyValue']
-_ARRAYVALUE = DESCRIPTOR.message_types_by_name['ArrayValue']
-_KEYVALUELIST = DESCRIPTOR.message_types_by_name['KeyValueList']
-_KEYVALUE = DESCRIPTOR.message_types_by_name['KeyValue']
-_INSTRUMENTATIONLIBRARY = DESCRIPTOR.message_types_by_name['InstrumentationLibrary']
-_INSTRUMENTATIONSCOPE = DESCRIPTOR.message_types_by_name['InstrumentationScope']
-AnyValue = _reflection.GeneratedProtocolMessageType('AnyValue', (_message.Message,), {
-  'DESCRIPTOR' : _ANYVALUE,
-  '__module__' : 'opentelemetry.proto.common.v1.common_pb2'
-  # @@protoc_insertion_point(class_scope:opentelemetry.proto.common.v1.AnyValue)
-  })
-_sym_db.RegisterMessage(AnyValue)
-
-ArrayValue = _reflection.GeneratedProtocolMessageType('ArrayValue', (_message.Message,), {
-  'DESCRIPTOR' : _ARRAYVALUE,
-  '__module__' : 'opentelemetry.proto.common.v1.common_pb2'
-  # @@protoc_insertion_point(class_scope:opentelemetry.proto.common.v1.ArrayValue)
-  })
-_sym_db.RegisterMessage(ArrayValue)
-
-KeyValueList = _reflection.GeneratedProtocolMessageType('KeyValueList', (_message.Message,), {
-  'DESCRIPTOR' : _KEYVALUELIST,
-  '__module__' : 'opentelemetry.proto.common.v1.common_pb2'
-  # @@protoc_insertion_point(class_scope:opentelemetry.proto.common.v1.KeyValueList)
-  })
-_sym_db.RegisterMessage(KeyValueList)
-
-KeyValue = _reflection.GeneratedProtocolMessageType('KeyValue', (_message.Message,), {
-  'DESCRIPTOR' : _KEYVALUE,
-  '__module__' : 'opentelemetry.proto.common.v1.common_pb2'
-  # @@protoc_insertion_point(class_scope:opentelemetry.proto.common.v1.KeyValue)
-  })
-_sym_db.RegisterMessage(KeyValue)
-
-InstrumentationLibrary = _reflection.GeneratedProtocolMessageType('InstrumentationLibrary', (_message.Message,), {
-  'DESCRIPTOR' : _INSTRUMENTATIONLIBRARY,
-  '__module__' : 'opentelemetry.proto.common.v1.common_pb2'
-  # @@protoc_insertion_point(class_scope:opentelemetry.proto.common.v1.InstrumentationLibrary)
-  })
-_sym_db.RegisterMessage(InstrumentationLibrary)
-
-InstrumentationScope = _reflection.GeneratedProtocolMessageType('InstrumentationScope', (_message.Message,), {
-  'DESCRIPTOR' : _INSTRUMENTATIONSCOPE,
-  '__module__' : 'opentelemetry.proto.common.v1.common_pb2'
-  # @@protoc_insertion_point(class_scope:opentelemetry.proto.common.v1.InstrumentationScope)
-  })
-_sym_db.RegisterMessage(InstrumentationScope)
-
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n io.opentelemetry.proto.common.v1B\013CommonProtoP\001Z(go.opentelemetry.io/proto/otlp/common/v1'
-  _INSTRUMENTATIONLIBRARY._options = None
-  _INSTRUMENTATIONLIBRARY._serialized_options = b'\030\001'
-  _ANYVALUE._serialized_start=78
-  _ANYVALUE._serialized_end=346
-  _ARRAYVALUE._serialized_start=348
-  _ARRAYVALUE._serialized_end=417
-  _KEYVALUELIST._serialized_start=419
-  _KEYVALUELIST._serialized_end=490
-  _KEYVALUE._serialized_start=492
-  _KEYVALUE._serialized_end=571
-  _INSTRUMENTATIONLIBRARY._serialized_start=573
-  _INSTRUMENTATIONLIBRARY._serialized_end=632
-  _INSTRUMENTATIONSCOPE._serialized_start=634
-  _INSTRUMENTATIONSCOPE._serialized_end=687
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'newrelic.packages.opentelemetry_proto.common_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n io.opentelemetry.proto.common.v1B\013CommonProtoP\001Z(go.opentelemetry.io/proto/otlp/common/v1\252\002\035OpenTelemetry.Proto.Common.V1'
+  _globals['_ANYVALUE']._serialized_start=94
+  _globals['_ANYVALUE']._serialized_end=378
+  _globals['_ARRAYVALUE']._serialized_start=380
+  _globals['_ARRAYVALUE']._serialized_end=457
+  _globals['_KEYVALUELIST']._serialized_start=459
+  _globals['_KEYVALUELIST']._serialized_end=538
+  _globals['_KEYVALUE']._serialized_start=540
+  _globals['_KEYVALUE']._serialized_end=627
+  _globals['_INSTRUMENTATIONSCOPE']._serialized_start=630
+  _globals['_INSTRUMENTATIONSCOPE']._serialized_end=786
 # @@protoc_insertion_point(module_scope)

newrelic/packages/opentelemetry_proto/generate_pb2.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+REPO_ROOT=$(git rev-parse --show-toplevel)
+cd $REPO_ROOT
+
+# Generated from:
+# opentelemetry-python==1.32.1
+# Which uses:
+# grpcio-tools==1.63.2
+# https://github.com/open-telemetry/opentelemetry-proto/tree/v1.2.0
+
+protos=(
+    ./newrelic/packages/opentelemetry_proto/metrics.proto
+    ./newrelic/packages/opentelemetry_proto/logs.proto
+    ./newrelic/packages/opentelemetry_proto/resource.proto
+    ./newrelic/packages/opentelemetry_proto/common.proto
+)
+python -m grpc_tools.protoc \
+    -I ./ \
+    --python_out=. \
+    ${protos[@]}