Fix config issue 2 (#327)

* Bump utils * Update manifest * Downgrade to prometheus 6
cognitedata · Oct 26, 2022 · f24cef9 · f24cef9
1 parent 28a6267
commit f24cef9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/manifest.yml b/manifest.yml
@@ -55,14 +55,19 @@ extractor:
   image: opc-ua.png
 
 versions:
+  "2.9.1":
+    description: Actual fix to missing `cognite` section bug.
+    changelog:
+      fixed:
+        - "Bug causing extractor to fail if the `cognite` section was missing in remote config."
   "2.9.0":
     description: Support for non-transparent server redundancy.
     changelog:
       added:
         - Support for non-transparent server redundancy ref. OPC-UA standard chapter 4 6.6.2
         - "`extraction-pipeline: external-id` as alias for `pipeline-id` in config, to align with python extractors."
       fixed:
-        - Bug causing extractor to fail if the `cognite` section was missing in remote config.
+        - "Bug causing extractor to fail if the `cognite` section was missing in remote config."
       changed:
         - Improved performance of force-restart, the extractor will no-longer rebrowse automatically if force-restart is enabled. Instead use restart-on-reconnect if that is desired.
   "2.8.0":

diff --git a/paket.dependencies b/paket.dependencies
@@ -21,3 +21,5 @@ nuget Microsoft.Extensions.Hosting.Abstractions
 nuget Microsoft.Extensions.Logging.EventLog
 nuget System.ComponentModel.Annotations
 nuget MQTTnet 3.1.2
+# There appears to be some issue with prometheus-net 7.0.0, investigate further in the future
+nuget prometheus-net 6
diff --git a/paket.lock b/paket.lock
@@ -3,53 +3,53 @@ NUGET
   remote: https://www.nuget.org/api/v2
     AdysTech.InfluxDB.Client.Net.Core (0.25)
       Newtonsoft.Json (>= 10.0.3) - restriction: || (>= net46) (>= netstandard2.0)
-    Cognite.Extensions (1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Common (>= 1.3.1) - restriction: >= netstandard2.0
+    Cognite.Extensions (1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Common (>= 1.3.2) - restriction: >= netstandard2.0
       CogniteSdk (>= 3.6) - restriction: >= netstandard2.0
       Microsoft.Extensions.Http (>= 6.0) - restriction: >= netstandard2.0
       Microsoft.Extensions.Http.Polly (>= 6.0.8) - restriction: >= netstandard2.0
       Microsoft.Identity.Client (>= 4.46.1) - restriction: >= netstandard2.0
       Polly.Extensions.Http (>= 3.0) - restriction: >= netstandard2.0
       prometheus-net (>= 6.0) - restriction: >= netstandard2.0
-    Cognite.Extractor.Common (1.3.1) - restriction: >= netstandard2.0
+    Cognite.Extractor.Common (1.3.2) - restriction: >= netstandard2.0
       Cronos (>= 0.7.1) - restriction: >= netstandard2.0
       System.Text.Json (>= 6.0.5) - restriction: >= netstandard2.0
-    Cognite.Extractor.Configuration (1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Common (>= 1.3.1) - restriction: >= netstandard2.0
+    Cognite.Extractor.Configuration (1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Common (>= 1.3.2) - restriction: >= netstandard2.0
       Microsoft.CSharp (>= 4.7) - restriction: >= netstandard2.0
       Microsoft.Extensions.DependencyInjection (>= 6.0) - restriction: >= netstandard2.0
       YamlDotNet (>= 12.0) - restriction: >= netstandard2.0
-    Cognite.Extractor.Logging (1.3.1) - restriction: >= netstandard2.0
+    Cognite.Extractor.Logging (1.3.2) - restriction: >= netstandard2.0
       Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: >= netstandard2.0
       Microsoft.Extensions.DependencyInjection (>= 6.0) - restriction: >= netstandard2.0
       Serilog (>= 2.11) - restriction: >= netstandard2.0
       Serilog.Extensions.Logging (>= 3.1) - restriction: >= netstandard2.0
       Serilog.Sinks.Async (>= 1.5) - restriction: >= netstandard2.0
       Serilog.Sinks.Console (>= 4.0.1) - restriction: >= netstandard2.0
       Serilog.Sinks.File (>= 5.0) - restriction: >= netstandard2.0
-    Cognite.Extractor.Metrics (1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Common (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Logging (>= 1.3.1) - restriction: >= netstandard2.0
+    Cognite.Extractor.Metrics (1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Common (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Logging (>= 1.3.2) - restriction: >= netstandard2.0
       Microsoft.Extensions.Http (>= 6.0) - restriction: >= netstandard2.0
       Microsoft.Extensions.Http.Polly (>= 6.0.8) - restriction: >= netstandard2.0
       Polly.Extensions.Http (>= 3.0) - restriction: >= netstandard2.0
       prometheus-net (>= 6.0) - restriction: >= netstandard2.0
-    Cognite.Extractor.StateStorage (1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Common (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Logging (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Metrics (>= 1.3.1) - restriction: >= netstandard2.0
+    Cognite.Extractor.StateStorage (1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Common (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Logging (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Metrics (>= 1.3.2) - restriction: >= netstandard2.0
       LiteDB (>= 5.0.12) - restriction: >= netstandard2.0
-    Cognite.Extractor.Testing (1.3.1)
-      Cognite.ExtractorUtils (>= 1.3.1) - restriction: >= netstandard2.0
+    Cognite.Extractor.Testing (1.3.2)
+      Cognite.ExtractorUtils (>= 1.3.2) - restriction: >= netstandard2.0
       xunit.assert (>= 2.4.2) - restriction: >= netstandard2.0
       xunit.core (>= 2.4.2) - restriction: >= netstandard2.0
-    Cognite.ExtractorUtils (1.3.1)
-      Cognite.Extensions (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Common (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Configuration (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Logging (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.Metrics (>= 1.3.1) - restriction: >= netstandard2.0
-      Cognite.Extractor.StateStorage (>= 1.3.1) - restriction: >= netstandard2.0
+    Cognite.ExtractorUtils (1.3.2)
+      Cognite.Extensions (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Common (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Configuration (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Logging (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.Metrics (>= 1.3.2) - restriction: >= netstandard2.0
+      Cognite.Extractor.StateStorage (>= 1.3.2) - restriction: >= netstandard2.0
       Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: >= netstandard2.0
       Microsoft.CSharp (>= 4.7) - restriction: >= netstandard2.0
       Microsoft.Extensions.DependencyInjection (>= 6.0) - restriction: >= netstandard2.0
@@ -168,7 +168,7 @@ NUGET
       Microsoft.Extensions.Hosting (>= 6.0.1) - restriction: || (>= net461) (>= netstandard2.0)
       Microsoft.Extensions.Logging.EventLog (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
       System.ServiceProcess.ServiceController (>= 6.0) - restriction: || (&& (< net461) (>= netstandard2.0)) (>= netstandard2.1)
-    Microsoft.Extensions.Http (6.0) - restriction: >= netstandard2.0
+    Microsoft.Extensions.Http (6.0) - restriction: || (>= net462) (>= netstandard2.0)
       Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
       Microsoft.Extensions.Logging (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
       Microsoft.Extensions.Logging.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
@@ -453,7 +453,7 @@ NUGET
     Polly.Extensions.Http (3.0) - restriction: >= netstandard2.0
       Polly (>= 7.1) - restriction: >= netstandard1.1
     Portable.BouncyCastle (1.9) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
-    prometheus-net (6.0) - restriction: >= netstandard2.0
+    prometheus-net (6.0)
       Microsoft.Extensions.Http (>= 3.1.9) - restriction: || (>= net462) (>= netstandard2.0)
       System.ValueTuple (>= 4.5) - restriction: >= net462
     runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: && (< monotouch) (< net452) (>= netstandard1.6) (< netstandard2.0) (< uap10.0) (< xamarintvos) (< xamarinwatchos)
@@ -1376,7 +1376,7 @@ NUGET
       Xamarin.Android.Support.Annotations (28.0.0.3) - restriction: >= monoandroid9.0
       Xamarin.Android.Support.Compat (28.0.0.3) - restriction: >= monoandroid9.0
       Xamarin.Android.Support.CustomView (28.0.0.3) - restriction: >= monoandroid9.0
-    Xamarin.AndroidX.Browser (1.4.0.2) - restriction: && (>= monoandroid10.0) (< net6.0-android)
+    Xamarin.AndroidX.Browser (1.4.0.3) - restriction: && (>= monoandroid10.0) (< net6.0-android)
     xunit (2.4.2)
       xunit.analyzers (>= 1.0)
       xunit.assert (>= 2.4.2)