pack_stats 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60606e6b527c76b27deaac01ad5991ebe06ec7db76bc5fe9eb707d0cfdde9c56
-  data.tar.gz: ec768521fe361499a52bb29b59b97d23249ef9bd6a9c1bc3c543c8d46d6ccc08
+  metadata.gz: 3f84f807ac7cd49095073c3da4a5f99fd2a4ba84a56b9740eb6d039ab310f720
+  data.tar.gz: 538a48f38b02506d4841c5f1c2be9d117c9623cc137315d353bb82547762cfe6
 SHA512:
-  metadata.gz: f33cff3e350f90dbd71cf07433df45bfc170fd9c2101e5713cae1976e034385af98fbc76eddc01ac0ed78009f6e23f2b2f43797999d1fd6e8405fbdb50c013b1
-  data.tar.gz: f04b2b9ac1e3cdf3fcdf0811a1d2a9d1b0a8b2864278ed892caf61c1676fcf762839d24f03ef0f7625895ec37287dcaf3cc034c7ab672468d9b5b1ccf18a15a6
+  metadata.gz: 9396f5f105aaadadcc5260d8eaf5beaa3bcc35bf053261b3c73c2c07bfe7e95d0a92e524e110ae842ed8507d87fa1581a76db95c097cae7d1e4da9a7b46b7c9c
+  data.tar.gz: bf1650ae0da82fcfdb29d25b09359c9f112aeb2a395b339f7a162d0963491b2fc0ccec54aa1e52ba178669c505023c301d456cf468372d9233fa2c3bdc93e42c

data/README.md

@@ -38,13 +38,6 @@ PackStats.report_to_datadog!(
   # Example: [Pathname.new("./gems")]
   #
   componentized_source_code_locations: componentized_source_code_locations,
-  #
-  # A file is determined to be packaged if it exists in any of these directories.
-  # This is an array of `Pathname`. `Pathname` can be relative or absolute paths.
-  #
-  # Example: [Pathname.new("./packs")]
-  #
-  packaged_source_code_locations: packaged_source_code_locations,
 )
 ```
 

data/lib/pack_stats/private/metrics/nested_packs.rb

@@ -53,7 +53,7 @@ module PackStats
           sig { returns(T::Array[ParsePackwerk::Violation]) }
           def cross_group_violations
             all_violations = members.flat_map do |member|
-              ParsePackwerk::DeprecatedReferences.for(member).violations
+              ParsePackwerk::PackageTodo.for(member).violations
             end
 
             all_violations.select do |violation|

data/lib/pack_stats/private/metrics/packages.rb

@@ -63,7 +63,7 @@ module PackStats
                 raise StandardError, "Could not find matching package #{to_package_name}"
               end
 
-              tags = package_tags + [Tag.for('to_package', Metrics.humanized_package_name(to_package_name))] + Metrics.tags_for_to_team(CodeOwnership.for_package(to_package)&.name)
+              tags = package_tags + [Tag.for('to_package', Metrics.humanized_package_name(to_package_name))] + Metrics.tags_for_to_team(Private.package_owner(to_package))
               all_metrics << GaugeMetric.for('by_package.outbound_dependency_violations.per_package.count', Metrics.file_count(violations.select(&:dependency?)), tags)
               all_metrics << GaugeMetric.for('by_package.outbound_privacy_violations.per_package.count', Metrics.file_count(violations.select(&:privacy?)), tags)
             end
@@ -89,7 +89,8 @@ module PackStats
                 raise StandardError, "Could not find matching package #{explicit_dependency}"
               end
 
-              tags = package_tags + [Tag.for('to_package', Metrics.humanized_package_name(explicit_dependency))] + Metrics.tags_for_to_team(CodeOwnership.for_package(to_package)&.name)
+              owner = Private.package_owner(to_package)
+              tags = package_tags + [Tag.for('to_package', Metrics.humanized_package_name(explicit_dependency))] + Metrics.tags_for_to_team(owner)
               all_metrics << GaugeMetric.for('by_package.outbound_explicit_dependencies.per_package.count', 1, tags)
             end
 

data/lib/pack_stats/private/metrics/packages_by_team.rb

@@ -17,7 +17,8 @@ module PackStats
           all_metrics = T.let([], T::Array[GaugeMetric])
           app_level_tag = Tag.for('app', app_name)
 
-          all_packages.group_by { |package| CodeOwnership.for_package(package)&.name }.each do |team_name, packages_by_team|
+          
+          all_packages.group_by { |package| Private.package_owner(package) }.each do |team_name, packages_by_team|
             # We look at `all_packages` because we care about ALL inbound violations across all teams
             inbound_violations_by_package = all_packages.flat_map(&:violations).group_by(&:to_package_name)
 
@@ -51,7 +52,7 @@ module PackStats
                 raise StandardError, "Could not find matching package #{violation.to_package_name}"
               end
 
-              CodeOwnership.for_package(to_package)&.name
+              Private.package_owner(to_package)
             end
 
             grouped_outbound_violations.each do |to_team_name, violations|

data/lib/pack_stats/private/metrics/packwerk_checker_usage.rb

@@ -12,7 +12,6 @@ module PackStats
         # Later, we might find a way we can get this directly from `packwerk`
         class PackwerkChecker < T::Struct
           const :setting, String
-          const :strict_mode, String
         end
 
         sig { params(prefix: String, packages: T::Array[ParsePackwerk::Package], package_tags: T::Array[Tag]).returns(T::Array[GaugeMetric]) }
@@ -20,22 +19,21 @@ module PackStats
           metrics = T.let([], T::Array[GaugeMetric])
 
           checkers = [
-            PackwerkChecker.new(setting: 'enforce_dependencies', strict_mode: 'enforce_dependencies_strictly'),
-            PackwerkChecker.new(setting: 'enforce_privacy', strict_mode: 'enforce_privacy_strictly')
+            PackwerkChecker.new(setting: 'enforce_dependencies'),
+            PackwerkChecker.new(setting: 'enforce_privacy')
           ]
 
           checkers.each do |checker|
             ['false', 'true', 'strict'].each do |enabled_mode|
               count_of_packages = ParsePackwerk.all.count do |package|
-                strict_mode = package.metadata[checker.strict_mode]
-                enabled = YAML.load_file(package.yml)[checker.setting]
+                checker_setting = YAML.load_file(package.yml)[checker.setting]
                 case enabled_mode
                 when 'false'
-                  !enabled
+                  !checker_setting
                 when 'true'
-                  enabled && !strict_mode
+                  checker_setting && checker_setting != 'strict'
                 when 'strict'
-                  !!strict_mode
+                  checker_setting == 'strict'
                 end
               end
 

data/lib/pack_stats/private/metrics.rb

@@ -17,7 +17,7 @@ module PackStats
         [
           Tag.new(key: 'package', value: humanized_package_name(package.name)),
           Tag.new(key: 'app', value: app_name),
-          *Metrics.tags_for_team(CodeOwnership.for_package(package)&.name),
+          *Metrics.tags_for_team(Private.package_owner(package)),
         ]
       end
 

data/lib/pack_stats/private.rb

@@ -48,6 +48,13 @@ module PackStats
         new_metric
       end
     end
+
+    sig { params(package: ParsePackwerk::Package).returns(T.nilable(String) )}
+    def self.package_owner(package)
+      pack = Packs.find(package.name)
+      return nil if pack.nil?
+      CodeOwnership.for_package(pack)&.name
+    end
   end
 
   private_constant :Private

data/lib/pack_stats.rb

@@ -7,6 +7,7 @@ require 'benchmark'
 require 'code_teams'
 require 'code_ownership'
 require 'pathname'
+require 'packs'
 require 'pack_stats/private'
 require 'pack_stats/private/source_code_file'
 require 'pack_stats/private/datadog_reporter'
@@ -27,23 +28,17 @@ module PackStats
     ].freeze, T::Array[Pathname]
   )
 
-  DEFAULT_PACKAGED_SOURCE_CODE_LOCATIONS = T.let(
-    [
-      Pathname.new('packs'),
-      Pathname.new('packages'),
-    ].freeze, T::Array[Pathname]
-  )
-
   sig do
     params(
       datadog_client: Dogapi::Client,
       app_name: String,
       source_code_pathnames: T::Array[Pathname],
       componentized_source_code_locations: T::Array[Pathname],
-      packaged_source_code_locations: T::Array[Pathname],
       report_time: Time,
       verbose: T::Boolean,
       # See note on get_metrics
+      packaged_source_code_locations: T.nilable(T::Array[Pathname]),
+      # See note on get_metrics
       use_gusto_legacy_names: T::Boolean
     ).void
   end
@@ -52,16 +47,15 @@ module PackStats
     app_name:,
     source_code_pathnames:,
     componentized_source_code_locations: DEFAULT_COMPONENTIZED_SOURCE_CODE_LOCATIONS,
-    packaged_source_code_locations: DEFAULT_PACKAGED_SOURCE_CODE_LOCATIONS,
     report_time: Time.now, # rubocop:disable Rails/TimeZone
     verbose: false,
+    packaged_source_code_locations: [],
     use_gusto_legacy_names: false
   )
 
     all_metrics = self.get_metrics(
       source_code_pathnames: source_code_pathnames,
       componentized_source_code_locations: componentized_source_code_locations,
-      packaged_source_code_locations: packaged_source_code_locations,
       app_name: app_name,
       use_gusto_legacy_names: use_gusto_legacy_names,
     )
@@ -88,8 +82,9 @@ module PackStats
     params(
       source_code_pathnames: T::Array[Pathname],
       componentized_source_code_locations: T::Array[Pathname],
-      packaged_source_code_locations: T::Array[Pathname],
       app_name: String,
+      # This field is deprecated
+      packaged_source_code_locations: T.nilable(T::Array[Pathname]),
       # It is not recommended to set this to true.
       # Gusto uses this to preserve historical trends in Dashboards as the names of
       # things changed, but new dashboards can use names that better match current tooling conventions.
@@ -100,15 +95,14 @@ module PackStats
   def self.get_metrics(
     source_code_pathnames:,
     componentized_source_code_locations:,
-    packaged_source_code_locations:,
     app_name:,
+    packaged_source_code_locations: [],
     use_gusto_legacy_names: false
   )
     all_metrics = Private::DatadogReporter.get_metrics(
       source_code_files: source_code_files(
         source_code_pathnames: source_code_pathnames,
         componentized_source_code_locations: componentized_source_code_locations,
-        packaged_source_code_locations: packaged_source_code_locations
       ),
       app_name: app_name
     )
@@ -124,18 +118,21 @@ module PackStats
     params(
       source_code_pathnames: T::Array[Pathname],
       componentized_source_code_locations: T::Array[Pathname],
-      packaged_source_code_locations: T::Array[Pathname]
     ).returns(T::Array[Private::SourceCodeFile])
   end
   def self.source_code_files(
     source_code_pathnames:,
-    componentized_source_code_locations:,
-    packaged_source_code_locations:
+    componentized_source_code_locations:
   )
 
     # Sorbet has the wrong signatures for `Pathname#find`, whoops!
     componentized_file_set = Set.new(componentized_source_code_locations.select(&:exist?).flat_map { |pathname| T.unsafe(pathname).find.to_a })
-    packaged_file_set = Set.new(packaged_source_code_locations.select(&:exist?).flat_map { |pathname| T.unsafe(pathname).find.to_a })
+
+    packaged_file_set = Packs.all.flat_map do |pack|
+      pack.relative_path.find.to_a
+    end
+
+    packaged_file_set = Set.new(packaged_file_set)
 
     source_code_pathnames.map do |pathname|
       componentized_file = componentized_file_set.include?(pathname)