grpc cleanup

Author: marcalff

examples/grpc/client.cc

@@ -5,6 +5,8 @@
 // ambiguity with `nostd::variant` if compiled with Visual Studio 2015. Other
 // modern compilers are unaffected.
 #include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/status.h>
 
 #include <stdint.h>
 #include <stdlib.h>

examples/grpc/server.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <grpcpp/grpcpp.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
@@ -23,7 +22,7 @@
 #include "opentelemetry/semconv/incubating/rpc_attributes.h"
 #include "opentelemetry/trace/context.h"
 #include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
+#include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_metadata.h"
 #include "opentelemetry/trace/span_startoptions.h"
 #include "opentelemetry/trace/tracer.h"

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_factory.h

@@ -5,18 +5,16 @@
 
 #include <memory>
 
+#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
 namespace otlp
 {
 
-class OtlpGrpcClientReferenceGuard;
-class OtlpGrpcClient;
-
 /**
  * Factory class for OtlpGrpcClient.
  */

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_utils.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/status.h>
 
 #include "opentelemetry/version.h"
 

exporters/otlp/test/otlp_grpc_exporter_factory_test.cc

@@ -3,7 +3,6 @@
 
 #include <gtest/gtest.h>
 
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
 
@@ -15,6 +14,10 @@
 #  error "protobuf should not be included"
 #endif
 
+/*
+  Implementation, this requires protobuf.
+*/
+#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc

@@ -3,7 +3,6 @@
 
 #include <gtest/gtest.h>
 
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
 
@@ -15,6 +14,10 @@
 #  error "protobuf should not be included"
 #endif
 
+/*
+  Implementation, this requires protobuf.
+*/
+#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc

@@ -3,7 +3,6 @@
 
 #include <gtest/gtest.h>
 
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
 
@@ -15,6 +14,10 @@
 #  error "protobuf should not be included"
 #endif
 
+/*
+  Implementation, this requires protobuf.
+*/
+#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

exporters/prometheus/include/opentelemetry/exporters/prometheus/collector.h

@@ -8,7 +8,6 @@
 #include <mutex>
 #include <vector>
 
-#include "opentelemetry/exporters/prometheus/exporter_utils.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
 #include "opentelemetry/version.h"
 

exporters/prometheus/src/collector.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "opentelemetry/exporters/prometheus/collector.h"
+#include "opentelemetry/exporters/prometheus/exporter_utils.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 
 namespace metric_sdk = opentelemetry::sdk::metrics;

exporters/prometheus/src/exporter.cc

@@ -1,6 +1,11 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <prometheus/exposer.h>
+#include <exception>
+#include <ostream>
+#include <string>
+
 #include "opentelemetry/exporters/prometheus/exporter.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"