Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stubenhuang committed Aug 10, 2022
2 parents 67acb23 + 2752b83 commit eb5a14c
Show file tree
Hide file tree
Showing 59 changed files with 3,165 additions and 62 deletions.
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ allprojects {
repositories {
mavenCentral()
jcenter()
gradlePluginPortal()
}
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ repositories {

kotlinDslPluginOptions {
experimentalWarning.set(false)
}
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ object Libs {
const val DependencyManagement = "io.spring.gradle:dependency-management-plugin:${Versions.DependencyManagement}"
const val KotlinSpringGradlePlugin = "org.jetbrains.kotlin:kotlin-allopen:${Versions.Kotlin}"
const val KtLint = "com.pinterest:ktlint:${Versions.KtLint}"
const val GoogleJibPlugin = "gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:${Versions.Jib}"
}

object MavenBom {
Expand Down
7 changes: 4 additions & 3 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
object Release {
const val Group = "com.tencent.devops"
const val Version = "0.0.5"
const val Version = "0.0.6"
}

object Versions {
const val Jib: String = "3.2.0"
const val Java = "1.8"
const val Kotlin = "1.4.32"
const val SpringBoot = "2.4.5"
const val SpringCloud = "2020.0.2"
const val SpringBoot = "2.5.13"
const val SpringCloud = "2020.0.3"
const val DependencyManagement = "1.0.11.RELEASE"
const val NexusPublish = "0.4.0"
const val NexusStaging = "0.22.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package com.tencent.devops.loadbalancer.gray

import org.slf4j.LoggerFactory
import org.springframework.beans.factory.ObjectProvider
import org.springframework.cloud.client.ServiceInstance
import org.springframework.cloud.client.loadbalancer.DefaultResponse
import org.springframework.cloud.client.loadbalancer.EmptyResponse
import org.springframework.cloud.client.loadbalancer.Request
import org.springframework.cloud.client.loadbalancer.Response
import org.springframework.cloud.loadbalancer.core.NoopServiceInstanceListSupplier
import org.springframework.cloud.loadbalancer.core.ReactorServiceInstanceLoadBalancer
import org.springframework.cloud.loadbalancer.core.SelectedInstanceCallback
import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier
import reactor.core.publisher.Mono
import java.util.Random
import java.util.concurrent.atomic.AtomicInteger
import kotlin.math.abs

open class BaseLoadBalancer(
private val serviceInstanceListSupplierProvider: ObjectProvider<ServiceInstanceListSupplier>,
private val serviceId: String,
private val position: AtomicInteger = AtomicInteger(Random().nextInt(1000))
) : ReactorServiceInstanceLoadBalancer {
override fun choose(request: Request<*>?): Mono<Response<ServiceInstance>> {
val supplier = serviceInstanceListSupplierProvider.getIfAvailable { NoopServiceInstanceListSupplier() }
return supplier.get(request).next().map { processInstanceResponse(supplier, it) }
}

private fun processInstanceResponse(
supplier: ServiceInstanceListSupplier,
serviceInstances: List<ServiceInstance>
): Response<ServiceInstance> {
val serviceInstanceResponse = getInstanceResponse(serviceInstances)
if (supplier is SelectedInstanceCallback && serviceInstanceResponse.hasServer()) {
supplier.selectedServiceInstance(serviceInstanceResponse.server)
}
return serviceInstanceResponse
}

protected open fun getInstanceResponse(instances: List<ServiceInstance>): Response<ServiceInstance> {
// 使用k8s的service的时候,应该只有一个endpoint,所以这里只取第一个
if (instances.size == 1) {
return DefaultResponse(instances[0])
}
return roundRobinChoose(instances)
}

protected open fun roundRobinChoose(instances: List<ServiceInstance>): Response<ServiceInstance> {
if (instances.isEmpty()) {
if (logger.isWarnEnabled) {
logger.warn("No servers available for service: $serviceId")
}
return EmptyResponse()
}

// TODO: enforce order?
val pos = abs(this.position.incrementAndGet())
val instance = instances[pos % instances.size]
return DefaultResponse(instance)
}

companion object {
private val logger = LoggerFactory.getLogger(BaseLoadBalancer::class.java)
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.tencent.devops.loadbalancer.gray

import com.tencent.devops.loadbalancer.config.DevOpsLoadBalancerProperties
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.cloud.client.ServiceInstance
import org.springframework.cloud.client.serviceregistry.Registration
Expand All @@ -18,7 +19,8 @@ class GrayLoadBalancerConfiguration : LoadBalancerClientConfiguration() {

@Bean
@ConditionalOnMissingBean
fun reactorServiceInstanceLoadBalancer(
@ConditionalOnBean(Registration::class)
fun grayReactorServiceInstanceLoadBalancer(
loadBalancerProperties: DevOpsLoadBalancerProperties,
registration: Registration,
environment: Environment,
Expand All @@ -34,4 +36,19 @@ class GrayLoadBalancerConfiguration : LoadBalancerClientConfiguration() {
serviceId = name.orEmpty()
)
}

@Bean
@ConditionalOnMissingBean(Registration::class)
override fun reactorServiceInstanceLoadBalancer(
environment: Environment,
loadBalancerClientFactory: LoadBalancerClientFactory
): ReactorLoadBalancer<ServiceInstance> {
val name = environment.getProperty(LoadBalancerClientFactory.PROPERTY_NAME)
val serviceInstanceListSupplier =
loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier::class.java)
return BaseLoadBalancer(
serviceInstanceListSupplierProvider = serviceInstanceListSupplier,
serviceId = name.orEmpty()
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@ import org.slf4j.LoggerFactory
import org.springframework.beans.factory.ObjectProvider
import org.springframework.cloud.client.ServiceInstance
import org.springframework.cloud.client.loadbalancer.DefaultResponse
import org.springframework.cloud.client.loadbalancer.EmptyResponse
import org.springframework.cloud.client.loadbalancer.Request
import org.springframework.cloud.client.loadbalancer.Response
import org.springframework.cloud.client.serviceregistry.Registration
import org.springframework.cloud.loadbalancer.core.NoopServiceInstanceListSupplier
import org.springframework.cloud.loadbalancer.core.ReactorServiceInstanceLoadBalancer
import org.springframework.cloud.loadbalancer.core.SelectedInstanceCallback
import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier
import reactor.core.publisher.Mono
import java.util.Random
import java.util.concurrent.atomic.AtomicInteger
import kotlin.math.abs

/**
* 支持灰度调用的loadbalancer
Expand All @@ -26,9 +23,9 @@ class GraySupportedLoadBalancer(
private val loadBalancerProperties: DevOpsLoadBalancerProperties,
private val registration: Registration,
private val serviceInstanceListSupplierProvider: ObjectProvider<ServiceInstanceListSupplier>,
private val serviceId: String,
private val position: AtomicInteger = AtomicInteger(Random().nextInt(1000))
) : ReactorServiceInstanceLoadBalancer {
serviceId: String,
position: AtomicInteger = AtomicInteger(Random().nextInt(1000))
) : BaseLoadBalancer(serviceInstanceListSupplierProvider, serviceId, position) {
override fun choose(request: Request<*>?): Mono<Response<ServiceInstance>> {
val supplier = serviceInstanceListSupplierProvider.getIfAvailable { NoopServiceInstanceListSupplier() }
return supplier.get(request).next().map { processInstanceResponse(supplier, it) }
Expand All @@ -45,7 +42,7 @@ class GraySupportedLoadBalancer(
return serviceInstanceResponse
}

private fun getInstanceResponse(instances: List<ServiceInstance>): Response<ServiceInstance> {
override fun getInstanceResponse(instances: List<ServiceInstance>): Response<ServiceInstance> {
val filteredInstances = if (loadBalancerProperties.gray.enabled) {
if (loadBalancerProperties.gray.metaKey.isEmpty()) {
logger.warn("Load balancer gray meta-key is empty.")
Expand All @@ -65,20 +62,6 @@ class GraySupportedLoadBalancer(
return roundRobinChoose(filteredInstances)
}

private fun roundRobinChoose(instances: List<ServiceInstance>): Response<ServiceInstance> {
if (instances.isEmpty()) {
if (logger.isWarnEnabled) {
logger.warn("No servers available for service: $serviceId")
}
return EmptyResponse()
}

// TODO: enforce order?
val pos = abs(this.position.incrementAndGet())
val instance = instances[pos % instances.size]
return DefaultResponse(instance)
}

companion object {
private val logger = LoggerFactory.getLogger(GraySupportedLoadBalancer::class.java)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
description = "DevOps Boot Pulsar"

dependencies {
api("org.springframework.cloud:spring-cloud-stream")
api("org.springframework.boot:spring-boot-actuator")
api("org.springframework.boot:spring-boot-actuator-autoconfigure")
api("org.apache.pulsar:pulsar-client")
api("com.google.protobuf:protobuf-java")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
/*
* Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
*
* Copyright (C) 2021 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.stream.binder.pulsar

import com.tencent.devops.stream.binder.pulsar.integration.inbound.PulsarInboundChannelAdapter
import com.tencent.devops.stream.binder.pulsar.integration.outbound.PulsarProducerMessageHandler
import com.tencent.devops.stream.binder.pulsar.properties.PulsarBinderConfigurationProperties
import com.tencent.devops.stream.binder.pulsar.properties.PulsarConsumerProperties
import com.tencent.devops.stream.binder.pulsar.properties.PulsarExtendedBindingProperties
import com.tencent.devops.stream.binder.pulsar.properties.PulsarProducerProperties
import com.tencent.devops.stream.binder.pulsar.provisioning.PulsarMessageQueueProvisioner
import org.springframework.cloud.stream.binder.AbstractMessageChannelBinder
import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties
import org.springframework.cloud.stream.binder.ExtendedProducerProperties
import org.springframework.cloud.stream.binder.ExtendedPropertiesBinder
import org.springframework.cloud.stream.provisioning.ConsumerDestination
import org.springframework.cloud.stream.provisioning.ProducerDestination
import org.springframework.integration.core.MessageProducer
import org.springframework.messaging.MessageChannel
import org.springframework.messaging.MessageHandler

class PulsarMessageChannelBinder(
messageBinderProvisioner: PulsarMessageQueueProvisioner,
private val extendedBindingProperties: PulsarExtendedBindingProperties,
private val pulsarProperties: PulsarBinderConfigurationProperties
) : AbstractMessageChannelBinder<
ExtendedConsumerProperties<PulsarConsumerProperties>,
ExtendedProducerProperties<PulsarProducerProperties>, PulsarMessageQueueProvisioner
>(
arrayOf(),
messageBinderProvisioner
),
ExtendedPropertiesBinder<MessageChannel, PulsarConsumerProperties, PulsarProducerProperties> {

override fun createProducerMessageHandler(
destination: ProducerDestination?,
producerProperties: ExtendedProducerProperties<PulsarProducerProperties>?,
errorChannel: MessageChannel?
): MessageHandler {
throw IllegalStateException(
"The abstract binder should not call this method"
)
}

override fun createProducerMessageHandler(
destination: ProducerDestination,
producerProperties: ExtendedProducerProperties<PulsarProducerProperties>,
channel: MessageChannel,
errorChannel: MessageChannel?
): MessageHandler {
val messageHandler = PulsarProducerMessageHandler(
destination = destination,
producerProperties = producerProperties.extension,
pulsarProperties = pulsarProperties.pulsarProperties!!
)
messageHandler.setApplicationContext(this.applicationContext)
if (errorChannel != null) {
// TODO 需要处理
}
// val partitioningInterceptor = (channel as AbstractMessageChannel)
// .interceptors.stream()
// .filter { channelInterceptor: ChannelInterceptor? -> channelInterceptor is PartitioningInterceptor }
// .map { channelInterceptor: ChannelInterceptor? -> channelInterceptor as PartitioningInterceptor? }
// .findFirst().orElse(null)
// TODO 分区处理
// messageHandler.partitioningInterceptor = partitioningInterceptor
messageHandler.setBeanFactory(applicationContext.beanFactory)
// TODO 错误消息策略
// messageHandler.setErrorMessageStrategy(this.errorMessageStrategy)
return messageHandler
}

override fun createConsumerEndpoint(
destination: ConsumerDestination?,
group: String?,
properties: ExtendedConsumerProperties<PulsarConsumerProperties>
): MessageProducer {

val inboundChannelAdapter = PulsarInboundChannelAdapter(
destination = destination!!.name,
extendedConsumerProperties = properties,
pulsarProperties = pulsarProperties.pulsarProperties!!,
group = group
)
val errorInfrastructure = registerErrorInfrastructure(
destination,
group, properties
)
if (properties.maxAttempts > 1) {
inboundChannelAdapter.retryTemplate = buildRetryTemplate(properties)
inboundChannelAdapter.recoveryCallback = errorInfrastructure.recoverer
} else {
inboundChannelAdapter.errorChannel = errorInfrastructure.errorChannel
}
return inboundChannelAdapter
}

// TODO Polled Consumer 定时拉取处理

override fun getExtendedConsumerProperties(channelName: String?): PulsarConsumerProperties {
return extendedBindingProperties.getExtendedConsumerProperties(channelName)
}

override fun getExtendedProducerProperties(channelName: String?): PulsarProducerProperties {
return extendedBindingProperties.getExtendedProducerProperties(channelName)
}

override fun getDefaultsPrefix(): String {
return this.extendedBindingProperties.defaultsPrefix
}

override fun getExtendedPropertiesEntryClass(): Class<out BinderSpecificPropertiesProvider> {
return extendedBindingProperties.extendedPropertiesEntryClass
}
}
Loading

0 comments on commit eb5a14c

Please sign in to comment.