From 90d85f101b1274f67dadef738c0019b138c19aa5 Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Thu, 7 Dec 2023 19:42:32 +0900 Subject: [PATCH 1/5] =?UTF-8?q?Sora=20C=20SDK=20=E3=81=AE=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E7=B5=B1=E8=A8=88?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collector/client.go | 2 ++ collector/sora_api.go | 1 + 2 files changed, 3 insertions(+) diff --git a/collector/client.go b/collector/client.go index ab2bc28..7ac9e19 100644 --- a/collector/client.go +++ b/collector/client.go @@ -19,6 +19,7 @@ func (m *ClientMetrics) Describe(ch chan<- *prometheus.Desc) { func (m *ClientMetrics) Collect(ch chan<- prometheus.Metric, report soraClientReport) { ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalFailedSoraClientType.SoraAndroidSdk), "android_sdk", "failed") + ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalFailedSoraClientType.SoraCSdk), "c_sdk", "failed") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalFailedSoraClientType.SoraCppSdk), "cpp_sdk", "failed") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalFailedSoraClientType.SoraFlutterSdk), "flutter_sdk", "failed") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalFailedSoraClientType.SoraIosSdk), "ios_sdk", "failed") @@ -30,6 +31,7 @@ func (m *ClientMetrics) Collect(ch chan<- prometheus.Metric, report soraClientRe ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalFailedSoraClientType.WebrtcLoadTestingToolZakuro), "zakuro", "failed") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalFailedSoraClientType.WebrtcNativeClientMomo), "momo", "failed") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalSuccessfulSoraClientType.SoraAndroidSdk), "android_sdk", "successful") + ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalSuccessfulSoraClientType.SoraCSdk), "c_sdk", "successful") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalSuccessfulSoraClientType.SoraCppSdk), "cpp_sdk", "successful") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalSuccessfulSoraClientType.SoraFlutterSdk), "flutter_sdk", "successful") ch <- newCounter(m.totalSoraClientConnections, float64(report.TotalSuccessfulSoraClientType.SoraIosSdk), "ios_sdk", "successful") diff --git a/collector/sora_api.go b/collector/sora_api.go index 08fd930..8011fe4 100644 --- a/collector/sora_api.go +++ b/collector/sora_api.go @@ -40,6 +40,7 @@ type soraWebhookReport struct { type soraClientStatistics struct { SoraAndroidSdk int64 `json:"sora_android_sdk"` + SoraCSdk int64 `json:"sora_c_sdk"` SoraCppSdk int64 `json:"sora_cpp_sdk"` SoraFlutterSdk int64 `json:"sora_flutter_sdk"` SoraIosSdk int64 `json:"sora_ios_sdk"` From 56088b1a22460bee7f2246394e4e5294033ba56a Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Thu, 7 Dec 2023 19:42:46 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E6=9C=9F=E5=BE=85=E5=80=A4=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main_test.go | 2 ++ test/maximum.metrics | 2 ++ test/sora_client_enabled.metrics | 2 ++ 3 files changed, 6 insertions(+) diff --git a/main_test.go b/main_test.go index 50f4a72..276625a 100644 --- a/main_test.go +++ b/main_test.go @@ -98,6 +98,7 @@ var ( "sora_client": { "total_failed_sora_client_type": { "sora_android_sdk": 1, + "sora_c_sdk": 12, "sora_cpp_sdk": 7, "sora_flutter_sdk": 9, "sora_ios_sdk": 2, @@ -111,6 +112,7 @@ var ( }, "total_successful_sora_client_type": { "sora_android_sdk": 11, + "sora_c_sdk": 1212, "sora_cpp_sdk": 77, "sora_flutter_sdk": 99, "sora_ios_sdk": 22, diff --git a/test/maximum.metrics b/test/maximum.metrics index 7f2aafd..755e312 100644 --- a/test/maximum.metrics +++ b/test/maximum.metrics @@ -25,6 +25,8 @@ sora_cluster_raft_term 3 # TYPE sora_client_type_total counter sora_client_type_total{client="android_sdk",state="failed"} 1 sora_client_type_total{client="android_sdk",state="successful"} 11 +sora_client_type_total{client="c_sdk",state="failed"} 12 +sora_client_type_total{client="c_sdk",state="successful"} 1212 sora_client_type_total{client="cpp_sdk",state="failed"} 7 sora_client_type_total{client="cpp_sdk",state="successful"} 77 sora_client_type_total{client="flutter_sdk",state="failed"} 9 diff --git a/test/sora_client_enabled.metrics b/test/sora_client_enabled.metrics index 5097d55..34fb87e 100644 --- a/test/sora_client_enabled.metrics +++ b/test/sora_client_enabled.metrics @@ -12,6 +12,8 @@ sora_average_setup_time_seconds 0 # TYPE sora_client_type_total counter sora_client_type_total{client="android_sdk",state="failed"} 1 sora_client_type_total{client="android_sdk",state="successful"} 11 +sora_client_type_total{client="c_sdk",state="failed"} 12 +sora_client_type_total{client="c_sdk",state="successful"} 1212 sora_client_type_total{client="cpp_sdk",state="failed"} 7 sora_client_type_total{client="cpp_sdk",state="successful"} 77 sora_client_type_total{client="flutter_sdk",state="failed"} 9 From 8d4639ebe7120b768496eb183c896fc9a6ce24bf Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Fri, 8 Dec 2023 10:04:53 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=81=AB=E8=BF=BD=E8=A8=98=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 0eb5139..e5314bc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,10 @@ # CHANGES +## develop + +- [ADD] `sora_client` の `sora_c_sdk` に対応する + - @tnamao + ## 2023.4.0 - [ADD] `sora_client` の `sora_python_sdk` に対応する From 0aa41f79eb0dcf729390a5aa1139b52543772ed0 Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Fri, 8 Dec 2023 10:13:57 +0900 Subject: [PATCH 4/5] bump staticcheck 2023.1.6 --- .github/workflows/ci.yml | 2 +- CHANGES.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41cd3a4..84199cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,5 +28,5 @@ jobs: - uses: dominikh/staticcheck-action@v1.3.0 with: - version: "2023.1.3" + version: "2023.1.6" install-go: false diff --git a/CHANGES.md b/CHANGES.md index e5314bc..e9196d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,8 @@ ## develop +- [UPDATE] CI の staticcheck のバージョンを 2023.1.6 に上げる + - @tnamao - [ADD] `sora_client` の `sora_c_sdk` に対応する - @tnamao From 6540e11d74e55488c526430e2247ff243106e66c Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Fri, 8 Dec 2023 10:20:21 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=81=AB=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92?= =?UTF-8?q?=E5=8F=8D=E6=98=A0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e9196d8..3696ffe 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # CHANGES -## develop +## 2023.5.0 - [UPDATE] CI の staticcheck のバージョンを 2023.1.6 に上げる - @tnamao