-
Notifications
You must be signed in to change notification settings - Fork 506
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'github/master' into rbac
- Loading branch information
Showing
33 changed files
with
885 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
...biz-auth/src/main/kotlin/com/tencent/devops/auth/service/AuthProjectUserMetricsService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. | ||
| * | ||
| * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * | ||
| * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. | ||
| * | ||
| * A copy of the MIT License is included in this file. | ||
| * | ||
| * | ||
| * Terms of the MIT License: | ||
| * --------------------------------------------------- | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the | ||
| * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to | ||
| * permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of | ||
| * the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT | ||
| * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN | ||
| * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | ||
| * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| */ | ||
|
|
||
| package com.tencent.devops.auth.service | ||
|
|
||
| import com.google.common.cache.CacheBuilder | ||
| import com.google.common.hash.BloomFilter | ||
| import com.google.common.hash.Funnels | ||
| import com.tencent.devops.common.event.dispatcher.pipeline.mq.MeasureEventDispatcher | ||
| import com.tencent.devops.common.event.pojo.measure.ProjectUserDailyEvent | ||
| import org.slf4j.LoggerFactory | ||
| import org.springframework.beans.factory.annotation.Autowired | ||
| import org.springframework.stereotype.Service | ||
| import java.nio.charset.Charset | ||
| import java.time.LocalDate | ||
| import java.util.concurrent.TimeUnit | ||
|
|
||
| @Service | ||
| @Suppress("UnstableApiUsage") | ||
| class AuthProjectUserMetricsService @Autowired constructor( | ||
| private val measureEventDispatcher: MeasureEventDispatcher | ||
| ) { | ||
|
|
||
| companion object { | ||
| private val logger = LoggerFactory.getLogger(AuthProjectUserMetricsService::class.java) | ||
| // 期待的用户数10w | ||
| private const val EXPECTED_USER_COUNT = 100000 | ||
| // 错误率0.1% | ||
| private const val EXPECTED_FPP = 0.001 | ||
| private val bloomFilterMap = CacheBuilder.newBuilder() | ||
| .maximumSize(2) | ||
| .expireAfterWrite(1, TimeUnit.DAYS) | ||
| .build<LocalDate, BloomFilter<String>>() | ||
| } | ||
|
|
||
| fun save( | ||
| projectId: String, | ||
| userId: String | ||
| ) { | ||
| val theDate = LocalDate.now() | ||
| try { | ||
| val bloomKey = "${projectId}_$userId" | ||
| val bloomFilter = getBloomFilter(theDate) | ||
| if (!bloomFilter.mightContain(bloomKey)) { | ||
| measureEventDispatcher.dispatch( | ||
| ProjectUserDailyEvent( | ||
| projectId = projectId, | ||
| userId = userId, | ||
| theDate = theDate | ||
| ) | ||
| ) | ||
| bloomFilter.put(bloomKey) | ||
| } | ||
| } catch (ignored: Throwable) { | ||
| logger.error("save auth user error", ignored) | ||
| } | ||
| } | ||
|
|
||
| private fun getBloomFilter(theDate: LocalDate): BloomFilter<String> { | ||
| var bloomFilter = bloomFilterMap.getIfPresent(theDate) | ||
| if (bloomFilter == null) { | ||
| bloomFilter = BloomFilter.create( | ||
| Funnels.stringFunnel(Charset.defaultCharset()), | ||
| EXPECTED_USER_COUNT, | ||
| EXPECTED_FPP | ||
| ) | ||
| bloomFilterMap.put(theDate, bloomFilter) | ||
| } | ||
| return bloomFilter!! | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...ent/src/main/kotlin/com/tencent/devops/common/event/pojo/measure/ProjectUserDailyEvent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. | ||
| * | ||
| * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * | ||
| * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. | ||
| * | ||
| * A copy of the MIT License is included in this file. | ||
| * | ||
| * | ||
| * Terms of the MIT License: | ||
| * --------------------------------------------------- | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the | ||
| * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to | ||
| * permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of | ||
| * the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT | ||
| * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN | ||
| * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | ||
| * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| */ | ||
|
|
||
| package com.tencent.devops.common.event.pojo.measure | ||
|
|
||
| import com.tencent.devops.common.event.annotation.Event | ||
| import com.tencent.devops.common.event.dispatcher.pipeline.mq.MQ | ||
| import io.swagger.annotations.ApiModelProperty | ||
| import java.time.LocalDate | ||
|
|
||
| @Event(exchange = MQ.EXCHANGE_PROJECT_USER_DAILY_FANOUT) | ||
| data class ProjectUserDailyEvent( | ||
| @ApiModelProperty("项目ID") | ||
| override val projectId: String, | ||
| @ApiModelProperty("用户ID") | ||
| val userId: String, | ||
| @ApiModelProperty("统计日期") | ||
| val theDate: LocalDate | ||
| ) : IMeasureEvent(projectId = projectId, pipelineId = "", buildId = "") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.