O11Y-2256: code cleanup

Workiva · Nov 30, 2022 · 60c2742 · 60c2742
1 parent b9ab121
commit 60c2742
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/lib/src/experimental_sdk.dart b/lib/src/experimental_sdk.dart
@@ -6,7 +6,4 @@ import 'package:meta/meta.dart';
 export 'sdk/metrics/counter.dart' show Counter;
 export 'sdk/metrics/meter_provider.dart' show MeterProvider;
 export 'sdk/metrics/meter.dart' show Meter;
-export 'sdk/metrics/state/meter_shared_state.dart' show MeterSharedState;
-export 'sdk/metrics/state/meter_provider_shared_state.dart'
-    show MeterProviderSharedState;
 export 'sdk/resource/resource.dart' show Resource;
diff --git a/lib/src/sdk/metrics/meter.dart b/lib/src/sdk/metrics/meter.dart
@@ -1,9 +1,11 @@
 import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
 import 'package:opentelemetry/src/experimental_api.dart' as api;
 
+import 'state/meter_shared_state.dart';
+
 class Meter implements api.Meter {
   // ignore: unused_field
-  final sdk.MeterSharedState _state;
+  final MeterSharedState _state;
 
   Meter(this._state);
 

diff --git a/lib/src/sdk/metrics/state/meter_provider_shared_state.dart b/lib/src/sdk/metrics/state/meter_provider_shared_state.dart
@@ -4,28 +4,23 @@ import 'package:opentelemetry/src/sdk/metrics/state/meter_shared_state.dart';
 import 'package:quiver/core.dart';
 
 int instrumentationScopeId(InstrumentationScope instrumentationScope) {
-  return hash4(
-      instrumentationScope.name,
-      instrumentationScope.version,
-      instrumentationScope.schemaUrl,
-      instrumentationScope.attributes.isEmpty
-          ? const []
-          : instrumentationScope.attributes);
+  return hash3(instrumentationScope.name, instrumentationScope.version,
+      instrumentationScope.schemaUrl);
 }
 
 class MeterProviderSharedState {
   Resource resource;
-  Map<int, MeterSharedState> meterSharedStates = {};
+  final Map<int, MeterSharedState> _meterSharedStates = {};
 
   MeterProviderSharedState(this.resource);
 
   MeterSharedState getMeterSharedState(
       InstrumentationScope instrumentationScope) {
     final id = instrumentationScopeId(instrumentationScope);
-    var meterSharedState = meterSharedStates[id];
+    var meterSharedState = _meterSharedStates[id];
     if (meterSharedState == null) {
       meterSharedState = MeterSharedState(this, instrumentationScope);
-      meterSharedStates[id] = meterSharedState;
+      _meterSharedStates[id] = meterSharedState;
     }
     return meterSharedState;
   }

diff --git a/lib/src/sdk/metrics/state/meter_shared_state.dart b/lib/src/sdk/metrics/state/meter_shared_state.dart
@@ -2,9 +2,11 @@ import 'package:opentelemetry/src/sdk/common/instrumentation_scope.dart';
 
 import 'package:opentelemetry/src/experimental_sdk.dart' as sdk;
 
+import 'meter_provider_shared_state.dart';
+
 class MeterSharedState {
   // ignore: unused_field
-  final sdk.MeterProviderSharedState _meterProviderSharedState;
+  final MeterProviderSharedState _meterProviderSharedState;
   // ignore: unused_field
   final InstrumentationScope _instrumentationScope;
   sdk.Meter meter;