From 36098986348b1375514e51736cf823a6a0006637 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 20 Oct 2025 09:47:56 -0700 Subject: [PATCH 1/4] Add opentelemetry-proto 1.8.0 --- modules/opentelemetry-proto/1.8.0/MODULE.bazel | 12 ++++++++++++ .../opentelemetry-proto/1.8.0/overlay/MODULE.bazel | 1 + modules/opentelemetry-proto/1.8.0/presubmit.yml | 12 ++++++++++++ modules/opentelemetry-proto/1.8.0/source.json | 10 ++++++++++ modules/opentelemetry-proto/metadata.json | 3 ++- 5 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 modules/opentelemetry-proto/1.8.0/MODULE.bazel create mode 120000 modules/opentelemetry-proto/1.8.0/overlay/MODULE.bazel create mode 100644 modules/opentelemetry-proto/1.8.0/presubmit.yml create mode 100644 modules/opentelemetry-proto/1.8.0/source.json diff --git a/modules/opentelemetry-proto/1.8.0/MODULE.bazel b/modules/opentelemetry-proto/1.8.0/MODULE.bazel new file mode 100644 index 00000000000..50f71f8b287 --- /dev/null +++ b/modules/opentelemetry-proto/1.8.0/MODULE.bazel @@ -0,0 +1,12 @@ +module( + name = "opentelemetry-proto", + version = "1.8.0", + bazel_compatibility = [">=7.2.1"], + compatibility_level = 0, +) + +bazel_dep(name = "grpc", version = "1.66.0.bcr.2", repo_name = "com_github_grpc_grpc") +bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf") +bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_proto", version = "6.0.0") +bazel_dep(name = "rules_python", version = "0.40.0") diff --git a/modules/opentelemetry-proto/1.8.0/overlay/MODULE.bazel b/modules/opentelemetry-proto/1.8.0/overlay/MODULE.bazel new file mode 120000 index 00000000000..9b599e3ad9c --- /dev/null +++ b/modules/opentelemetry-proto/1.8.0/overlay/MODULE.bazel @@ -0,0 +1 @@ +../MODULE.bazel \ No newline at end of file diff --git a/modules/opentelemetry-proto/1.8.0/presubmit.yml b/modules/opentelemetry-proto/1.8.0/presubmit.yml new file mode 100644 index 00000000000..64ee6d5b03d --- /dev/null +++ b/modules/opentelemetry-proto/1.8.0/presubmit.yml @@ -0,0 +1,12 @@ +matrix: + platform: ["debian10", "macos", "ubuntu2004"] + bazel: ["7.x", "8.x"] +tasks: + verify_targets: + platform: ${{ platform }} + bazel: ${{ bazel }} + build_flags: + - '--cxxopt=-std=c++14' + - '--host_cxxopt=-std=c++14' + build_targets: + - '@opentelemetry-proto//...' diff --git a/modules/opentelemetry-proto/1.8.0/source.json b/modules/opentelemetry-proto/1.8.0/source.json new file mode 100644 index 00000000000..9387f980ce2 --- /dev/null +++ b/modules/opentelemetry-proto/1.8.0/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-BXgSyrUBIsD9UEquV7C1hCSl7AXRsHiJgUvfx2mau+c=", + "strip_prefix": "opentelemetry-proto-1.8.0", + "url": "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.8.0.tar.gz", + "patch_strip": 1, + "patches": {}, + "overlay": { + "MODULE.bazel": "sha256-1h3YU6rCvUhgaQLjuWhi1G3QmZwFv2nouBWkh6JsAJs=" + } +} diff --git a/modules/opentelemetry-proto/metadata.json b/modules/opentelemetry-proto/metadata.json index 34a24277d70..c781b9bf504 100644 --- a/modules/opentelemetry-proto/metadata.json +++ b/modules/opentelemetry-proto/metadata.json @@ -19,7 +19,8 @@ "1.4.0.bcr.1", "1.5.0", "1.6.0", - "1.7.0" + "1.7.0", + "1.8.0" ], "yanked_versions": {} } From 7b1aea164fa1e2a208c325a9fcc96119c06cb194 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 20 Oct 2025 09:57:12 -0700 Subject: [PATCH 2/4] sha --- modules/opentelemetry-proto/1.8.0/source.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/opentelemetry-proto/1.8.0/source.json b/modules/opentelemetry-proto/1.8.0/source.json index 9387f980ce2..6f52ed1b7e5 100644 --- a/modules/opentelemetry-proto/1.8.0/source.json +++ b/modules/opentelemetry-proto/1.8.0/source.json @@ -5,6 +5,6 @@ "patch_strip": 1, "patches": {}, "overlay": { - "MODULE.bazel": "sha256-1h3YU6rCvUhgaQLjuWhi1G3QmZwFv2nouBWkh6JsAJs=" + "MODULE.bazel": "sha256-DbmzeL6MVggFjTGkutCyGUu7NJ96xIT9+1rTFcWLFao=" } } From 276223a7f39a6441b5c4447b53c7fbcd9d508bdb Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 20 Oct 2025 10:00:50 -0700 Subject: [PATCH 3/4] build --- .../1.8.0/overlay/BUILD.bazel | 281 ++++++++++++++++++ modules/opentelemetry-proto/1.8.0/source.json | 1 + 2 files changed, 282 insertions(+) create mode 100644 modules/opentelemetry-proto/1.8.0/overlay/BUILD.bazel diff --git a/modules/opentelemetry-proto/1.8.0/overlay/BUILD.bazel b/modules/opentelemetry-proto/1.8.0/overlay/BUILD.bazel new file mode 100644 index 00000000000..c748256247e --- /dev/null +++ b/modules/opentelemetry-proto/1.8.0/overlay/BUILD.bazel @@ -0,0 +1,281 @@ +load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library") +load("@rules_proto//proto:defs.bzl", "proto_library") + +package(default_visibility = ["//visibility:public"]) + +proto_library( + name = "common_proto", + srcs = [ + "opentelemetry/proto/common/v1/common.proto", + ], +) + +cc_proto_library( + name = "common_proto_cc", + deps = [":common_proto"], +) + +py_proto_library( + name = "common_proto_py", + deps = [":common_proto"], +) + +go_proto_library( + name = "common_proto_go", + importpath = "go.opentelemetry.io/proto/otlp/common/v1", + protos = [":common_proto"], +) + +proto_library( + name = "logs_proto", + srcs = [ + "opentelemetry/proto/logs/v1/logs.proto", + ], + deps = [ + ":common_proto", + ":resource_proto", + ], +) + +cc_proto_library( + 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 = "logs_service_proto", + srcs = [ + "opentelemetry/proto/collector/logs/v1/logs_service.proto", + ], + deps = [ + ":logs_proto", + ], +) + +cc_proto_library( + name = "logs_service_proto_cc", + deps = [":logs_service_proto"], +) + +cc_grpc_library( + name = "logs_service_grpc_cc", + srcs = [":logs_service_proto"], + generate_mocks = True, + grpc_only = True, + 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", + embed = [ + ":logs_proto_go", + ], + importpath = "go.opentelemetry.io/proto/otlp/logs/v1", + protos = [":logs_service_proto"], +) + +proto_library( + name = "metrics_proto", + srcs = [ + "opentelemetry/proto/metrics/v1/metrics.proto", + ], + deps = [ + ":common_proto", + ":resource_proto", + ], +) + +cc_proto_library( + 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 = "metrics_service_proto", + srcs = [ + "opentelemetry/proto/collector/metrics/v1/metrics_service.proto", + ], + deps = [ + ":metrics_proto", + ], +) + +cc_proto_library( + name = "metrics_service_proto_cc", + deps = [":metrics_service_proto"], +) + +cc_grpc_library( + name = "metrics_service_grpc_cc", + srcs = [":metrics_service_proto"], + generate_mocks = True, + grpc_only = True, + 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", + embed = [ + ":metrics_proto_go", + ], + importpath = "go.opentelemetry.io/proto/otlp/metrics/v1", + protos = [":metrics_service_proto"], +) + +proto_library( + name = "resource_proto", + srcs = [ + "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", + ":resource_proto", + ], +) + +cc_proto_library( + 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 = "trace_service_proto", + srcs = [ + "opentelemetry/proto/collector/trace/v1/trace_service.proto", + ], + deps = [ + ":trace_proto", + ], +) + +cc_proto_library( + name = "trace_service_proto_cc", + deps = [":trace_service_proto"], +) + +cc_grpc_library( + name = "trace_service_grpc_cc", + srcs = [":trace_service_proto"], + generate_mocks = True, + grpc_only = True, + 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", + embed = [ + ":trace_proto_go", + ], + importpath = "go.opentelemetry.io/proto/otlp/trace/v1", + protos = [":trace_service_proto"], +) diff --git a/modules/opentelemetry-proto/1.8.0/source.json b/modules/opentelemetry-proto/1.8.0/source.json index 6f52ed1b7e5..c7d8cb3bac2 100644 --- a/modules/opentelemetry-proto/1.8.0/source.json +++ b/modules/opentelemetry-proto/1.8.0/source.json @@ -5,6 +5,7 @@ "patch_strip": 1, "patches": {}, "overlay": { + "BUILD.bazel": "sha256-JWkNdSwQNm2rv75qOZAAozLBegE8GjvYtaCEHEY0DWI=", "MODULE.bazel": "sha256-DbmzeL6MVggFjTGkutCyGUu7NJ96xIT9+1rTFcWLFao=" } } From e9b429a87a5646eefbd19a092fdfff8507fa9107 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 20 Oct 2025 10:30:51 -0700 Subject: [PATCH 4/4] Update presubmit.yml --- modules/opentelemetry-proto/1.8.0/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/opentelemetry-proto/1.8.0/presubmit.yml b/modules/opentelemetry-proto/1.8.0/presubmit.yml index 64ee6d5b03d..dece082f77d 100644 --- a/modules/opentelemetry-proto/1.8.0/presubmit.yml +++ b/modules/opentelemetry-proto/1.8.0/presubmit.yml @@ -1,5 +1,5 @@ matrix: - platform: ["debian10", "macos", "ubuntu2004"] + platform: ["debian10", "ubuntu2004"] bazel: ["7.x", "8.x"] tasks: verify_targets: