mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 04:12:25 -05:00 
			
		
		
		
	[chore]: Bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp from 1.17.0 to 1.18.0 (#2207)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								f302ebb8e5
							
						
					
				
			
			
				commit
				
					
						c6fdcd52fa
					
				
			
		
					 72 changed files with 1040 additions and 864 deletions
				
			
		
							
								
								
									
										10
									
								
								vendor/google.golang.org/grpc/resolver/map.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/google.golang.org/grpc/resolver/map.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -20,7 +20,7 @@ package resolver | |||
| 
 | ||||
| type addressMapEntry struct { | ||||
| 	addr  Address | ||||
| 	value interface{} | ||||
| 	value any | ||||
| } | ||||
| 
 | ||||
| // AddressMap is a map of addresses to arbitrary values taking into account | ||||
|  | @ -69,7 +69,7 @@ func (l addressMapEntryList) find(addr Address) int { | |||
| } | ||||
| 
 | ||||
| // Get returns the value for the address in the map, if present. | ||||
| func (a *AddressMap) Get(addr Address) (value interface{}, ok bool) { | ||||
| func (a *AddressMap) Get(addr Address) (value any, ok bool) { | ||||
| 	addrKey := toMapKey(&addr) | ||||
| 	entryList := a.m[addrKey] | ||||
| 	if entry := entryList.find(addr); entry != -1 { | ||||
|  | @ -79,7 +79,7 @@ func (a *AddressMap) Get(addr Address) (value interface{}, ok bool) { | |||
| } | ||||
| 
 | ||||
| // Set updates or adds the value to the address in the map. | ||||
| func (a *AddressMap) Set(addr Address, value interface{}) { | ||||
| func (a *AddressMap) Set(addr Address, value any) { | ||||
| 	addrKey := toMapKey(&addr) | ||||
| 	entryList := a.m[addrKey] | ||||
| 	if entry := entryList.find(addr); entry != -1 { | ||||
|  | @ -127,8 +127,8 @@ func (a *AddressMap) Keys() []Address { | |||
| } | ||||
| 
 | ||||
| // Values returns a slice of all current map values. | ||||
| func (a *AddressMap) Values() []interface{} { | ||||
| 	ret := make([]interface{}, 0, a.Len()) | ||||
| func (a *AddressMap) Values() []any { | ||||
| 	ret := make([]any, 0, a.Len()) | ||||
| 	for _, entryList := range a.m { | ||||
| 		for _, entry := range entryList { | ||||
| 			ret = append(ret, entry.value) | ||||
|  |  | |||
							
								
								
									
										76
									
								
								vendor/google.golang.org/grpc/resolver/resolver.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										76
									
								
								vendor/google.golang.org/grpc/resolver/resolver.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -77,25 +77,6 @@ func GetDefaultScheme() string { | |||
| 	return defaultScheme | ||||
| } | ||||
| 
 | ||||
| // AddressType indicates the address type returned by name resolution. | ||||
| // | ||||
| // Deprecated: use Attributes in Address instead. | ||||
| type AddressType uint8 | ||||
| 
 | ||||
| const ( | ||||
| 	// Backend indicates the address is for a backend server. | ||||
| 	// | ||||
| 	// Deprecated: use Attributes in Address instead. | ||||
| 	Backend AddressType = iota | ||||
| 	// GRPCLB indicates the address is for a grpclb load balancer. | ||||
| 	// | ||||
| 	// Deprecated: to select the GRPCLB load balancing policy, use a service | ||||
| 	// config with a corresponding loadBalancingConfig.  To supply balancer | ||||
| 	// addresses to the GRPCLB load balancing policy, set State.Attributes | ||||
| 	// using balancer/grpclb/state.Set. | ||||
| 	GRPCLB | ||||
| ) | ||||
| 
 | ||||
| // Address represents a server the client connects to. | ||||
| // | ||||
| // # Experimental | ||||
|  | @ -111,9 +92,6 @@ type Address struct { | |||
| 	// the address, instead of the hostname from the Dial target string. In most cases, | ||||
| 	// this should not be set. | ||||
| 	// | ||||
| 	// If Type is GRPCLB, ServerName should be the name of the remote load | ||||
| 	// balancer, not the name of the backend. | ||||
| 	// | ||||
| 	// WARNING: ServerName must only be populated with trusted values. It | ||||
| 	// is insecure to populate it with data from untrusted inputs since untrusted | ||||
| 	// values could be used to bypass the authority checks performed by TLS. | ||||
|  | @ -126,18 +104,16 @@ type Address struct { | |||
| 	// BalancerAttributes contains arbitrary data about this address intended | ||||
| 	// for consumption by the LB policy.  These attributes do not affect SubConn | ||||
| 	// creation, connection establishment, handshaking, etc. | ||||
| 	BalancerAttributes *attributes.Attributes | ||||
| 
 | ||||
| 	// Type is the type of this address. | ||||
| 	// | ||||
| 	// Deprecated: use Attributes instead. | ||||
| 	Type AddressType | ||||
| 	// Deprecated: when an Address is inside an Endpoint, this field should not | ||||
| 	// be used, and it will eventually be removed entirely. | ||||
| 	BalancerAttributes *attributes.Attributes | ||||
| 
 | ||||
| 	// Metadata is the information associated with Addr, which may be used | ||||
| 	// to make load balancing decision. | ||||
| 	// | ||||
| 	// Deprecated: use Attributes instead. | ||||
| 	Metadata interface{} | ||||
| 	Metadata any | ||||
| } | ||||
| 
 | ||||
| // Equal returns whether a and o are identical.  Metadata is compared directly, | ||||
|  | @ -150,7 +126,7 @@ func (a Address) Equal(o Address) bool { | |||
| 	return a.Addr == o.Addr && a.ServerName == o.ServerName && | ||||
| 		a.Attributes.Equal(o.Attributes) && | ||||
| 		a.BalancerAttributes.Equal(o.BalancerAttributes) && | ||||
| 		a.Type == o.Type && a.Metadata == o.Metadata | ||||
| 		a.Metadata == o.Metadata | ||||
| } | ||||
| 
 | ||||
| // String returns JSON formatted string representation of the address. | ||||
|  | @ -194,11 +170,37 @@ type BuildOptions struct { | |||
| 	Dialer func(context.Context, string) (net.Conn, error) | ||||
| } | ||||
| 
 | ||||
| // An Endpoint is one network endpoint, or server, which may have multiple | ||||
| // addresses with which it can be accessed. | ||||
| type Endpoint struct { | ||||
| 	// Addresses contains a list of addresses used to access this endpoint. | ||||
| 	Addresses []Address | ||||
| 
 | ||||
| 	// Attributes contains arbitrary data about this endpoint intended for | ||||
| 	// consumption by the LB policy. | ||||
| 	Attributes *attributes.Attributes | ||||
| } | ||||
| 
 | ||||
| // State contains the current Resolver state relevant to the ClientConn. | ||||
| type State struct { | ||||
| 	// Addresses is the latest set of resolved addresses for the target. | ||||
| 	// | ||||
| 	// If a resolver sets Addresses but does not set Endpoints, one Endpoint | ||||
| 	// will be created for each Address before the State is passed to the LB | ||||
| 	// policy.  The BalancerAttributes of each entry in Addresses will be set | ||||
| 	// in Endpoints.Attributes, and be cleared in the Endpoint's Address's | ||||
| 	// BalancerAttributes. | ||||
| 	// | ||||
| 	// Soon, Addresses will be deprecated and replaced fully by Endpoints. | ||||
| 	Addresses []Address | ||||
| 
 | ||||
| 	// Endpoints is the latest set of resolved endpoints for the target. | ||||
| 	// | ||||
| 	// If a resolver produces a State containing Endpoints but not Addresses, | ||||
| 	// it must take care to ensure the LB policies it selects will support | ||||
| 	// Endpoints. | ||||
| 	Endpoints []Endpoint | ||||
| 
 | ||||
| 	// ServiceConfig contains the result from parsing the latest service | ||||
| 	// config.  If it is nil, it indicates no service config is present or the | ||||
| 	// resolver does not provide service configs. | ||||
|  | @ -258,15 +260,6 @@ type ClientConn interface { | |||
| // target does not contain a scheme or if the parsed scheme is not registered | ||||
| // (i.e. no corresponding resolver available to resolve the endpoint), we will | ||||
| // apply the default scheme, and will attempt to reparse it. | ||||
| // | ||||
| // Examples: | ||||
| // | ||||
| //   - "dns://some_authority/foo.bar" | ||||
| //     Target{Scheme: "dns", Authority: "some_authority", Endpoint: "foo.bar"} | ||||
| //   - "foo.bar" | ||||
| //     Target{Scheme: resolver.GetDefaultScheme(), Endpoint: "foo.bar"} | ||||
| //   - "unknown_scheme://authority/endpoint" | ||||
| //     Target{Scheme: resolver.GetDefaultScheme(), Endpoint: "unknown_scheme://authority/endpoint"} | ||||
| type Target struct { | ||||
| 	// URL contains the parsed dial target with an optional default scheme added | ||||
| 	// to it if the original dial target contained no scheme or contained an | ||||
|  | @ -321,10 +314,3 @@ type Resolver interface { | |||
| 	// Close closes the resolver. | ||||
| 	Close() | ||||
| } | ||||
| 
 | ||||
| // UnregisterForTesting removes the resolver builder with the given scheme from the | ||||
| // resolver map. | ||||
| // This function is for testing only. | ||||
| func UnregisterForTesting(scheme string) { | ||||
| 	delete(m, scheme) | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue