Skip to content

Commit 9af9675

Browse files
committed
merged from upstream. bazel 8.1.0, local fixes and enabled some preview features
1 parent c5ebc48 commit 9af9675

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.1.0rc4
1+
8.1.0

api/include/opentelemetry/common/macros.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,12 +560,15 @@ point.
560560
# define ENABLE_METRICS_EXEMPLAR_PREVIEW 1
561561
# define ENABLE_ASYNC_EXPORT 1
562562
# define ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW 1
563+
# define ENABLE_OTLP_COMPRESSION_PREVIEW 1
564+
# define ENABLE_OTLP_RETRY_PREVIEW 1
565+
# define ENABLE_THREAD_INSTRUMENTATION_PREVIEW 1
566+
# define ENABLE_CURL_LOGGING 1
563567
// We ensure that this is defined to a value of, as its gets encoded down in the detect_mismatch
564568
# undef OPENTELEMETRY_RTTI_ENABLED
565569
# define OPENTELEMETRY_RTTI_ENABLED 1
566570
# undef OPENTELEMETRY_HAVE_EXCEPTIONS
567571
# define OPENTELEMETRY_HAVE_EXCEPTIONS 1
568-
//
569572
# undef OPENTELEMETRY_EXPORT
570573
# undef OPENTELEMETRY_EXPORT_TYPE
571574
# undef OPENTELEMETRY_API_SINGLETON
@@ -608,6 +611,10 @@ point.
608611
"+exemplar:" OPENTELEMETRY_DLL_STR(ENABLE_METRICS_EXEMPLAR_PREVIEW) \
609612
"+async:" OPENTELEMETRY_DLL_STR(ENABLE_ASYNC_EXPORT) \
610613
"+mtls:" OPENTELEMETRY_DLL_STR(ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW) \
614+
"+otlp_compr:" OPENTELEMETRY_DLL_STR(ENABLE_OTLP_COMPRESSION_PREVIEW) \
615+
"+otlp_retry:" OPENTELEMETRY_DLL_STR(ENABLE_OTLP_RETRY_PREVIEW) \
616+
"+thrd_instr:" OPENTELEMETRY_DLL_STR(ENABLE_THREAD_INSTRUMENTATION_PREVIEW) \
617+
"+curl_log:" OPENTELEMETRY_DLL_STR(ENABLE_CURL_LOGGING) \
611618
)
612619
# undef OPENTELEMETRY_DLL_STRX
613620
# undef OPENTELEMETRY_DLL_STR

ext/test/http/curl_http_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <curl/curlver.h>
55
#include "gtest/gtest.h"
6+
#include "gmock/gmock.h"
67

78
#ifdef ENABLE_OTLP_RETRY_PREVIEW
89
# include <curl/curl.h>
@@ -665,7 +666,7 @@ TEST_F(BasicCurlHttpTests, ElegantQuitQuick)
665666
// wait should be less than scheduled_delay_milliseconds_
666667
// Due to load on CI hosts (some take 10ms), we assert it is less than 20ms
667668
auto cost = std::chrono::system_clock::now() - beg;
668-
ASSERT_TRUE(cost < std::chrono::milliseconds{20})
669+
ASSERT_TRUE(cost < std::chrono::milliseconds{40})
669670
<< "cost ms: " << std::chrono::duration_cast<std::chrono::milliseconds>(cost).count()
670671
<< " libcurl version: 0x" << std::hex << LIBCURL_VERSION_NUM;
671672
ASSERT_TRUE(handler->is_called_);

x/.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.1.0rc4
1+
8.1.0

0 commit comments

Comments
 (0)