chore: update deps

vhatsura · Aug 7, 2024 · 423a9af · 423a9af
1 parent f4ab8c6
commit 423a9af
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 31 deletions.
diff --git a/.github/workflows/continuous.integration.yml b/.github/workflows/continuous.integration.yml
@@ -1,28 +1,34 @@
----
 name: Continuous Integration Check
 
 on:
   pull_request:
     branches: [ main ]
-    types: [ opened, synchronize, reopened, ready_for_review ]
+  workflow_dispatch:
 
-jobs:
+permissions: read-all
+
+env:
+  GH_PKG_USER: ${{ secrets.GH_PKG_USER }}
+  GH_PKG_TOKEN: ${{ secrets.GH_PKG_TOKEN }}
 
+jobs:
   ci:
+    name: Continuous Integration Check
     runs-on: ubuntu-latest
+
     env:
       DOTNET_NOLOGO: true
       DOTNET_CLI_TELEMETRY_OPTOUT: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup .NET Core 7.0.x
-        uses: actions/setup-dotnet@v3
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -1,27 +1,27 @@
----
 name: Lint Code Base
 
 on:
   pull_request:
-    branches: [ main ]
-    types: [ opened, synchronize, reopened, ready_for_review ]
+    branches: [main]
 
-jobs:
-  lint:
+permissions:
+  contents: read
+  statuses: write
 
+jobs:
+  build:
     name: Lint Code Base
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter@v5
+        uses: super-linter/super-linter@v6
         env:
           VALIDATE_ALL_CODEBASE: false
-          VALIDATE_EDITORCONFIG: false
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/nuget.publish.yml b/.github/workflows/nuget.publish.yml
@@ -1,11 +1,14 @@
----
 name: Publish NuGet package
 
 on:
   release:
     types: [ published ]
-#  push:
-#    branches: [ main ]
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: read
+  pull-requests: read
 
 jobs:
 
@@ -16,14 +19,14 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup .NET Core 7.0.x
+      - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/examples/WebExample/Program.cs b/examples/WebExample/Program.cs
@@ -48,6 +48,7 @@
         {
             o.Endpoint = new Uri("http://localhost:9411/api/v2/spans");
         })
+        .AddOtlpExporter()
         .AddHttpClientInstrumentation()
         .AddAspNetCoreInstrumentation()
         .AddConfluentKafkaInstrumentation();

diff --git a/examples/WebExample/WebExample.csproj b/examples/WebExample/WebExample.csproj
@@ -7,12 +7,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Confluent.Kafka" Version="2.2.0"/>
-        <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.5.1"/>
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.1"/>
-        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14"/>
-        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14"/>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
+        <PackageReference Include="Confluent.Kafka" Version="2.5.2"/>
+        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0"/>
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Confluent.Kafka.Extensions.OpenTelemetry/Confluent.Kafka.Extensions.OpenTelemetry.csproj b/src/Confluent.Kafka.Extensions.OpenTelemetry/Confluent.Kafka.Extensions.OpenTelemetry.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -26,16 +26,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Confluent.Kafka.Extensions.Diagnostics" Version="0.4.0"/>
+        <PackageReference Include="Confluent.Kafka.Extensions.Diagnostics" Version="0.5.0"/>
         <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="OpenTelemetry.Api" Version="1.5.1"/>
+        <PackageReference Include="OpenTelemetry.Api" Version="1.9.0"/>
     </ItemGroup>
 
     <ItemGroup>