mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 05:22:24 -05:00 
			
		
		
		
	[chore] Update usage of OTEL libraries (#2725)
* otel to 1.24 * prometheus exporter to 0.46 * bunotel to 1.1.17 Also: * Use schemaless URL for metrics * Add software version to tracing schema
This commit is contained in:
		
					parent
					
						
							
								8e88ee8d9c
							
						
					
				
			
			
				commit
				
					
						5e871e81a8
					
				
			
		
					 126 changed files with 12940 additions and 2267 deletions
				
			
		
							
								
								
									
										32
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/mux.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										32
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/mux.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -57,6 +57,7 @@ type ServeMux struct { | |||
| 	marshalers                marshalerRegistry | ||||
| 	incomingHeaderMatcher     HeaderMatcherFunc | ||||
| 	outgoingHeaderMatcher     HeaderMatcherFunc | ||||
| 	outgoingTrailerMatcher    HeaderMatcherFunc | ||||
| 	metadataAnnotators        []func(context.Context, *http.Request) metadata.MD | ||||
| 	errorHandler              ErrorHandlerFunc | ||||
| 	streamErrorHandler        StreamErrorHandlerFunc | ||||
|  | @ -114,10 +115,18 @@ func DefaultHeaderMatcher(key string) (string, bool) { | |||
| 	return "", false | ||||
| } | ||||
| 
 | ||||
| func defaultOutgoingHeaderMatcher(key string) (string, bool) { | ||||
| 	return fmt.Sprintf("%s%s", MetadataHeaderPrefix, key), true | ||||
| } | ||||
| 
 | ||||
| func defaultOutgoingTrailerMatcher(key string) (string, bool) { | ||||
| 	return fmt.Sprintf("%s%s", MetadataTrailerPrefix, key), true | ||||
| } | ||||
| 
 | ||||
| // WithIncomingHeaderMatcher returns a ServeMuxOption representing a headerMatcher for incoming request to gateway. | ||||
| // | ||||
| // This matcher will be called with each header in http.Request. If matcher returns true, that header will be | ||||
| // passed to gRPC context. To transform the header before passing to gRPC context, matcher should return modified header. | ||||
| // passed to gRPC context. To transform the header before passing to gRPC context, matcher should return the modified header. | ||||
| func WithIncomingHeaderMatcher(fn HeaderMatcherFunc) ServeMuxOption { | ||||
| 	for _, header := range fn.matchedMalformedHeaders() { | ||||
| 		grpclog.Warningf("The configured forwarding filter would allow %q to be sent to the gRPC server, which will likely cause errors. See https://github.com/grpc/grpc-go/pull/4803#issuecomment-986093310 for more information.", header) | ||||
|  | @ -147,13 +156,24 @@ func (fn HeaderMatcherFunc) matchedMalformedHeaders() []string { | |||
| // | ||||
| // This matcher will be called with each header in response header metadata. If matcher returns true, that header will be | ||||
| // passed to http response returned from gateway. To transform the header before passing to response, | ||||
| // matcher should return modified header. | ||||
| // matcher should return the modified header. | ||||
| func WithOutgoingHeaderMatcher(fn HeaderMatcherFunc) ServeMuxOption { | ||||
| 	return func(mux *ServeMux) { | ||||
| 		mux.outgoingHeaderMatcher = fn | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // WithOutgoingTrailerMatcher returns a ServeMuxOption representing a headerMatcher for outgoing response from gateway. | ||||
| // | ||||
| // This matcher will be called with each header in response trailer metadata. If matcher returns true, that header will be | ||||
| // passed to http response returned from gateway. To transform the header before passing to response, | ||||
| // matcher should return the modified header. | ||||
| func WithOutgoingTrailerMatcher(fn HeaderMatcherFunc) ServeMuxOption { | ||||
| 	return func(mux *ServeMux) { | ||||
| 		mux.outgoingTrailerMatcher = fn | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // WithMetadata returns a ServeMuxOption for passing metadata to a gRPC context. | ||||
| // | ||||
| // This can be used by services that need to read from http.Request and modify gRPC context. A common use case | ||||
|  | @ -273,11 +293,11 @@ func NewServeMux(opts ...ServeMuxOption) *ServeMux { | |||
| 	if serveMux.incomingHeaderMatcher == nil { | ||||
| 		serveMux.incomingHeaderMatcher = DefaultHeaderMatcher | ||||
| 	} | ||||
| 
 | ||||
| 	if serveMux.outgoingHeaderMatcher == nil { | ||||
| 		serveMux.outgoingHeaderMatcher = func(key string) (string, bool) { | ||||
| 			return fmt.Sprintf("%s%s", MetadataHeaderPrefix, key), true | ||||
| 		} | ||||
| 		serveMux.outgoingHeaderMatcher = defaultOutgoingHeaderMatcher | ||||
| 	} | ||||
| 	if serveMux.outgoingTrailerMatcher == nil { | ||||
| 		serveMux.outgoingTrailerMatcher = defaultOutgoingTrailerMatcher | ||||
| 	} | ||||
| 
 | ||||
| 	return serveMux | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue