merged from upstream, and applied local fixes

Author: malkia

MODULE.bazel

@@ -54,17 +54,16 @@ archive_override(
 # this rule is missing dependency declarations for the following files included by 'src/google/protobuf/any_lite.cc':
 #   'bazel-out/x64_windows-opt-exec-ST-d610928244b0/bin/external/protobuf+/src/google/protobuf/_virtual_includes/protobuf_lite/google/protobuf/port.h'
 bazel_dep(name = "protobuf", version = "29.2")
-bazel_dep(name = "opentelemetry-proto", version = "1.4.0.bcr.1")
+bazel_dep(name = "opentelemetry-proto", version = "1.5.0")
 archive_override(
     module_name = "opentelemetry-proto",
-    integrity = "sha256-U80yztsndi6iBgqcjYPkuCLeE9c7XV03ots89VAY1pQ=",
+    integrity = "sha256-CPQGNq28XzPSCEvY57ZOSR3QI50alQIdv/vfHKjOpFQ=",
     patch_strip = 1,
-    # Copied from https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto/1.3.1/patches
     patches = [
         "bazel/opentelemetry-proto.patch",
     ],
-    strip_prefix = "opentelemetry-proto-1.4.0",
-    urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz"]
+    strip_prefix = "opentelemetry-proto-1.5.0",
+    urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.5.0.tar.gz"]
 )
 
 bazel_dep(name = "prometheus-cpp", version = "1.3.0")

bazel/opentelemetry-proto.patch

@@ -1,13 +1,12 @@
 diff --git a/BUILD.bazel b/BUILD.bazel
 new file mode 100644
-index 0000000..07d6a90
+index 0000000..be1bc02
 --- /dev/null
 +++ b/BUILD.bazel
-@@ -0,0 +1,150 @@
-+# Copyright The OpenTelemetry Authors
-+# SPDX-License-Identifier: Apache-2.0
-+
+@@ -0,0 +1,279 @@
 +load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
++load("@grpc//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library")
++load("@rules_go//proto:def.bzl", "go_proto_library", "go_grpc_library")
 +
 +package(default_visibility = ["//visibility:public"])
 +
@@ -23,25 +22,21 @@ index 0000000..07d6a90
 +    deps = [":common_proto"],
 +)
 +
-+proto_library(
-+    name = "resource_proto",
-+    srcs = [
-+        "opentelemetry/proto/resource/v1/resource.proto",
-+    ],
-+    deps = [
-+        ":common_proto",
-+    ],
++py_proto_library(
++    name = "common_proto_py",
++    deps = [":common_proto"],
 +)
 +
-+cc_proto_library(
-+    name = "resource_proto_cc",
-+    deps = [":resource_proto"],
++go_proto_library(
++    name = "common_proto_go",
++    importpath = "go.opentelemetry.io/proto/otlp/common/v1",
++    protos = [":common_proto"],
 +)
 +
 +proto_library(
-+    name = "trace_proto",
++    name = "logs_proto",
 +    srcs = [
-+        "opentelemetry/proto/trace/v1/trace.proto",
++        "opentelemetry/proto/logs/v1/logs.proto",
 +    ],
 +    deps = [
 +        ":common_proto",
@@ -50,37 +45,72 @@ index 0000000..07d6a90
 +)
 +
 +cc_proto_library(
-+    name = "trace_proto_cc",
-+    deps = [":trace_proto"],
++    name = "logs_proto_cc",
++    deps = [":logs_proto"],
++)
++
++py_proto_library(
++    name = "logs_proto_py",
++    deps = [":logs_proto"],
++)
++
++go_proto_library(
++    name = "logs_proto_go",
++    importpath = "go.opentelemetry.io/proto/otlp/logs/v1",
++    protos = [":logs_proto"],
++    deps = [
++        ":common_proto_go",
++        ":resource_proto_go",
++    ],
 +)
 +
 +proto_library(
-+    name = "trace_service_proto",
++    name = "logs_service_proto",
 +    srcs = [
-+        "opentelemetry/proto/collector/trace/v1/trace_service.proto",
++        "opentelemetry/proto/collector/logs/v1/logs_service.proto",
 +    ],
 +    deps = [
-+        ":trace_proto",
++        ":logs_proto",
 +    ],
 +)
 +
 +cc_proto_library(
-+    name = "trace_service_proto_cc",
-+    deps = [":trace_service_proto"],
++    name = "logs_service_proto_cc",
++    deps = [":logs_service_proto"],
 +)
 +
 +cc_grpc_library(
-+    name = "trace_service_grpc_cc",
-+    srcs = [":trace_service_proto"],
++    name = "logs_service_grpc_cc",
++    srcs = [":logs_service_proto"],
 +    generate_mocks = True,
 +    grpc_only = True,
-+    deps = [":trace_service_proto_cc"],
++    deps = [":logs_service_proto_cc"],
++)
++
++py_proto_library(
++    name = "logs_service_proto_py",
++    deps = [":logs_service_proto"],
++)
++
++py_grpc_library(
++    name = "logs_service_grpc_py",
++    srcs = [":logs_service_proto"],
++    deps = [":logs_service_proto_py"],
++)
++
++go_grpc_library(
++    name = "logs_service_grpc_go",
++    protos = [":logs_service_proto"],
++    importpath = "go.opentelemetry.io/proto/otlp/logs/v1",
++    embed = [
++        ":logs_proto_go",
++    ],
 +)
 +
 +proto_library(
-+    name = "logs_proto",
++    name = "metrics_proto",
 +    srcs = [
-+        "opentelemetry/proto/logs/v1/logs.proto",
++        "opentelemetry/proto/metrics/v1/metrics.proto",
 +    ],
 +    deps = [
 +        ":common_proto",
@@ -89,37 +119,101 @@ index 0000000..07d6a90
 +)
 +
 +cc_proto_library(
-+    name = "logs_proto_cc",
-+    deps = [":logs_proto"],
++    name = "metrics_proto_cc",
++    deps = [":metrics_proto"],
++)
++
++py_proto_library(
++    name = "metrics_proto_py",
++    deps = [":metrics_proto"],
++)
++
++go_proto_library(
++    name = "metrics_proto_go",
++    importpath = "go.opentelemetry.io/proto/otlp/metrics/v1",
++    protos = [":metrics_proto"],
++    deps = [
++        ":common_proto_go",
++        ":resource_proto_go",
++    ],
 +)
 +
 +proto_library(
-+    name = "logs_service_proto",
++    name = "metrics_service_proto",
 +    srcs = [
-+        "opentelemetry/proto/collector/logs/v1/logs_service.proto",
++        "opentelemetry/proto/collector/metrics/v1/metrics_service.proto",
 +    ],
 +    deps = [
-+        ":logs_proto",
++        ":metrics_proto",
 +    ],
 +)
 +
 +cc_proto_library(
-+    name = "logs_service_proto_cc",
-+    deps = [":logs_service_proto"],
++    name = "metrics_service_proto_cc",
++    deps = [":metrics_service_proto"],
 +)
 +
 +cc_grpc_library(
-+    name = "logs_service_grpc_cc",
-+    srcs = [":logs_service_proto"],
++    name = "metrics_service_grpc_cc",
++    srcs = [":metrics_service_proto"],
 +    generate_mocks = True,
 +    grpc_only = True,
-+    deps = [":logs_service_proto_cc"],
++    deps = [":metrics_service_proto_cc"],
++)
++
++py_proto_library(
++    name = "metrics_service_proto_py",
++    deps = [":metrics_service_proto"],
++)
++
++py_grpc_library(
++    name = "metrics_service_grpc_py",
++    srcs = [":metrics_service_proto"],
++    deps = [":metrics_service_proto_py"],
++)
++
++go_grpc_library(
++    name = "metrics_service_grpc_go",
++    protos = [":metrics_service_proto"],
++    importpath = "go.opentelemetry.io/proto/otlp/metrics/v1",
++    embed = [
++        ":metrics_proto_go",
++    ],
 +)
 +
 +proto_library(
-+    name = "metrics_proto",
++    name = "resource_proto",
 +    srcs = [
-+        "opentelemetry/proto/metrics/v1/metrics.proto",
++        "opentelemetry/proto/resource/v1/resource.proto",
++    ],
++    deps = [
++        ":common_proto",
++    ],
++)
++
++cc_proto_library(
++    name = "resource_proto_cc",
++    deps = [":resource_proto"],
++)
++
++py_proto_library(
++    name = "resource_proto_py",
++    deps = [":resource_proto"],
++)
++
++go_proto_library(
++    name = "resource_proto_go",
++    importpath = "go.opentelemetry.io/proto/otlp/resource/v1",
++    protos = [":resource_proto"],
++    deps = [
++        ":common_proto_go",
++    ],
++)
++
++proto_library(
++    name = "trace_proto",
++    srcs = [
++        "opentelemetry/proto/trace/v1/trace.proto",
 +    ],
 +    deps = [
 +        ":common_proto",
@@ -128,42 +222,78 @@ index 0000000..07d6a90
 +)
 +
 +cc_proto_library(
-+    name = "metrics_proto_cc",
-+    deps = [":metrics_proto"],
++    name = "trace_proto_cc",
++    deps = [":trace_proto"],
++)
++
++py_proto_library(
++    name = "trace_proto_py",
++    deps = [":trace_proto"],
++)
++
++go_proto_library(
++    name = "trace_proto_go",
++    importpath = "go.opentelemetry.io/proto/otlp/trace/v1",
++    protos = [":trace_proto"],
++    deps = [
++        ":common_proto_go",
++        ":resource_proto_go",
++    ],
 +)
 +
 +proto_library(
-+    name = "metrics_service_proto",
++    name = "trace_service_proto",
 +    srcs = [
-+        "opentelemetry/proto/collector/metrics/v1/metrics_service.proto",
++        "opentelemetry/proto/collector/trace/v1/trace_service.proto",
 +    ],
 +    deps = [
-+        ":metrics_proto",
++        ":trace_proto",
 +    ],
 +)
 +
 +cc_proto_library(
-+    name = "metrics_service_proto_cc",
-+    deps = [":metrics_service_proto"],
++    name = "trace_service_proto_cc",
++    deps = [":trace_service_proto"],
 +)
 +
 +cc_grpc_library(
-+    name = "metrics_service_grpc_cc",
-+    srcs = [":metrics_service_proto"],
++    name = "trace_service_grpc_cc",
++    srcs = [":trace_service_proto"],
 +    generate_mocks = True,
 +    grpc_only = True,
-+    deps = [":metrics_service_proto_cc"],
++    deps = [":trace_service_proto_cc"],
++)
++
++py_proto_library(
++    name = "trace_service_proto_py",
++    deps = [":trace_service_proto"],
++)
++
++py_grpc_library(
++    name = "trace_service_grpc_py",
++    srcs = [":trace_service_proto"],
++    deps = [":trace_service_proto_py"],
++)
++
++go_grpc_library(
++    name = "trace_service_grpc_go",
++    protos = [":trace_service_proto"],
++    importpath = "go.opentelemetry.io/proto/otlp/trace/v1",
++    embed = [
++        ":trace_proto_go",
++    ],
 +)
 diff --git a/MODULE.bazel b/MODULE.bazel
 new file mode 100644
-index 0000000..a5a5e54
+index 0000000..8b1a510
 --- /dev/null
 +++ b/MODULE.bazel
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,8 @@
 +module(
 +    name = "opentelemetry-proto",
-+    version = "1.4.0",
++    version = "1.5.0",
 +    compatibility_level = 0,
 +)
 +
 +bazel_dep(name = "grpc", version = "1.68.0")
++bazel_dep(name = "rules_go", version = "0.51.0")