Merge pull request #608 from vasireddy99/updep

[chore] Update Dependencies for java and Java Script sample apps
aws-observability · Aug 8, 2023 · 94947e7 · 94947e7
2 parents ab279a1 + ad00291
commit 94947e7
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3,536 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -36,6 +36,10 @@ updates:
       js-sample-app-deps:
         patterns:
           - "*"
+    ignore:
+      - dependency-name: "node-fetch"
+        update-types:
+          - "version-update:semver-major"
   - package-ecosystem: "gomod"
     directory: "/sample-apps/prometheus-sample-app"
     schedule:

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -5,6 +5,10 @@ on:
     branches: [ master ]
   workflow_dispatch:
 
+concurrency:
+  group: integration-test-${{ github.ref_name }}
+  cancel-in-progress: true
+
 permissions: 
   id-token: write
   contents: read

diff --git a/sample-apps/java-sample-app/auto/build.gradle.kts b/sample-apps/java-sample-app/auto/build.gradle.kts
@@ -49,7 +49,7 @@ jib {
     container {
         ports = listOf("8080")
         jvmFlags = listOf(
-            "-javaagent:aws-opentelemetry-agent-1.27.0.jar",
+            "-javaagent:aws-opentelemetry-agent-1.28.1.jar",
             "-Dotel.javaagent.extensions=${buildDir}/javaagent/extension.jar")
     }
 }
@@ -67,7 +67,7 @@ dependencies {
 application {
     mainClass.set("software.amazon.adot.sampleapp.MainAuto")
     applicationDefaultJvmArgs = listOf(
-        "-javaagent:$buildDir/javaagent/aws-opentelemetry-agent-1.27.0.jar", // Use the Java agent when the application is run
+        "-javaagent:$buildDir/javaagent/aws-opentelemetry-agent-1.28.1.jar", // Use the Java agent when the application is run
         "-Dotel.service.name=java-sample-app",  // sets the name of the application in traces and metrics.
         "-Dotel.javaagent.extensions=${buildDir}/javaagent/extension.jar")
 }