Merge branch 'main' into fix/doc_comment_api

Author: marcalff

.github/workflows/ci.yml

@@ -62,6 +62,7 @@ jobs:
     runs-on: ubuntu-24.04
     env:
       CXX_STANDARD: '17'
+      BUILD_TYPE: 'Debug'
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -75,6 +76,10 @@ jobs:
         sudo -E ./ci/setup_ci_environment.sh
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_googletest.sh
+    - name: Install abseil, protobuf, and grpc with apt
+      run: |
+        sudo -E apt-get update
+        sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
     - name: run fetch content cmake test
       run: |
         ./ci/do_ci.sh cmake.fetch_content.test

CHANGELOG.md

@@ -15,6 +15,9 @@ Increment the:
 
 ## [Unreleased]
 
+* [BUILD] Error out when building DLL without MSVC
+  [#3438](https://github.com/open-telemetry/opentelemetry-cpp/pull/3438)
+
 * [Metrics SDK] Use nostd::function_ref in AttributesHashMap
   [#3393](https://github.com/open-telemetry/opentelemetry-cpp/pull/3393)
 
@@ -55,6 +58,37 @@ Increment the:
 * [CMAKE] Add generated protobuf headers to the opentelemetry_proto target
   [#3400](https://github.com/open-telemetry/opentelemetry-cpp/pull/3400)
 
+* [CMAKE] Remove include_directories usage and rely on target properties
+  [#3426](https://github.com/open-telemetry/opentelemetry-cpp/pull/3426)
+
+* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.34.0
+  [#3428](https://github.com/open-telemetry/opentelemetry-cpp/pull/3428)
+
+* [EXPORTER] ostream log exporter, fixed memory ownership issues
+  [#3417](https://github.com/open-telemetry/opentelemetry-cpp/pull/3417)
+
+* [TEST] Test all components in a CMake super build
+  [#3433](https://github.com/open-telemetry/opentelemetry-cpp/pull/3433)
+
+Important changes:
+
+* [EXPORTER] ostream log exporter, fixed memory ownership issues
+  [#3417](https://github.com/open-telemetry/opentelemetry-cpp/pull/3417)
+
+  * In the SDK, the following classes implementation has changed:
+
+    * opentelemetry::sdk::logs::ReadableLogRecord
+    * opentelemetry::sdk::logs::ReadWriteLogRecord
+
+  * An application implementing a custom log record exporter,
+    that reuses these classes from the opentelemetry-cpp SDK,
+    will need code adjustments, in particular for methods:
+
+    * GetBody()
+    * GetAttributes()
+
+  * Applications not using these SDK classes directly are not affected.
+
 ## [1.20 2025-04-01]
 
 * [BUILD] Update opentelemetry-proto version

CMakeLists.txt

@@ -867,8 +867,6 @@ if(DEFINED OPENTELEMETRY_BUILD_DLL)
   add_definitions(-DOPENTELEMETRY_BUILD_EXPORT_DLL)
 endif()
 
-include_directories(api/include)
-
 add_subdirectory(api)
 
 if(WITH_OPENTRACING)
@@ -901,9 +899,6 @@ endif()
 
 if(NOT WITH_API_ONLY)
   set(BUILD_TESTING ${BUILD_TESTING})
-  include_directories(sdk/include)
-  include_directories(sdk)
-  include_directories(ext/include)
 
   add_subdirectory(sdk)
   add_subdirectory(ext)

api/include/opentelemetry/semconv/exception_attributes.h

@@ -24,7 +24,7 @@ namespace exception
  *
  * @deprecated
  * {"note": "It's no longer recommended to record exceptions that are handled and do not escape the
- * scope of a span.", "reason": "uncategorized"}
+ * scope of a span.\n", "reason": "obsoleted"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped";
 

api/include/opentelemetry/semconv/incubating/aws_attributes.h

@@ -19,6 +19,21 @@ namespace semconv
 namespace aws
 {
 
+/**
+ * The unique identifier of the AWS Bedrock Guardrail. A <a
+ * href="https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails.html">guardrail</a> helps
+ * safeguard and prevent unwanted behavior from model responses or user messages.
+ */
+static constexpr const char *kAwsBedrockGuardrailId = "aws.bedrock.guardrail.id";
+
+/**
+ * The unique identifier of the AWS Bedrock Knowledge base. A <a
+ * href="https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base.html">knowledge
+ * base</a> is a bank of information that can be queried by models to generate more relevant
+ * responses and augment prompts.
+ */
+static constexpr const char *kAwsBedrockKnowledgeBaseId = "aws.bedrock.knowledge_base.id";
+
 /**
  * The JSON-serialized value of each item in the @code AttributeDefinitions @endcode request field.
  */
@@ -191,6 +206,15 @@ static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
  */
 static constexpr const char *kAwsExtendedRequestId = "aws.extended_request_id";
 
+/**
+ * The name of the AWS Kinesis <a
+ * href="https://docs.aws.amazon.com/streams/latest/dev/introduction.html">stream</a> the request
+ * refers to. Corresponds to the @code --stream-name @endcode parameter of the Kinesis <a
+ * href="https://docs.aws.amazon.com/cli/latest/reference/kinesis/describe-stream.html">describe-stream</a>
+ * operation.
+ */
+static constexpr const char *kAwsKinesisStreamName = "aws.kinesis.stream_name";
+
 /**
  * The full invoked ARN as provided on the @code Context @endcode passed to the function (@code
  * Lambda-Runtime-Invoked-Function-Arn @endcode header on the @code /runtime/invocation/next
@@ -199,6 +223,17 @@ static constexpr const char *kAwsExtendedRequestId = "aws.extended_request_id";
  */
 static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn";
 
+/**
+ * The UUID of the <a
+ * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html">AWS
+ * Lambda EvenSource Mapping</a>. An event source is mapped to a lambda function. It's contents are
+ * read by Lambda and used to trigger a function. This isn't available in the lambda execution
+ * context or the lambda runtime environtment. This is going to be populated by the AWS SDK for each
+ * language when that UUID is present. Some of these operations are Create/Delete/Get/List/Update
+ * EventSourceMapping.
+ */
+static constexpr const char *kAwsLambdaResourceMappingId = "aws.lambda.resource_mapping.id";
+
 /**
  * The Amazon Resource Name(s) (ARN) of the AWS log group(s).
  * <p>
@@ -342,6 +377,35 @@ static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
  */
 static constexpr const char *kAwsS3UploadId = "aws.s3.upload_id";
 
+/**
+ * The ARN of the Secret stored in the Secrets Mangger
+ */
+static constexpr const char *kAwsSecretsmanagerSecretArn = "aws.secretsmanager.secret.arn";
+
+/**
+ * The ARN of the AWS SNS Topic. An Amazon SNS <a
+ * href="https://docs.aws.amazon.com/sns/latest/dg/sns-create-topic.html">topic</a> is a logical
+ * access point that acts as a communication channel.
+ */
+static constexpr const char *kAwsSnsTopicArn = "aws.sns.topic.arn";
+
+/**
+ * The URL of the AWS SQS Queue. It's a unique identifier for a queue in Amazon Simple Queue Service
+ * (SQS) and is used to access the queue and perform actions on it.
+ */
+static constexpr const char *kAwsSqsQueueUrl = "aws.sqs.queue.url";
+
+/**
+ * The ARN of the AWS Step Functions Activity.
+ */
+static constexpr const char *kAwsStepFunctionsActivityArn = "aws.step_functions.activity.arn";
+
+/**
+ * The ARN of the AWS Step Functions State Machine.
+ */
+static constexpr const char *kAwsStepFunctionsStateMachineArn =
+    "aws.step_functions.state_machine.arn";
+
 namespace AwsEcsLaunchtypeValues
 {
 /**

api/include/opentelemetry/semconv/incubating/cloud_attributes.h

@@ -44,9 +44,10 @@ static constexpr const char *kCloudPlatform = "cloud.platform";
 static constexpr const char *kCloudProvider = "cloud.provider";
 
 /**
- * The geographical region the resource is running.
- * <p>
- * Refer to your provider's docs to see the available regions, for example <a
+ * The geographical region within a cloud provider. When associated with a resource, this attribute
+ * specifies the region where the resource operates. When calling services or APIs deployed on a
+ * cloud, this attribute identifies the region where the called destination is deployed. <p> Refer
+ * to your provider's docs to see the available regions, for example <a
  * href="https://www.alibabacloud.com/help/doc-detail/40654.htm">Alibaba Cloud regions</a>, <a
  * href="https://aws.amazon.com/about-aws/global-infrastructure/regions_az/">AWS regions</a>, <a
  * href="https://azure.microsoft.com/global-infrastructure/geographies/">Azure regions</a>, <a

api/include/opentelemetry/semconv/incubating/code_attributes.h

@@ -23,7 +23,8 @@ namespace code
  * Deprecated, use @code code.column.number @endcode
  *
  * @deprecated
- * {"note": "Replaced by @code code.column.number @endcode", "reason": "uncategorized"}
+ * {"note": "Replaced by @code code.column.number @endcode.", "reason": "renamed", "renamed_to":
+ * "code.column.number"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeColumn = "code.column";
 
@@ -47,15 +48,17 @@ static constexpr const char *kCodeFilePath = "code.file.path";
  * Deprecated, use @code code.file.path @endcode instead
  *
  * @deprecated
- * {"note": "Replaced by @code code.file.path @endcode", "reason": "uncategorized"}
+ * {"note": "Replaced by @code code.file.path @endcode.", "reason": "renamed", "renamed_to":
+ * "code.file.path"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeFilepath = "code.filepath";
 
 /**
  * Deprecated, use @code code.function.name @endcode instead
  *
  * @deprecated
- * {"note": "Replaced by @code code.function.name @endcode", "reason": "uncategorized"}
+ * {"note": "Value should be included in @code code.function.name @endcode which is expected to be a
+ * fully-qualified name.\n", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeFunction = "code.function";
 
@@ -94,7 +97,8 @@ static constexpr const char *kCodeLineNumber = "code.line.number";
  * Deprecated, use @code code.line.number @endcode instead
  *
  * @deprecated
- * {"note": "Replaced by @code code.line.number @endcode", "reason": "uncategorized"}
+ * {"note": "Replaced by @code code.line.number @endcode.", "reason": "renamed", "renamed_to":
+ * "code.line.number"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeLineno = "code.lineno";
 
@@ -103,7 +107,7 @@ OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeLineno = "code.lineno
  *
  * @deprecated
  * {"note": "Value should be included in @code code.function.name @endcode which is expected to be a
- * fully-qualified name.", "reason": "uncategorized"}
+ * fully-qualified name.\n", "reason": "uncategorized"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeNamespace = "code.namespace";
 

api/include/opentelemetry/semconv/incubating/container_attributes.h

@@ -41,7 +41,7 @@ static constexpr const char *kContainerCommandLine = "container.command_line";
  * Deprecated, use @code cpu.mode @endcode instead.
  *
  * @deprecated
- * {"note": "Replaced by @code cpu.mode @endcode", "reason": "uncategorized"}
+ * {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
 
@@ -119,7 +119,8 @@ static constexpr const char *kContainerLabel = "container.label";
  * Deprecated, use @code container.label @endcode instead.
  *
  * @deprecated
- * {"note": "Replaced by @code container.label @endcode.", "reason": "uncategorized"}
+ * {"note": "Replaced by @code container.label @endcode.", "reason": "renamed", "renamed_to":
+ * "container.label"}
  */
 OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerLabels = "container.labels";