From b1ff408e6dd9d3b7c5abbe0e2e24f1cd63012af8 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Mon, 24 May 2021 20:55:28 -0700 Subject: [PATCH 1/4] Fix build status icon (#795) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cb0634ce4..fc0b39480a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Slack](https://img.shields.io/badge/slack-@cncf/otel/cpp-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01N3AT62SJ) [![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/branch/main/graphs/badge.svg?)](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/) [![Build -Status](https://action-badges.now.sh/open-telemetry/opentelemetry-cpp)](https://github.com/open-telemetry/opentelemetry-cpp/actions) +Status](https://github.com/open-telemetry/opentelemetry-cpp/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/open-telemetry/opentelemetry-cpp/actions) [![Release](https://img.shields.io/github/v/release/open-telemetry/opentelemetry-cpp?include_prereleases&style=)](https://github.com/open-telemetry/opentelemetry-cpp/releases/) The C++ [OpenTelemetry](https://opentelemetry.io/) client. From 02f9efc350196ee0e82959aadc9c5b1484bf55ae Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 25 May 2021 11:06:13 +0530 Subject: [PATCH 2/4] Update readthedocs api guide: nested spans and context propagator (#792) --- docs/public/GettingStarted.rst | 54 +++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/docs/public/GettingStarted.rst b/docs/public/GettingStarted.rst index ad061cc125..abff4d6d13 100644 --- a/docs/public/GettingStarted.rst +++ b/docs/public/GettingStarted.rst @@ -48,5 +48,57 @@ related span is ended. The concept of an active span is important, as any span that is created without explicitly specifying a parent is parented to the currently -active span. +active span. A span without a parent is called root span. +Create nested Spans +^^^^^^^^^^^^^^^^^^^ + +.. code:: cpp + + auto outer_span = tracer->StartSpan("Outer operation"); + auto outer_scope = tracer->WithActiveSpan(outer_span); + { + auto inner_span = tracer->StartSpan("Inner operation"); + auto inner_scope = tracer->WithActiveSpan(inner_span); + // ... perform inner operation + inner_span->End(); + } + // ... perform outer operation + outer_span->End(); + + +Spans can be nested, and have a parent-child relationship with other spans. +When a given span is active, the newly created span inherits the active span's +trace ID, and other context attributes. + +Context Propagation +^^^^^^^^^^^^^^^^^^ + +.. code:: cpp + + // set global propagator + opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator( + nostd::shared_ptr( + new opentelemetry::trace::propagation::HttpTraceContext())); + + // get global propagator + HttpTextMapCarrier carrier; + auto propagator = + opentelemetry::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator(); + + //inject context to headers + auto current_ctx = opentelemetry::context::RuntimeContext::GetCurrent(); + propagator->Inject(carrier, current_ctx); + + //Extract headers to context + auto current_ctx = opentelemetry::context::RuntimeContext::GetCurrent(); + auto new_context = propagator->Extract(carrier, current_ctx); + auto remote_span = opentelemetry::trace::propagation::GetSpan(new_context); + + + +``Context`` contains the meta-data of the currently active Span including Span Id, +Trace Id, and flags. Context Propagation is an important mechanism in distributed +tracing to transfer this Context across service boundary often through HTTP headers. +OpenTelemetry provides a text-based approach to propagate context to remote services +using the W3C Trace Context HTTP headers. From 3fa6525f40493ae52f69e4379c03c75ca8725aef Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 25 May 2021 11:37:08 +0530 Subject: [PATCH 3/4] Add missing Copyright headers (#754) --- api/include/opentelemetry/baggage/baggage.h | 15 ++------------- .../opentelemetry/common/attribute_value.h | 3 +++ .../opentelemetry/common/key_value_iterable.h | 3 +++ .../common/key_value_iterable_view.h | 3 +++ .../opentelemetry/common/kv_properties.h | 15 ++------------- .../opentelemetry/common/spin_lock_mutex.h | 3 +++ api/include/opentelemetry/common/string_util.h | 15 ++------------- api/include/opentelemetry/common/timestamp.h | 3 +++ api/include/opentelemetry/config.h | 3 +++ api/include/opentelemetry/context/context.h | 3 +++ .../opentelemetry/context/context_value.h | 3 +++ .../context/propagation/composite_propagator.h | 3 +++ .../context/propagation/global_propagator.h | 15 ++------------- .../context/propagation/noop_propagator.h | 3 +++ .../context/propagation/text_map_propagator.h | 3 +++ .../opentelemetry/context/runtime_context.h | 3 +++ .../opentelemetry/detail/preprocessor.h | 3 +++ api/include/opentelemetry/logs/logger.h | 17 ++--------------- .../opentelemetry/logs/logger_provider.h | 17 ++--------------- api/include/opentelemetry/logs/noop.h | 17 ++--------------- api/include/opentelemetry/logs/provider.h | 17 ++--------------- api/include/opentelemetry/logs/severity.h | 17 ++--------------- .../opentelemetry/metrics/async_instruments.h | 3 +++ api/include/opentelemetry/metrics/instrument.h | 3 +++ api/include/opentelemetry/metrics/meter.h | 3 +++ .../opentelemetry/metrics/meter_provider.h | 3 +++ api/include/opentelemetry/metrics/noop.h | 3 +++ .../opentelemetry/metrics/observer_result.h | 3 +++ api/include/opentelemetry/metrics/provider.h | 3 +++ .../opentelemetry/metrics/sync_instruments.h | 3 +++ api/include/opentelemetry/nostd/function_ref.h | 15 ++------------- api/include/opentelemetry/nostd/shared_ptr.h | 15 ++------------- api/include/opentelemetry/nostd/span.h | 15 ++------------- api/include/opentelemetry/nostd/string_view.h | 15 ++------------- api/include/opentelemetry/nostd/type_traits.h | 15 ++------------- api/include/opentelemetry/nostd/unique_ptr.h | 15 ++------------- api/include/opentelemetry/nostd/utility.h | 15 ++------------- api/include/opentelemetry/nostd/variant.h | 15 ++------------- .../plugin/detail/dynamic_library_handle.h | 3 +++ .../plugin/detail/dynamic_load_unix.h | 3 +++ .../plugin/detail/dynamic_load_windows.h | 3 +++ .../opentelemetry/plugin/detail/loader_info.h | 3 +++ .../plugin/detail/tracer_handle.h | 3 +++ .../opentelemetry/plugin/detail/utility.h | 3 +++ .../opentelemetry/plugin/dynamic_load.h | 3 +++ api/include/opentelemetry/plugin/factory.h | 3 +++ api/include/opentelemetry/plugin/hook.h | 3 +++ api/include/opentelemetry/plugin/tracer.h | 3 +++ api/include/opentelemetry/std/shared_ptr.h | 15 ++------------- api/include/opentelemetry/std/span.h | 15 ++------------- api/include/opentelemetry/std/string_view.h | 15 ++------------- api/include/opentelemetry/std/type_traits.h | 15 ++------------- api/include/opentelemetry/std/unique_ptr.h | 15 ++------------- api/include/opentelemetry/std/utility.h | 15 ++------------- api/include/opentelemetry/std/variant.h | 15 ++------------- .../opentelemetry/trace/canonical_code.h | 3 +++ api/include/opentelemetry/trace/default_span.h | 3 +++ .../opentelemetry/trace/default_tracer.h | 3 +++ api/include/opentelemetry/trace/noop.h | 3 +++ .../trace/propagation/b3_propagator.h | 3 +++ .../trace/propagation/detail/context.h | 3 +++ .../trace/propagation/detail/hex.h | 3 +++ .../trace/propagation/detail/string.h | 3 +++ .../trace/propagation/http_trace_context.h | 15 ++------------- .../opentelemetry/trace/propagation/jaeger.h | 17 +++-------------- api/include/opentelemetry/trace/provider.h | 3 +++ api/include/opentelemetry/trace/scope.h | 15 ++------------- api/include/opentelemetry/trace/span.h | 3 +++ api/include/opentelemetry/trace/span_context.h | 15 ++------------- .../trace/span_context_kv_iterable.h | 3 +++ .../trace/span_context_kv_iterable_view.h | 3 +++ api/include/opentelemetry/trace/trace_flags.h | 15 ++------------- api/include/opentelemetry/trace/trace_id.h | 15 ++------------- api/include/opentelemetry/trace/trace_state.h | 15 ++------------- api/include/opentelemetry/trace/tracer.h | 3 +++ .../opentelemetry/trace/tracer_provider.h | 3 +++ api/include/opentelemetry/version.h | 3 +++ api/test/baggage/baggage_test.cc | 3 +++ api/test/common/kv_properties_test.cc | 15 ++------------- api/test/common/spinlock_benchmark.cc | 3 +++ api/test/common/string_util_test.cc | 15 ++------------- api/test/context/context_test.cc | 3 +++ .../propagation/composite_propagator_test.cc | 3 +++ api/test/context/runtime_context_test.cc | 3 +++ api/test/core/timestamp_test.cc | 3 +++ api/test/logs/logger_test.cc | 3 +++ api/test/logs/provider_test.cc | 3 +++ api/test/metrics/meter_provider_test.cc | 3 +++ api/test/metrics/noop_instrument_test.cc | 3 +++ api/test/metrics/noop_metrics_test.cc | 3 +++ api/test/nostd/function_ref_test.cc | 3 +++ api/test/nostd/shared_ptr_test.cc | 3 +++ api/test/nostd/span_test.cc | 3 +++ api/test/nostd/string_view_test.cc | 3 +++ api/test/nostd/unique_ptr_test.cc | 3 +++ api/test/nostd/utility_test.cc | 3 +++ api/test/nostd/variant_test.cc | 3 +++ api/test/plugin/dynamic_load_test.cc | 3 +++ api/test/trace/default_span_test.cc | 3 +++ api/test/trace/key_value_iterable_view_test.cc | 3 +++ api/test/trace/noop_test.cc | 3 +++ .../trace/propagation/b3_propagation_test.cc | 3 +++ .../trace/propagation/http_text_format_test.cc | 3 +++ .../propagation/jaeger_propagation_test.cc | 3 +++ api/test/trace/propagation/util.h | 3 +++ api/test/trace/provider_test.cc | 3 +++ api/test/trace/scope_test.cc | 3 +++ api/test/trace/span_context_test.cc | 3 +++ api/test/trace/span_id_benchmark.cc | 3 +++ api/test/trace/span_id_test.cc | 3 +++ api/test/trace/trace_flags_test.cc | 3 +++ api/test/trace/trace_id_test.cc | 3 +++ api/test/trace/trace_state_test.cc | 15 ++------------- api/test/trace/tracer_test.cc | 3 +++ buildscripts/pre-commit | 6 ++---- buildscripts/pre_release.sh | 3 +++ ci/do_ci.sh | 3 +++ ci/install_bazelisk.sh | 3 +++ ci/install_format_tools.sh | 3 +++ ci/install_gcc48.sh | 3 +++ ci/install_osx_bazelisk.sh | 3 +++ ci/install_protobuf.sh | 3 +++ ci/run_docker.sh | 3 +++ ci/setup_ci_environment.sh | 3 +++ ci/setup_cmake.sh | 3 +++ ci/setup_grpc.sh | 3 +++ examples/batch/main.cc | 3 +++ examples/http/client.cc | 3 +++ examples/http/server.cc | 3 +++ examples/http/server.h | 3 +++ examples/http/tracer_common.h | 3 +++ examples/jaeger/foo_library/foo_library.cc | 3 +++ examples/jaeger/foo_library/foo_library.h | 3 +++ examples/jaeger/main.cc | 3 +++ examples/metrics_simple/main.cc | 3 +++ .../multi_processor/foo_library/foo_library.cc | 3 +++ .../multi_processor/foo_library/foo_library.h | 3 +++ examples/multi_processor/main.cc | 3 +++ examples/multithreaded/main.cc | 3 +++ examples/otlp/foo_library/foo_library.cc | 3 +++ examples/otlp/foo_library/foo_library.h | 3 +++ examples/otlp/main.cc | 3 +++ examples/plugin/load/main.cc | 3 +++ examples/plugin/plugin/factory_impl.cc | 3 +++ examples/plugin/plugin/tracer.cc | 3 +++ examples/plugin/plugin/tracer.h | 3 +++ examples/simple/foo_library/foo_library.cc | 3 +++ examples/simple/foo_library/foo_library.h | 3 +++ examples/simple/main.cc | 3 +++ examples/zpages/zpages_example.cc | 3 +++ .../exporters/elasticsearch/es_log_exporter.h | 17 ++--------------- .../elasticsearch/es_log_recordable.h | 17 ++--------------- exporters/elasticsearch/src/es_log_exporter.cc | 17 ++--------------- .../elasticsearch/test/es_log_exporter_test.cc | 3 +++ .../opentelemetry/exporters/etw/etw_fields.h | 3 ++- .../exporters/etw/etw_properties.h | 15 ++------------- .../opentelemetry/exporters/etw/etw_provider.h | 3 ++- .../opentelemetry/exporters/etw/etw_tracer.h | 16 +++------------- .../exporters/etw/etw_tracer_exporter.h | 15 ++------------- .../opentelemetry/exporters/etw/utils.h | 15 ++------------- .../include/opentelemetry/exporters/etw/uuid.h | 15 ++------------- exporters/etw/test/etw_perf_test.cc | 15 ++------------- exporters/etw/test/etw_provider_test.cc | 15 ++------------- exporters/etw/test/etw_tracer_test.cc | 15 ++------------- .../exporters/jaeger/jaeger_exporter.h | 15 ++------------- .../exporters/jaeger/recordable.h | 15 ++------------- exporters/jaeger/src/TUDPTransport.cc | 15 ++------------- exporters/jaeger/src/TUDPTransport.h | 15 ++------------- exporters/jaeger/src/jaeger_exporter.cc | 15 ++------------- exporters/jaeger/src/recordable.cc | 15 ++------------- exporters/jaeger/src/sender.h | 15 ++------------- exporters/jaeger/src/thrift_sender.cc | 15 ++------------- exporters/jaeger/src/thrift_sender.h | 15 ++------------- exporters/jaeger/src/transport.h | 15 ++------------- exporters/jaeger/src/udp_transport.cc | 15 ++------------- exporters/jaeger/src/udp_transport.h | 15 ++------------- .../jaeger/test/jaeger_recordable_test.cc | 15 ++------------- .../exporters/memory/in_memory_span_data.h | 3 +++ .../exporters/memory/in_memory_span_exporter.h | 3 +++ .../memory/test/in_memory_span_data_test.cc | 3 +++ .../test/in_memory_span_exporter_test.cc | 3 +++ .../exporters/ostream/log_exporter.h | 17 ++--------------- .../exporters/ostream/metrics_exporter.h | 5 ++++- .../exporters/ostream/span_exporter.h | 3 +++ exporters/ostream/src/log_exporter.cc | 17 ++--------------- exporters/ostream/src/metrics_exporter.cc | 3 +++ exporters/ostream/src/span_exporter.cc | 3 +++ exporters/ostream/test/ostream_capture.h | 3 +++ exporters/ostream/test/ostream_log_test.cc | 3 +++ exporters/ostream/test/ostream_metrics_test.cc | 3 +++ exporters/ostream/test/ostream_span_test.cc | 3 +++ .../exporters/otlp/otlp_exporter.h | 3 +++ .../exporters/otlp/otlp_recordable.h | 3 +++ .../exporters/otlp/protobuf_include_prefix.h | 3 +++ .../exporters/otlp/protobuf_include_suffix.h | 3 +++ exporters/otlp/src/otlp_exporter.cc | 3 +++ exporters/otlp/src/otlp_recordable.cc | 3 +++ exporters/otlp/test/otlp_exporter_benchmark.cc | 3 +++ exporters/otlp/test/otlp_exporter_test.cc | 3 +++ exporters/otlp/test/otlp_recordable_test.cc | 3 +++ .../prometheus/prometheus_collector.h | 18 +++--------------- .../prometheus/prometheus_exporter_utils.h | 18 +++--------------- .../prometheus/src/prometheus_collector.cc | 18 +++--------------- .../src/prometheus_exporter_utils.cc | 17 ++--------------- .../test/prometheus_collector_test.cc | 17 ++--------------- .../test/prometheus_exporter_utils_test.cc | 17 ++--------------- .../exporters/zipkin/recordable.h | 17 ++--------------- .../exporters/zipkin/zipkin_exporter.h | 17 ++--------------- exporters/zipkin/src/recordable.cc | 17 ++--------------- exporters/zipkin/src/zipkin_exporter.cc | 18 +++--------------- .../zipkin/test/zipkin_recordable_test.cc | 17 ++--------------- .../ext/http/client/curl/http_client_curl.h | 3 +++ .../ext/http/client/curl/http_operation_curl.h | 3 +++ .../ext/http/client/http_client.h | 3 +++ .../ext/http/client/http_client_factory.h | 3 +++ .../opentelemetry/ext/http/common/url_parser.h | 3 +++ .../ext/http/server/file_http_server.h | 3 +++ .../ext/http/server/http_server.h | 15 ++------------- .../ext/http/server/socket_tools.h | 15 ++------------- .../ext/zpages/latency_boundaries.h | 3 +++ .../ext/zpages/static/tracez_index.h | 3 +++ .../ext/zpages/static/tracez_script.h | 3 +++ .../ext/zpages/static/tracez_style.h | 3 +++ .../ext/zpages/threadsafe_span_data.h | 3 +++ .../opentelemetry/ext/zpages/tracez_data.h | 3 +++ .../ext/zpages/tracez_data_aggregator.h | 3 +++ .../ext/zpages/tracez_http_server.h | 3 +++ .../ext/zpages/tracez_processor.h | 3 +++ .../ext/zpages/tracez_shared_data.h | 3 +++ ext/include/opentelemetry/ext/zpages/zpages.h | 3 +++ .../ext/zpages/zpages_http_server.h | 3 +++ ext/src/http/client/curl/http_client_curl.cc | 3 +++ .../client/curl/http_client_factory_curl.cc | 3 +++ ext/src/zpages/tracez_data_aggregator.cc | 3 +++ ext/src/zpages/tracez_http_server.cc | 3 +++ ext/src/zpages/tracez_processor.cc | 3 +++ ext/src/zpages/tracez_shared_data.cc | 3 +++ ext/test/http/curl_http_test.cc | 3 +++ ext/test/http/url_parser_test.cc | 3 +++ ext/test/w3c_tracecontext_test/main.cc | 3 +++ ext/test/zpages/threadsafe_span_data_test.cc | 3 +++ ext/test/zpages/tracez_data_aggregator_test.cc | 3 +++ ext/test/zpages/tracez_processor_test.cc | 3 +++ .../sdk/common/atomic_shared_ptr.h | 3 +++ .../sdk/common/atomic_unique_ptr.h | 3 +++ .../opentelemetry/sdk/common/attribute_utils.h | 17 ++--------------- .../opentelemetry/sdk/common/circular_buffer.h | 3 +++ .../sdk/common/circular_buffer_range.h | 3 +++ .../sdk/common/empty_attributes.h | 17 ++--------------- .../opentelemetry/sdk/common/exporter_utils.h | 17 ++--------------- .../instrumentation_library.h | 15 ++------------- .../sdk/logs/batch_log_processor.h | 17 ++--------------- sdk/include/opentelemetry/sdk/logs/exporter.h | 17 ++--------------- .../opentelemetry/sdk/logs/log_record.h | 17 ++--------------- sdk/include/opentelemetry/sdk/logs/logger.h | 17 ++--------------- .../opentelemetry/sdk/logs/logger_provider.h | 17 ++--------------- sdk/include/opentelemetry/sdk/logs/processor.h | 17 ++--------------- .../opentelemetry/sdk/logs/recordable.h | 3 +++ .../sdk/logs/simple_log_processor.h | 17 ++--------------- .../sdk/metrics/aggregator/aggregator.h | 3 +++ .../metrics/aggregator/counter_aggregator.h | 3 +++ .../sdk/metrics/aggregator/exact_aggregator.h | 3 +++ .../sdk/metrics/aggregator/gauge_aggregator.h | 3 +++ .../metrics/aggregator/histogram_aggregator.h | 3 +++ .../aggregator/min_max_sum_count_aggregator.h | 3 +++ .../sdk/metrics/aggregator/sketch_aggregator.h | 3 +++ .../sdk/metrics/async_instruments.h | 3 +++ .../opentelemetry/sdk/metrics/controller.h | 3 +++ .../opentelemetry/sdk/metrics/exporter.h | 18 +++--------------- .../opentelemetry/sdk/metrics/instrument.h | 3 +++ sdk/include/opentelemetry/sdk/metrics/meter.h | 3 +++ .../opentelemetry/sdk/metrics/meter_provider.h | 3 +++ .../opentelemetry/sdk/metrics/processor.h | 3 +++ sdk/include/opentelemetry/sdk/metrics/record.h | 3 +++ .../sdk/metrics/sync_instruments.h | 3 +++ .../sdk/metrics/ungrouped_processor.h | 3 +++ .../opentelemetry/sdk/resource/resource.h | 3 +++ .../sdk/resource/resource_detector.h | 3 +++ .../sdk/trace/batch_span_processor.h | 3 +++ sdk/include/opentelemetry/sdk/trace/exporter.h | 3 +++ .../opentelemetry/sdk/trace/id_generator.h | 15 ++------------- .../opentelemetry/sdk/trace/multi_recordable.h | 3 +++ .../sdk/trace/multi_span_processor.h | 3 +++ .../opentelemetry/sdk/trace/processor.h | 3 +++ .../sdk/trace/random_id_generator.h | 15 ++------------- .../opentelemetry/sdk/trace/recordable.h | 3 +++ sdk/include/opentelemetry/sdk/trace/sampler.h | 3 +++ .../sdk/trace/samplers/always_off.h | 3 +++ .../sdk/trace/samplers/always_on.h | 3 +++ .../opentelemetry/sdk/trace/samplers/parent.h | 3 +++ .../sdk/trace/samplers/trace_id_ratio.h | 3 +++ .../opentelemetry/sdk/trace/simple_processor.h | 3 +++ .../opentelemetry/sdk/trace/span_data.h | 3 +++ sdk/include/opentelemetry/sdk/trace/tracer.h | 3 +++ .../opentelemetry/sdk/trace/tracer_context.h | 3 +++ .../opentelemetry/sdk/trace/tracer_provider.h | 3 +++ .../opentelemetry/sdk/version/version.h | 3 +++ sdk/src/common/core.cc | 3 +++ sdk/src/common/fast_random_number_generator.h | 3 +++ sdk/src/common/platform/fork.h | 3 +++ sdk/src/common/platform/fork_unix.cc | 3 +++ sdk/src/common/platform/fork_windows.cc | 3 +++ sdk/src/common/random.cc | 4 ++++ sdk/src/common/random.h | 3 +++ sdk/src/logs/batch_log_processor.cc | 17 ++--------------- sdk/src/logs/logger.cc | 18 +++--------------- sdk/src/logs/logger_provider.cc | 17 ++--------------- sdk/src/logs/simple_log_processor.cc | 17 ++--------------- sdk/src/metrics/meter.cc | 3 +++ sdk/src/metrics/meter_provider.cc | 3 +++ sdk/src/metrics/ungrouped_processor.cc | 3 +++ sdk/src/resource/resource.cc | 3 +++ sdk/src/resource/resource_detector.cc | 3 +++ sdk/src/trace/batch_span_processor.cc | 3 +++ sdk/src/trace/random_id_generator.cc | 15 ++------------- sdk/src/trace/samplers/parent.cc | 3 +++ sdk/src/trace/span.cc | 3 +++ sdk/src/trace/span.h | 3 +++ sdk/src/trace/tracer.cc | 3 +++ sdk/src/trace/tracer_context.cc | 3 +++ sdk/src/trace/tracer_provider.cc | 3 +++ sdk/test/common/atomic_unique_ptr_test.cc | 3 +++ sdk/test/common/attribute_utils_test.cc | 3 +++ sdk/test/common/baseline_circular_buffer.h | 3 +++ sdk/test/common/circular_buffer_benchmark.cc | 3 +++ sdk/test/common/circular_buffer_range_test.cc | 3 +++ sdk/test/common/circular_buffer_test.cc | 3 +++ sdk/test/common/empty_attributes_test.cc | 3 +++ .../fast_random_number_generator_test.cc | 3 +++ sdk/test/common/random_benchmark.cc | 3 +++ sdk/test/common/random_fork_test.cc | 3 +++ sdk/test/common/random_test.cc | 3 +++ .../instrumentationlibrary_test.cc | 15 ++------------- sdk/test/logs/batch_log_processor_test.cc | 17 ++--------------- sdk/test/logs/log_record_test.cc | 3 +++ sdk/test/logs/logger_provider_sdk_test.cc | 17 ++--------------- sdk/test/logs/logger_sdk_test.cc | 17 ++--------------- sdk/test/logs/simple_log_processor_test.cc | 3 +++ sdk/test/metrics/controller_test.cc | 3 +++ sdk/test/metrics/counter_aggregator_test.cc | 3 +++ sdk/test/metrics/exact_aggregator_test.cc | 3 +++ sdk/test/metrics/gauge_aggregator_test.cc | 2 ++ sdk/test/metrics/histogram_aggregator_test.cc | 3 +++ sdk/test/metrics/meter_provider_sdk_test.cc | 3 +++ sdk/test/metrics/meter_test.cc | 3 +++ sdk/test/metrics/metric_instrument_test.cc | 3 +++ .../min_max_sum_count_aggregator_test.cc | 3 +++ sdk/test/metrics/sketch_aggregator_test.cc | 3 +++ sdk/test/metrics/ungrouped_processor_test.cc | 3 +++ sdk/test/resource/resource_test.cc | 3 +++ sdk/test/trace/always_off_sampler_test.cc | 3 +++ sdk/test/trace/always_on_sampler_test.cc | 3 +++ sdk/test/trace/batch_span_processor_test.cc | 3 +++ sdk/test/trace/parent_sampler_test.cc | 3 +++ sdk/test/trace/sampler_benchmark.cc | 3 +++ sdk/test/trace/simple_processor_test.cc | 3 +++ sdk/test/trace/span_data_test.cc | 3 +++ sdk/test/trace/trace_id_ratio_sampler_test.cc | 3 +++ sdk/test/trace/tracer_provider_test.cc | 3 +++ sdk/test/trace/tracer_test.cc | 3 +++ 360 files changed, 990 insertions(+), 1334 deletions(-) diff --git a/api/include/opentelemetry/baggage/baggage.h b/api/include/opentelemetry/baggage/baggage.h index 73f83a3dba..f2a2a4fbdc 100644 --- a/api/include/opentelemetry/baggage/baggage.h +++ b/api/include/opentelemetry/baggage/baggage.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/common/attribute_value.h b/api/include/opentelemetry/common/attribute_value.h index a83133f13e..5ea9b99d11 100644 --- a/api/include/opentelemetry/common/attribute_value.h +++ b/api/include/opentelemetry/common/attribute_value.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/common/key_value_iterable.h b/api/include/opentelemetry/common/key_value_iterable.h index 12c14d1bdc..f187f75b86 100644 --- a/api/include/opentelemetry/common/key_value_iterable.h +++ b/api/include/opentelemetry/common/key_value_iterable.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/common/attribute_value.h" diff --git a/api/include/opentelemetry/common/key_value_iterable_view.h b/api/include/opentelemetry/common/key_value_iterable_view.h index 25734fff6d..1712cfcda7 100644 --- a/api/include/opentelemetry/common/key_value_iterable_view.h +++ b/api/include/opentelemetry/common/key_value_iterable_view.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/common/kv_properties.h b/api/include/opentelemetry/common/kv_properties.h index 8864776c96..e9ea1709a0 100644 --- a/api/include/opentelemetry/common/kv_properties.h +++ b/api/include/opentelemetry/common/kv_properties.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/common/spin_lock_mutex.h b/api/include/opentelemetry/common/spin_lock_mutex.h index 66d291b116..b30fd3f44b 100644 --- a/api/include/opentelemetry/common/spin_lock_mutex.h +++ b/api/include/opentelemetry/common/spin_lock_mutex.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/common/string_util.h b/api/include/opentelemetry/common/string_util.h index 9b7740992b..04479d5594 100644 --- a/api/include/opentelemetry/common/string_util.h +++ b/api/include/opentelemetry/common/string_util.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/common/timestamp.h b/api/include/opentelemetry/common/timestamp.h index b08d955407..54e7b7aa6c 100644 --- a/api/include/opentelemetry/common/timestamp.h +++ b/api/include/opentelemetry/common/timestamp.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/config.h b/api/include/opentelemetry/config.h index de7efa746f..21a2947e28 100644 --- a/api/include/opentelemetry/config.h +++ b/api/include/opentelemetry/config.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifndef __has_include diff --git a/api/include/opentelemetry/context/context.h b/api/include/opentelemetry/context/context.h index 318ba08dcb..50cfde3c4f 100644 --- a/api/include/opentelemetry/context/context.h +++ b/api/include/opentelemetry/context/context.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/context/context_value.h b/api/include/opentelemetry/context/context_value.h index 52b806c227..013b3a4608 100644 --- a/api/include/opentelemetry/context/context_value.h +++ b/api/include/opentelemetry/context/context_value.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/context/propagation/composite_propagator.h b/api/include/opentelemetry/context/propagation/composite_propagator.h index 59b8e4cafe..52c05ae56f 100644 --- a/api/include/opentelemetry/context/propagation/composite_propagator.h +++ b/api/include/opentelemetry/context/propagation/composite_propagator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #include #include diff --git a/api/include/opentelemetry/context/propagation/global_propagator.h b/api/include/opentelemetry/context/propagation/global_propagator.h index c4afff9dde..b4e49325cd 100644 --- a/api/include/opentelemetry/context/propagation/global_propagator.h +++ b/api/include/opentelemetry/context/propagation/global_propagator.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/context/propagation/noop_propagator.h b/api/include/opentelemetry/context/propagation/noop_propagator.h index b831fc0ad6..ece0229ae8 100644 --- a/api/include/opentelemetry/context/propagation/noop_propagator.h +++ b/api/include/opentelemetry/context/propagation/noop_propagator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/context/propagation/text_map_propagator.h" diff --git a/api/include/opentelemetry/context/propagation/text_map_propagator.h b/api/include/opentelemetry/context/propagation/text_map_propagator.h index 823223147d..efa2686441 100644 --- a/api/include/opentelemetry/context/propagation/text_map_propagator.h +++ b/api/include/opentelemetry/context/propagation/text_map_propagator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/context/runtime_context.h b/api/include/opentelemetry/context/runtime_context.h index d9c5b0f7b4..400b3de544 100644 --- a/api/include/opentelemetry/context/runtime_context.h +++ b/api/include/opentelemetry/context/runtime_context.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/context/context.h" diff --git a/api/include/opentelemetry/detail/preprocessor.h b/api/include/opentelemetry/detail/preprocessor.h index e00ac0fdca..5585c69db4 100644 --- a/api/include/opentelemetry/detail/preprocessor.h +++ b/api/include/opentelemetry/detail/preprocessor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #define OPENTELEMETRY_STRINGIFY(S) OPENTELEMETRY_STRINGIFY_(S) diff --git a/api/include/opentelemetry/logs/logger.h b/api/include/opentelemetry/logs/logger.h index b436d96ec5..6cc21a5abc 100644 --- a/api/include/opentelemetry/logs/logger.h +++ b/api/include/opentelemetry/logs/logger.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/logs/logger_provider.h b/api/include/opentelemetry/logs/logger_provider.h index b0ca7303dc..94ef7c6f55 100644 --- a/api/include/opentelemetry/logs/logger_provider.h +++ b/api/include/opentelemetry/logs/logger_provider.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/logs/noop.h b/api/include/opentelemetry/logs/noop.h index 0f8650f277..ecfdfa3ad1 100644 --- a/api/include/opentelemetry/logs/noop.h +++ b/api/include/opentelemetry/logs/noop.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once // Please refer to provider.h for documentation on how to obtain a Logger object. diff --git a/api/include/opentelemetry/logs/provider.h b/api/include/opentelemetry/logs/provider.h index ab8e779b20..57a4ee8bba 100644 --- a/api/include/opentelemetry/logs/provider.h +++ b/api/include/opentelemetry/logs/provider.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/logs/severity.h b/api/include/opentelemetry/logs/severity.h index a314c9695e..252acb3504 100644 --- a/api/include/opentelemetry/logs/severity.h +++ b/api/include/opentelemetry/logs/severity.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once #include "opentelemetry/version.h" diff --git a/api/include/opentelemetry/metrics/async_instruments.h b/api/include/opentelemetry/metrics/async_instruments.h index 430618157c..867382ec19 100644 --- a/api/include/opentelemetry/metrics/async_instruments.h +++ b/api/include/opentelemetry/metrics/async_instruments.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/api/include/opentelemetry/metrics/instrument.h b/api/include/opentelemetry/metrics/instrument.h index c763c61085..d0cffac4b1 100644 --- a/api/include/opentelemetry/metrics/instrument.h +++ b/api/include/opentelemetry/metrics/instrument.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/api/include/opentelemetry/metrics/meter.h b/api/include/opentelemetry/metrics/meter.h index c4f812ee6c..a2adafb9da 100644 --- a/api/include/opentelemetry/metrics/meter.h +++ b/api/include/opentelemetry/metrics/meter.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/api/include/opentelemetry/metrics/meter_provider.h b/api/include/opentelemetry/metrics/meter_provider.h index eb1c5084c9..840c7d2aa7 100644 --- a/api/include/opentelemetry/metrics/meter_provider.h +++ b/api/include/opentelemetry/metrics/meter_provider.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/api/include/opentelemetry/metrics/noop.h b/api/include/opentelemetry/metrics/noop.h index 51322c1504..3a38df732b 100644 --- a/api/include/opentelemetry/metrics/noop.h +++ b/api/include/opentelemetry/metrics/noop.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW // Please refer to provider.h for documentation on how to obtain a Meter object. diff --git a/api/include/opentelemetry/metrics/observer_result.h b/api/include/opentelemetry/metrics/observer_result.h index 5f804f9265..90ad10efc2 100644 --- a/api/include/opentelemetry/metrics/observer_result.h +++ b/api/include/opentelemetry/metrics/observer_result.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/api/include/opentelemetry/metrics/provider.h b/api/include/opentelemetry/metrics/provider.h index eee1ba6405..e5b6d1b66f 100644 --- a/api/include/opentelemetry/metrics/provider.h +++ b/api/include/opentelemetry/metrics/provider.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW # include diff --git a/api/include/opentelemetry/metrics/sync_instruments.h b/api/include/opentelemetry/metrics/sync_instruments.h index 05bc16a862..b7eb09e84d 100644 --- a/api/include/opentelemetry/metrics/sync_instruments.h +++ b/api/include/opentelemetry/metrics/sync_instruments.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/api/include/opentelemetry/nostd/function_ref.h b/api/include/opentelemetry/nostd/function_ref.h index 21d2a48eff..edc2007762 100644 --- a/api/include/opentelemetry/nostd/function_ref.h +++ b/api/include/opentelemetry/nostd/function_ref.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/nostd/shared_ptr.h b/api/include/opentelemetry/nostd/shared_ptr.h index e7c2a464d2..e1eac61561 100644 --- a/api/include/opentelemetry/nostd/shared_ptr.h +++ b/api/include/opentelemetry/nostd/shared_ptr.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once #ifdef HAVE_CPP_STDLIB diff --git a/api/include/opentelemetry/nostd/span.h b/api/include/opentelemetry/nostd/span.h index 5fba66e5f2..4334f3cafe 100644 --- a/api/include/opentelemetry/nostd/span.h +++ b/api/include/opentelemetry/nostd/span.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/nostd/string_view.h b/api/include/opentelemetry/nostd/string_view.h index c4ed15be09..b5a9e4c52f 100644 --- a/api/include/opentelemetry/nostd/string_view.h +++ b/api/include/opentelemetry/nostd/string_view.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/nostd/type_traits.h b/api/include/opentelemetry/nostd/type_traits.h index c1e4cfdf02..3d212ea3e2 100644 --- a/api/include/opentelemetry/nostd/type_traits.h +++ b/api/include/opentelemetry/nostd/type_traits.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/nostd/unique_ptr.h b/api/include/opentelemetry/nostd/unique_ptr.h index 0a1c28a4af..a97111b9d0 100644 --- a/api/include/opentelemetry/nostd/unique_ptr.h +++ b/api/include/opentelemetry/nostd/unique_ptr.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/nostd/utility.h b/api/include/opentelemetry/nostd/utility.h index ae9197e714..a22491ce01 100644 --- a/api/include/opentelemetry/nostd/utility.h +++ b/api/include/opentelemetry/nostd/utility.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/nostd/variant.h b/api/include/opentelemetry/nostd/variant.h index 923af09ba8..d9c2581975 100644 --- a/api/include/opentelemetry/nostd/variant.h +++ b/api/include/opentelemetry/nostd/variant.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/plugin/detail/dynamic_library_handle.h b/api/include/opentelemetry/plugin/detail/dynamic_library_handle.h index b042c2743d..9ffe076ad2 100644 --- a/api/include/opentelemetry/plugin/detail/dynamic_library_handle.h +++ b/api/include/opentelemetry/plugin/detail/dynamic_library_handle.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/version.h" diff --git a/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h b/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h index 0f33220e17..bcc4bd0b87 100644 --- a/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h +++ b/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h b/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h index d23a805e8e..7a586b6bcc 100644 --- a/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h +++ b/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/plugin/detail/loader_info.h b/api/include/opentelemetry/plugin/detail/loader_info.h index 9cdfc71b19..ca8c9f0a14 100644 --- a/api/include/opentelemetry/plugin/detail/loader_info.h +++ b/api/include/opentelemetry/plugin/detail/loader_info.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/string_view.h" diff --git a/api/include/opentelemetry/plugin/detail/tracer_handle.h b/api/include/opentelemetry/plugin/detail/tracer_handle.h index b1efad3e86..559d7ddf40 100644 --- a/api/include/opentelemetry/plugin/detail/tracer_handle.h +++ b/api/include/opentelemetry/plugin/detail/tracer_handle.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/trace/tracer.h" diff --git a/api/include/opentelemetry/plugin/detail/utility.h b/api/include/opentelemetry/plugin/detail/utility.h index 789371d0e2..6f8dd5d462 100644 --- a/api/include/opentelemetry/plugin/detail/utility.h +++ b/api/include/opentelemetry/plugin/detail/utility.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/plugin/dynamic_load.h b/api/include/opentelemetry/plugin/dynamic_load.h index 0ce2ec6c9f..8318d534ac 100644 --- a/api/include/opentelemetry/plugin/dynamic_load.h +++ b/api/include/opentelemetry/plugin/dynamic_load.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/plugin/factory.h b/api/include/opentelemetry/plugin/factory.h index 0d2e1e6408..0a285d65b1 100644 --- a/api/include/opentelemetry/plugin/factory.h +++ b/api/include/opentelemetry/plugin/factory.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include #include diff --git a/api/include/opentelemetry/plugin/hook.h b/api/include/opentelemetry/plugin/hook.h index 006c9f53a6..c06c0b3243 100644 --- a/api/include/opentelemetry/plugin/hook.h +++ b/api/include/opentelemetry/plugin/hook.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/plugin/detail/loader_info.h" diff --git a/api/include/opentelemetry/plugin/tracer.h b/api/include/opentelemetry/plugin/tracer.h index 8e1dec632f..149f2a93b8 100644 --- a/api/include/opentelemetry/plugin/tracer.h +++ b/api/include/opentelemetry/plugin/tracer.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/std/shared_ptr.h b/api/include/opentelemetry/std/shared_ptr.h index 8969f2ced5..418d4ef71e 100644 --- a/api/include/opentelemetry/std/shared_ptr.h +++ b/api/include/opentelemetry/std/shared_ptr.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/std/span.h b/api/include/opentelemetry/std/span.h index 9a95b449f5..0291e5aba5 100644 --- a/api/include/opentelemetry/std/span.h +++ b/api/include/opentelemetry/std/span.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/std/string_view.h b/api/include/opentelemetry/std/string_view.h index 755b4387a1..8fd159d3ad 100644 --- a/api/include/opentelemetry/std/string_view.h +++ b/api/include/opentelemetry/std/string_view.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/std/type_traits.h b/api/include/opentelemetry/std/type_traits.h index 1fd6ef7f88..66308a42a8 100644 --- a/api/include/opentelemetry/std/type_traits.h +++ b/api/include/opentelemetry/std/type_traits.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/std/unique_ptr.h b/api/include/opentelemetry/std/unique_ptr.h index 7877d2d854..f15699b676 100644 --- a/api/include/opentelemetry/std/unique_ptr.h +++ b/api/include/opentelemetry/std/unique_ptr.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/std/utility.h b/api/include/opentelemetry/std/utility.h index a0d73c9fe9..7a8233f67d 100644 --- a/api/include/opentelemetry/std/utility.h +++ b/api/include/opentelemetry/std/utility.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/std/variant.h b/api/include/opentelemetry/std/variant.h index a6f5cbac43..fffe963bac 100644 --- a/api/include/opentelemetry/std/variant.h +++ b/api/include/opentelemetry/std/variant.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/trace/canonical_code.h b/api/include/opentelemetry/trace/canonical_code.h index 103147f311..fd722891d6 100644 --- a/api/include/opentelemetry/trace/canonical_code.h +++ b/api/include/opentelemetry/trace/canonical_code.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/trace/default_span.h b/api/include/opentelemetry/trace/default_span.h index 6051a72e58..57785e633c 100644 --- a/api/include/opentelemetry/trace/default_span.h +++ b/api/include/opentelemetry/trace/default_span.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/common/attribute_value.h" #include "opentelemetry/trace/canonical_code.h" diff --git a/api/include/opentelemetry/trace/default_tracer.h b/api/include/opentelemetry/trace/default_tracer.h index 384c0115a1..8b00e60079 100644 --- a/api/include/opentelemetry/trace/default_tracer.h +++ b/api/include/opentelemetry/trace/default_tracer.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/unique_ptr.h" #include "opentelemetry/trace/default_span.h" diff --git a/api/include/opentelemetry/trace/noop.h b/api/include/opentelemetry/trace/noop.h index 762b2dd035..ad7f05273a 100644 --- a/api/include/opentelemetry/trace/noop.h +++ b/api/include/opentelemetry/trace/noop.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once // Please refer to provider.h for documentation on how to obtain a Tracer object. // diff --git a/api/include/opentelemetry/trace/propagation/b3_propagator.h b/api/include/opentelemetry/trace/propagation/b3_propagator.h index b8c1db5a01..77d736bedc 100644 --- a/api/include/opentelemetry/trace/propagation/b3_propagator.h +++ b/api/include/opentelemetry/trace/propagation/b3_propagator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "detail/context.h" diff --git a/api/include/opentelemetry/trace/propagation/detail/context.h b/api/include/opentelemetry/trace/propagation/detail/context.h index da0737600f..728a198911 100644 --- a/api/include/opentelemetry/trace/propagation/detail/context.h +++ b/api/include/opentelemetry/trace/propagation/detail/context.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/context/context.h" #include "opentelemetry/trace/default_span.h" diff --git a/api/include/opentelemetry/trace/propagation/detail/hex.h b/api/include/opentelemetry/trace/propagation/detail/hex.h index 779eff55cf..1a9f597070 100644 --- a/api/include/opentelemetry/trace/propagation/detail/hex.h +++ b/api/include/opentelemetry/trace/propagation/detail/hex.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/string_view.h" diff --git a/api/include/opentelemetry/trace/propagation/detail/string.h b/api/include/opentelemetry/trace/propagation/detail/string.h index a47fd4a2cc..c583934251 100644 --- a/api/include/opentelemetry/trace/propagation/detail/string.h +++ b/api/include/opentelemetry/trace/propagation/detail/string.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/string_view.h" diff --git a/api/include/opentelemetry/trace/propagation/http_trace_context.h b/api/include/opentelemetry/trace/propagation/http_trace_context.h index 12ca07200e..5bee19c9b7 100644 --- a/api/include/opentelemetry/trace/propagation/http_trace_context.h +++ b/api/include/opentelemetry/trace/propagation/http_trace_context.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include #include "detail/context.h" diff --git a/api/include/opentelemetry/trace/propagation/jaeger.h b/api/include/opentelemetry/trace/propagation/jaeger.h index 4cdc4354d6..f1a842bdeb 100644 --- a/api/include/opentelemetry/trace/propagation/jaeger.h +++ b/api/include/opentelemetry/trace/propagation/jaeger.h @@ -1,18 +1,7 @@ -#pragma once +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +#pragma once #include "detail/context.h" #include "detail/hex.h" diff --git a/api/include/opentelemetry/trace/provider.h b/api/include/opentelemetry/trace/provider.h index c78c4ad90c..6267cbd4d2 100644 --- a/api/include/opentelemetry/trace/provider.h +++ b/api/include/opentelemetry/trace/provider.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/trace/scope.h b/api/include/opentelemetry/trace/scope.h index 797e91cdef..ecceba458f 100644 --- a/api/include/opentelemetry/trace/scope.h +++ b/api/include/opentelemetry/trace/scope.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/trace/span.h b/api/include/opentelemetry/trace/span.h index b9f1326853..be5f5276cd 100644 --- a/api/include/opentelemetry/trace/span.h +++ b/api/include/opentelemetry/trace/span.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/trace/span_context.h b/api/include/opentelemetry/trace/span_context.h index 7096d608ea..a69a6d6230 100644 --- a/api/include/opentelemetry/trace/span_context.h +++ b/api/include/opentelemetry/trace/span_context.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/trace/span_context_kv_iterable.h b/api/include/opentelemetry/trace/span_context_kv_iterable.h index 18afdb91a5..2cbff8d65a 100644 --- a/api/include/opentelemetry/trace/span_context_kv_iterable.h +++ b/api/include/opentelemetry/trace/span_context_kv_iterable.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/common/attribute_value.h" diff --git a/api/include/opentelemetry/trace/span_context_kv_iterable_view.h b/api/include/opentelemetry/trace/span_context_kv_iterable_view.h index afaf2b5bfd..c6b74bc00d 100644 --- a/api/include/opentelemetry/trace/span_context_kv_iterable_view.h +++ b/api/include/opentelemetry/trace/span_context_kv_iterable_view.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/include/opentelemetry/trace/trace_flags.h b/api/include/opentelemetry/trace/trace_flags.h index 5c8335f398..3cfbb022f4 100644 --- a/api/include/opentelemetry/trace/trace_flags.h +++ b/api/include/opentelemetry/trace/trace_flags.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/trace/trace_id.h b/api/include/opentelemetry/trace/trace_id.h index fff2160786..3a262c7a6a 100644 --- a/api/include/opentelemetry/trace/trace_id.h +++ b/api/include/opentelemetry/trace/trace_id.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/trace/trace_state.h b/api/include/opentelemetry/trace/trace_state.h index 915a71e832..4ffd32d1ab 100644 --- a/api/include/opentelemetry/trace/trace_state.h +++ b/api/include/opentelemetry/trace/trace_state.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/api/include/opentelemetry/trace/tracer.h b/api/include/opentelemetry/trace/tracer.h index 168cf5e583..7fe53139d1 100644 --- a/api/include/opentelemetry/trace/tracer.h +++ b/api/include/opentelemetry/trace/tracer.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/shared_ptr.h" diff --git a/api/include/opentelemetry/trace/tracer_provider.h b/api/include/opentelemetry/trace/tracer_provider.h index 9c25cd94c5..04e83531c1 100644 --- a/api/include/opentelemetry/trace/tracer_provider.h +++ b/api/include/opentelemetry/trace/tracer_provider.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/shared_ptr.h" diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h index 551116506d..2cbe88fbbe 100644 --- a/api/include/opentelemetry/version.h +++ b/api/include/opentelemetry/version.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/detail/preprocessor.h" diff --git a/api/test/baggage/baggage_test.cc b/api/test/baggage/baggage_test.cc index 4dc741cf8f..9c14fc892f 100644 --- a/api/test/baggage/baggage_test.cc +++ b/api/test/baggage/baggage_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/string_view.h" #include diff --git a/api/test/common/kv_properties_test.cc b/api/test/common/kv_properties_test.cc index 4a9f1b01df..e5d9a2439e 100644 --- a/api/test/common/kv_properties_test.cc +++ b/api/test/common/kv_properties_test.cc @@ -1,17 +1,6 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include #include diff --git a/api/test/common/spinlock_benchmark.cc b/api/test/common/spinlock_benchmark.cc index 72b48bcac3..3557063479 100644 --- a/api/test/common/spinlock_benchmark.cc +++ b/api/test/common/spinlock_benchmark.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/common/spin_lock_mutex.h" #include diff --git a/api/test/common/string_util_test.cc b/api/test/common/string_util_test.cc index 55d1310975..da2e635119 100644 --- a/api/test/common/string_util_test.cc +++ b/api/test/common/string_util_test.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include #include diff --git a/api/test/context/context_test.cc b/api/test/context/context_test.cc index 730563f842..975e11f8c4 100644 --- a/api/test/context/context_test.cc +++ b/api/test/context/context_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/context/context.h" #include diff --git a/api/test/context/propagation/composite_propagator_test.cc b/api/test/context/propagation/composite_propagator_test.cc index 8404a39369..5168cec989 100644 --- a/api/test/context/propagation/composite_propagator_test.cc +++ b/api/test/context/propagation/composite_propagator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/string_view.h" #include "opentelemetry/trace/scope.h" #include "opentelemetry/trace/span.h" diff --git a/api/test/context/runtime_context_test.cc b/api/test/context/runtime_context_test.cc index 6d94d1d069..e85fc6350d 100644 --- a/api/test/context/runtime_context_test.cc +++ b/api/test/context/runtime_context_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/context/runtime_context.h" #include "opentelemetry/context/context.h" diff --git a/api/test/core/timestamp_test.cc b/api/test/core/timestamp_test.cc index bd73d4b7bd..8efc0215be 100644 --- a/api/test/core/timestamp_test.cc +++ b/api/test/core/timestamp_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/common/timestamp.h" #include diff --git a/api/test/logs/logger_test.cc b/api/test/logs/logger_test.cc index b6c1e9edb4..1919edb6fe 100644 --- a/api/test/logs/logger_test.cc +++ b/api/test/logs/logger_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #include diff --git a/api/test/logs/provider_test.cc b/api/test/logs/provider_test.cc index 91fd8f8c15..d61de52eb0 100644 --- a/api/test/logs/provider_test.cc +++ b/api/test/logs/provider_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #include diff --git a/api/test/metrics/meter_provider_test.cc b/api/test/metrics/meter_provider_test.cc index 3ecc7e2c7c..862ce4a7fe 100644 --- a/api/test/metrics/meter_provider_test.cc +++ b/api/test/metrics/meter_provider_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include # include "opentelemetry/metrics/provider.h" diff --git a/api/test/metrics/noop_instrument_test.cc b/api/test/metrics/noop_instrument_test.cc index b29ea05de8..0d0b9a07f5 100644 --- a/api/test/metrics/noop_instrument_test.cc +++ b/api/test/metrics/noop_instrument_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include # include diff --git a/api/test/metrics/noop_metrics_test.cc b/api/test/metrics/noop_metrics_test.cc index fc740cf282..14b3643c7b 100644 --- a/api/test/metrics/noop_metrics_test.cc +++ b/api/test/metrics/noop_metrics_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include # include "opentelemetry/metrics/instrument.h" diff --git a/api/test/nostd/function_ref_test.cc b/api/test/nostd/function_ref_test.cc index 148d305344..1153360d2d 100644 --- a/api/test/nostd/function_ref_test.cc +++ b/api/test/nostd/function_ref_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/function_ref.h" #include diff --git a/api/test/nostd/shared_ptr_test.cc b/api/test/nostd/shared_ptr_test.cc index ac7d60871b..6f3d43a771 100644 --- a/api/test/nostd/shared_ptr_test.cc +++ b/api/test/nostd/shared_ptr_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/shared_ptr.h" #include diff --git a/api/test/nostd/span_test.cc b/api/test/nostd/span_test.cc index 8bfbf60f29..09d32ecfb8 100644 --- a/api/test/nostd/span_test.cc +++ b/api/test/nostd/span_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/span.h" #include diff --git a/api/test/nostd/string_view_test.cc b/api/test/nostd/string_view_test.cc index 481787f0f4..d5c7fe4fdd 100644 --- a/api/test/nostd/string_view_test.cc +++ b/api/test/nostd/string_view_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/string_view.h" #include diff --git a/api/test/nostd/unique_ptr_test.cc b/api/test/nostd/unique_ptr_test.cc index 731c5f79c2..1d2e6c062f 100644 --- a/api/test/nostd/unique_ptr_test.cc +++ b/api/test/nostd/unique_ptr_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/unique_ptr.h" #include diff --git a/api/test/nostd/utility_test.cc b/api/test/nostd/utility_test.cc index edf5cd3f9e..c6ee9e2102 100644 --- a/api/test/nostd/utility_test.cc +++ b/api/test/nostd/utility_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/utility.h" #include diff --git a/api/test/nostd/variant_test.cc b/api/test/nostd/variant_test.cc index 9362b7794b..299ef8377e 100644 --- a/api/test/nostd/variant_test.cc +++ b/api/test/nostd/variant_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/variant.h" #include diff --git a/api/test/plugin/dynamic_load_test.cc b/api/test/plugin/dynamic_load_test.cc index 3e0e45ecc1..4fdc79eee6 100644 --- a/api/test/plugin/dynamic_load_test.cc +++ b/api/test/plugin/dynamic_load_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/plugin/dynamic_load.h" #include diff --git a/api/test/trace/default_span_test.cc b/api/test/trace/default_span_test.cc index f88da3b77f..377a0a8584 100644 --- a/api/test/trace/default_span_test.cc +++ b/api/test/trace/default_span_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/default_span.h" #include "opentelemetry/trace/span_context.h" diff --git a/api/test/trace/key_value_iterable_view_test.cc b/api/test/trace/key_value_iterable_view_test.cc index 43cbcf88d9..989856b423 100644 --- a/api/test/trace/key_value_iterable_view_test.cc +++ b/api/test/trace/key_value_iterable_view_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/common/key_value_iterable_view.h" #include diff --git a/api/test/trace/noop_test.cc b/api/test/trace/noop_test.cc index 2b2864af1a..5414a5c726 100644 --- a/api/test/trace/noop_test.cc +++ b/api/test/trace/noop_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/noop.h" #include "opentelemetry/common/timestamp.h" diff --git a/api/test/trace/propagation/b3_propagation_test.cc b/api/test/trace/propagation/b3_propagation_test.cc index dc7e3ef8c0..2538b5be29 100644 --- a/api/test/trace/propagation/b3_propagation_test.cc +++ b/api/test/trace/propagation/b3_propagation_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/context/runtime_context.h" #include "opentelemetry/trace/propagation/b3_propagator.h" #include "opentelemetry/trace/scope.h" diff --git a/api/test/trace/propagation/http_text_format_test.cc b/api/test/trace/propagation/http_text_format_test.cc index 8ed75ef648..a775c3a9ac 100644 --- a/api/test/trace/propagation/http_text_format_test.cc +++ b/api/test/trace/propagation/http_text_format_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/context/propagation/global_propagator.h" #include "opentelemetry/context/runtime_context.h" #include "opentelemetry/trace/propagation/http_trace_context.h" diff --git a/api/test/trace/propagation/jaeger_propagation_test.cc b/api/test/trace/propagation/jaeger_propagation_test.cc index 70bd8d475b..85a126e663 100644 --- a/api/test/trace/propagation/jaeger_propagation_test.cc +++ b/api/test/trace/propagation/jaeger_propagation_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/propagation/jaeger.h" #include "opentelemetry/trace/scope.h" #include "util.h" diff --git a/api/test/trace/propagation/util.h b/api/test/trace/propagation/util.h index 1f6a8f8451..ae234d92ea 100644 --- a/api/test/trace/propagation/util.h +++ b/api/test/trace/propagation/util.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/api/test/trace/provider_test.cc b/api/test/trace/provider_test.cc index 55b941091d..49781e5e48 100644 --- a/api/test/trace/provider_test.cc +++ b/api/test/trace/provider_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/provider.h" #include "opentelemetry/nostd/shared_ptr.h" diff --git a/api/test/trace/scope_test.cc b/api/test/trace/scope_test.cc index e27e708125..b74905b167 100644 --- a/api/test/trace/scope_test.cc +++ b/api/test/trace/scope_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/scope.h" #include "opentelemetry/context/context.h" #include "opentelemetry/nostd/shared_ptr.h" diff --git a/api/test/trace/span_context_test.cc b/api/test/trace/span_context_test.cc index ebcdf785aa..c56b6df6dd 100644 --- a/api/test/trace/span_context_test.cc +++ b/api/test/trace/span_context_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/span_context.h" #include "opentelemetry/trace/span_id.h" #include "opentelemetry/trace/trace_id.h" diff --git a/api/test/trace/span_id_benchmark.cc b/api/test/trace/span_id_benchmark.cc index 65f0c775e9..42d4aeb465 100644 --- a/api/test/trace/span_id_benchmark.cc +++ b/api/test/trace/span_id_benchmark.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/span_id.h" #include diff --git a/api/test/trace/span_id_test.cc b/api/test/trace/span_id_test.cc index 3834d688f5..52bb9b7ded 100644 --- a/api/test/trace/span_id_test.cc +++ b/api/test/trace/span_id_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/span_id.h" #include diff --git a/api/test/trace/trace_flags_test.cc b/api/test/trace/trace_flags_test.cc index 21e737eabc..783b56d839 100644 --- a/api/test/trace/trace_flags_test.cc +++ b/api/test/trace/trace_flags_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/trace_flags.h" #include diff --git a/api/test/trace/trace_id_test.cc b/api/test/trace/trace_id_test.cc index 542eca58e3..f903bfe9e8 100644 --- a/api/test/trace/trace_id_test.cc +++ b/api/test/trace/trace_id_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/trace_id.h" #include diff --git a/api/test/trace/trace_state_test.cc b/api/test/trace/trace_state_test.cc index 3435d43e50..ed6c7e8274 100644 --- a/api/test/trace/trace_state_test.cc +++ b/api/test/trace/trace_state_test.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/trace/trace_state.h" diff --git a/api/test/trace/tracer_test.cc b/api/test/trace/tracer_test.cc index b97a1b285e..62777232a2 100644 --- a/api/test/trace/tracer_test.cc +++ b/api/test/trace/tracer_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/trace/noop.h" #include "opentelemetry/trace/scope.h" diff --git a/buildscripts/pre-commit b/buildscripts/pre-commit index 501a0a5f75..aa7e8cc6fa 100755 --- a/buildscripts/pre-commit +++ b/buildscripts/pre-commit @@ -1,9 +1,7 @@ #!/usr/bin/env bash -# This script is supposed to be executed to recreate version.cc. It can be executed as: -# git pre-commit hook -# git per-merge-commit hook -# manually as part of release process ( refer RELEASING.md ) +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 set -eo pipefail diff --git a/buildscripts/pre_release.sh b/buildscripts/pre_release.sh index 8ff623eb19..2382d3d68b 100755 --- a/buildscripts/pre_release.sh +++ b/buildscripts/pre_release.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + usage() { echo "Usage: $0 -t " 1>&2; exit 1; } while getopts ":t:" o; do diff --git a/ci/do_ci.sh b/ci/do_ci.sh index ba19f94269..f8bfe4bf96 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e function install_prometheus_cpp_client diff --git a/ci/install_bazelisk.sh b/ci/install_bazelisk.sh index ec23a41caa..0c3e90b167 100755 --- a/ci/install_bazelisk.sh +++ b/ci/install_bazelisk.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e BAZELISK_VERSION=v1.7.4 diff --git a/ci/install_format_tools.sh b/ci/install_format_tools.sh index e351d8f275..fc6960f9dd 100755 --- a/ci/install_format_tools.sh +++ b/ci/install_format_tools.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e apt-get install -y clang-format-10 python3-pip git curl diff --git a/ci/install_gcc48.sh b/ci/install_gcc48.sh index c076d97402..497b89dbe1 100755 --- a/ci/install_gcc48.sh +++ b/ci/install_gcc48.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e apt-get update apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/ci/install_osx_bazelisk.sh b/ci/install_osx_bazelisk.sh index 9c09285051..dbe5a15e3c 100755 --- a/ci/install_osx_bazelisk.sh +++ b/ci/install_osx_bazelisk.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e brew install bazelisk diff --git a/ci/install_protobuf.sh b/ci/install_protobuf.sh index 71390f9a2a..8fff91d062 100755 --- a/ci/install_protobuf.sh +++ b/ci/install_protobuf.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e [ -z "${PROTOBUF_VERSION}" ] && export PROTOBUF_VERSION="3.11.4" diff --git a/ci/run_docker.sh b/ci/run_docker.sh index c09ca51ce4..9f81e68143 100755 --- a/ci/run_docker.sh +++ b/ci/run_docker.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e BUILD_IMAGE=opentelemetry-cpp-build diff --git a/ci/setup_ci_environment.sh b/ci/setup_ci_environment.sh index 66b3d73d67..f995ed75b5 100755 --- a/ci/setup_ci_environment.sh +++ b/ci/setup_ci_environment.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e apt-get update apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index 439019416a..fcc0c12a25 100755 --- a/ci/setup_cmake.sh +++ b/ci/setup_cmake.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e export DEBIAN_FRONTEND=noninteractive diff --git a/ci/setup_grpc.sh b/ci/setup_grpc.sh index ed32f5e9d9..98780bb943 100755 --- a/ci/setup_grpc.sh +++ b/ci/setup_grpc.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + set -e export DEBIAN_FRONTEND=noninteractive diff --git a/examples/batch/main.cc b/examples/batch/main.cc index 32e285d344..5c007dfbc7 100644 --- a/examples/batch/main.cc +++ b/examples/batch/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/tracer_provider.h" #include "opentelemetry/trace/provider.h" // Using an exporter that simply dumps span data to stdout. diff --git a/examples/http/client.cc b/examples/http/client.cc index 9b24825dde..aa6bc86af7 100644 --- a/examples/http/client.cc +++ b/examples/http/client.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/http/client/http_client_factory.h" #include "opentelemetry/ext/http/common/url_parser.h" #include "tracer_common.h" diff --git a/examples/http/server.cc b/examples/http/server.cc index 190f40eac1..2906dacae9 100644 --- a/examples/http/server.cc +++ b/examples/http/server.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "server.h" #include "tracer_common.h" diff --git a/examples/http/server.h b/examples/http/server.h index f37b60a302..2b94bf3a68 100644 --- a/examples/http/server.h +++ b/examples/http/server.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include #include diff --git a/examples/http/tracer_common.h b/examples/http/tracer_common.h index 276ed3d9a2..41dbfd29c1 100644 --- a/examples/http/tracer_common.h +++ b/examples/http/tracer_common.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/exporters/ostream/span_exporter.h" #include "opentelemetry/sdk/trace/simple_processor.h" diff --git a/examples/jaeger/foo_library/foo_library.cc b/examples/jaeger/foo_library/foo_library.cc index 764e6653d4..05ee35d537 100644 --- a/examples/jaeger/foo_library/foo_library.cc +++ b/examples/jaeger/foo_library/foo_library.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/provider.h" namespace trace = opentelemetry::trace; diff --git a/examples/jaeger/foo_library/foo_library.h b/examples/jaeger/foo_library/foo_library.h index 7ac75c0e50..daebb2603f 100644 --- a/examples/jaeger/foo_library/foo_library.h +++ b/examples/jaeger/foo_library/foo_library.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once void foo_library(); diff --git a/examples/jaeger/main.cc b/examples/jaeger/main.cc index d614e1af36..f3f94884ca 100644 --- a/examples/jaeger/main.cc +++ b/examples/jaeger/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/jaeger/jaeger_exporter.h" #include "opentelemetry/sdk/trace/simple_processor.h" #include "opentelemetry/sdk/trace/tracer_provider.h" diff --git a/examples/metrics_simple/main.cc b/examples/metrics_simple/main.cc index 57fe7390bc..fe0e7df4bb 100644 --- a/examples/metrics_simple/main.cc +++ b/examples/metrics_simple/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/exporters/ostream/metrics_exporter.h" # include "opentelemetry/metrics/provider.h" diff --git a/examples/multi_processor/foo_library/foo_library.cc b/examples/multi_processor/foo_library/foo_library.cc index 73077f135e..b1df37a84c 100644 --- a/examples/multi_processor/foo_library/foo_library.cc +++ b/examples/multi_processor/foo_library/foo_library.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/provider.h" namespace trace = opentelemetry::trace; diff --git a/examples/multi_processor/foo_library/foo_library.h b/examples/multi_processor/foo_library/foo_library.h index 7ac75c0e50..daebb2603f 100644 --- a/examples/multi_processor/foo_library/foo_library.h +++ b/examples/multi_processor/foo_library/foo_library.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once void foo_library(); diff --git a/examples/multi_processor/main.cc b/examples/multi_processor/main.cc index 64e9098f9f..8246a2ec91 100644 --- a/examples/multi_processor/main.cc +++ b/examples/multi_processor/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/simple_processor.h" #include "opentelemetry/sdk/trace/tracer_context.h" #include "opentelemetry/sdk/trace/tracer_provider.h" diff --git a/examples/multithreaded/main.cc b/examples/multithreaded/main.cc index 309d7ff19a..b245aad5aa 100644 --- a/examples/multithreaded/main.cc +++ b/examples/multithreaded/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/sdk/trace/simple_processor.h" #include "opentelemetry/sdk/trace/tracer_provider.h" diff --git a/examples/otlp/foo_library/foo_library.cc b/examples/otlp/foo_library/foo_library.cc index 764e6653d4..05ee35d537 100644 --- a/examples/otlp/foo_library/foo_library.cc +++ b/examples/otlp/foo_library/foo_library.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/provider.h" namespace trace = opentelemetry::trace; diff --git a/examples/otlp/foo_library/foo_library.h b/examples/otlp/foo_library/foo_library.h index 7ac75c0e50..daebb2603f 100644 --- a/examples/otlp/foo_library/foo_library.h +++ b/examples/otlp/foo_library/foo_library.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once void foo_library(); diff --git a/examples/otlp/main.cc b/examples/otlp/main.cc index f2ec3c3edd..2acf2ccb8e 100644 --- a/examples/otlp/main.cc +++ b/examples/otlp/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/otlp/otlp_exporter.h" #include "opentelemetry/sdk/trace/simple_processor.h" #include "opentelemetry/sdk/trace/tracer_provider.h" diff --git a/examples/plugin/load/main.cc b/examples/plugin/load/main.cc index 393c5a57ea..41a04baa48 100644 --- a/examples/plugin/load/main.cc +++ b/examples/plugin/load/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/plugin/dynamic_load.h" #include diff --git a/examples/plugin/plugin/factory_impl.cc b/examples/plugin/plugin/factory_impl.cc index 86579940a5..59effb739e 100644 --- a/examples/plugin/plugin/factory_impl.cc +++ b/examples/plugin/plugin/factory_impl.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/plugin/factory.h" #include "opentelemetry/plugin/hook.h" #include "tracer.h" diff --git a/examples/plugin/plugin/tracer.cc b/examples/plugin/plugin/tracer.cc index 17cb76e704..541f2a8225 100644 --- a/examples/plugin/plugin/tracer.cc +++ b/examples/plugin/plugin/tracer.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "tracer.h" #include "opentelemetry/nostd/unique_ptr.h" diff --git a/examples/plugin/plugin/tracer.h b/examples/plugin/plugin/tracer.h index 0af97928f5..af2a4c5e92 100644 --- a/examples/plugin/plugin/tracer.h +++ b/examples/plugin/plugin/tracer.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/examples/simple/foo_library/foo_library.cc b/examples/simple/foo_library/foo_library.cc index 73077f135e..b1df37a84c 100644 --- a/examples/simple/foo_library/foo_library.cc +++ b/examples/simple/foo_library/foo_library.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/trace/provider.h" namespace trace = opentelemetry::trace; diff --git a/examples/simple/foo_library/foo_library.h b/examples/simple/foo_library/foo_library.h index 7ac75c0e50..daebb2603f 100644 --- a/examples/simple/foo_library/foo_library.h +++ b/examples/simple/foo_library/foo_library.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once void foo_library(); diff --git a/examples/simple/main.cc b/examples/simple/main.cc index 28d9196dd6..3d7102d009 100644 --- a/examples/simple/main.cc +++ b/examples/simple/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/simple_processor.h" #include "opentelemetry/sdk/trace/tracer_provider.h" #include "opentelemetry/trace/provider.h" diff --git a/examples/zpages/zpages_example.cc b/examples/zpages/zpages_example.cc index 43fb9cd806..a4f0e6bbf0 100644 --- a/examples/zpages/zpages_example.cc +++ b/examples/zpages/zpages_example.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + /** * This is a basic example for zpages that helps users get familiar with how to * use this feature in OpenTelemetery diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h index 9e0c895fa3..5656ec4f13 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h +++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h index aa4836335e..7dc96ba2bd 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h +++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/elasticsearch/src/es_log_exporter.cc b/exporters/elasticsearch/src/es_log_exporter.cc index 785a5b40c2..c4805d3d94 100644 --- a/exporters/elasticsearch/src/es_log_exporter.cc +++ b/exporters/elasticsearch/src/es_log_exporter.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/exporters/elasticsearch/es_log_exporter.h" #include "opentelemetry/exporters/elasticsearch/es_log_recordable.h" diff --git a/exporters/elasticsearch/test/es_log_exporter_test.cc b/exporters/elasticsearch/test/es_log_exporter_test.cc index 787b5ce4d7..9424232631 100644 --- a/exporters/elasticsearch/test/es_log_exporter_test.cc +++ b/exporters/elasticsearch/test/es_log_exporter_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/elasticsearch/es_log_exporter.h" #include "opentelemetry/ext/http/server/http_server.h" #include "opentelemetry/logs/provider.h" diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_fields.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_fields.h index 301f25a7a2..addf3bcba0 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_fields.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_fields.h @@ -1,4 +1,5 @@ -/* Copyright 2020-2021, OpenTelemetry Authors +/* // Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h index 387fcd7a61..3f7ac3464c 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once #include "opentelemetry/version.h" diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h index b377c88374..616f088187 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h @@ -1,4 +1,5 @@ -// Copyright 2020-2021, OpenTelemetry Authors +// // Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h index 8be2381bd7..4a6b191735 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h @@ -1,16 +1,6 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h index 45c54a68d7..3a85d8b27c 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once #include diff --git a/exporters/etw/include/opentelemetry/exporters/etw/utils.h b/exporters/etw/include/opentelemetry/exporters/etw/utils.h index 4e9f431ac4..f1f2898954 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/utils.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/utils.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/etw/include/opentelemetry/exporters/etw/uuid.h b/exporters/etw/include/opentelemetry/exporters/etw/uuid.h index dc9fac0e40..ca1a58ac94 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/uuid.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/uuid.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/etw/test/etw_perf_test.cc b/exporters/etw/test/etw_perf_test.cc index cdc5c88e1d..f2d28c094b 100644 --- a/exporters/etw/test/etw_perf_test.cc +++ b/exporters/etw/test/etw_perf_test.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #ifdef _WIN32 diff --git a/exporters/etw/test/etw_provider_test.cc b/exporters/etw/test/etw_provider_test.cc index 24faf8e51e..433630270f 100644 --- a/exporters/etw/test/etw_provider_test.cc +++ b/exporters/etw/test/etw_provider_test.cc @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #ifdef _WIN32 diff --git a/exporters/etw/test/etw_tracer_test.cc b/exporters/etw/test/etw_tracer_test.cc index 9bef0cf68a..2f25a85bdb 100644 --- a/exporters/etw/test/etw_tracer_test.cc +++ b/exporters/etw/test/etw_tracer_test.cc @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #ifdef _WIN32 diff --git a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h index 48b9274695..4e046ad7d1 100644 --- a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h +++ b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/jaeger/include/opentelemetry/exporters/jaeger/recordable.h b/exporters/jaeger/include/opentelemetry/exporters/jaeger/recordable.h index 27b7e3a7af..10da9360a5 100644 --- a/exporters/jaeger/include/opentelemetry/exporters/jaeger/recordable.h +++ b/exporters/jaeger/include/opentelemetry/exporters/jaeger/recordable.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/jaeger/src/TUDPTransport.cc b/exporters/jaeger/src/TUDPTransport.cc index 1be2207024..123ba66d96 100644 --- a/exporters/jaeger/src/TUDPTransport.cc +++ b/exporters/jaeger/src/TUDPTransport.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "TUDPTransport.h" diff --git a/exporters/jaeger/src/TUDPTransport.h b/exporters/jaeger/src/TUDPTransport.h index 59d45fd1dc..df3151d110 100644 --- a/exporters/jaeger/src/TUDPTransport.h +++ b/exporters/jaeger/src/TUDPTransport.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/jaeger/src/jaeger_exporter.cc b/exporters/jaeger/src/jaeger_exporter.cc index 8937e5d58d..7770e5c299 100644 --- a/exporters/jaeger/src/jaeger_exporter.cc +++ b/exporters/jaeger/src/jaeger_exporter.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include #include diff --git a/exporters/jaeger/src/recordable.cc b/exporters/jaeger/src/recordable.cc index 3a493e4ef1..10ae117948 100644 --- a/exporters/jaeger/src/recordable.cc +++ b/exporters/jaeger/src/recordable.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include diff --git a/exporters/jaeger/src/sender.h b/exporters/jaeger/src/sender.h index 1189f5cb30..9a42e251c6 100644 --- a/exporters/jaeger/src/sender.h +++ b/exporters/jaeger/src/sender.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/jaeger/src/thrift_sender.cc b/exporters/jaeger/src/thrift_sender.cc index 4021cb4d76..8cca180609 100644 --- a/exporters/jaeger/src/thrift_sender.cc +++ b/exporters/jaeger/src/thrift_sender.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "thrift_sender.h" #include "udp_transport.h" diff --git a/exporters/jaeger/src/thrift_sender.h b/exporters/jaeger/src/thrift_sender.h index 4d503d66db..c6467baf51 100644 --- a/exporters/jaeger/src/thrift_sender.h +++ b/exporters/jaeger/src/thrift_sender.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/jaeger/src/transport.h b/exporters/jaeger/src/transport.h index 377893ffb3..a507d5b4a3 100644 --- a/exporters/jaeger/src/transport.h +++ b/exporters/jaeger/src/transport.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/jaeger/src/udp_transport.cc b/exporters/jaeger/src/udp_transport.cc index 14e2cc9e16..82624ae313 100644 --- a/exporters/jaeger/src/udp_transport.cc +++ b/exporters/jaeger/src/udp_transport.cc @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "udp_transport.h" diff --git a/exporters/jaeger/src/udp_transport.h b/exporters/jaeger/src/udp_transport.h index 3b40f182e8..96411e0681 100644 --- a/exporters/jaeger/src/udp_transport.h +++ b/exporters/jaeger/src/udp_transport.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/jaeger/test/jaeger_recordable_test.cc b/exporters/jaeger/test/jaeger_recordable_test.cc index 792a1bc3f5..5fd2400b18 100644 --- a/exporters/jaeger/test/jaeger_recordable_test.cc +++ b/exporters/jaeger/test/jaeger_recordable_test.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/exporters/jaeger/recordable.h" #include "opentelemetry/sdk/trace/simple_processor.h" diff --git a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h index d2c9ca3271..df6d377b9d 100644 --- a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h +++ b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/common/circular_buffer.h" diff --git a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h index 6e36aadf0c..94e9e7f929 100644 --- a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h +++ b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/exporters/memory/in_memory_span_data.h" #include "opentelemetry/sdk/trace/exporter.h" diff --git a/exporters/memory/test/in_memory_span_data_test.cc b/exporters/memory/test/in_memory_span_data_test.cc index 2b68d18515..bc19550264 100644 --- a/exporters/memory/test/in_memory_span_data_test.cc +++ b/exporters/memory/test/in_memory_span_data_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/memory/in_memory_span_data.h" #include "opentelemetry/nostd/span.h" #include "opentelemetry/sdk/trace/span_data.h" diff --git a/exporters/memory/test/in_memory_span_exporter_test.cc b/exporters/memory/test/in_memory_span_exporter_test.cc index ba94be27dc..56a0ef7790 100644 --- a/exporters/memory/test/in_memory_span_exporter_test.cc +++ b/exporters/memory/test/in_memory_span_exporter_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/memory/in_memory_span_exporter.h" #include "opentelemetry/nostd/span.h" #include "opentelemetry/sdk/trace/span_data.h" diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/log_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/log_exporter.h index 62ca699991..4ef7858126 100644 --- a/exporters/ostream/include/opentelemetry/exporters/ostream/log_exporter.h +++ b/exporters/ostream/include/opentelemetry/exporters/ostream/log_exporter.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/metrics_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/metrics_exporter.h index 630ab4268b..469382b6bd 100644 --- a/exporters/ostream/include/opentelemetry/exporters/ostream/metrics_exporter.h +++ b/exporters/ostream/include/opentelemetry/exporters/ostream/metrics_exporter.h @@ -1,5 +1,8 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +#pragma once #ifdef ENABLE_METRICS_PREVIEW -# pragma once # include # include diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h index eeed9a6fd4..2224e828a6 100644 --- a/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h +++ b/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/type_traits.h" diff --git a/exporters/ostream/src/log_exporter.cc b/exporters/ostream/src/log_exporter.cc index 790614fa23..150b66c49b 100644 --- a/exporters/ostream/src/log_exporter.cc +++ b/exporters/ostream/src/log_exporter.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/exporters/ostream/log_exporter.h" diff --git a/exporters/ostream/src/metrics_exporter.cc b/exporters/ostream/src/metrics_exporter.cc index 943ec3c98f..c310b7c856 100644 --- a/exporters/ostream/src/metrics_exporter.cc +++ b/exporters/ostream/src/metrics_exporter.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/exporters/ostream/metrics_exporter.h" diff --git a/exporters/ostream/src/span_exporter.cc b/exporters/ostream/src/span_exporter.cc index 8d989d7632..98eb86bdda 100644 --- a/exporters/ostream/src/span_exporter.cc +++ b/exporters/ostream/src/span_exporter.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/ostream/span_exporter.h" #include diff --git a/exporters/ostream/test/ostream_capture.h b/exporters/ostream/test/ostream_capture.h index 28aac5e8d4..6c61c7152d 100644 --- a/exporters/ostream/test/ostream_capture.h +++ b/exporters/ostream/test/ostream_capture.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/exporters/ostream/test/ostream_log_test.cc b/exporters/ostream/test/ostream_log_test.cc index 9eb77bec12..c7fd647935 100644 --- a/exporters/ostream/test/ostream_log_test.cc +++ b/exporters/ostream/test/ostream_log_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #include "opentelemetry/exporters/ostream/log_exporter.h" #include "opentelemetry/logs/provider.h" diff --git a/exporters/ostream/test/ostream_metrics_test.cc b/exporters/ostream/test/ostream_metrics_test.cc index 53b58401a6..d86a41b382 100644 --- a/exporters/ostream/test/ostream_metrics_test.cc +++ b/exporters/ostream/test/ostream_metrics_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #ifdef ENABLE_METRICS_PREVIEW diff --git a/exporters/ostream/test/ostream_span_test.cc b/exporters/ostream/test/ostream_span_test.cc index 6c7a7a1e89..b4b387ed50 100644 --- a/exporters/ostream/test/ostream_span_test.cc +++ b/exporters/ostream/test/ostream_span_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/common/key_value_iterable_view.h" #include "opentelemetry/sdk/trace/recordable.h" #include "opentelemetry/sdk/trace/simple_processor.h" diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_exporter.h index 5be228a78f..edf3b59003 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_exporter.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_exporter.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h index 8b3051860d..b5b73e36d8 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h index 55b32748f6..d3947999cc 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + // This file may be include multiple times, do not add #pragma once here #if defined(_MSC_VER) diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h index f2757cc870..26e7a2913e 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + // This file may be include multiple times, do not add #pragma once here #if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__) diff --git a/exporters/otlp/src/otlp_exporter.cc b/exporters/otlp/src/otlp_exporter.cc index 2c9dc74f43..995c2ba146 100644 --- a/exporters/otlp/src/otlp_exporter.cc +++ b/exporters/otlp/src/otlp_exporter.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/otlp/otlp_exporter.h" #include "opentelemetry/exporters/otlp/otlp_recordable.h" diff --git a/exporters/otlp/src/otlp_recordable.cc b/exporters/otlp/src/otlp_recordable.cc index b3b26246d2..907ff3bc60 100644 --- a/exporters/otlp/src/otlp_recordable.cc +++ b/exporters/otlp/src/otlp_recordable.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/otlp/otlp_recordable.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/exporters/otlp/test/otlp_exporter_benchmark.cc b/exporters/otlp/test/otlp_exporter_benchmark.cc index b20149f21d..6eee6dac83 100644 --- a/exporters/otlp/test/otlp_exporter_benchmark.cc +++ b/exporters/otlp/test/otlp_exporter_benchmark.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/otlp/otlp_exporter.h" #include "opentelemetry/exporters/otlp/otlp_recordable.h" diff --git a/exporters/otlp/test/otlp_exporter_test.cc b/exporters/otlp/test/otlp_exporter_test.cc index ecc89de5f6..b9fe53b9ad 100644 --- a/exporters/otlp/test/otlp_exporter_test.cc +++ b/exporters/otlp/test/otlp_exporter_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifndef HAVE_CPP_STDLIB // Unfortunately as of 04/27/2021 the fix is NOT in the vcpkg snapshot of Google Test. // Remove above `#ifdef` once the GMock fix for C++20 is in the mainline. diff --git a/exporters/otlp/test/otlp_recordable_test.cc b/exporters/otlp/test/otlp_recordable_test.cc index be373434ac..f6e0858a8a 100644 --- a/exporters/otlp/test/otlp_recordable_test.cc +++ b/exporters/otlp/test/otlp_recordable_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/otlp/otlp_recordable.h" #include diff --git a/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_collector.h b/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_collector.h index ebf1e2d548..e1e6e74f4e 100644 --- a/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_collector.h +++ b/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_collector.h @@ -1,18 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_exporter_utils.h b/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_exporter_utils.h index cf7636d431..30793725b4 100644 --- a/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_exporter_utils.h +++ b/exporters/prometheus/include/opentelemetry/exporters/prometheus/prometheus_exporter_utils.h @@ -1,18 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/exporters/prometheus/src/prometheus_collector.cc b/exporters/prometheus/src/prometheus_collector.cc index 23e727f2ab..ca0daced3c 100644 --- a/exporters/prometheus/src/prometheus_collector.cc +++ b/exporters/prometheus/src/prometheus_collector.cc @@ -1,18 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include diff --git a/exporters/prometheus/src/prometheus_exporter_utils.cc b/exporters/prometheus/src/prometheus_exporter_utils.cc index 303153499c..846b6faff2 100644 --- a/exporters/prometheus/src/prometheus_exporter_utils.cc +++ b/exporters/prometheus/src/prometheus_exporter_utils.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #ifdef ENABLE_METRICS_PREVIEW # include diff --git a/exporters/prometheus/test/prometheus_collector_test.cc b/exporters/prometheus/test/prometheus_collector_test.cc index 8270bb3a2d..662fbf4f3e 100644 --- a/exporters/prometheus/test/prometheus_collector_test.cc +++ b/exporters/prometheus/test/prometheus_collector_test.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #ifdef ENABLE_METRICS_PREVIEW # include diff --git a/exporters/prometheus/test/prometheus_exporter_utils_test.cc b/exporters/prometheus/test/prometheus_exporter_utils_test.cc index e6725d81cd..d48cb0f16b 100644 --- a/exporters/prometheus/test/prometheus_exporter_utils_test.cc +++ b/exporters/prometheus/test/prometheus_exporter_utils_test.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #ifdef ENABLE_METRICS_PREVIEW # include diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h index edfc85686c..7d51b3b694 100644 --- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h +++ b/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h index 63fdb31685..a69eaf9caf 100644 --- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h +++ b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/exporters/zipkin/src/recordable.cc b/exporters/zipkin/src/recordable.cc index 6999bb21e3..b440b4491f 100644 --- a/exporters/zipkin/src/recordable.cc +++ b/exporters/zipkin/src/recordable.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/exporters/zipkin/recordable.h" diff --git a/exporters/zipkin/src/zipkin_exporter.cc b/exporters/zipkin/src/zipkin_exporter.cc index acef753ef7..717f9e7c97 100644 --- a/exporters/zipkin/src/zipkin_exporter.cc +++ b/exporters/zipkin/src/zipkin_exporter.cc @@ -1,18 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/zipkin/zipkin_exporter.h" #include "opentelemetry/exporters/zipkin/recordable.h" #include "opentelemetry/ext/http/client/http_client_factory.h" diff --git a/exporters/zipkin/test/zipkin_recordable_test.cc b/exporters/zipkin/test/zipkin_recordable_test.cc index fc445bb15e..51ba1024b6 100644 --- a/exporters/zipkin/test/zipkin_recordable_test.cc +++ b/exporters/zipkin/test/zipkin_recordable_test.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/trace/recordable.h" #include "opentelemetry/sdk/trace/simple_processor.h" diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h index ad27ce4dea..ffdb10985a 100644 --- a/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h +++ b/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "http_operation_curl.h" diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h index 24bbe2057b..9aafbbf27c 100644 --- a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h +++ b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "http_client_curl.h" diff --git a/ext/include/opentelemetry/ext/http/client/http_client.h b/ext/include/opentelemetry/ext/http/client/http_client.h index 682030e532..88938dcda5 100644 --- a/ext/include/opentelemetry/ext/http/client/http_client.h +++ b/ext/include/opentelemetry/ext/http/client/http_client.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/http/client/http_client_factory.h b/ext/include/opentelemetry/ext/http/client/http_client_factory.h index 9ae5b0dd1b..49504d4aac 100644 --- a/ext/include/opentelemetry/ext/http/client/http_client_factory.h +++ b/ext/include/opentelemetry/ext/http/client/http_client_factory.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/ext/http/client/http_client.h" diff --git a/ext/include/opentelemetry/ext/http/common/url_parser.h b/ext/include/opentelemetry/ext/http/common/url_parser.h index bf05f35b9b..491a961756 100644 --- a/ext/include/opentelemetry/ext/http/common/url_parser.h +++ b/ext/include/opentelemetry/ext/http/common/url_parser.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/http/server/file_http_server.h b/ext/include/opentelemetry/ext/http/server/file_http_server.h index b93e545968..cb28d01fa3 100644 --- a/ext/include/opentelemetry/ext/http/server/file_http_server.h +++ b/ext/include/opentelemetry/ext/http/server/file_http_server.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/http/server/http_server.h b/ext/include/opentelemetry/ext/http/server/http_server.h index 672bf95c6a..dec1fd914c 100644 --- a/ext/include/opentelemetry/ext/http/server/http_server.h +++ b/ext/include/opentelemetry/ext/http/server/http_server.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/ext/include/opentelemetry/ext/http/server/socket_tools.h b/ext/include/opentelemetry/ext/http/server/socket_tools.h index 2b31c67e7f..b54d3e55a8 100644 --- a/ext/include/opentelemetry/ext/http/server/socket_tools.h +++ b/ext/include/opentelemetry/ext/http/server/socket_tools.h @@ -1,16 +1,5 @@ -// Copyright 2020, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/latency_boundaries.h b/ext/include/opentelemetry/ext/zpages/latency_boundaries.h index 0548406e18..cc03b169b2 100644 --- a/ext/include/opentelemetry/ext/zpages/latency_boundaries.h +++ b/ext/include/opentelemetry/ext/zpages/latency_boundaries.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/static/tracez_index.h b/ext/include/opentelemetry/ext/zpages/static/tracez_index.h index 86b1fe21c8..c4c5b4933d 100644 --- a/ext/include/opentelemetry/ext/zpages/static/tracez_index.h +++ b/ext/include/opentelemetry/ext/zpages/static/tracez_index.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once const char tracez_index[] = diff --git a/ext/include/opentelemetry/ext/zpages/static/tracez_script.h b/ext/include/opentelemetry/ext/zpages/static/tracez_script.h index 63c9f5de59..b21ceea8ee 100644 --- a/ext/include/opentelemetry/ext/zpages/static/tracez_script.h +++ b/ext/include/opentelemetry/ext/zpages/static/tracez_script.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once const char tracez_script[] = diff --git a/ext/include/opentelemetry/ext/zpages/static/tracez_style.h b/ext/include/opentelemetry/ext/zpages/static/tracez_style.h index 2043dfe5ed..16b83f897e 100644 --- a/ext/include/opentelemetry/ext/zpages/static/tracez_style.h +++ b/ext/include/opentelemetry/ext/zpages/static/tracez_style.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once const char tracez_style[] = diff --git a/ext/include/opentelemetry/ext/zpages/threadsafe_span_data.h b/ext/include/opentelemetry/ext/zpages/threadsafe_span_data.h index e15fbc8703..3b3c9a7ec0 100644 --- a/ext/include/opentelemetry/ext/zpages/threadsafe_span_data.h +++ b/ext/include/opentelemetry/ext/zpages/threadsafe_span_data.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/tracez_data.h b/ext/include/opentelemetry/ext/zpages/tracez_data.h index 1e6696d8ad..4594fbe057 100644 --- a/ext/include/opentelemetry/ext/zpages/tracez_data.h +++ b/ext/include/opentelemetry/ext/zpages/tracez_data.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/tracez_data_aggregator.h b/ext/include/opentelemetry/ext/zpages/tracez_data_aggregator.h index 158c89a4d6..28236b60f5 100644 --- a/ext/include/opentelemetry/ext/zpages/tracez_data_aggregator.h +++ b/ext/include/opentelemetry/ext/zpages/tracez_data_aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/tracez_http_server.h b/ext/include/opentelemetry/ext/zpages/tracez_http_server.h index 9b0717508b..eaa3fac8d3 100644 --- a/ext/include/opentelemetry/ext/zpages/tracez_http_server.h +++ b/ext/include/opentelemetry/ext/zpages/tracez_http_server.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/tracez_processor.h b/ext/include/opentelemetry/ext/zpages/tracez_processor.h index a8f43373d1..5e032c4568 100644 --- a/ext/include/opentelemetry/ext/zpages/tracez_processor.h +++ b/ext/include/opentelemetry/ext/zpages/tracez_processor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/tracez_shared_data.h b/ext/include/opentelemetry/ext/zpages/tracez_shared_data.h index 566698c94d..571661550f 100644 --- a/ext/include/opentelemetry/ext/zpages/tracez_shared_data.h +++ b/ext/include/opentelemetry/ext/zpages/tracez_shared_data.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/zpages.h b/ext/include/opentelemetry/ext/zpages/zpages.h index b1e3606277..f0242d92d7 100644 --- a/ext/include/opentelemetry/ext/zpages/zpages.h +++ b/ext/include/opentelemetry/ext/zpages/zpages.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/include/opentelemetry/ext/zpages/zpages_http_server.h b/ext/include/opentelemetry/ext/zpages/zpages_http_server.h index 9438baf199..abf6c1a5b4 100644 --- a/ext/include/opentelemetry/ext/zpages/zpages_http_server.h +++ b/ext/include/opentelemetry/ext/zpages/zpages_http_server.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc index c65774667d..74ad86ea4b 100644 --- a/ext/src/http/client/curl/http_client_curl.cc +++ b/ext/src/http/client/curl/http_client_curl.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/http/client/curl/http_client_curl.h" bool opentelemetry::ext::http::client::curl::Session::CancelSession() noexcept diff --git a/ext/src/http/client/curl/http_client_factory_curl.cc b/ext/src/http/client/curl/http_client_factory_curl.cc index 1f554276ce..51c90ee0c9 100644 --- a/ext/src/http/client/curl/http_client_factory_curl.cc +++ b/ext/src/http/client/curl/http_client_factory_curl.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/http/client/curl/http_client_curl.h" #include "opentelemetry/ext/http/client/http_client.h" #include "opentelemetry/ext/http/client/http_client_factory.h" diff --git a/ext/src/zpages/tracez_data_aggregator.cc b/ext/src/zpages/tracez_data_aggregator.cc index ca1b32c577..993fc182ce 100644 --- a/ext/src/zpages/tracez_data_aggregator.cc +++ b/ext/src/zpages/tracez_data_aggregator.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/zpages/tracez_data_aggregator.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/ext/src/zpages/tracez_http_server.cc b/ext/src/zpages/tracez_http_server.cc index d44a8939a3..958d1c708c 100644 --- a/ext/src/zpages/tracez_http_server.cc +++ b/ext/src/zpages/tracez_http_server.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/zpages/tracez_http_server.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/ext/src/zpages/tracez_processor.cc b/ext/src/zpages/tracez_processor.cc index e5adef83f1..d6108e1997 100644 --- a/ext/src/zpages/tracez_processor.cc +++ b/ext/src/zpages/tracez_processor.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/zpages/tracez_processor.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/ext/src/zpages/tracez_shared_data.cc b/ext/src/zpages/tracez_shared_data.cc index 66726de5da..4f4e4f5e91 100644 --- a/ext/src/zpages/tracez_shared_data.cc +++ b/ext/src/zpages/tracez_shared_data.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/zpages/tracez_shared_data.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc index 88be5fe535..a0678fd9ab 100644 --- a/ext/test/http/curl_http_test.cc +++ b/ext/test/http/curl_http_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext//http/client/curl//http_client_curl.h" #include "opentelemetry/ext/http/client/http_client_factory.h" #include "opentelemetry/ext/http/server/http_server.h" diff --git a/ext/test/http/url_parser_test.cc b/ext/test/http/url_parser_test.cc index dfc9c3f961..b39a5bf90d 100644 --- a/ext/test/http/url_parser_test.cc +++ b/ext/test/http/url_parser_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/http/common/url_parser.h" #include diff --git a/ext/test/w3c_tracecontext_test/main.cc b/ext/test/w3c_tracecontext_test/main.cc index 7cace577f0..c2c834f317 100644 --- a/ext/test/w3c_tracecontext_test/main.cc +++ b/ext/test/w3c_tracecontext_test/main.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/context/runtime_context.h" #include "opentelemetry/exporters/ostream/span_exporter.h" #include "opentelemetry/ext/http/client/curl/http_client_curl.h" diff --git a/ext/test/zpages/threadsafe_span_data_test.cc b/ext/test/zpages/threadsafe_span_data_test.cc index 73feaf137c..9078203ef3 100644 --- a/ext/test/zpages/threadsafe_span_data_test.cc +++ b/ext/test/zpages/threadsafe_span_data_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/zpages/threadsafe_span_data.h" #include "opentelemetry/nostd/variant.h" #include "opentelemetry/trace/span_id.h" diff --git a/ext/test/zpages/tracez_data_aggregator_test.cc b/ext/test/zpages/tracez_data_aggregator_test.cc index f84058d298..26ae46ecf5 100644 --- a/ext/test/zpages/tracez_data_aggregator_test.cc +++ b/ext/test/zpages/tracez_data_aggregator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/zpages/tracez_data_aggregator.h" #include diff --git a/ext/test/zpages/tracez_processor_test.cc b/ext/test/zpages/tracez_processor_test.cc index 208b67c96a..f96385acda 100644 --- a/ext/test/zpages/tracez_processor_test.cc +++ b/ext/test/zpages/tracez_processor_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/ext/zpages/tracez_processor.h" #include diff --git a/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h b/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h index ed1277cf66..07e19ac0f8 100644 --- a/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h +++ b/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h b/sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h index 32217da220..5945df98c6 100644 --- a/sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h +++ b/sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/common/attribute_utils.h b/sdk/include/opentelemetry/sdk/common/attribute_utils.h index 98521b707b..c1b390672b 100644 --- a/sdk/include/opentelemetry/sdk/common/attribute_utils.h +++ b/sdk/include/opentelemetry/sdk/common/attribute_utils.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/common/circular_buffer.h b/sdk/include/opentelemetry/sdk/common/circular_buffer.h index f0d1bd7331..0040369241 100644 --- a/sdk/include/opentelemetry/sdk/common/circular_buffer.h +++ b/sdk/include/opentelemetry/sdk/common/circular_buffer.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/common/circular_buffer_range.h b/sdk/include/opentelemetry/sdk/common/circular_buffer_range.h index d26026690b..9ef3b66be0 100644 --- a/sdk/include/opentelemetry/sdk/common/circular_buffer_range.h +++ b/sdk/include/opentelemetry/sdk/common/circular_buffer_range.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/common/empty_attributes.h b/sdk/include/opentelemetry/sdk/common/empty_attributes.h index 114b8ef42b..2b88751ffc 100644 --- a/sdk/include/opentelemetry/sdk/common/empty_attributes.h +++ b/sdk/include/opentelemetry/sdk/common/empty_attributes.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/common/exporter_utils.h b/sdk/include/opentelemetry/sdk/common/exporter_utils.h index 35945ed7c1..091f481f9f 100644 --- a/sdk/include/opentelemetry/sdk/common/exporter_utils.h +++ b/sdk/include/opentelemetry/sdk/common/exporter_utils.h @@ -1,18 +1,5 @@ -/* - * Copyright 2021, The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h b/sdk/include/opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h index ce9a89e9eb..20d62eba16 100644 --- a/sdk/include/opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h +++ b/sdk/include/opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_processor.h b/sdk/include/opentelemetry/sdk/logs/batch_log_processor.h index f27bf231fc..4ac55d44a2 100644 --- a/sdk/include/opentelemetry/sdk/logs/batch_log_processor.h +++ b/sdk/include/opentelemetry/sdk/logs/batch_log_processor.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/logs/exporter.h b/sdk/include/opentelemetry/sdk/logs/exporter.h index 7963a66751..fe08f0355a 100644 --- a/sdk/include/opentelemetry/sdk/logs/exporter.h +++ b/sdk/include/opentelemetry/sdk/logs/exporter.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/logs/log_record.h b/sdk/include/opentelemetry/sdk/logs/log_record.h index a41e47523b..a49b7d8138 100644 --- a/sdk/include/opentelemetry/sdk/logs/log_record.h +++ b/sdk/include/opentelemetry/sdk/logs/log_record.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/logs/logger.h b/sdk/include/opentelemetry/sdk/logs/logger.h index 5666d954d2..f972756990 100644 --- a/sdk/include/opentelemetry/sdk/logs/logger.h +++ b/sdk/include/opentelemetry/sdk/logs/logger.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/logs/logger_provider.h b/sdk/include/opentelemetry/sdk/logs/logger_provider.h index 8d085a6176..c2e35edcf1 100644 --- a/sdk/include/opentelemetry/sdk/logs/logger_provider.h +++ b/sdk/include/opentelemetry/sdk/logs/logger_provider.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0/ #pragma once diff --git a/sdk/include/opentelemetry/sdk/logs/processor.h b/sdk/include/opentelemetry/sdk/logs/processor.h index 7e0ab6d366..458632e7fb 100644 --- a/sdk/include/opentelemetry/sdk/logs/processor.h +++ b/sdk/include/opentelemetry/sdk/logs/processor.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/logs/recordable.h b/sdk/include/opentelemetry/sdk/logs/recordable.h index bf305ed3fa..1dba6967b1 100644 --- a/sdk/include/opentelemetry/sdk/logs/recordable.h +++ b/sdk/include/opentelemetry/sdk/logs/recordable.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/common/attribute_value.h" diff --git a/sdk/include/opentelemetry/sdk/logs/simple_log_processor.h b/sdk/include/opentelemetry/sdk/logs/simple_log_processor.h index d387e3c7fc..5a055534ef 100644 --- a/sdk/include/opentelemetry/sdk/logs/simple_log_processor.h +++ b/sdk/include/opentelemetry/sdk/logs/simple_log_processor.h @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h index 7a950fe44c..361b6bd19f 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h index f53a5d600f..aa5e6bed04 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h index 2e2d36d23a..d9853b54a9 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h index 403c2ec1db..c74d057bd1 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h index 191cbf60e6..87372a43a8 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h index db3a8b5e53..42dbfa367c 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h index 4956e9a7b0..27f8c46f9a 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/async_instruments.h b/sdk/include/opentelemetry/sdk/metrics/async_instruments.h index 644ccb937c..bacb4d74c5 100644 --- a/sdk/include/opentelemetry/sdk/metrics/async_instruments.h +++ b/sdk/include/opentelemetry/sdk/metrics/async_instruments.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/controller.h b/sdk/include/opentelemetry/sdk/metrics/controller.h index fc90ce9dd2..8161ffad03 100644 --- a/sdk/include/opentelemetry/sdk/metrics/controller.h +++ b/sdk/include/opentelemetry/sdk/metrics/controller.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/exporter.h b/sdk/include/opentelemetry/sdk/metrics/exporter.h index 1888eb27ac..05e28eda23 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exporter.h +++ b/sdk/include/opentelemetry/sdk/metrics/exporter.h @@ -1,18 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/instrument.h b/sdk/include/opentelemetry/sdk/metrics/instrument.h index 754abfd941..62707e17e7 100644 --- a/sdk/include/opentelemetry/sdk/metrics/instrument.h +++ b/sdk/include/opentelemetry/sdk/metrics/instrument.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/meter.h b/sdk/include/opentelemetry/sdk/metrics/meter.h index 591b6ef0c8..a770584cd3 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h index 9d75613077..59c180bda0 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/processor.h b/sdk/include/opentelemetry/sdk/metrics/processor.h index f60831944c..94822a3e60 100644 --- a/sdk/include/opentelemetry/sdk/metrics/processor.h +++ b/sdk/include/opentelemetry/sdk/metrics/processor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/metrics/instrument.h" diff --git a/sdk/include/opentelemetry/sdk/metrics/record.h b/sdk/include/opentelemetry/sdk/metrics/record.h index bc868169b2..d51349bd05 100644 --- a/sdk/include/opentelemetry/sdk/metrics/record.h +++ b/sdk/include/opentelemetry/sdk/metrics/record.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h index 6a774e3a5f..e97c09aa5e 100644 --- a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h +++ b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/metrics/ungrouped_processor.h b/sdk/include/opentelemetry/sdk/metrics/ungrouped_processor.h index a1bf68d57e..4441015d5b 100644 --- a/sdk/include/opentelemetry/sdk/metrics/ungrouped_processor.h +++ b/sdk/include/opentelemetry/sdk/metrics/ungrouped_processor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/include/opentelemetry/sdk/resource/resource.h b/sdk/include/opentelemetry/sdk/resource/resource.h index 3efecff255..f59077bf70 100644 --- a/sdk/include/opentelemetry/sdk/resource/resource.h +++ b/sdk/include/opentelemetry/sdk/resource/resource.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/common/attribute_utils.h" diff --git a/sdk/include/opentelemetry/sdk/resource/resource_detector.h b/sdk/include/opentelemetry/sdk/resource/resource_detector.h index 76a38d60b7..5f9d904aff 100644 --- a/sdk/include/opentelemetry/sdk/resource/resource_detector.h +++ b/sdk/include/opentelemetry/sdk/resource/resource_detector.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/unique_ptr.h" diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h index 50788b4d65..6b47d993d8 100644 --- a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h +++ b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/common/circular_buffer.h" diff --git a/sdk/include/opentelemetry/sdk/trace/exporter.h b/sdk/include/opentelemetry/sdk/trace/exporter.h index 3605e3c967..5826b5f454 100644 --- a/sdk/include/opentelemetry/sdk/trace/exporter.h +++ b/sdk/include/opentelemetry/sdk/trace/exporter.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/trace/id_generator.h b/sdk/include/opentelemetry/sdk/trace/id_generator.h index ea2ec09725..da17effaeb 100644 --- a/sdk/include/opentelemetry/sdk/trace/id_generator.h +++ b/sdk/include/opentelemetry/sdk/trace/id_generator.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once #include "opentelemetry/trace/span_id.h" diff --git a/sdk/include/opentelemetry/sdk/trace/multi_recordable.h b/sdk/include/opentelemetry/sdk/trace/multi_recordable.h index be04566627..be97dddc9d 100644 --- a/sdk/include/opentelemetry/sdk/trace/multi_recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/multi_recordable.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/common/timestamp.h" diff --git a/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h b/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h index 2e32657bfc..a273710bd7 100644 --- a/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h +++ b/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/trace/processor.h b/sdk/include/opentelemetry/sdk/trace/processor.h index e46cc6ac9c..17ac0e59a0 100644 --- a/sdk/include/opentelemetry/sdk/trace/processor.h +++ b/sdk/include/opentelemetry/sdk/trace/processor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/trace/random_id_generator.h b/sdk/include/opentelemetry/sdk/trace/random_id_generator.h index 70a8b68ed6..908f1b8506 100644 --- a/sdk/include/opentelemetry/sdk/trace/random_id_generator.h +++ b/sdk/include/opentelemetry/sdk/trace/random_id_generator.h @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #pragma once #include "opentelemetry/sdk/trace/id_generator.h" diff --git a/sdk/include/opentelemetry/sdk/trace/recordable.h b/sdk/include/opentelemetry/sdk/trace/recordable.h index 64492b665b..b92a3ff063 100644 --- a/sdk/include/opentelemetry/sdk/trace/recordable.h +++ b/sdk/include/opentelemetry/sdk/trace/recordable.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/common/attribute_value.h" diff --git a/sdk/include/opentelemetry/sdk/trace/sampler.h b/sdk/include/opentelemetry/sdk/trace/sampler.h index d26b33bb97..dd46c3ac6a 100644 --- a/sdk/include/opentelemetry/sdk/trace/sampler.h +++ b/sdk/include/opentelemetry/sdk/trace/sampler.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/common/attribute_value.h" diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h b/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h index 6a8b7f5581..96fb034c5d 100644 --- a/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h +++ b/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/trace/sampler.h" diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/always_on.h b/sdk/include/opentelemetry/sdk/trace/samplers/always_on.h index b717f9bdf7..c2e63eb308 100644 --- a/sdk/include/opentelemetry/sdk/trace/samplers/always_on.h +++ b/sdk/include/opentelemetry/sdk/trace/samplers/always_on.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/trace/sampler.h" diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/parent.h b/sdk/include/opentelemetry/sdk/trace/samplers/parent.h index 2341827854..ad2be2e36e 100644 --- a/sdk/include/opentelemetry/sdk/trace/samplers/parent.h +++ b/sdk/include/opentelemetry/sdk/trace/samplers/parent.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/common/atomic_shared_ptr.h" diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h b/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h index 624316be1e..52670249e1 100644 --- a/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h +++ b/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/trace/sampler.h" diff --git a/sdk/include/opentelemetry/sdk/trace/simple_processor.h b/sdk/include/opentelemetry/sdk/trace/simple_processor.h index ac4148d576..accc685965 100644 --- a/sdk/include/opentelemetry/sdk/trace/simple_processor.h +++ b/sdk/include/opentelemetry/sdk/trace/simple_processor.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/trace/span_data.h b/sdk/include/opentelemetry/sdk/trace/span_data.h index fafd6ce315..6a6d823e51 100644 --- a/sdk/include/opentelemetry/sdk/trace/span_data.h +++ b/sdk/include/opentelemetry/sdk/trace/span_data.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/trace/tracer.h b/sdk/include/opentelemetry/sdk/trace/tracer.h index ce1f60370f..4b6c1de796 100644 --- a/sdk/include/opentelemetry/sdk/trace/tracer.h +++ b/sdk/include/opentelemetry/sdk/trace/tracer.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/common/atomic_shared_ptr.h" diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_context.h b/sdk/include/opentelemetry/sdk/trace/tracer_context.h index 0a953b8aa4..e4d968d2b0 100644 --- a/sdk/include/opentelemetry/sdk/trace/tracer_context.h +++ b/sdk/include/opentelemetry/sdk/trace/tracer_context.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/sdk/common/atomic_unique_ptr.h" diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_provider.h b/sdk/include/opentelemetry/sdk/trace/tracer_provider.h index feb191f1e9..bd131704d5 100644 --- a/sdk/include/opentelemetry/sdk/trace/tracer_provider.h +++ b/sdk/include/opentelemetry/sdk/trace/tracer_provider.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h index e7a8eb3051..5d69af7bda 100644 --- a/sdk/include/opentelemetry/sdk/version/version.h +++ b/sdk/include/opentelemetry/sdk/version/version.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/detail/preprocessor.h" diff --git a/sdk/src/common/core.cc b/sdk/src/common/core.cc index c5025c2c95..bebec2585d 100644 --- a/sdk/src/common/core.cc +++ b/sdk/src/common/core.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + // clang-format off // version.h should be included before nostd/variant.h. #include "opentelemetry/version.h" diff --git a/sdk/src/common/fast_random_number_generator.h b/sdk/src/common/fast_random_number_generator.h index 72bc46c1b9..9887f2f3b3 100644 --- a/sdk/src/common/fast_random_number_generator.h +++ b/sdk/src/common/fast_random_number_generator.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/src/common/platform/fork.h b/sdk/src/common/platform/fork.h index bac528b684..b1a0e9d779 100644 --- a/sdk/src/common/platform/fork.h +++ b/sdk/src/common/platform/fork.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/version.h" diff --git a/sdk/src/common/platform/fork_unix.cc b/sdk/src/common/platform/fork_unix.cc index ac7a3e0410..cfbd8ab778 100644 --- a/sdk/src/common/platform/fork_unix.cc +++ b/sdk/src/common/platform/fork_unix.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "src/common/platform/fork.h" #include diff --git a/sdk/src/common/platform/fork_windows.cc b/sdk/src/common/platform/fork_windows.cc index 1eb0bb712c..9d9f2bf791 100644 --- a/sdk/src/common/platform/fork_windows.cc +++ b/sdk/src/common/platform/fork_windows.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "src/common/platform/fork.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/src/common/random.cc b/sdk/src/common/random.cc index 9133092f05..77b88cfa2a 100644 --- a/sdk/src/common/random.cc +++ b/sdk/src/common/random.cc @@ -1,3 +1,7 @@ + +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "src/common/random.h" #include "src/common/platform/fork.h" diff --git a/sdk/src/common/random.h b/sdk/src/common/random.h index 948c24f2b1..ecd6dabc1e 100644 --- a/sdk/src/common/random.h +++ b/sdk/src/common/random.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include "opentelemetry/nostd/span.h" diff --git a/sdk/src/logs/batch_log_processor.cc b/sdk/src/logs/batch_log_processor.cc index 1d6bc26d3a..477adc0e3d 100644 --- a/sdk/src/logs/batch_log_processor.cc +++ b/sdk/src/logs/batch_log_processor.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/logs/batch_log_processor.h" diff --git a/sdk/src/logs/logger.cc b/sdk/src/logs/logger.cc index b4dfefb983..d08e30368b 100644 --- a/sdk/src/logs/logger.cc +++ b/sdk/src/logs/logger.cc @@ -1,18 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/logs/logger.h" #include "opentelemetry/sdk/logs/log_record.h" #include "opentelemetry/trace/provider.h" diff --git a/sdk/src/logs/logger_provider.cc b/sdk/src/logs/logger_provider.cc index 6c978c3472..beab4e3139 100644 --- a/sdk/src/logs/logger_provider.cc +++ b/sdk/src/logs/logger_provider.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/logs/logger_provider.h" diff --git a/sdk/src/logs/simple_log_processor.cc b/sdk/src/logs/simple_log_processor.cc index 0cc776ecd0..73224be8a5 100644 --- a/sdk/src/logs/simple_log_processor.cc +++ b/sdk/src/logs/simple_log_processor.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/logs/simple_log_processor.h" diff --git a/sdk/src/metrics/meter.cc b/sdk/src/metrics/meter.cc index 636a0880ef..13e73cbc9e 100644 --- a/sdk/src/metrics/meter.cc +++ b/sdk/src/metrics/meter.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/meter.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc index 7da48c36b1..903ba76e06 100644 --- a/sdk/src/metrics/meter_provider.cc +++ b/sdk/src/metrics/meter_provider.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/meter_provider.h" diff --git a/sdk/src/metrics/ungrouped_processor.cc b/sdk/src/metrics/ungrouped_processor.cc index 414ed28cdb..c36cac2ca5 100644 --- a/sdk/src/metrics/ungrouped_processor.cc +++ b/sdk/src/metrics/ungrouped_processor.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/ungrouped_processor.h" diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc index 40354b5b5d..e7f055b101 100644 --- a/sdk/src/resource/resource.cc +++ b/sdk/src/resource/resource.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/nostd/span.h" #include "opentelemetry/sdk/resource/resource_detector.h" diff --git a/sdk/src/resource/resource_detector.cc b/sdk/src/resource/resource_detector.cc index 435640252e..586de79738 100644 --- a/sdk/src/resource/resource_detector.cc +++ b/sdk/src/resource/resource_detector.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/resource/resource_detector.h" #include #include "opentelemetry/sdk/resource/resource.h" diff --git a/sdk/src/trace/batch_span_processor.cc b/sdk/src/trace/batch_span_processor.cc index 40e82360a4..4b8d6353e0 100644 --- a/sdk/src/trace/batch_span_processor.cc +++ b/sdk/src/trace/batch_span_processor.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/batch_span_processor.h" #include diff --git a/sdk/src/trace/random_id_generator.cc b/sdk/src/trace/random_id_generator.cc index 431f183ef6..78bc2a4117 100644 --- a/sdk/src/trace/random_id_generator.cc +++ b/sdk/src/trace/random_id_generator.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/trace/random_id_generator.h" #include "opentelemetry/version.h" diff --git a/sdk/src/trace/samplers/parent.cc b/sdk/src/trace/samplers/parent.cc index 212a29e3c4..599798ca3c 100644 --- a/sdk/src/trace/samplers/parent.cc +++ b/sdk/src/trace/samplers/parent.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/samplers/parent.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/src/trace/span.cc b/sdk/src/trace/span.cc index 32eba9cbec..35d8658d7c 100644 --- a/sdk/src/trace/span.cc +++ b/sdk/src/trace/span.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "src/trace/span.h" #include "src/common/random.h" diff --git a/sdk/src/trace/span.h b/sdk/src/trace/span.h index b0c674d98a..f57023c20a 100644 --- a/sdk/src/trace/span.h +++ b/sdk/src/trace/span.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/src/trace/tracer.cc b/sdk/src/trace/tracer.cc index 3cbc978576..149684bc8e 100644 --- a/sdk/src/trace/tracer.cc +++ b/sdk/src/trace/tracer.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/tracer.h" #include "opentelemetry/context/runtime_context.h" #include "opentelemetry/nostd/shared_ptr.h" diff --git a/sdk/src/trace/tracer_context.cc b/sdk/src/trace/tracer_context.cc index 96cb4a5fc9..196cecd6a0 100644 --- a/sdk/src/trace/tracer_context.cc +++ b/sdk/src/trace/tracer_context.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/tracer_context.h" #include "opentelemetry/sdk/trace/multi_span_processor.h" diff --git a/sdk/src/trace/tracer_provider.cc b/sdk/src/trace/tracer_provider.cc index 25b0eb6747..13b41d73b6 100644 --- a/sdk/src/trace/tracer_provider.cc +++ b/sdk/src/trace/tracer_provider.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/tracer_provider.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/sdk/test/common/atomic_unique_ptr_test.cc b/sdk/test/common/atomic_unique_ptr_test.cc index c55bc19a88..aa6d88a005 100644 --- a/sdk/test/common/atomic_unique_ptr_test.cc +++ b/sdk/test/common/atomic_unique_ptr_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/common/atomic_unique_ptr.h" #include diff --git a/sdk/test/common/attribute_utils_test.cc b/sdk/test/common/attribute_utils_test.cc index 178af01823..1499a03e78 100644 --- a/sdk/test/common/attribute_utils_test.cc +++ b/sdk/test/common/attribute_utils_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/common/attribute_utils.h" #include diff --git a/sdk/test/common/baseline_circular_buffer.h b/sdk/test/common/baseline_circular_buffer.h index 4c77990844..398a4d0385 100644 --- a/sdk/test/common/baseline_circular_buffer.h +++ b/sdk/test/common/baseline_circular_buffer.h @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #pragma once #include diff --git a/sdk/test/common/circular_buffer_benchmark.cc b/sdk/test/common/circular_buffer_benchmark.cc index 7308893361..1f2b9b42cf 100644 --- a/sdk/test/common/circular_buffer_benchmark.cc +++ b/sdk/test/common/circular_buffer_benchmark.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "benchmark/benchmark.h" #include diff --git a/sdk/test/common/circular_buffer_range_test.cc b/sdk/test/common/circular_buffer_range_test.cc index f40178409b..5852704687 100644 --- a/sdk/test/common/circular_buffer_range_test.cc +++ b/sdk/test/common/circular_buffer_range_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/common/circular_buffer_range.h" #include diff --git a/sdk/test/common/circular_buffer_test.cc b/sdk/test/common/circular_buffer_test.cc index 4d993920fd..259a884c21 100644 --- a/sdk/test/common/circular_buffer_test.cc +++ b/sdk/test/common/circular_buffer_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/common/circular_buffer.h" #include diff --git a/sdk/test/common/empty_attributes_test.cc b/sdk/test/common/empty_attributes_test.cc index 8fdae04053..f37ea0a5c4 100644 --- a/sdk/test/common/empty_attributes_test.cc +++ b/sdk/test/common/empty_attributes_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/common/empty_attributes.h" #include diff --git a/sdk/test/common/fast_random_number_generator_test.cc b/sdk/test/common/fast_random_number_generator_test.cc index f6e2ab6eb0..e9209fdb6b 100644 --- a/sdk/test/common/fast_random_number_generator_test.cc +++ b/sdk/test/common/fast_random_number_generator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "src/common/random.h" #include diff --git a/sdk/test/common/random_benchmark.cc b/sdk/test/common/random_benchmark.cc index 9b3da93a2d..df2ebf95ec 100644 --- a/sdk/test/common/random_benchmark.cc +++ b/sdk/test/common/random_benchmark.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "src/common/random.h" #include diff --git a/sdk/test/common/random_fork_test.cc b/sdk/test/common/random_fork_test.cc index 3ffed988bd..2db8b9fcdf 100644 --- a/sdk/test/common/random_fork_test.cc +++ b/sdk/test/common/random_fork_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef __unix__ // Verifies that IDs don't clash after forking the process. // diff --git a/sdk/test/common/random_test.cc b/sdk/test/common/random_test.cc index 850e289fff..35cfd4a1ee 100644 --- a/sdk/test/common/random_test.cc +++ b/sdk/test/common/random_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "src/common/random.h" #include diff --git a/sdk/test/instrumentationlibrary/instrumentationlibrary_test.cc b/sdk/test/instrumentationlibrary/instrumentationlibrary_test.cc index a27ac0718f..d21f113580 100644 --- a/sdk/test/instrumentationlibrary/instrumentationlibrary_test.cc +++ b/sdk/test/instrumentationlibrary/instrumentationlibrary_test.cc @@ -1,16 +1,5 @@ -// Copyright 2021, OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/nostd/string_view.h" #include "opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h" diff --git a/sdk/test/logs/batch_log_processor_test.cc b/sdk/test/logs/batch_log_processor_test.cc index 7c9c769422..65ead5601d 100644 --- a/sdk/test/logs/batch_log_processor_test.cc +++ b/sdk/test/logs/batch_log_processor_test.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/logs/batch_log_processor.h" #include "opentelemetry/sdk/logs/exporter.h" diff --git a/sdk/test/logs/log_record_test.cc b/sdk/test/logs/log_record_test.cc index fc4307223c..f93176517a 100644 --- a/sdk/test/logs/log_record_test.cc +++ b/sdk/test/logs/log_record_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/logs/log_record.h" #include "opentelemetry/nostd/variant.h" #include "opentelemetry/trace/span_id.h" diff --git a/sdk/test/logs/logger_provider_sdk_test.cc b/sdk/test/logs/logger_provider_sdk_test.cc index 7db4d27f3a..fbcb20125c 100644 --- a/sdk/test/logs/logger_provider_sdk_test.cc +++ b/sdk/test/logs/logger_provider_sdk_test.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include #include "opentelemetry/logs/provider.h" diff --git a/sdk/test/logs/logger_sdk_test.cc b/sdk/test/logs/logger_sdk_test.cc index 669ae2fbc0..a635840850 100644 --- a/sdk/test/logs/logger_sdk_test.cc +++ b/sdk/test/logs/logger_sdk_test.cc @@ -1,18 +1,5 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #include "opentelemetry/sdk/logs/log_record.h" #include "opentelemetry/sdk/logs/logger.h" diff --git a/sdk/test/logs/simple_log_processor_test.cc b/sdk/test/logs/simple_log_processor_test.cc index 2791cd22d8..d87aabbf0e 100644 --- a/sdk/test/logs/simple_log_processor_test.cc +++ b/sdk/test/logs/simple_log_processor_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/logs/simple_log_processor.h" #include "opentelemetry/nostd/span.h" #include "opentelemetry/sdk/logs/exporter.h" diff --git a/sdk/test/metrics/controller_test.cc b/sdk/test/metrics/controller_test.cc index 51749bb7df..b90f1d1bcc 100644 --- a/sdk/test/metrics/controller_test.cc +++ b/sdk/test/metrics/controller_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/controller.h" # include "opentelemetry/sdk/metrics/meter.h" diff --git a/sdk/test/metrics/counter_aggregator_test.cc b/sdk/test/metrics/counter_aggregator_test.cc index 188faa2843..fe3ab7e036 100644 --- a/sdk/test/metrics/counter_aggregator_test.cc +++ b/sdk/test/metrics/counter_aggregator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/aggregator/counter_aggregator.h" diff --git a/sdk/test/metrics/exact_aggregator_test.cc b/sdk/test/metrics/exact_aggregator_test.cc index ee31fda1a3..88ce1a4432 100644 --- a/sdk/test/metrics/exact_aggregator_test.cc +++ b/sdk/test/metrics/exact_aggregator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #ifdef ENABLE_METRICS_PREVIEW diff --git a/sdk/test/metrics/gauge_aggregator_test.cc b/sdk/test/metrics/gauge_aggregator_test.cc index 7d0438cbe7..b2721b8b51 100644 --- a/sdk/test/metrics/gauge_aggregator_test.cc +++ b/sdk/test/metrics/gauge_aggregator_test.cc @@ -1,3 +1,5 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 #ifdef ENABLE_METRICS_PREVIEW # include diff --git a/sdk/test/metrics/histogram_aggregator_test.cc b/sdk/test/metrics/histogram_aggregator_test.cc index 74961d9890..eec00e8360 100644 --- a/sdk/test/metrics/histogram_aggregator_test.cc +++ b/sdk/test/metrics/histogram_aggregator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h" diff --git a/sdk/test/metrics/meter_provider_sdk_test.cc b/sdk/test/metrics/meter_provider_sdk_test.cc index 54a545a96a..459fbabd8f 100644 --- a/sdk/test/metrics/meter_provider_sdk_test.cc +++ b/sdk/test/metrics/meter_provider_sdk_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc index d980050afa..3c708fca92 100644 --- a/sdk/test/metrics/meter_test.cc +++ b/sdk/test/metrics/meter_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include # include diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 741a3d819d..461d3603f7 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include # include diff --git a/sdk/test/metrics/min_max_sum_count_aggregator_test.cc b/sdk/test/metrics/min_max_sum_count_aggregator_test.cc index 638147e856..62b2b6763d 100644 --- a/sdk/test/metrics/min_max_sum_count_aggregator_test.cc +++ b/sdk/test/metrics/min_max_sum_count_aggregator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include # include diff --git a/sdk/test/metrics/sketch_aggregator_test.cc b/sdk/test/metrics/sketch_aggregator_test.cc index 47c080236c..c17900e0a6 100644 --- a/sdk/test/metrics/sketch_aggregator_test.cc +++ b/sdk/test/metrics/sketch_aggregator_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h" diff --git a/sdk/test/metrics/ungrouped_processor_test.cc b/sdk/test/metrics/ungrouped_processor_test.cc index 2c8a368b91..6bfbd0cde3 100644 --- a/sdk/test/metrics/ungrouped_processor_test.cc +++ b/sdk/test/metrics/ungrouped_processor_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #ifdef ENABLE_METRICS_PREVIEW # include "opentelemetry/sdk/metrics/ungrouped_processor.h" # include diff --git a/sdk/test/resource/resource_test.cc b/sdk/test/resource/resource_test.cc index 1f58ee2f9c..f938c0abdf 100644 --- a/sdk/test/resource/resource_test.cc +++ b/sdk/test/resource/resource_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/common/key_value_iterable_view.h" #include "opentelemetry/nostd/string_view.h" diff --git a/sdk/test/trace/always_off_sampler_test.cc b/sdk/test/trace/always_off_sampler_test.cc index 6fea04906d..5a51549626 100644 --- a/sdk/test/trace/always_off_sampler_test.cc +++ b/sdk/test/trace/always_off_sampler_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #include "opentelemetry/sdk/trace/samplers/always_off.h" #include "opentelemetry/trace/span_context_kv_iterable_view.h" diff --git a/sdk/test/trace/always_on_sampler_test.cc b/sdk/test/trace/always_on_sampler_test.cc index 9adb5258a5..28ad4cfdfc 100644 --- a/sdk/test/trace/always_on_sampler_test.cc +++ b/sdk/test/trace/always_on_sampler_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/nostd/span.h" #include "opentelemetry/sdk/trace/samplers/always_on.h" #include "opentelemetry/trace/span_context_kv_iterable_view.h" diff --git a/sdk/test/trace/batch_span_processor_test.cc b/sdk/test/trace/batch_span_processor_test.cc index 0f3cd7ed1b..72a742a68b 100644 --- a/sdk/test/trace/batch_span_processor_test.cc +++ b/sdk/test/trace/batch_span_processor_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/batch_span_processor.h" #include "opentelemetry/sdk/trace/span_data.h" #include "opentelemetry/sdk/trace/tracer.h" diff --git a/sdk/test/trace/parent_sampler_test.cc b/sdk/test/trace/parent_sampler_test.cc index 692a1bf92d..5f2c8cdd91 100644 --- a/sdk/test/trace/parent_sampler_test.cc +++ b/sdk/test/trace/parent_sampler_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include #include #include "opentelemetry/sdk/trace/samplers/always_off.h" diff --git a/sdk/test/trace/sampler_benchmark.cc b/sdk/test/trace/sampler_benchmark.cc index 6cfe67d1f7..b09cb5b0cd 100644 --- a/sdk/test/trace/sampler_benchmark.cc +++ b/sdk/test/trace/sampler_benchmark.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/exporters/memory/in_memory_span_exporter.h" #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/sdk/trace/sampler.h" diff --git a/sdk/test/trace/simple_processor_test.cc b/sdk/test/trace/simple_processor_test.cc index 4b92ebfd0e..9398b922a5 100644 --- a/sdk/test/trace/simple_processor_test.cc +++ b/sdk/test/trace/simple_processor_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/simple_processor.h" #include "opentelemetry/exporters/memory/in_memory_span_exporter.h" #include "opentelemetry/nostd/span.h" diff --git a/sdk/test/trace/span_data_test.cc b/sdk/test/trace/span_data_test.cc index 2ae870b7ea..5d9dcbb5f7 100644 --- a/sdk/test/trace/span_data_test.cc +++ b/sdk/test/trace/span_data_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/span_data.h" #include "opentelemetry/nostd/variant.h" #include "opentelemetry/trace/span.h" diff --git a/sdk/test/trace/trace_id_ratio_sampler_test.cc b/sdk/test/trace/trace_id_ratio_sampler_test.cc index 4c2c270022..610c0bd9e7 100644 --- a/sdk/test/trace/trace_id_ratio_sampler_test.cc +++ b/sdk/test/trace/trace_id_ratio_sampler_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/samplers/trace_id_ratio.h" #include "opentelemetry/trace/span_context_kv_iterable_view.h" #include "src/common/random.h" diff --git a/sdk/test/trace/tracer_provider_test.cc b/sdk/test/trace/tracer_provider_test.cc index 4943346269..444b416a39 100644 --- a/sdk/test/trace/tracer_provider_test.cc +++ b/sdk/test/trace/tracer_provider_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/tracer_provider.h" #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/sdk/trace/samplers/always_off.h" diff --git a/sdk/test/trace/tracer_test.cc b/sdk/test/trace/tracer_test.cc index bf912744ea..0c5cc397d8 100644 --- a/sdk/test/trace/tracer_test.cc +++ b/sdk/test/trace/tracer_test.cc @@ -1,3 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + #include "opentelemetry/sdk/trace/tracer.h" #include "opentelemetry/exporters/memory/in_memory_span_exporter.h" #include "opentelemetry/sdk/resource/resource.h" From 2b080c1a4c8d95aea617686d7f3444413ae4f552 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 25 May 2021 13:30:43 +0530 Subject: [PATCH 4/4] Return Scope object instead of unique_ptr from Tracer::WithActiveSpan() (#788) --- api/include/opentelemetry/trace/tracer.h | 5 +- api/test/trace/tracer_test.cc | 25 +-- .../opentelemetry/exporters/etw/etw_tracer.h | 16 -- exporters/etw/test/etw_tracer_test.cc | 144 +++++++++++------- 4 files changed, 100 insertions(+), 90 deletions(-) diff --git a/api/include/opentelemetry/trace/tracer.h b/api/include/opentelemetry/trace/tracer.h index 7fe53139d1..57761e5f90 100644 --- a/api/include/opentelemetry/trace/tracer.h +++ b/api/include/opentelemetry/trace/tracer.h @@ -143,10 +143,7 @@ class Tracer * @param span the span that should be set as the new active span. * @return a Scope that controls how long the span will be active. */ - static nostd::unique_ptr WithActiveSpan(nostd::shared_ptr &span) noexcept - { - return nostd::unique_ptr(new Scope{span}); - } + static Scope WithActiveSpan(nostd::shared_ptr &span) noexcept { return Scope{span}; } /** * Get the currently active span. diff --git a/api/test/trace/tracer_test.cc b/api/test/trace/tracer_test.cc index 62777232a2..8e16f15e25 100644 --- a/api/test/trace/tracer_test.cc +++ b/api/test/trace/tracer_test.cc @@ -20,19 +20,20 @@ TEST(TracerTest, GetCurrentSpan) auto current = tracer->GetCurrentSpan(); ASSERT_FALSE(current->GetContext().IsValid()); - auto scope_first = tracer->WithActiveSpan(span_first); - current = tracer->GetCurrentSpan(); - ASSERT_EQ(current, span_first); + { + auto scope_first = tracer->WithActiveSpan(span_first); + current = tracer->GetCurrentSpan(); + ASSERT_EQ(current, span_first); + + { + auto scope_second = tracer->WithActiveSpan(span_second); + current = tracer->GetCurrentSpan(); + ASSERT_EQ(current, span_second); + } + current = tracer->GetCurrentSpan(); + ASSERT_EQ(current, span_first); + } - auto scope_second = tracer->WithActiveSpan(span_second); - current = tracer->GetCurrentSpan(); - ASSERT_EQ(current, span_second); - - scope_second.reset(nullptr); - current = tracer->GetCurrentSpan(); - ASSERT_EQ(current, span_first); - - scope_first.reset(nullptr); current = tracer->GetCurrentSpan(); ASSERT_FALSE(current->GetContext().IsValid()); } diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h index 4a6b191735..7cf6edea24 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h @@ -477,22 +477,12 @@ class Tracer : public trace::Tracer UpdateStatus(currentSpan, evt); etwProvider().write(provHandle, evt, ActivityIdPtr, RelatedActivityIdPtr, 0, encoding); } - - { - // Atomically remove the span from list of spans - const std::lock_guard lock(scopes_mutex_); - auto spanId = ToLowerBase16(spanBase.GetContext().span_id()); - scopes_.erase(spanId); - } }; const trace::TraceId &trace_id() { return traceId_; }; friend class Span; - std::mutex scopes_mutex_; // protects scopes_ - std::map> scopes_; - /** * @brief Init a reference to etw::ProviderHandle * @return Provider Handle @@ -648,12 +638,6 @@ class Tracer : public trace::Tracer etwProvider().write(provHandle, evt, ActivityIdPtr, RelatedActivityIdPtr, 1, encoding); }; - { - const std::lock_guard lock(scopes_mutex_); - // Use span_id as index - scopes_[ToLowerBase16(result->GetContext().span_id())] = WithActiveSpan(result); - } - return result; }; diff --git a/exporters/etw/test/etw_tracer_test.cc b/exporters/etw/test/etw_tracer_test.cc index 2f25a85bdb..45acd4f705 100644 --- a/exporters/etw/test/etw_tracer_test.cc +++ b/exporters/etw/test/etw_tracer_test.cc @@ -57,55 +57,62 @@ TEST(ETWTracer, TracerCheck) {"attrib1", 1}, {"attrib2", 2} }; + { + auto topSpan = tracer->StartSpan("MySpanTop"); + auto topScope = tracer->WithActiveSpan(topSpan); + std::this_thread::sleep_for (std::chrono::seconds(1)); + { + auto outerSpan = tracer->StartSpan("MySpanL2", attribs); + auto outerScope = tracer->WithActiveSpan(outerSpan); - auto topSpan = tracer->StartSpan("MySpanTop"); - std::this_thread::sleep_for (std::chrono::seconds(1)); - - auto outerSpan = tracer->StartSpan("MySpanL2", attribs); - - // Create nested span. Note how we share the attributes here. - // It is Okay to either reuse/share or have your own attributes. - auto innerSpan = tracer->StartSpan("MySpanL3", attribs); + // Create nested span. Note how we share the attributes here. + // It is Okay to either reuse/share or have your own attributes. + { + auto innerSpan = tracer->StartSpan("MySpanL3", attribs); + auto innerScope = tracer->WithActiveSpan(innerSpan); - // Add first event - std::string eventName1 = "MyEvent1"; - Properties event1 = - { - {"uint32Key", (uint32_t)1234}, - {"uint64Key", (uint64_t)1234567890}, - {"strKey", "someValue"} - }; - EXPECT_NO_THROW(outerSpan->AddEvent(eventName1, event1)); - std::this_thread::sleep_for (std::chrono::seconds(1)); + // Add first event + std::string eventName1 = "MyEvent1"; + Properties event1 = + { + {"uint32Key", (uint32_t)1234}, + {"uint64Key", (uint64_t)1234567890}, + {"strKey", "someValue"} + }; + EXPECT_NO_THROW(outerSpan->AddEvent(eventName1, event1)); + std::this_thread::sleep_for (std::chrono::seconds(1)); - // Add second event - std::string eventName2 = "MyEvent2"; - Properties event2 = - { - {"uint32Key", (uint32_t)9876}, - {"uint64Key", (uint64_t)987654321}, - {"strKey", "anotherValue"} - }; - EXPECT_NO_THROW(outerSpan->AddEvent(eventName2, event2)); - std::this_thread::sleep_for (std::chrono::seconds(2)); + // Add second event + std::string eventName2 = "MyEvent2"; + Properties event2 = + { + {"uint32Key", (uint32_t)9876}, + {"uint64Key", (uint64_t)987654321}, + {"strKey", "anotherValue"} + }; + EXPECT_NO_THROW(outerSpan->AddEvent(eventName2, event2)); + std::this_thread::sleep_for (std::chrono::seconds(2)); - std::string eventName3= "MyEvent3"; - Properties event3 = - { - /* Extra metadata that allows event to flow to A.I. pipeline */ - {"metadata", "ai_event"}, - {"uint32Key", (uint32_t)9876}, - {"uint64Key", (uint64_t)987654321}, - // {"int32array", {{-1,0,1,2,3}} }, - {"tempString", getTemporaryValue() } - }; - EXPECT_NO_THROW(innerSpan->AddEvent(eventName3, event3)); - std::this_thread::sleep_for (std::chrono::seconds(1)); + std::string eventName3= "MyEvent3"; + Properties event3 = + { + /* Extra metadata that allows event to flow to A.I. pipeline */ + {"metadata", "ai_event"}, + {"uint32Key", (uint32_t)9876}, + {"uint64Key", (uint64_t)987654321}, + // {"int32array", {{-1,0,1,2,3}} }, + {"tempString", getTemporaryValue() } + }; + EXPECT_NO_THROW(innerSpan->AddEvent(eventName3, event3)); + std::this_thread::sleep_for (std::chrono::seconds(1)); + EXPECT_NO_THROW(innerSpan->End()); - EXPECT_NO_THROW(innerSpan->End()); // end innerSpan + } + EXPECT_NO_THROW(outerSpan->End()); - EXPECT_NO_THROW(outerSpan->End()); // end outerSpan - EXPECT_NO_THROW(topSpan->End()); // end topSpan + } + EXPECT_NO_THROW(topSpan->End()); + } EXPECT_NO_THROW(tracer->CloseWithMicroseconds(0)); } @@ -141,12 +148,21 @@ TEST(ETWTracer, TracerCheckMinDecoration) {"enableAutoParent", false} }); auto tracer = tp.GetTracer(providerName, "TLD"); - auto aSpan = tracer->StartSpan("A.min"); - auto bSpan = tracer->StartSpan("B.min"); - auto cSpan = tracer->StartSpan("C.min"); - cSpan->End(); - bSpan->End(); - aSpan->End(); + { + auto aSpan = tracer->StartSpan("A.min"); + auto aScope = tracer->WithActiveSpan(aSpan); + { + auto bSpan = tracer->StartSpan("B.min"); + auto bScope = tracer->WithActiveSpan(bSpan); + { + auto cSpan = tracer->StartSpan("C.min"); + auto cScope = tracer->WithActiveSpan(cSpan); + EXPECT_NO_THROW(cSpan->End()); + } + EXPECT_NO_THROW(bSpan->End()); + } + EXPECT_NO_THROW(aSpan->End()); +} tracer->CloseWithMicroseconds(0); } @@ -183,12 +199,21 @@ TEST(ETWTracer, TracerCheckMaxDecoration) {"enableAutoParent", true} }); auto tracer = tp.GetTracer(providerName, "TLD" ); - auto aSpan = tracer->StartSpan("A.max"); - auto bSpan = tracer->StartSpan("B.max"); - auto cSpan = tracer->StartSpan("C.max"); - cSpan->End(); - bSpan->End(); - aSpan->End(); + { + auto aSpan = tracer->StartSpan("A.max"); + auto aScope = tracer->WithActiveSpan(aSpan); + { + auto bSpan = tracer->StartSpan("B.max"); + auto bScope = tracer->WithActiveSpan(bSpan); + { + auto cSpan = tracer->StartSpan("C.max"); + auto cScope = tracer->WithActiveSpan(cSpan); + EXPECT_NO_THROW(cSpan->End()); + } + EXPECT_NO_THROW(bSpan->End()); + } + EXPECT_NO_THROW(aSpan->End()); + } tracer->CloseWithMicroseconds(0); } @@ -206,10 +231,13 @@ TEST(ETWTracer, TracerCheckMsgPack) auto tracer = tp.GetTracer(providerName, "MsgPack" ); { auto aSpan = tracer->StartSpan("A.max"); + auto aScope = tracer->WithActiveSpan(aSpan); { auto bSpan = tracer->StartSpan("B.max"); + auto bScope = tracer->WithActiveSpan(bSpan); { auto cSpan = tracer->StartSpan("C.max"); + auto cScope = tracer->WithActiveSpan(cSpan); std::string eventName = "MyMsgPackEvent"; Properties event = { @@ -218,11 +246,11 @@ TEST(ETWTracer, TracerCheckMsgPack) {"strKey", "someValue"} }; cSpan->AddEvent(eventName, event); - cSpan->End(); + EXPECT_NO_THROW(cSpan->End()); } - bSpan->End(); + EXPECT_NO_THROW(bSpan->End()); } - aSpan->End(); + EXPECT_NO_THROW(aSpan->End()); } tracer->CloseWithMicroseconds(0); }