Skip to content

Commit 530f8a1

Browse files
committed
Merge branch 'main' into test_examples_with_install
2 parents 2233c43 + 76460cf commit 530f8a1

File tree

5 files changed

+43
-5
lines changed

5 files changed

+43
-5
lines changed

.github/workflows/iwyu.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
-DWITH_STL=CXX14 \
5454
-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
5555
-DBUILD_TESTING=ON \
56+
-DWITH_EXAMPLES=ON \
57+
-DWITH_EXAMPLES_HTTP=ON \
5658
-DBUILD_W3CTRACECONTEXT_TEST=ON \
5759
-DWITH_OTLP_GRPC=ON \
5860
-DWITH_OTLP_HTTP=ON \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ doc](https://docs.google.com/document/d/1i1E4-_y4uJ083lCutKGDhkpi3n4_e774SBLi9hP
8484
For edit access, get in touch on
8585
[Slack](https://cloud-native.slack.com/archives/C01N3AT62SJ).
8686

87-
[Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
87+
[Maintainers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer)
8888
([@open-telemetry/cpp-maintainers](https://github.com/orgs/open-telemetry/teams/cpp-maintainers)):
8989

9090
* [Ehsan Saei](https://github.com/esigo)
9191
* [Lalit Kumar Bhasin](https://github.com/lalitb), Microsoft
9292
* [Marc Alff](https://github.com/marcalff), Oracle
9393
* [Tom Tan](https://github.com/ThomsonTan), Microsoft
9494

95-
[Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
95+
[Approvers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver)
9696
([@open-telemetry/cpp-approvers](https://github.com/orgs/open-telemetry/teams/cpp-approvers)):
9797

9898
* [Doug Barker](https://github.com/dbarker)
@@ -101,7 +101,7 @@ For edit access, get in touch on
101101
* [WenTao Ou](https://github.com/owent), Tencent
102102

103103
[Emeritus
104-
Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/main/community-membership.md#emeritus-maintainerapprovertriager):
104+
Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager):
105105

106106
* [Alolita Sharma](https://github.com/alolita)
107107
* [Emil Mikulic](https://github.com/g-easy)

examples/http/client.cc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#include "opentelemetry/context/propagation/global_propagator.h"
5+
#include "opentelemetry/context/propagation/text_map_propagator.h"
6+
#include "opentelemetry/context/runtime_context.h"
7+
#include "opentelemetry/ext/http/client/http_client.h"
48
#include "opentelemetry/ext/http/client/http_client_factory.h"
59
#include "opentelemetry/ext/http/common/url_parser.h"
10+
#include "opentelemetry/nostd/function_ref.h"
11+
#include "opentelemetry/nostd/shared_ptr.h"
12+
#include "opentelemetry/nostd/string_view.h"
613
#include "opentelemetry/semconv/http_attributes.h"
714
#include "opentelemetry/semconv/url_attributes.h"
15+
#include "opentelemetry/trace/span.h"
16+
#include "opentelemetry/trace/span_metadata.h"
17+
#include "opentelemetry/trace/span_startoptions.h"
18+
#include "opentelemetry/trace/tracer.h"
819
#include "tracer_common.h"
920

21+
#include <stdint.h>
22+
#include <stdlib.h>
23+
#include <map>
24+
#include <string>
25+
#include <type_traits>
26+
#include <utility>
27+
1028
namespace
1129
{
1230

examples/http/server.cc

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#include "server.h"
4+
#include "opentelemetry/context/propagation/global_propagator.h"
5+
#include "opentelemetry/context/propagation/text_map_propagator.h"
6+
#include "opentelemetry/context/runtime_context.h"
7+
#include "opentelemetry/nostd/shared_ptr.h"
8+
#include "opentelemetry/nostd/variant.h"
59
#include "opentelemetry/semconv/client_attributes.h"
610
#include "opentelemetry/semconv/incubating/http_attributes.h"
711
#include "opentelemetry/semconv/server_attributes.h"
812
#include "opentelemetry/semconv/url_attributes.h"
913
#include "opentelemetry/trace/context.h"
14+
#include "opentelemetry/trace/scope.h"
15+
#include "opentelemetry/trace/span.h"
16+
#include "opentelemetry/trace/span_context.h"
17+
#include "opentelemetry/trace/span_metadata.h"
18+
#include "opentelemetry/trace/span_startoptions.h"
19+
#include "opentelemetry/trace/tracer.h"
1020
#include "tracer_common.h"
1121

22+
#include <stdlib.h>
23+
#include <chrono>
1224
#include <iostream>
25+
#include <map>
1326
#include <thread>
27+
#include <utility>
28+
#include "server.h"
1429

1530
namespace
1631
{

examples/http/server.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#pragma once
5+
6+
#include "opentelemetry/ext/http/server/http_server.h"
7+
8+
#include <stdint.h>
59
#include <atomic>
610
#include <string>
7-
#include "opentelemetry/ext/http/server/http_server.h"
811

912
namespace
1013
{

0 commit comments

Comments
 (0)