Skip to content

Commit

Permalink
add telemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
spatten committed May 28, 2024
1 parent 395ff9e commit 9e7f328
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/App/Fossa/SBOM.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import Control.Effect.Diagnostics (
Has,
)
import Control.Effect.Lift (Lift, sendIO)
import Control.Effect.Telemetry (Telemetry)
import Data.Aeson qualified as Aeson
import Data.ByteString.Lazy qualified as BL
import Effect.Exec (Exec)
Expand All @@ -40,6 +41,7 @@ dispatch ::
, Has Logger sig m
, Has ReadFS sig m
, Has Exec sig m
, Has Telemetry sig m
) =>
SBOMScanConfig ->
m ()
Expand Down
4 changes: 4 additions & 0 deletions src/App/Fossa/SBOM/Analyze.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ import Control.Carrier.Debug (Debug)
import Control.Carrier.Diagnostics qualified as Diag
import Control.Carrier.FossaApiClient (runFossaApiClient)
import Control.Carrier.StickyLogger (StickyLogger, logSticky, runStickyLogger)
import Control.Carrier.Telemetry.Types (CountableCliFeature (SBOMAnalyzeUsage))
import Control.Effect.FossaApiClient (FossaApiClient, PackageRevision (PackageRevision), getOrganization, getSignedUploadUrl, queueSBOMBuild, uploadArchive)
import Control.Effect.Lift
import Control.Effect.Telemetry (Telemetry, trackUsage)
import Data.Foldable (traverse_)
import Data.String.Conversion
import Data.Text (Text)
Expand All @@ -25,12 +27,14 @@ analyze ::
, Has (Lift IO) sig m
, Has Logger sig m
, Has Debug sig m
, Has Telemetry sig m
) =>
SBOMAnalyzeConfig ->
m ()
analyze config = do
let emptyMetadata = ProjectMetadata Nothing Nothing Nothing Nothing Nothing Nothing [] Nothing
let apiOpts = sbomApiOpts config
trackUsage SBOMAnalyzeUsage
runFossaApiClient apiOpts . preflightChecks $ AnalyzeChecks (sbomRevision config) emptyMetadata
runFossaApiClient apiOpts . runStickyLogger (severity config) $ analyzeInternal config

Expand Down
1 change: 1 addition & 0 deletions src/Control/Carrier/Telemetry/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ data CountableCliFeature
= ExperimentalGradleSingleConfigurationUsage
| ExperimentalKeywordSearchUsage
| CustomLicenseSearchUsage
| SBOMAnalyzeUsage
deriving (Show, Eq, Ord, Generic)

instance ToJSONKey CountableCliFeature where
Expand Down

0 comments on commit 9e7f328

Please sign in to comment.