Merge branch 'main' into feat/otlp-exporter--base-fetch-transport

Author: SacDeNoeuds

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 
 For API changes, see the [API CHANGELOG](api/CHANGELOG.md).
 For experimental package changes, see the [experimental CHANGELOG](experimental/CHANGELOG.md).
-For semantic convention package changes, see the [semconv CHANGELOG](packages/semantic-conventions/CHANGELOG.md).
+For semantic convention package changes, see the [semconv CHANGELOG](semantic-conventions/CHANGELOG.md).
 For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2.x.md).
 
 ## Unreleased

doc/contributing/dependencies.md

@@ -11,7 +11,7 @@ This section refers to `"dependencies"` and `"devDependencies"` entries in `pack
 **Example:** `^1.2.3` might inadvertently lead to version `1.2.6` which includes unintended breaking changes).
 
 > [!NOTE]
-> As this approach might leave our project with outdated tooling, we adopt `renovate-bot`. This automated dependency update tool proactively opens pull requests upon the release of new patch/minor/major versions. The complete configuration for renovate-bot can be found in [renovate.json](../renovate.json) file.
+> As this approach might leave our project with outdated tooling, we adopt `renovate-bot`. This automated dependency update tool proactively opens pull requests upon the release of new patch/minor/major versions. The complete configuration for renovate-bot can be found in [renovate.json](../../renovate.json) file.
 
 ## @opentelemetry/* dependencies
 

experimental/CHANGELOG.md

@@ -18,6 +18,8 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 
 ### :house: Internal
 
+* chore(sdk-logs): refactored imports [#5801](https://github.com/open-telemetry/opentelemetry-js/pull/5801) @svetlanabrennan
+
 ## 0.203.0
 
 ### :boom: Breaking Changes

experimental/packages/sdk-logs/src/LogRecordImpl.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { AttributeValue, diag } from '@opentelemetry/api';
 import type * as logsAPI from '@opentelemetry/api-logs';
 import * as api from '@opentelemetry/api';
 import {
@@ -26,7 +25,6 @@ import type { Resource } from '@opentelemetry/resources';
 
 import type { ReadableLogRecord } from './export/ReadableLogRecord';
 import type { LogRecordLimits } from './types';
-import { AnyValue, LogAttributes, LogBody } from '@opentelemetry/api-logs';
 import { LoggerProviderSharedState } from './internal/LoggerProviderSharedState';
 
 export class LogRecordImpl implements ReadableLogRecord {
@@ -38,7 +36,7 @@ export class LogRecordImpl implements ReadableLogRecord {
   readonly attributes: logsAPI.LogAttributes = {};
   private _severityText?: string;
   private _severityNumber?: logsAPI.SeverityNumber;
-  private _body?: LogBody;
+  private _body?: logsAPI.LogBody;
   private _eventName?: string;
   private totalAttributesCount: number = 0;
 
@@ -65,13 +63,13 @@ export class LogRecordImpl implements ReadableLogRecord {
     return this._severityNumber;
   }
 
-  set body(body: LogBody | undefined) {
+  set body(body: logsAPI.LogBody | undefined) {
     if (this._isLogRecordReadonly()) {
       return;
     }
     this._body = body;
   }
-  get body(): LogBody | undefined {
+  get body(): logsAPI.LogBody | undefined {
     return this._body;
   }
 
@@ -125,7 +123,7 @@ export class LogRecordImpl implements ReadableLogRecord {
     this.setAttributes(attributes);
   }
 
-  public setAttribute(key: string, value?: AnyValue) {
+  public setAttribute(key: string, value?: logsAPI.AnyValue) {
     if (this._isLogRecordReadonly()) {
       return this;
     }
@@ -167,14 +165,14 @@ export class LogRecordImpl implements ReadableLogRecord {
     return this;
   }
 
-  public setAttributes(attributes: LogAttributes) {
+  public setAttributes(attributes: logsAPI.LogAttributes) {
     for (const [k, v] of Object.entries(attributes)) {
       this.setAttribute(k, v);
     }
     return this;
   }
 
-  public setBody(body: LogBody) {
+  public setBody(body: logsAPI.LogBody) {
     this.body = body;
     return this;
   }
@@ -203,7 +201,7 @@ export class LogRecordImpl implements ReadableLogRecord {
     this._isReadonly = true;
   }
 
-  private _truncateToSize(value: AttributeValue): AttributeValue {
+  private _truncateToSize(value: api.AttributeValue): api.AttributeValue {
     const limit = this._logRecordLimits.attributeValueLengthLimit;
     // Check limit
     if (limit <= 0) {
@@ -237,7 +235,7 @@ export class LogRecordImpl implements ReadableLogRecord {
 
   private _isLogRecordReadonly(): boolean {
     if (this._isReadonly) {
-      diag.warn('Can not execute the operation on emitted log record');
+      api.diag.warn('Can not execute the operation on emitted log record');
     }
     return this._isReadonly;
   }

experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-import { ExportResult, getNumberFromEnv } from '@opentelemetry/core';
 import { diag } from '@opentelemetry/api';
 import {
+  ExportResult,
   ExportResultCode,
+  getNumberFromEnv,
   globalErrorHandler,
   unrefTimer,
   BindOnceFuture,

experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts

@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-import { ExportResult, hrTimeToMicroseconds } from '@opentelemetry/core';
-import { ExportResultCode } from '@opentelemetry/core';
+import {
+  ExportResultCode,
+  ExportResult,
+  hrTimeToMicroseconds,
+} from '@opentelemetry/core';
 
 import type { ReadableLogRecord } from './ReadableLogRecord';
 import type { LogRecordExporter } from './LogRecordExporter';