mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 22:02:25 -05:00 
			
		
		
		
	[chore]: Bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc (#2818)
Bumps [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) from 1.24.0 to 1.25.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.24.0...v1.25.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								db2dcc3455
							
						
					
				
			
			
				commit
				
					
						c097745c38
					
				
			
		
					 286 changed files with 4546 additions and 16869 deletions
				
			
		
							
								
								
									
										29
									
								
								vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										29
									
								
								vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -45,6 +45,13 @@ import ( | |||
| // addresses from SRV records.  Must not be changed after init time. | ||||
| var EnableSRVLookups = false | ||||
| 
 | ||||
| // ResolvingTimeout specifies the maximum duration for a DNS resolution request. | ||||
| // If the timeout expires before a response is received, the request will be canceled. | ||||
| // | ||||
| // It is recommended to set this value at application startup. Avoid modifying this variable | ||||
| // after initialization as it's not thread-safe for concurrent modification. | ||||
| var ResolvingTimeout = 30 * time.Second | ||||
| 
 | ||||
| var logger = grpclog.Component("dns") | ||||
| 
 | ||||
| func init() { | ||||
|  | @ -221,18 +228,18 @@ func (d *dnsResolver) watcher() { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| func (d *dnsResolver) lookupSRV() ([]resolver.Address, error) { | ||||
| func (d *dnsResolver) lookupSRV(ctx context.Context) ([]resolver.Address, error) { | ||||
| 	if !EnableSRVLookups { | ||||
| 		return nil, nil | ||||
| 	} | ||||
| 	var newAddrs []resolver.Address | ||||
| 	_, srvs, err := d.resolver.LookupSRV(d.ctx, "grpclb", "tcp", d.host) | ||||
| 	_, srvs, err := d.resolver.LookupSRV(ctx, "grpclb", "tcp", d.host) | ||||
| 	if err != nil { | ||||
| 		err = handleDNSError(err, "SRV") // may become nil | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	for _, s := range srvs { | ||||
| 		lbAddrs, err := d.resolver.LookupHost(d.ctx, s.Target) | ||||
| 		lbAddrs, err := d.resolver.LookupHost(ctx, s.Target) | ||||
| 		if err != nil { | ||||
| 			err = handleDNSError(err, "A") // may become nil | ||||
| 			if err == nil { | ||||
|  | @ -269,8 +276,8 @@ func handleDNSError(err error, lookupType string) error { | |||
| 	return err | ||||
| } | ||||
| 
 | ||||
| func (d *dnsResolver) lookupTXT() *serviceconfig.ParseResult { | ||||
| 	ss, err := d.resolver.LookupTXT(d.ctx, txtPrefix+d.host) | ||||
| func (d *dnsResolver) lookupTXT(ctx context.Context) *serviceconfig.ParseResult { | ||||
| 	ss, err := d.resolver.LookupTXT(ctx, txtPrefix+d.host) | ||||
| 	if err != nil { | ||||
| 		if envconfig.TXTErrIgnore { | ||||
| 			return nil | ||||
|  | @ -297,8 +304,8 @@ func (d *dnsResolver) lookupTXT() *serviceconfig.ParseResult { | |||
| 	return d.cc.ParseServiceConfig(sc) | ||||
| } | ||||
| 
 | ||||
| func (d *dnsResolver) lookupHost() ([]resolver.Address, error) { | ||||
| 	addrs, err := d.resolver.LookupHost(d.ctx, d.host) | ||||
| func (d *dnsResolver) lookupHost(ctx context.Context) ([]resolver.Address, error) { | ||||
| 	addrs, err := d.resolver.LookupHost(ctx, d.host) | ||||
| 	if err != nil { | ||||
| 		err = handleDNSError(err, "A") | ||||
| 		return nil, err | ||||
|  | @ -316,8 +323,10 @@ func (d *dnsResolver) lookupHost() ([]resolver.Address, error) { | |||
| } | ||||
| 
 | ||||
| func (d *dnsResolver) lookup() (*resolver.State, error) { | ||||
| 	srv, srvErr := d.lookupSRV() | ||||
| 	addrs, hostErr := d.lookupHost() | ||||
| 	ctx, cancel := context.WithTimeout(d.ctx, ResolvingTimeout) | ||||
| 	defer cancel() | ||||
| 	srv, srvErr := d.lookupSRV(ctx) | ||||
| 	addrs, hostErr := d.lookupHost(ctx) | ||||
| 	if hostErr != nil && (srvErr != nil || len(srv) == 0) { | ||||
| 		return nil, hostErr | ||||
| 	} | ||||
|  | @ -327,7 +336,7 @@ func (d *dnsResolver) lookup() (*resolver.State, error) { | |||
| 		state = grpclbstate.Set(state, &grpclbstate.State{BalancerAddresses: srv}) | ||||
| 	} | ||||
| 	if !d.disableServiceConfig { | ||||
| 		state.ServiceConfig = d.lookupTXT() | ||||
| 		state.ServiceConfig = d.lookupTXT(ctx) | ||||
| 	} | ||||
| 	return &state, nil | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue