wip: move away from experimental

yuzurihaaa · yuzurihaaa · commit d482daee9a91 · 2025-03-18T12:49:23.000+08:00
diff --git a/lib/api.dart b/lib/api.dart
@@ -5,18 +5,15 @@ export 'src/api/common/attribute.dart' show Attribute;
 export 'src/api/common/resource_attributes.dart' show ResourceAttributes;
 export 'src/api/common/semantic_attributes.dart' show SemanticAttributes;
 export 'src/api/context/context.dart'
-    show
-        Context,
-        ContextKey,
-        contextWithSpan,
-        contextWithSpanContext,
-        spanContextFromContext,
-        spanFromContext,
-        zone;
-export 'src/api/context/context_manager.dart'
-    show globalContextManager, registerGlobalContextManager;
+    show Context, ContextKey, contextWithSpan, contextWithSpanContext, spanContextFromContext, spanFromContext, zone;
+export 'src/api/context/context_manager.dart' show globalContextManager, registerGlobalContextManager;
 export 'src/api/exporters/span_exporter.dart' show SpanExporter;
 export 'src/api/instrumentation_library.dart' show InstrumentationLibrary;
+export 'src/api/logs/log_record.dart' show Severity;
+export 'src/api/logs/logger.dart' show Logger;
+export 'src/api/logs/logger_provider.dart' show LoggerProvider;
+export 'src/api/logs/noop/noop_logger.dart' show NoopLogger;
+export 'src/api/logs/noop/noop_logger_provider.dart' show NoopLoggerProvider;
 export 'src/api/open_telemetry.dart'
     show
         globalTextMapPropagator,
@@ -30,8 +27,7 @@ export 'src/api/open_telemetry.dart'
 export 'src/api/propagation/extractors/text_map_getter.dart' show TextMapGetter;
 export 'src/api/propagation/injectors/text_map_setter.dart' show TextMapSetter;
 export 'src/api/propagation/text_map_propagator.dart' show TextMapPropagator;
-export 'src/api/propagation/w3c_trace_context_propagator.dart'
-    show W3CTraceContextPropagator;
+export 'src/api/propagation/w3c_trace_context_propagator.dart' show W3CTraceContextPropagator;
 export 'src/api/span_processors/span_processor.dart' show SpanProcessor;
 export 'src/api/trace/id_generator.dart' show IdGenerator;
 export 'src/api/trace/span.dart' show Span, SpanKind;
diff --git a/lib/sdk.dart b/lib/sdk.dart
@@ -1,30 +1,38 @@
 // Copyright 2021-2022 Workiva.
 // Licensed under the Apache License, Version 2.0. Please see https://github.com/Workiva/opentelemetry-dart/blob/master/LICENSE for more information
 
-export 'src/sdk/instrumentation_library.dart' show InstrumentationLibrary;
 export 'src/sdk/common/attributes.dart' show Attributes;
 export 'src/sdk/common/instrumentation_scope.dart' show InstrumentationScope;
+export 'src/sdk/instrumentation_library.dart' show InstrumentationLibrary;
+export 'src/sdk/logs/export_result.dart' show ExportResult, ExportResultCode;
+export 'src/sdk/logs/exporters/console_log_record_exporter.dart' show ConsoleLogRecordExporter;
+export 'src/sdk/logs/exporters/inmemory_log_record_exporter.dart' show InMemoryLogRecordExporter;
+export 'src/sdk/logs/exporters/log_record_exporter.dart' show LogRecordExporter;
+export 'src/sdk/logs/exporters/otlp_log_exporter.dart' show OTLPLogExporter;
+export 'src/sdk/logs/log_record.dart' show ReadableLogRecord, ReadWriteLogRecord, LogRecord;
+export 'src/sdk/logs/log_record_limit.dart' show LogRecordLimits;
+export 'src/sdk/logs/logger.dart' show Logger;
+export 'src/sdk/logs/logger_provider.dart' show LoggerProvider;
+export 'src/sdk/logs/processors/batch_log_record_processor.dart' show BatchLogRecordProcessor;
+export 'src/sdk/logs/processors/log_record_processor.dart' show LogRecordProcessor;
+export 'src/sdk/logs/processors/noop_log_processor.dart' show NoopLogRecordProcessor;
+export 'src/sdk/logs/processors/simple_log_record_processor.dart' show SimpleLogRecordProcessor;
 export 'src/sdk/resource/resource.dart' show Resource;
-export 'src/sdk/time_providers/datetime_time_provider.dart'
-    show DateTimeTimeProvider;
+export 'src/sdk/time_providers/datetime_time_provider.dart' show DateTimeTimeProvider;
 export 'src/sdk/time_providers/time_provider.dart' show TimeProvider;
-export 'src/sdk/trace/exporters/span_exporter.dart' show SpanExporter;
 export 'src/sdk/trace/exporters/collector_exporter.dart' show CollectorExporter;
 export 'src/sdk/trace/exporters/console_exporter.dart' show ConsoleExporter;
+export 'src/sdk/trace/exporters/span_exporter.dart' show SpanExporter;
 export 'src/sdk/trace/id_generator.dart' show IdGenerator;
+export 'src/sdk/trace/read_only_span.dart' show ReadOnlySpan;
+export 'src/sdk/trace/read_write_span.dart' show ReadWriteSpan;
 export 'src/sdk/trace/sampling/always_off_sampler.dart' show AlwaysOffSampler;
 export 'src/sdk/trace/sampling/always_on_sampler.dart' show AlwaysOnSampler;
-export 'src/sdk/trace/sampling/parent_based_sampler.dart'
-    show ParentBasedSampler;
+export 'src/sdk/trace/sampling/parent_based_sampler.dart' show ParentBasedSampler;
 export 'src/sdk/trace/sampling/sampler.dart' show Sampler;
-export 'src/sdk/trace/sampling/sampling_result.dart'
-    show Decision, SamplingResult;
-export 'src/sdk/trace/read_only_span.dart' show ReadOnlySpan;
-export 'src/sdk/trace/read_write_span.dart' show ReadWriteSpan;
+export 'src/sdk/trace/sampling/sampling_result.dart' show Decision, SamplingResult;
 export 'src/sdk/trace/span_limits.dart' show SpanLimits;
+export 'src/sdk/trace/span_processors/batch_processor.dart' show BatchSpanProcessor;
+export 'src/sdk/trace/span_processors/simple_processor.dart' show SimpleSpanProcessor;
 export 'src/sdk/trace/span_processors/span_processor.dart' show SpanProcessor;
-export 'src/sdk/trace/span_processors/batch_processor.dart'
-    show BatchSpanProcessor;
-export 'src/sdk/trace/span_processors/simple_processor.dart'
-    show SimpleSpanProcessor;
 export 'src/sdk/trace/tracer_provider.dart' show TracerProviderBase;
diff --git a/lib/src/api/context/context.dart b/lib/src/api/context/context.dart
@@ -7,7 +7,7 @@ import 'package:collection/collection.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 
-import '../../../api.dart';
+import '../../../api.dart' hide Logger;
 import '../trace/nonrecording_span.dart' show NonRecordingSpan;
 
 final Logger _log = Logger('opentelemetry');
diff --git a/lib/src/api/open_telemetry.dart b/lib/src/api/open_telemetry.dart
@@ -6,20 +6,19 @@ import 'dart:async';
 import 'package:meta/meta.dart';
 
 import '../../api.dart' as api;
-import '../experimental_api.dart';
 import 'propagation/noop_text_map_propagator.dart';
 import 'trace/noop_tracer_provider.dart';
 
 final api.TracerProvider _noopTracerProvider = NoopTracerProvider();
 final api.TextMapPropagator _noopTextMapPropagator = NoopTextMapPropagator();
-final LoggerProvider _noopLoggerProvider = NoopLoggerProvider();
-LoggerProvider _logProvider = _noopLoggerProvider;
+final api.LoggerProvider _noopLoggerProvider = api.NoopLoggerProvider();
+api.LoggerProvider _logProvider = _noopLoggerProvider;
 api.TracerProvider _tracerProvider = _noopTracerProvider;
 api.TextMapPropagator _textMapPropagator = _noopTextMapPropagator;
 
 api.TracerProvider get globalTracerProvider => _tracerProvider;
 
-LoggerProvider get globalLogProvider => _logProvider;
+api.LoggerProvider get globalLogProvider => _logProvider;
 
 api.TextMapPropagator get globalTextMapPropagator => _textMapPropagator;
 
@@ -33,7 +32,7 @@ void registerGlobalTracerProvider(api.TracerProvider tracerProvider) {
   _tracerProvider = tracerProvider;
 }
 
-void registerGlobalLogProvider(LoggerProvider logProvider) {
+void registerGlobalLogProvider(api.LoggerProvider logProvider) {
   if (_logProvider != _noopLoggerProvider) {
     throw StateError('A global LoggerProvider has already been created. '
         'registerGlobalLoggerProvider must be called only once before any '
diff --git a/lib/src/experimental_api.dart b/lib/src/experimental_api.dart
@@ -10,11 +10,6 @@ export 'api/context/context_manager.dart' show ContextManager;
 export 'api/context/noop_context_manager.dart' show NoopContextManager;
 export 'api/context/zone_context.dart' show ZoneContext;
 export 'api/context/zone_context_manager.dart' show ZoneContextManager;
-export 'api/logs/log_record.dart' show Severity;
-export 'api/logs/logger.dart' show Logger;
-export 'api/logs/logger_provider.dart' show LoggerProvider;
-export 'api/logs/noop/noop_logger.dart' show NoopLogger;
-export 'api/logs/noop/noop_logger_provider.dart' show NoopLoggerProvider;
 export 'api/metrics/counter.dart' show Counter;
 export 'api/metrics/meter.dart' show Meter;
 export 'api/metrics/meter_provider.dart' show MeterProvider;
diff --git a/lib/src/experimental_sdk.dart b/lib/src/experimental_sdk.dart
@@ -6,17 +6,6 @@ library experimental_sdk;
 
 import 'package:meta/meta.dart';
 
-export 'sdk/logs/export_result.dart' show ExportResult, ExportResultCode;
-export 'sdk/logs/exporters/console_log_record_exporter.dart' show ConsoleLogRecordExporter;
-export 'sdk/logs/exporters/inmemory_log_record_exporter.dart' show InMemoryLogRecordExporter;
-export 'sdk/logs/exporters/log_record_exporter.dart' show LogRecordExporter;
-export 'sdk/logs/exporters/otlp_log_exporter.dart' show OTLPLogExporter;
-export 'sdk/logs/log_record.dart' show ReadableLogRecord, ReadWriteLogRecord, LogRecord;
-export 'sdk/logs/log_record_limit.dart' show LogRecordLimits;
-export 'sdk/logs/logger.dart' show Logger;
-export 'sdk/logs/logger_provider.dart' show LoggerProvider;
-export 'sdk/logs/processors/batch_log_record_processor.dart' show BatchLogRecordProcessor;
-export 'sdk/logs/processors/log_record_processor.dart' show LogRecordProcessor;
 export 'sdk/metrics/counter.dart' show Counter;
 export 'sdk/metrics/meter.dart' show Meter;
 export 'sdk/metrics/meter_provider.dart' show MeterProvider;
diff --git a/lib/src/sdk/logs/exporters/console_log_record_exporter.dart b/lib/src/sdk/logs/exporters/console_log_record_exporter.dart
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. Please see https://github.com/Workiva/opentelemetry-dart/blob/master/LICENSE for more information
 
 import 'package:opentelemetry/api.dart' as api;
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
+import 'package:opentelemetry/sdk.dart' as sdk;
 
 /// This is implementation of [sdk.ReadWriteLogRecordExporter] that prints LogRecords to the
 /// console. This class can be used for diagnostic purposes.
diff --git a/lib/src/sdk/logs/exporters/inmemory_log_record_exporter.dart b/lib/src/sdk/logs/exporters/inmemory_log_record_exporter.dart
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. Please see https://github.com/Workiva/opentelemetry-dart/blob/master/LICENSE for more information
 
 import 'package:meta/meta.dart';
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
+import 'package:opentelemetry/sdk.dart' as sdk;
 
 /// This class can be used for testing purposes. It stores the exported LogRecords
 /// in a list in memory that can be retrieved using the `getFinishedLogRecords()`
diff --git a/lib/src/sdk/logs/exporters/log_record_exporter.dart b/lib/src/sdk/logs/exporters/log_record_exporter.dart
@@ -1,7 +1,7 @@
 // Copyright 2021-2022 Workiva.
 // Licensed under the Apache License, Version 2.0. Please see https://github.com/Workiva/opentelemetry-dart/blob/master/LICENSE for more information
 
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
+import 'package:opentelemetry/sdk.dart' as sdk;
 
 abstract class LogRecordExporter {
   Future<sdk.ExportResult> export(List<sdk.ReadableLogRecord> logs);
diff --git a/lib/src/sdk/logs/logger.dart b/lib/src/sdk/logs/logger.dart
@@ -5,8 +5,7 @@ import 'package:meta/meta.dart';
 import 'package:opentelemetry/api.dart' as api;
 import 'package:opentelemetry/sdk.dart' as sdk;
 import 'package:opentelemetry/src/api/context/context.dart';
-import 'package:opentelemetry/src/experimental_api.dart' as api;
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
+import 'package:opentelemetry/api.dart' as api;
 
 class Logger extends api.Logger {
   final sdk.InstrumentationScope instrumentationScope;
diff --git a/lib/src/sdk/logs/logger_provider.dart b/lib/src/sdk/logs/logger_provider.dart
@@ -3,8 +3,6 @@
 
 import 'package:opentelemetry/api.dart' as api;
 import 'package:opentelemetry/sdk.dart' as sdk;
-import 'package:opentelemetry/src/experimental_api.dart' as api;
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
 import 'package:opentelemetry/src/sdk/logs/log_record_limit.dart';
 import 'package:opentelemetry/src/sdk/logs/logger_config.dart';
 import 'package:quiver/core.dart';
diff --git a/lib/src/sdk/logs/processors/batch_log_record_processor.dart b/lib/src/sdk/logs/processors/batch_log_record_processor.dart
@@ -4,7 +4,7 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
+import 'package:opentelemetry/sdk.dart' as sdk;
 
 class BatchLogRecordProcessor extends sdk.LogRecordProcessor {
   static const OTEL_BLRP_MAX_EXPORT_BATCH_SIZE = 512;
diff --git a/lib/src/sdk/logs/processors/log_record_processor.dart b/lib/src/sdk/logs/processors/log_record_processor.dart
@@ -1,7 +1,7 @@
 // Copyright 2021-2022 Workiva.
 // Licensed under the Apache License, Version 2.0. Please see https://github.com/Workiva/opentelemetry-dart/blob/master/LICENSE for more information
 
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
+import 'package:opentelemetry/sdk.dart' as sdk;
 
 /// https://opentelemetry.io/docs/specs/otel/logs/sdk/#logrecordprocessor
 abstract class LogRecordProcessor {
diff --git a/lib/src/sdk/logs/processors/simple_log_record_processor.dart b/lib/src/sdk/logs/processors/simple_log_record_processor.dart
@@ -5,7 +5,7 @@ import 'dart:async';
 
 import 'package:logging/logging.dart' as logging;
 import 'package:meta/meta.dart';
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
+import 'package:opentelemetry/sdk.dart' as sdk;
 
 class SimpleLogRecordProcessor implements sdk.LogRecordProcessor {
   final logger = logging.Logger('opentelemetry.sdk.logs.simplelogrecordprocessor');
diff --git a/test/unit/api/logs/noop/noop_logger_provider_test.dart b/test/unit/api/logs/noop/noop_logger_provider_test.dart
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. Please see https://github.com/Workiva/opentelemetry-dart/blob/master/LICENSE for more information
 
 @TestOn('vm')
-import 'package:opentelemetry/src/experimental_api.dart' as api;
+import 'package:opentelemetry/api.dart' as api;
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/unit/sdk/logs/logger_provider_test.dart b/test/unit/sdk/logs/logger_provider_test.dart
@@ -5,7 +5,6 @@
 import 'package:fixnum/src/int64.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:opentelemetry/sdk.dart' as sdk;
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
 import 'package:opentelemetry/src/sdk/logs/log_record_limit.dart';
 import 'package:test/test.dart';
 
diff --git a/test/unit/sdk/logs/processors/simple_log_record_processor_test.dart b/test/unit/sdk/logs/processors/simple_log_record_processor_test.dart
@@ -8,9 +8,7 @@ import 'package:fixnum/fixnum.dart';
 import 'package:logging/logging.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:opentelemetry/sdk.dart' as sdk;
-import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
 import 'package:opentelemetry/src/sdk/logs/log_record_limit.dart';
-import 'package:opentelemetry/src/sdk/logs/processors/simple_log_record_processor.dart';
 import 'package:test/test.dart';
 
 import '../../../mocks.dart';
@@ -21,7 +19,7 @@ void main() {
 
   setUp(() {
     exporter = MockLogRecordExporter();
-    processor = SimpleLogRecordProcessor(exporter: exporter);
+    processor = sdk.SimpleLogRecordProcessor(exporter: exporter);
     when(() => exporter.export(any())).thenAnswer((_) async => sdk.ExportResult(code: sdk.ExportResultCode.success));
     when(() => exporter.shutdown()).thenAnswer((_) => Future.value());
   });
@@ -82,7 +80,7 @@ void main() {
           logRecordLimits: LogRecordLimits(),
           timeProvider: FakeTimeProvider(now: Int64(123))),
     );
-    expect((processor as SimpleLogRecordProcessor).exportsCompletion.length, 2);
+    expect((processor as sdk.SimpleLogRecordProcessor).exportsCompletion.length, 2);
     // Ensure the exports are pending.
     final flushFuture = processor.forceFlush();
     expect(flushFuture, completes);
