Skip to content

Commit a43028d

Browse files
lalitblalitb
committed
Merge branch 'sdk_docs_impl' of github.com:lalitb/opentelemetry-cpp into sdk_docs_impl
2 parents de60f5b + 88f932f commit a43028d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+989
-342
lines changed

‎.github/workflows/ci.yml

+24-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
./ci/do_ci.sh cmake.abseil.test
4141
4242
cmake_gcc_48_test:
43-
name: CMake gcc 4.8
43+
name: CMake gcc 4.8 (without otlp exporter)
4444
runs-on: ubuntu-18.04
4545
steps:
4646
- uses: actions/checkout@v2
@@ -59,6 +59,29 @@ jobs:
5959
CC: /usr/bin/gcc-4.8
6060
CXX: /usr/bin/g++-4.8
6161

62+
cmake_gcc_48_otlp_exporter_test:
63+
name: CMake gcc 4.8 (with otlp exporter)
64+
runs-on: ubuntu-18.04
65+
steps:
66+
- uses: actions/checkout@v2
67+
with:
68+
submodules: 'recursive'
69+
- name: setup
70+
run: |
71+
sudo ./ci/setup_ci_environment.sh
72+
sudo ./ci/install_gcc48.sh
73+
- name: setup cmake
74+
run: |
75+
sudo CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_cmake.sh
76+
- name: setup grpc
77+
run: |
78+
sudo CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/setup_grpc.sh -v 4.8
79+
- name: run tests
80+
run: ./ci/do_ci.sh cmake.legacy.exporter.otprotocol.test
81+
env:
82+
CC: /usr/bin/gcc-4.8
83+
CXX: /usr/bin/g++-4.8
84+
6285
cmake_test_cxx20:
6386
name: CMake C++20 test
6487
runs-on: ubuntu-20.04

‎CHANGELOG.md

+21-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,27 @@ Increment the:
1515

1616
## [Unreleased]
1717

18-
* [BUILD] Allow to use local GSL
18+
## [1.0.0-rc4] 2021-08-04
19+
20+
* [EXPORTER] `BREAKING CHANGE` Fix default HTTP port for OTLP HTTP Exporter ([#939](https://github.com/open-telemetry/opentelemetry-cpp/pull/939))
21+
* [API] Fix timeout calculation for Tracer::Flush() and Tracer::Close() ([#937](https://github.com/open-telemetry/opentelemetry-cpp/pull/937))
22+
* [API] Fix for Stack::Resize that new_capacity is not assigned to capacity_ ([#934](https://github.com/open-telemetry/opentelemetry-cpp/pull/934))
23+
* [SDK] Fix race condition in circular buffer simulation test ([#931](https://github.com/open-telemetry/opentelemetry-cpp/pull/931))
24+
* [EXPORTER] Fix error logging in Jaeger Exporter ([#930](https://github.com/open-telemetry/opentelemetry-cpp/pull/930))
25+
* [BUILD] Use latest grpc version (v1.39.0) for cmake build of otlp exporter ([#927](https://github.com/open-telemetry/opentelemetry-cpp/pull/927))
26+
* [EXPORTER] Add Jaeger Thrift HTTP exporter ([#926](https://github.com/open-telemetry/opentelemetry-cpp/pull/926))
27+
* [SDK] Move env-var read logic to common dir, and optional reading of env-var ([#924](https://github.com/open-telemetry/opentelemetry-cpp/pull/924))
28+
* [EXPORTER] Remove recordable header from CMake install rules for exporters ([#923](https://github.com/open-telemetry/opentelemetry-cpp/pull/923))
29+
* [EXPORTER] `BREAKING CHANGE` Rename Recordable to JaegerRecordable in Jaeger exporter ([#919](https://github.com/open-telemetry/opentelemetry-cpp/pull/919))
30+
* [EXPORTER] `BREAKING CHANGE` Rename Jaeger exporter target ([#918](https://github.com/open-telemetry/opentelemetry-cpp/pull/918))
31+
* [EXPORTER] Add Zipkin exporter example ([#917](https://github.com/open-telemetry/opentelemetry-cpp/pull/917))
32+
* [EXPORTER] Bazel build for Zipkin exorter ([#916](https://github.com/open-telemetry/opentelemetry-cpp/pull/916))
33+
* [BUILD] Allow to use local GSL ([#915](https://github.com/open-telemetry/opentelemetry-cpp/pull/915))
34+
* [DOCS] Document vcpkg toolchain configuration ([#913](https://github.com/open-telemetry/opentelemetry-cpp/pull/913))
35+
* [SDK] Fix for resource deletion after tracer provider shutdown ([#911](https://github.com/open-telemetry/opentelemetry-cpp/pull/911))
36+
* [BUILD] Add bazel build for grpc example ([#910](https://github.com/open-telemetry/opentelemetry-cpp/pull/910))
37+
* [EXPORTER] Add resource and instrumentation library support for OStreamSpanExporter ([#906](https://github.com/open-telemetry/opentelemetry-cpp/pull/906))
38+
* [API] Adding semantic-convention attributes for trace ([#868](https://github.com/open-telemetry/opentelemetry-cpp/pull/868))
1939

2040
## [1.0.0-rc3] 2021-07-12
2141

‎CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,14 @@ option(WITH_ELASTICSEARCH
152152

153153
option(WITH_JAEGER "Whether to include the Jaeger exporter" OFF)
154154

155+
option(WITH_NO_GETENV "Whether the platform supports environment variables" OFF)
156+
155157
option(BUILD_TESTING "Whether to enable tests" ON)
158+
159+
if(WITH_NO_GENENV)
160+
add_definitions(-DNO_GETENV)
161+
endif()
162+
156163
if(WIN32)
157164
add_definitions(-DNOMINMAX)
158165
if(BUILD_TESTING)

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ Approvers
7878
* [Josh Suereth](https://github.com/jsuereth), Google
7979
* [Max Golovanov](https://github.com/maxgolov), Microsoft
8080
* [Ryan Burn](https://github.com/rnburn), Lightstep
81-
* [Tom Tan](https://github.com/ThomsonTan), Microsoft
8281

8382
*Find more about the approver role in [community
8483
repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
@@ -89,6 +88,7 @@ Maintainers
8988
* [Emil Mikulic](https://github.com/g-easy), Google
9089
* [Lalit Kumar Bhasin](https://github.com/lalitb), Microsoft
9190
* [Reiley Yang](https://github.com/reyang), Microsoft
91+
* [Tom Tan](https://github.com/ThomsonTan), Microsoft
9292

9393
*Find more about the maintainer role in [community
9494
repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*

‎api/include/opentelemetry/context/runtime_context.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@ class ThreadLocalContextStorage : public RuntimeContextStorage
294294
}
295295
delete[] base_;
296296
}
297-
base_ = temp;
297+
base_ = temp;
298+
capacity_ = new_capacity;
298299
}
299300

300301
~Stack() noexcept { delete[] base_; }

‎api/include/opentelemetry/trace/semantic_conventions.h

+189
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#pragma once
5+
6+
#include "opentelemetry/common/string_util.h"
7+
#include "opentelemetry/version.h"
8+
9+
OPENTELEMETRY_BEGIN_NAMESPACE
10+
namespace trace
11+
{
12+
13+
#define OTEL_CPP_GET_ATTR(name) attr(OTEL_CPP_CONST_HASHCODE(name))
14+
15+
/**
16+
* Stores the Constants for semantic kAttribute names outlined by the OpenTelemetry specifications.
17+
* <see
18+
* href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/README.md"/>.
19+
*/
20+
static const struct
21+
{
22+
uint32_t attribute_id;
23+
const char *attribute_key;
24+
} attribute_ids[] = {
25+
// The set of constants matches the specification as of this commit.
26+
// https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions
27+
// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/exceptions.md
28+
29+
// General network connection attributes
30+
{OTEL_CPP_CONST_HASHCODE(AttrNetTransport), "net.transport"},
31+
{OTEL_CPP_CONST_HASHCODE(AttrNetPeerIp), "net.peer.ip"},
32+
{OTEL_CPP_CONST_HASHCODE(AttrNetPeerPort), "net.peer.port"},
33+
{OTEL_CPP_CONST_HASHCODE(AttrNetPeerName), "net.peer.name"},
34+
{OTEL_CPP_CONST_HASHCODE(AttrNetHostIp), "net.host.ip"},
35+
{OTEL_CPP_CONST_HASHCODE(AttrNetHostPort), "net.host.port"},
36+
{OTEL_CPP_CONST_HASHCODE(AttrNetHostName), "net.host.name"},
37+
38+
// General identity attributes
39+
{OTEL_CPP_CONST_HASHCODE(AttrEnduserId), "enduser.id"},
40+
{OTEL_CPP_CONST_HASHCODE(AttrEnduserRole), "enduser.role"},
41+
{OTEL_CPP_CONST_HASHCODE(AttrEnduserScope), "enduser.scope"},
42+
43+
// General remote service attributes
44+
{OTEL_CPP_CONST_HASHCODE(AttrPeerService), "peer.service"},
45+
46+
// General thread attributes
47+
{OTEL_CPP_CONST_HASHCODE(AttrThreadId), "thread.id"},
48+
{OTEL_CPP_CONST_HASHCODE(AttrThreadName), "thread.name"},
49+
50+
// Source Code Attributes
51+
{OTEL_CPP_CONST_HASHCODE(AttrCodeFunction), "code.function"},
52+
{OTEL_CPP_CONST_HASHCODE(AttrCodeNamespace), "code.namespace"},
53+
{OTEL_CPP_CONST_HASHCODE(AttrCodeFilepath), "code.filepath"},
54+
{OTEL_CPP_CONST_HASHCODE(AttrCodeLineno), "code.lineno"},
55+
56+
// Http Span Common Attributes
57+
{OTEL_CPP_CONST_HASHCODE(AttrHttpMethod), "http.method"},
58+
{OTEL_CPP_CONST_HASHCODE(AttrHttpUrl), "http.url"},
59+
{OTEL_CPP_CONST_HASHCODE(AttrHttpTarget), "http.target"},
60+
{OTEL_CPP_CONST_HASHCODE(AttrHttpHost), "http.host"},
61+
{OTEL_CPP_CONST_HASHCODE(AttrHttpScheme), "http.scheme"},
62+
{OTEL_CPP_CONST_HASHCODE(AttrHttpStatusCode), "http.status_code"},
63+
{OTEL_CPP_CONST_HASHCODE(AttrHttpFlavor), "http.flavor"},
64+
{OTEL_CPP_CONST_HASHCODE(AttrHttpUserAgent), "http.user_agent"},
65+
{OTEL_CPP_CONST_HASHCODE(AttrHttpRequestContentLength), "http.request_content_length"},
66+
{OTEL_CPP_CONST_HASHCODE(AttrHttpRequestContentLengthUncompressed),
67+
"http.request_content_length_uncompressed"},
68+
{OTEL_CPP_CONST_HASHCODE(AttrHttpResponseContentLength), "http.response_content_length"},
69+
{OTEL_CPP_CONST_HASHCODE(AttrHttpResponseContentLengthUncompressed),
70+
"http.response_content_length_uncompressed"},
71+
72+
// HTTP Span Client Attributes
73+
// One of the following combinations:
74+
// - http.url
75+
// - http.scheme, http.host, http.target
76+
// - http.scheme, net.peer.name, net.peer.port, http.target
77+
// - http.scheme, net.peer.ip, net.peer.port, http.target
78+
79+
// HTTP Span Server Attributes
80+
// One of the following combinations:
81+
// -http.scheme, http.host, http.target
82+
// -http.scheme, http.server_name, net.host.port, http.target
83+
// -http.scheme, net.host.name, net.host.port, http.target
84+
// -http.url
85+
{OTEL_CPP_CONST_HASHCODE(AttrHttpServerName), "http.server_name"},
86+
{OTEL_CPP_CONST_HASHCODE(AttrHttpRoute), "http.route"},
87+
{OTEL_CPP_CONST_HASHCODE(AttrHttpClientIp), "http.client_ip"},
88+
89+
// DB: Connection-level attributes
90+
{OTEL_CPP_CONST_HASHCODE(AttrDbSystem), "db.system"}, // other_sql, mssql, mysql...
91+
{OTEL_CPP_CONST_HASHCODE(AttrDbConnectionString), "db.connection_string"},
92+
{OTEL_CPP_CONST_HASHCODE(AttrDbUser), "db.user"},
93+
// DB: Connection-level attributes for specific technologies
94+
{OTEL_CPP_CONST_HASHCODE(AttrDbMssqlInstanceName), "db.mssql.instance_name"},
95+
{OTEL_CPP_CONST_HASHCODE(AttrDbJdbcDriverClassname), "db.jdbc.driver_classname"},
96+
// DB: Call-level attributes
97+
{OTEL_CPP_CONST_HASHCODE(AttrDbName), "db.name"},
98+
{OTEL_CPP_CONST_HASHCODE(AttrDbStatement), "db.statement"},
99+
{OTEL_CPP_CONST_HASHCODE(AttrDbOperation), "db.operation"},
100+
// DB: Call-level attributes for specific technologies
101+
{OTEL_CPP_CONST_HASHCODE(AttrDbHbaseNamespace), "db.hbase.namespace"},
102+
{OTEL_CPP_CONST_HASHCODE(AttrDbRedisDatabaseIndex), "db.redis.database_index"},
103+
{OTEL_CPP_CONST_HASHCODE(AttrDbMongodbCollection), "db.mongodb.collection"},
104+
105+
// // DB: Call-level attributes for Cassandra for clarity
106+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraKeyspace), "db.cassandra.keyspace"},
107+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraPageSize), "db.cassandra.page_size"},
108+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraConsistencyLevel), "db.cassandra.consistency_level"},
109+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraTable), "db.cassandra.table"},
110+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraIdempotence), "db.cassandra.idempotence"},
111+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraSpeculativeExecutionCount),
112+
"db.cassandra.speculative_execution_count"},
113+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraCoordinatorId), "db.cassandra.coordinator.id"},
114+
{OTEL_CPP_CONST_HASHCODE(AttrDbCassandraCoordinatorDC), "db.cassandra.coordinator.dc"},
115+
116+
// Common RPC attributes
117+
{OTEL_CPP_CONST_HASHCODE(AttrRpcSystem), "rpc.system"},
118+
{OTEL_CPP_CONST_HASHCODE(AttrRpcService), "rpc.service"},
119+
{OTEL_CPP_CONST_HASHCODE(AttrRpcMethod), "rpc.method"},
120+
// gRPC attributes
121+
{OTEL_CPP_CONST_HASHCODE(AttrRpcGrpcStatusCode), "rpc.grpc.status_code"},
122+
// JSON-RPC attributes
123+
{OTEL_CPP_CONST_HASHCODE(AttrRpcJsonrpcVersion), "rpc.jsonrpc.version"},
124+
{OTEL_CPP_CONST_HASHCODE(AttrRpcJsonrpcRequestId), "rpc.jsonrpc.request_id"},
125+
{OTEL_CPP_CONST_HASHCODE(AttrRpcJsonrpcErrorCode), "rpc.jsonrpc.error_code"},
126+
{OTEL_CPP_CONST_HASHCODE(AttrRpcJsonrpcErrorMessage), "rpc.jsonrpc.error_message"},
127+
128+
// faas: General Attributes
129+
{OTEL_CPP_CONST_HASHCODE(AttrFaasTrigger), "faas.trigger"},
130+
{OTEL_CPP_CONST_HASHCODE(AttrFaasExecution), "faas.execution"},
131+
// faas: incoming invocations
132+
{OTEL_CPP_CONST_HASHCODE(AttrFaasColdStart), "faas.coldstart"},
133+
// faas: outgoing invocations
134+
{OTEL_CPP_CONST_HASHCODE(AttrFaasInvokedName), "faas.invoked_name"},
135+
{OTEL_CPP_CONST_HASHCODE(AttrFaasInvokedProvider), "faas.invoked_provider"},
136+
{OTEL_CPP_CONST_HASHCODE(AttrFaasInvokedRegion), "faas.invoked_region"},
137+
// faas: datastore trigger
138+
{OTEL_CPP_CONST_HASHCODE(AttrFaasDocumentCollection), "faas.document.collection"},
139+
{OTEL_CPP_CONST_HASHCODE(AttrFaasDocumentOperation), "faas.document.operation"},
140+
{OTEL_CPP_CONST_HASHCODE(AttrFaasDocumentTime), "faas.document.time"},
141+
{OTEL_CPP_CONST_HASHCODE(AttrFaasDocumentName), "faas.document.name"},
142+
// faas: timer trigger
143+
{OTEL_CPP_CONST_HASHCODE(AttrFaasTime), "faas.time"},
144+
{OTEL_CPP_CONST_HASHCODE(AttrFaasCron), "faas.cron"},
145+
146+
// messaging attributes
147+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingSystem), "messaging.system"},
148+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingDestination), "messaging.destination"},
149+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingDestinationKind), "messaging.destination_kind"},
150+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingTempDestination), "messaging.temp_destination"},
151+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingProtocol), "messaging.protocol"},
152+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingProtocolVersion), "messaging.protocol_version"},
153+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingUrl), "messaging.url"},
154+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingMessageId), "messaging.message_id"},
155+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingConversationId), "messaging.conversation_id"},
156+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingPayloadSize), "messaging.message_payload_size_bytes"},
157+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingPayloadCompressedSize),
158+
"messaging.message_payload_compressed_size_bytes"},
159+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingOperation), "messaging.operation"},
160+
// messaging attributes specific to messaging systems
161+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingRabbitMQRoutingKey), "messaging.rabbitmq.routing_key"},
162+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingKafkaMessageKey), "messaging.kafka.message_key"},
163+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingKafkaConsumerGroup), "messaging.kafka.consumer_group"},
164+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingKafkaClientId), "messaging.kafka.client_id"},
165+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingKafkaPartition), "messaging.kafka.partition"},
166+
{OTEL_CPP_CONST_HASHCODE(AttrMessagingKafkaTombstone), "messaging.kafka.tombstone"},
167+
168+
// Exceptions attributes
169+
{OTEL_CPP_CONST_HASHCODE(AttrExceptionType), "exception.type"},
170+
{OTEL_CPP_CONST_HASHCODE(AttrExceptionMessage), "exception.message"},
171+
{OTEL_CPP_CONST_HASHCODE(AttrExceptionStacktrace), "exception.stacktrace"},
172+
{OTEL_CPP_CONST_HASHCODE(AttrExceptionEscapted), "exception.escaped"},
173+
};
174+
// function to generate hash code for semantic conventions attributes.
175+
176+
#define OTEL_CPP_TRACE_ATTRIBUTES_MAX (sizeof(attribute_ids) / sizeof(attribute_ids[0]))
177+
178+
inline const char *attr(uint32_t attr)
179+
{
180+
for (int i = 0; i < OTEL_CPP_TRACE_ATTRIBUTES_MAX; i++)
181+
{
182+
if (attribute_ids[i].attribute_id == attr)
183+
return attribute_ids[i].attribute_key;
184+
}
185+
return "";
186+
}
187+
188+
} // namespace trace
189+
OPENTELEMETRY_END_NAMESPACE

‎api/include/opentelemetry/trace/tracer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ class Tracer
170170
template <class Rep, class Period>
171171
void ForceFlush(std::chrono::duration<Rep, Period> timeout) noexcept
172172
{
173-
this->ForceFlushWithMicroseconds(
174-
static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::microseconds>(timeout)));
173+
this->ForceFlushWithMicroseconds(static_cast<uint64_t>(
174+
std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
175175
}
176176

177177
virtual void ForceFlushWithMicroseconds(uint64_t timeout) noexcept = 0;
@@ -183,8 +183,8 @@ class Tracer
183183
template <class Rep, class Period>
184184
void Close(std::chrono::duration<Rep, Period> timeout) noexcept
185185
{
186-
this->CloseWithMicroseconds(
187-
static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::microseconds>(timeout)));
186+
this->CloseWithMicroseconds(static_cast<uint64_t>(
187+
std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
188188
}
189189

190190
virtual void CloseWithMicroseconds(uint64_t timeout) noexcept = 0;

‎api/include/opentelemetry/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "opentelemetry/detail/preprocessor.h"
77

88
#define OPENTELEMETRY_ABI_VERSION_NO 0
9-
#define OPENTELEMETRY_VERSION "1.0.0-rc3"
9+
#define OPENTELEMETRY_VERSION "1.0.0-rc4"
1010
#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
1111

1212
// clang-format off

‎ci/do_ci.sh

+16
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,22 @@ elif [[ "$1" == "cmake.legacy.test" ]]; then
9292
make
9393
make test
9494
exit 0
95+
elif [[ "$1" == "cmake.legacy.exporter.otprotocol.test" ]]; then
96+
cd "${BUILD_DIR}"
97+
rm -rf *
98+
export BUILD_ROOT="${BUILD_DIR}"
99+
${SRC_DIR}/tools/build-gtest.sh
100+
${SRC_DIR}/tools/build-benchmark.sh
101+
cmake -DCMAKE_BUILD_TYPE=Debug \
102+
-DCMAKE_CXX_STANDARD=11 \
103+
-DWITH_OTLP=ON \
104+
"${SRC_DIR}"
105+
grpc_cpp_plugin=`which grpc_cpp_plugin`
106+
proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
107+
sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
108+
make -j $(nproc)
109+
cd exporters/otlp && make test
110+
exit 0
95111
elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then
96112
cd "${BUILD_DIR}"
97113
rm -rf *

0 commit comments

Comments
 (0)