From bcc4932d6dae681898f53c855b9e3b77e3738b41 Mon Sep 17 00:00:00 2001 From: rochaudhari Date: Wed, 2 Nov 2022 10:53:08 +0530 Subject: [PATCH] [Exporter] add fix for prometheus exporter build Signed-off-by: Roshan Chaudhari rochaudhari@nvidia.com --- INSTALL.md | 5 +++++ WORKSPACE | 18 ++---------------- bazel/extra_deps.bzl | 12 ++++++++++++ 3 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 bazel/extra_deps.bzl diff --git a/INSTALL.md b/INSTALL.md index 518c96be99..bdf76eb9f7 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -229,6 +229,11 @@ load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps") opentelemetry_cpp_deps() +# Load extra dependencies required for openTelemetry +load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps") + +opentelemetry_extra_deps() + # Load gRPC dependencies after load. load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") diff --git a/WORKSPACE b/WORKSPACE index c35455c019..66ab11b55f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -19,14 +19,9 @@ load("//bazel:repository.bzl", "opentelemetry_cpp_deps") opentelemetry_cpp_deps() -# Load prometheus C++ dependencies. -load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories") +load("//bazel:extra_deps.bzl", "opentelemetry_extra_deps") -prometheus_cpp_repositories() - -load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") - -bazel_skylib_workspace() +opentelemetry_extra_deps() # Load gRPC dependencies after load. load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") @@ -37,12 +32,3 @@ grpc_deps() load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") grpc_extra_deps() - -load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") -load("@upb//bazel:workspace_deps.bzl", "upb_deps") - -upb_deps() - -load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") - -rules_foreign_cc_dependencies() diff --git a/bazel/extra_deps.bzl b/bazel/extra_deps.bzl new file mode 100644 index 0000000000..40803ca6f0 --- /dev/null +++ b/bazel/extra_deps.bzl @@ -0,0 +1,12 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +# Load prometheus C++ dependencies. +load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories") +load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") +load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") + +def opentelemetry_extra_deps(): + prometheus_cpp_repositories() + bazel_skylib_workspace() + rules_foreign_cc_dependencies()