Merge pull request #173 from RADAR-base/release-0.6.3

Sync release changes with dev

Author: mpgxvii

README.md

@@ -92,18 +92,46 @@ your Fitbit App client ID and client secret. The following tables shows the poss
 <tr>
 <td>fitbit.intraday.steps.topic</td><td>Topic for Fitbit intraday steps</td><td>string</td><td>connect_fitbit_intraday_steps</td><td>non-empty string without control characters</td><td>low</td></tr>
 <tr>
+<td>fitbit.intraday.steps.enabled</td><td>Config to enable or disable intraday steps</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
 <td>fitbit.intraday.heart.rate.topic</td><td>Topic for Fitbit intraday heart_rate</td><td>string</td><td>connect_fitbit_intraday_heart_rate</td><td>non-empty string without control characters</td><td>low</td></tr>
 <tr>
+<td>fitbit.intraday.heart.rate.enabled</td><td>Config to enable or disable intraday heart rate</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
+<td>fitbit.intraday.heart.rate.variability.enabled</td><td>Config to enable or disable intraday heart rate variability</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
+<td>fitbit.resting.heart.rate.enabled</td><td>Config to enable or disable resting heart rate</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
 <td>fitbit.sleep.stages.topic</td><td>Topic for Fitbit sleep stages</td><td>string</td><td>connect_fitbit_sleep_stages</td><td>non-empty string without control characters</td><td>low</td></tr>
 <tr>
+<td>fitbit.sleep.stages.enabled</td><td>Config to enable or disable sleep stages</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
 <td>fitbit.sleep.classic.topic</td><td>Topic for Fitbit sleep classic data</td><td>string</td><td>connect_fitbit_sleep_classic</td><td>non-empty string without control characters</td><td>low</td></tr>
 <tr>
+<td>fitbit.sleep.classic.enabled</td><td>Config to enable or disable sleep classic</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
 <td>fitbit.time.zone.topic</td><td>Topic for Fitbit profile time zone</td><td>string</td><td>connect_fitbit_time_zone</td><td>non-empty string without control characters</td><td>low</td></tr>
 <tr>
+<td>fitbit.time.zone.enabled</td><td>Config to enable or disable time zone</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
 <td>fitbit.activity.log.topic</td><td>Topic for Fitbit activity log.</td><td>string</td><td>connect_fitbit_activity_log</td><td>non-empty string without control characters</td><td>low</td></tr>
 <tr>
+<td>fitbit.activity.log.enabled</td><td>Config to enable or disable the activity log</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
 <td>fitbit.intraday.calories.topic</td><td>Topic for Fitbit intraday calories</td><td>string</td><td>connect_fitbit_intraday_calories</td><td>non-empty string without control characters</td><td>low</td></tr>
 <tr>
+<td>fitbit.intraday.calories.enabled</td><td>Config to enable or disable intraday calories</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
+<td>fitbit.intraday.spo2.enabled</td><td>Config to enable or disable intraday spo2</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
+<td>fitbit.breathing.rate.enabled</td><td>Config to enable or disable breathing rate</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
+<td>fitbit.skin.temperature.enabled</td><td>Config to enable or disable skin temperature</td><td>boolean</td><td>true</td><td></td><td>low</td></tr>
+<tr>
+<td>fitbit.request.max.forbidden</td><td>Maximum number of consecutive forbidden responses before backing off</td><td>int</td><td>3</td><td></td><td>medium</td></tr>
+<tr>
+<td>fitbit.request.forbidden.backoff.s</td><td>Backoff time in seconds between forbidden requests</td><td>int</td><td>86400</td><td></td><td>medium</td></tr>
+<tr>
 <td>fitbit.user.firebase.collection.fitbit.name</td><td>Firestore Collection for retrieving Fitbit Auth details. Only used when a Firebase based user repository is used.</td><td>string</td><td>fitbit</td><td></td><td>low</td></tr>
 <tr>
 <td>fitbit.user.firebase.collection.user.name</td><td>Firestore Collection for retrieving User details. Only used when a Firebase based user repository is used.</td><td>string</td><td>users</td><td></td><td>low</td></tr>
@@ -187,7 +215,7 @@ To enable Sentry monitoring for the generic REST, Fitbit, or Oura source connect
 1. Set a `SENTRY_DSN` environment variable that points to the desired Sentry DSN.
 2. (Optional) Set the `SENTRY_LOG_LEVEL` environment variable to control the minimum log level of
    events sent to Sentry.
-   The default log level for Sentry is `WARN`. Possible values are `TRACE`, `DEBUG`, `INFO`, `WARN`,
+   The default log level for Sentry is `ERROR`. Possible values are `TRACE`, `DEBUG`, `INFO`, `WARN`,
    and `ERROR`.
 
 For further configuration of Sentry via environmental variables see [here](https://docs.sentry.io/platforms/java/configuration/#configuration-via-the-runtime-environment). For instance:

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 @Suppress("ConstPropertyName", "MemberVisibilityCanBePrivate")
 object Versions {
-    const val project = "0.7.0-SNAPSHOT"
+    const val project = "0.7.0"
 
     const val java = 17
     const val kotlin = "1.9.22"
@@ -19,6 +19,7 @@ object Versions {
     const val log4j2 = "2.23.1"
     const val slf4j = "2.0.13"
     const val sentryLog4j = "1.7.30"
+    const val sentryOpenTelemetryAgent = "8.1.0"
 
     const val okhttp = "4.12.0"
 

kafka-connect-fitbit-source/build.gradle.kts

@@ -34,12 +34,5 @@ dependencies {
     compileOnly(platform("com.fasterxml.jackson:jackson-bom:${Versions.jackson}"))
     compileOnly("com.fasterxml.jackson.core:jackson-databind")
 
-    // Application monitoring
-    // This dependency is not used by the REST connector, but copied into the Docker image (Dockerfile)
-    compileOnly("io.sentry:sentry-log4j:${Versions.sentryLog4j}") {
-        // Exclude log4j with security vulnerability (safe version is provided by docker image).
-        exclude(group = "log4j", module = "log4j")
-    }
-
     testImplementation("org.apache.kafka:connect-api:${Versions.kafka}")
 }

kafka-connect-oura-source/build.gradle.kts

@@ -33,12 +33,5 @@ dependencies {
     compileOnly(platform("com.fasterxml.jackson:jackson-bom:${Versions.jackson}"))
     compileOnly("com.fasterxml.jackson.core:jackson-databind")
 
-    // Application monitoring
-    // This dependency is not used by the REST connector, but copied into the Docker image (Dockerfile)
-    compileOnly("io.sentry:sentry-log4j:${Versions.sentryLog4j}") {
-        // Exclude log4j with security vulnerability (safe version is provided by docker image).
-        exclude(group = "log4j", module = "log4j")
-    }
-
     testImplementation("org.apache.kafka:connect-api:${Versions.kafka}")
 }

kafka-connect-rest-source/build.gradle.kts

@@ -11,4 +11,12 @@ dependencies {
     testImplementation("com.github.tomakehurst:wiremock:${Versions.wiremock}")
 
     testImplementation("org.apache.kafka:connect-api:${Versions.kafka}")
+
+    // Application monitoring
+    // These dependencies are not used by the REST connector, but copied into the Docker image (Dockerfile)
+    runtimeOnly("io.sentry:sentry-log4j:${Versions.sentryLog4j}") {
+        // Exclude log4j with security vulnerability (safe version is provided by docker image).
+        exclude(group = "log4j", module = "log4j")
+    }
+    runtimeOnly("io.sentry:sentry-opentelemetry-agent:${Versions.sentryOpenTelemetryAgent}")
 }