Skip to content

[pull] main from open-telemetry:main #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2025
Merged

[pull] main from open-telemetry:main #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <memory>

#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
// IWYU pragma: no_include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
#include "opentelemetry/version.h"

Expand All @@ -15,6 +15,9 @@ namespace exporter
namespace otlp
{

class OtlpGrpcClient; // IWYU pragma: keep
class OtlpGrpcClientReferenceGuard; // IWYU pragma: keep

/**
* Factory class for OtlpGrpcClient.
*/
Expand Down
9 changes: 9 additions & 0 deletions exporters/otlp/test/otlp_grpc_exporter_factory_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
Implementation, this requires protobuf.
*/
#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"

/*
Make sure OtlpGrpcClientFactory does not require,
even indirectly, gRPC headers.
*/
#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
# error "gRPC should not be included"
#endif

#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down
9 changes: 9 additions & 0 deletions exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
Implementation, this requires protobuf.
*/
#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"

/*
Make sure OtlpGrpcClientFactory does not require,
even indirectly, gRPC headers.
*/
#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
# error "gRPC should not be included"
#endif

#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down
9 changes: 9 additions & 0 deletions exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
Implementation, this requires protobuf.
*/
#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"

/*
Make sure OtlpGrpcClientFactory does not require,
even indirectly, gRPC headers.
*/
#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
# error "gRPC should not be included"
#endif

#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down
Loading