Skip to content

Commit dd0c9db

Browse files
chusitoochusitoo
committed
Fixes for CI tests
1 parent 863e0ed commit dd0c9db

File tree

2 files changed

+54
-47
lines changed

2 files changed

+54
-47
lines changed

‎exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55

66
#include <chrono>
7+
#include <cstdint>
78
#include <string>
89

910
#include "opentelemetry/exporters/otlp/otlp_environment.h"

‎exporters/otlp/test/otlp_grpc_exporter_test.cc

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -432,73 +432,79 @@ struct TestTraceService : public opentelemetry::proto::collector::trace::v1::Tra
432432
std::vector<grpc::StatusCode> status_codes_;
433433
};
434434

435+
using StatusCodeVector = std::vector<grpc::StatusCode>;
436+
435437
class OtlpGrpcExporterRetryIntegrationTests
436-
: public ::testing::TestWithParam<std::tuple<bool, std::vector<grpc::StatusCode>, std::size_t>>
438+
: public ::testing::TestWithParam<std::tuple<bool, StatusCodeVector, std::size_t>>
437439
{};
438440

439441
INSTANTIATE_TEST_SUITE_P(
440442
StatusCodes,
441443
OtlpGrpcExporterRetryIntegrationTests,
442444
testing::Values(
443445
// With retry policy enabled
444-
std::make_tuple(true, std::vector{grpc::StatusCode::CANCELLED}, 5),
445-
std::make_tuple(true, std::vector{grpc::StatusCode::UNKNOWN}, 1),
446-
std::make_tuple(true, std::vector{grpc::StatusCode::INVALID_ARGUMENT}, 1),
447-
std::make_tuple(true, std::vector{grpc::StatusCode::DEADLINE_EXCEEDED}, 5),
448-
std::make_tuple(true, std::vector{grpc::StatusCode::NOT_FOUND}, 1),
449-
std::make_tuple(true, std::vector{grpc::StatusCode::ALREADY_EXISTS}, 1),
450-
std::make_tuple(true, std::vector{grpc::StatusCode::PERMISSION_DENIED}, 1),
451-
std::make_tuple(true, std::vector{grpc::StatusCode::UNAUTHENTICATED}, 1),
452-
std::make_tuple(true, std::vector{grpc::StatusCode::RESOURCE_EXHAUSTED}, 1),
453-
std::make_tuple(true, std::vector{grpc::StatusCode::FAILED_PRECONDITION}, 1),
454-
std::make_tuple(true, std::vector{grpc::StatusCode::ABORTED}, 5),
455-
std::make_tuple(true, std::vector{grpc::StatusCode::OUT_OF_RANGE}, 5),
456-
std::make_tuple(true, std::vector{grpc::StatusCode::UNIMPLEMENTED}, 1),
457-
std::make_tuple(true, std::vector{grpc::StatusCode::INTERNAL}, 1),
458-
std::make_tuple(true, std::vector{grpc::StatusCode::UNAVAILABLE}, 5),
459-
std::make_tuple(true, std::vector{grpc::StatusCode::DATA_LOSS}, 5),
460-
std::make_tuple(true, std::vector{grpc::StatusCode::OK}, 1),
446+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::CANCELLED}, 5),
447+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNKNOWN}, 1),
448+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::INVALID_ARGUMENT}, 1),
449+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::DEADLINE_EXCEEDED}, 5),
450+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::NOT_FOUND}, 1),
451+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::ALREADY_EXISTS}, 1),
452+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::PERMISSION_DENIED}, 1),
453+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNAUTHENTICATED}, 1),
454+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::RESOURCE_EXHAUSTED}, 1),
455+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::FAILED_PRECONDITION}, 1),
456+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::ABORTED}, 5),
457+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::OUT_OF_RANGE}, 5),
458+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNIMPLEMENTED}, 1),
459+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::INTERNAL}, 1),
460+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNAVAILABLE}, 5),
461+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::DATA_LOSS}, 5),
462+
std::make_tuple(true, StatusCodeVector{grpc::StatusCode::OK}, 1),
461463
std::make_tuple(true,
462-
std::vector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::ABORTED,
463-
grpc::StatusCode::OUT_OF_RANGE, grpc::StatusCode::DATA_LOSS},
464+
StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::ABORTED,
465+
grpc::StatusCode::OUT_OF_RANGE,
466+
grpc::StatusCode::DATA_LOSS},
464467
5),
465468
std::make_tuple(true,
466-
std::vector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::UNAVAILABLE,
467-
grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::OK},
469+
StatusCodeVector{grpc::StatusCode::UNAVAILABLE,
470+
grpc::StatusCode::UNAVAILABLE,
471+
grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::OK},
468472
4),
469473
std::make_tuple(true,
470-
std::vector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::CANCELLED,
471-
grpc::StatusCode::DEADLINE_EXCEEDED, grpc::StatusCode::OK},
474+
StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::CANCELLED,
475+
grpc::StatusCode::DEADLINE_EXCEEDED, grpc::StatusCode::OK},
472476
4),
473477
// With retry policy disabled
474-
std::make_tuple(false, std::vector{grpc::StatusCode::CANCELLED}, 1),
475-
std::make_tuple(false, std::vector{grpc::StatusCode::UNKNOWN}, 1),
476-
std::make_tuple(false, std::vector{grpc::StatusCode::INVALID_ARGUMENT}, 1),
477-
std::make_tuple(false, std::vector{grpc::StatusCode::DEADLINE_EXCEEDED}, 1),
478-
std::make_tuple(false, std::vector{grpc::StatusCode::NOT_FOUND}, 1),
479-
std::make_tuple(false, std::vector{grpc::StatusCode::ALREADY_EXISTS}, 1),
480-
std::make_tuple(false, std::vector{grpc::StatusCode::PERMISSION_DENIED}, 1),
481-
std::make_tuple(false, std::vector{grpc::StatusCode::UNAUTHENTICATED}, 1),
482-
std::make_tuple(false, std::vector{grpc::StatusCode::RESOURCE_EXHAUSTED}, 1),
483-
std::make_tuple(false, std::vector{grpc::StatusCode::FAILED_PRECONDITION}, 1),
484-
std::make_tuple(false, std::vector{grpc::StatusCode::ABORTED}, 1),
485-
std::make_tuple(false, std::vector{grpc::StatusCode::OUT_OF_RANGE}, 1),
486-
std::make_tuple(false, std::vector{grpc::StatusCode::UNIMPLEMENTED}, 1),
487-
std::make_tuple(false, std::vector{grpc::StatusCode::INTERNAL}, 1),
488-
std::make_tuple(false, std::vector{grpc::StatusCode::UNAVAILABLE}, 1),
489-
std::make_tuple(false, std::vector{grpc::StatusCode::DATA_LOSS}, 1),
490-
std::make_tuple(false, std::vector{grpc::StatusCode::OK}, 1),
478+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::CANCELLED}, 1),
479+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNKNOWN}, 1),
480+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::INVALID_ARGUMENT}, 1),
481+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::DEADLINE_EXCEEDED}, 1),
482+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::NOT_FOUND}, 1),
483+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::ALREADY_EXISTS}, 1),
484+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::PERMISSION_DENIED}, 1),
485+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNAUTHENTICATED}, 1),
486+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::RESOURCE_EXHAUSTED}, 1),
487+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::FAILED_PRECONDITION}, 1),
488+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::ABORTED}, 1),
489+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::OUT_OF_RANGE}, 1),
490+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNIMPLEMENTED}, 1),
491+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::INTERNAL}, 1),
492+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNAVAILABLE}, 1),
493+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::DATA_LOSS}, 1),
494+
std::make_tuple(false, StatusCodeVector{grpc::StatusCode::OK}, 1),
491495
std::make_tuple(false,
492-
std::vector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::ABORTED,
493-
grpc::StatusCode::OUT_OF_RANGE, grpc::StatusCode::DATA_LOSS},
496+
StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::ABORTED,
497+
grpc::StatusCode::OUT_OF_RANGE,
498+
grpc::StatusCode::DATA_LOSS},
494499
1),
495500
std::make_tuple(false,
496-
std::vector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::UNAVAILABLE,
497-
grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::OK},
501+
StatusCodeVector{grpc::StatusCode::UNAVAILABLE,
502+
grpc::StatusCode::UNAVAILABLE,
503+
grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::OK},
498504
1),
499505
std::make_tuple(false,
500-
std::vector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::CANCELLED,
501-
grpc::StatusCode::DEADLINE_EXCEEDED, grpc::StatusCode::OK},
506+
StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::CANCELLED,
507+
grpc::StatusCode::DEADLINE_EXCEEDED, grpc::StatusCode::OK},
502508
1)));
503509

504510
TEST_P(OtlpGrpcExporterRetryIntegrationTests, StatusCodes)

0 commit comments

Comments
 (0)