Merge pull request #1480 from microsoftgraph/release/v3

handles merge conflicts for release

Author: baywet

.github/dependabot.yml

@@ -5,11 +5,19 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    kiota-dependencies:
+      patterns:
+        - "*kiota*"
 - package-ecosystem: gradle
   directory: "/android"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    kiota-dependencies:
+      patterns:
+        - "*kiota*"
 - package-ecosystem: gradle
   directory: "/samples/deviceCodeSample"
   schedule:
@@ -25,6 +33,10 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    kiota-dependencies:
+      patterns:
+        - "*kiota*"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:
@@ -36,18 +48,30 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    kiota-dependencies:
+      patterns:
+        - "*kiota*"
 - package-ecosystem: gradle
   directory: "/android"
   target-branch: v3/longTermBranch
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    kiota-dependencies:
+      patterns:
+        - "*kiota*"
 - package-ecosystem: maven
   directory: "/"
   target-branch: v3/longTermBranch
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    kiota-dependencies:
+      patterns:
+        - "*kiota*"
 - package-ecosystem: github-actions
   directory: "/"
   target-branch: v3/longTermBranch

.github/workflows/sonarcloud.yml

@@ -8,8 +8,24 @@ on:
       - feature/v2
   pull_request:
     types: [opened, synchronize, reopened]
+
+env:
+  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
 jobs:
+  checksecret:
+    name: check if SONAR_TOKEN is set in github secrets
+    runs-on: ubuntu-latest
+    outputs:
+      is_SONAR_TOKEN_set: ${{ steps.checksecret_job.outputs.is_SONAR_TOKEN_set }}
+    steps:
+      - name: Check whether unity activation requests should be done
+        id: checksecret_job
+        run: |
+          echo "is_SONAR_TOKEN_set=${{ env.SONAR_TOKEN != '' }}" >> $GITHUB_OUTPUT
   build:
+    needs: [checksecret]
+    if: needs.checksecret.outputs.is_SONAR_TOKEN_set == 'true'
     name: Build
     runs-on: ubuntu-latest
     steps:
@@ -37,5 +53,4 @@ jobs:
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: ./gradlew build sonarqube --info

CHANGELOG.md

@@ -112,6 +112,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - GraphClientFactory to handle OkHttp client creation.
 - BaseClient refactored to use Kiota framework.
 
+## [2.0.21] - 2023-11-08
+
+### Changed
+
+- Changed CoreHttpProvider dependency from OkHttpClient to Call.Factory (parent interface implemented by OkHttpClient). This make usage of OpenTelemetry tracing possible.
+  https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/okhttp/okhttp-3.0/library/README.md
+
+```java
+  private Call.Factory createTracedClient(OpenTelemetry openTelemetry, @Nonnull final IAuthenticationProvider auth) {
+    return OkHttpTelemetry.builder(openTelemetry).build().newCallFactory(createClient(auth));
+  }
+
+  private OkHttpClient createClient(@Nonnull final IAuthenticationProvider auth) {
+    return HttpClients.createDefault(auth);
+  }
+  
+  // then create the GraphServiceClient
+    IAuthenticationProvider authenticationProvider = ...;
+    GraphServiceClient
+    .builder(Call.Factory.class, Request.class)
+    .httpClient(createTracedClient(openTelemetry, authenticationProvider))
+    .authenticationProvider(authenticationProvider)
+    .buildClient();
+```
+
+## [2.0.20] - 2023-10-23
+
+### Changed 
+
+- Updates Okhttp3 to avoid transient vulnerabilty. [#1038](https://github.com/microsoftgraph/msgraph-sdk-java-core/issues/1038) 
+
 ## [2.0.19] - 2023-06-20
 
 ### Changed