merge main

.github/workflows/post-merge.yml

@@ -70,6 +70,8 @@ jobs:
       #
       - name: Checkout the source code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        with:
+          token: ${{ secrets.GIT_PAT }}
 
       #
       # RELEASE CANDIDATE - Update of gradle.properties with the RC new version.

build.gradle

@@ -23,6 +23,7 @@ repositories {
 
 ext {
 	set('springCloudAzureVersion', "5.18.0")
+	set('otelInstrumentationVersion','2.10.0')
 }
 
 dependencies {
@@ -41,6 +42,12 @@ dependencies {
 	implementation("org.openapitools:jackson-databind-nullable:0.2.6")
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 	implementation("org.springframework.boot:spring-boot-starter-validation")
+
+	// opentelemetry
+	// implementation("io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter")
+	// provides the same functionality of spring-boot-starter but configure the azure exporter
+	implementation("com.azure.spring:spring-cloud-azure-starter-monitor:1.0.0-beta.6")
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testImplementation 'io.projectreactor:reactor-test'
@@ -52,6 +59,7 @@ dependencies {
 dependencyManagement {
 	imports {
 		mavenBom "com.azure.spring:spring-cloud-azure-dependencies:${springCloudAzureVersion}"
+		mavenBom "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${otelInstrumentationVersion}"
 	}
 }
 

gradle.properties

@@ -1 +1 @@
-version=1.1.0
+version=1.2.0

src/main/resources/application.properties

@@ -1,6 +1,5 @@
 logging.level.root=INFO
 
-
 spring.application.name=rtp-activator
 
 # enable spring boot actuator health endpoint

src/main/terraform/container_app.tf

@@ -73,6 +73,7 @@ resource "azurerm_container_app" "rtp-activator" {
     value = "${data.azurerm_user_assigned_identity.rtp-activator.client_id}"
   }
 
+
   dynamic "secret" {
     for_each = var.rtp_environment_secrets
     content {

src/main/terraform/data.tf

@@ -15,11 +15,11 @@ data "azurerm_user_assigned_identity" "rtp-activator" {
 }
 
 
-
 # ------------------------------------------------------------------------------
 # General purpose key vault used to protect secrets.
 # ------------------------------------------------------------------------------
 data "azurerm_key_vault" "rtp-kv" {
   name                = local.rtp_kv_name
   resource_group_name = local.rtp_kv_resource_group_name
-}
+}
+

src/main/terraform/env/cstar-d-weu-rtp/terraform.tfvars

@@ -43,12 +43,13 @@ rtp_activator_base_url                          = "https://mil-d-apim.azure-api.
 
 
 rtp_environment_secrets = {
-  COSMOS_ACCOUNT_RTP_ENDPOINT  : "cosmosdb-account-rtp-endpoint"
-  APPLICATIONINSIGHTS_CONNECTION_STRING: "appinsights-connection-string"
+  COSMOS_ACCOUNT_RTP_ENDPOINT           : "cosmosdb-account-rtp-endpoint"
+  APPLICATIONINSIGHTS_CONNECTION_STRING : "appinsights-connection-string"
 }
 
 
 rtp_environment_configs = {
   DB_NAME                   : "rtp"
   BASE_URL                  : "https://"
-}
+  OTEL_TRACES_SAMPLER       : "always_on"
+}

src/main/terraform/env/cstar-p-weu-rtp/terraform.tfvars

@@ -42,12 +42,12 @@ rtp_activator_min_replicas                      = 1
 rtp_activator_base_url                          = "https://mil-d-apim.azure-api.net/rtp_activator"
 
 rtp_environment_secrets = {
-  COSMOS_ACCOUNT_RTP_ENDPOINT  : "cosmosdb-account-rtp-endpoint"
-  APPLICATIONINSIGHTS_CONNECTION_STRING: "appinsights-connection-string"
+  COSMOS_ACCOUNT_RTP_ENDPOINT           : "cosmosdb-account-rtp-endpoint"
+  APPLICATIONINSIGHTS_CONNECTION_STRING : "appinsights-connection-string"
 }
 
-
 rtp_environment_configs = {
   DB_NAME                   : "rtp"
   BASE_URL                  : "https://"
-}
+  OTEL_TRACES_SAMPLER       : "always_on"
+}

src/main/terraform/env/cstar-u-weu-rtp/terraform.tfvars

@@ -43,12 +43,13 @@ rtp_activator_base_url                          = "https://mil-d-apim.azure-api.
 
 
 rtp_environment_secrets = {
-  COSMOS_ACCOUNT_RTP_ENDPOINT  : "cosmosdb-account-rtp-endpoint"
-  APPLICATIONINSIGHTS_CONNECTION_STRING: "appinsights-connection-string"
+  COSMOS_ACCOUNT_RTP_ENDPOINT           : "cosmosdb-account-rtp-endpoint"
+  APPLICATIONINSIGHTS_CONNECTION_STRING : "appinsights-connection-string"
 }
 
 
 rtp_environment_configs = {
   DB_NAME                   : "rtp"
   BASE_URL                  : "https://"
-}
+  OTEL_TRACES_SAMPLER       : "always_on"
+}

src/main/terraform/locals.tf

@@ -4,8 +4,6 @@ locals {
   #
   project = var.domain == "" ? "${var.prefix}-${var.env_short}" : "${var.prefix}-${var.env_short}-${var.domain}"
 
-
-
   rtp_kv_name = "${var.prefix}-${var.env_short}-${var.location_short}-${var.domain}-kv"
   rtp_kv_resource_group_name = "${var.prefix}-${var.env_short}-${var.location_short}-${var.domain}-sec-rg"
 }