update fix

danielqsj · danielqsj · commit 204a621360c5 · 2021-10-28T12:06:48.000+08:00
diff --git a/Sources/Exporters/Zipkin/Implementation/ZipkinConversionExtension.swift b/Sources/Exporters/Zipkin/Implementation/ZipkinConversionExtension.swift
@@ -46,13 +46,11 @@ struct ZipkinConversionExtension {
 
         var localEndpoint = defaultLocalEndpoint
 
-        if let serviceName = attributeEnumerationState.serviceName, !serviceName.isEmpty && !defaultServiceName.elementsEqual(serviceName) {
+        if let serviceName = attributeEnumerationState.serviceName, !serviceName.isEmpty, defaultServiceName != serviceName {
             if localEndpointCache[serviceName] == nil {
-                localEndpoint = defaultLocalEndpoint.clone(serviceName: serviceName)
-                localEndpointCache[serviceName] = localEndpoint
-            } else {
-                localEndpoint = localEndpointCache[serviceName]
+                localEndpointCache[serviceName] = defaultLocalEndpoint.clone(serviceName: serviceName)
             }
+            localEndpoint = localEndpointCache[serviceName] ?? localEndpoint
         }
 
         if let serviceNamespace = attributeEnumerationState.serviceNamespace, !serviceNamespace.isEmpty {

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,11 @@ struct ZipkinConversionExtension {`
`46`	`46`
`47`	`47`	`var localEndpoint = defaultLocalEndpoint`
`48`	`48`
`49`		`- if let serviceName = attributeEnumerationState.serviceName, !serviceName.isEmpty && !defaultServiceName.elementsEqual(serviceName) {`
	`49`	`+ if let serviceName = attributeEnumerationState.serviceName, !serviceName.isEmpty, defaultServiceName != serviceName {`
`50`	`50`	`if localEndpointCache[serviceName] == nil {`
`51`		`- localEndpoint = defaultLocalEndpoint.clone(serviceName: serviceName)`
`52`		`- localEndpointCache[serviceName] = localEndpoint`
`53`		`- } else {`
`54`		`- localEndpoint = localEndpointCache[serviceName]`
	`51`	`+ localEndpointCache[serviceName] = defaultLocalEndpoint.clone(serviceName: serviceName)`
`55`	`52`	`}`
	`53`	`+ localEndpoint = localEndpointCache[serviceName] ?? localEndpoint`
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`if let serviceNamespace = attributeEnumerationState.serviceNamespace, !serviceNamespace.isEmpty {`