Unfreeze build for BigQuery target

Author: haf

src/Logary.Tests/Targets.Baseline.fs

@@ -113,7 +113,7 @@ let basicTests targetName confFac addTS =
     }
 
     testCaseJob "log user upgraded plan message" <| job {
-      let! targetApi, now = configure ()
+      let! targetApi, _ = configure ()
       do! logMsgWaitAndShutdown targetApi (fun logAndWait -> logAndWait Messages.userUpgradedPlan)
     }
   ]

src/targets/Logary.Targets.BigQuery/Targets_BigQuery.fs

@@ -36,20 +36,19 @@ let empty = BigQueryConf.create()
 
 module internal Impl =
   open System
-  open System.IO
   open Google.Apis.Bigquery.v2.Data
   open Logary.Internals.Chiron
   module E = Json.Encode
 
   let tableSchema =
     let builder = TableSchemaBuilder()
-    let field name typ mode = new TableFieldSchema(Name=name, Type=typ, Mode=mode)
+    let field name typ mode = TableFieldSchema(Name=name, Type=typ, Mode=mode)
     let req name typ = field name typ "REQUIRED"
     let opt name typ = field name typ "NULLABLE"
     builder.Add(req "level" "INT64")
     builder.Add(opt "event" "STRING")
-    builder.Add(opt "monetaryValue.amount" "NUMERIC")
-    builder.Add(opt "monetaryValue.currency" "STRING")
+    builder.Add(opt "money_amount" "NUMERIC")
+    builder.Add(opt "money_currency" "STRING")
     builder.Add(req "name" "STRING")
     builder.Add(req "timestamp" "TIMESTAMP")
     /// JSON string
@@ -74,11 +73,11 @@ module internal Impl =
         let me = x.getAsOrThrow<EventMessage>()
         row.["event"] <- me.event
         if me.monetaryValue.IsSome then
-          row.["monetaryValue.amount"] <- me.monetaryValue.Value.value.asFloat
-          row.["monetaryValue.currency"] <- me.monetaryValue.Value.unit.name
+          row.["money_amount"] <- me.monetaryValue.Value.value.asFloat
+          row.["money_currency"] <- me.monetaryValue.Value.unit.name.Value
         else
-          row.["monetaryValue.amount"] <- 0.
-          row.["monetaryValue.currency"] <- "EUR"
+          row.["money_amount"] <- 0.
+          row.["money_currency"] <- "EUR"
       | _ -> ()
       row
 
@@ -97,12 +96,16 @@ module internal Impl =
 
     let rec initialise () =
       job {
+        logger.debug "Starting BigQuery target"
         let! platform = Platform.InstanceAsync()
+        logger.debug "Received platform information"
         let projectId = conf.projectId |> Option.defaultValue platform.ProjectId
         let client = BigQueryClient.Create(projectId)
         let dataset = client.GetOrCreateDataset(conf.dataset)
         let table = dataset.GetOrCreateTable(conf.table, tableSchema)
         do! maybeUpdate projectId dataset table tableSchema
+
+        logger.debug "Going into the Running state"
         return! running { table=table; client=client }
       }
 
@@ -132,11 +135,18 @@ module internal Impl =
           }
 
         api.shutdownCh ^=> fun ack ->
+          logger.debug "Shutting down BigQuery target"
           Job.Scheduler.isolate (fun _ -> (state :> IDisposable).Dispose())
           >>=. ack *<= ()
       ] :> Job<_>
 
-    initialise ()
+    Job.catch (initialise ()) >>= function
+      | Choice1Of2 () ->
+        Job.unit ()
+      | Choice2Of2 e ->
+        printfn "%A" e
+        Job.raises e
+
 
 /// Create a new BigQuery target
 [<CompiledName "Create">]

src/tests/Logary.Targets.BigQuery.Tests/Program.fs

@@ -5,7 +5,6 @@ open Hopac
 open Logary
 open Logary.Tests
 open Logary.Internals
-open Logary.Targets
 open Logary.Targets.BigQuery
 open System
 open System.IO
@@ -22,14 +21,14 @@ let bigQuery =
 let target =
   testList "big query" [
     TargetBaseline.basicTests "Google BigQuery" (fun name ->
-      BigQuery.create bigQuery.Value name) true
+      create bigQuery.Value name) true
 
     testCaseJob "send" <| job {
       let ri = RuntimeInfo.ofServiceAndHost "bigquery-tests" "localhost"
-      let targetConf = BigQuery.create bigQuery.Value "logary-bigquery"
+      let targetConf = create bigQuery.Value "logary-bigquery"
       let! target = Target.create ri targetConf
 
-      for i in 0..20 do
+      for _ in 0..20 do
         let! ack =
           let e = raisedExnWithInner "outer exception" (raisedExn "inner exception")
           let evt = Model.Event("thing happened at {blah}", None, level=Error)
@@ -47,4 +46,4 @@ let target =
 let main argv =
   let privKey = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bigquery-service-account.json")
   Environment.SetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS", privKey)
-  Tests.runTestsInAssembly defaultConfig argv
+  runTestsInAssembly defaultConfig argv