mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 17:02:25 -05:00 
			
		
		
		
	[chore]: Bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc (#2878)
This commit is contained in:
		
					parent
					
						
							
								b2eecd9dc7
							
						
					
				
			
			
				commit
				
					
						1375a86919
					
				
			
		
					 12 changed files with 145 additions and 69 deletions
				
			
		
							
								
								
									
										4
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/fieldmask.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/fieldmask.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -41,7 +41,7 @@ func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.Field | |||
| 
 | ||||
| 		m, ok := item.node.(map[string]interface{}) | ||||
| 		switch { | ||||
| 		case ok: | ||||
| 		case ok && len(m) > 0: | ||||
| 			// if the item is an object, then enqueue all of its children | ||||
| 			for k, v := range m { | ||||
| 				if item.msg == nil { | ||||
|  | @ -96,6 +96,8 @@ func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.Field | |||
| 					queue = append(queue, child) | ||||
| 				} | ||||
| 			} | ||||
| 		case ok && len(m) == 0: | ||||
| 			fallthrough | ||||
| 		case len(item.path) > 0: | ||||
| 			// otherwise, it's a leaf node so print its path | ||||
| 			fm.Paths = append(fm.Paths, item.path) | ||||
|  |  | |||
							
								
								
									
										2
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/mux.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/mux.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -341,13 +341,13 @@ func (s *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { | |||
| 	} | ||||
| 
 | ||||
| 	if override := r.Header.Get("X-HTTP-Method-Override"); override != "" && s.isPathLengthFallback(r) { | ||||
| 		r.Method = strings.ToUpper(override) | ||||
| 		if err := r.ParseForm(); err != nil { | ||||
| 			_, outboundMarshaler := MarshalerForRequest(s, r) | ||||
| 			sterr := status.Error(codes.InvalidArgument, err.Error()) | ||||
| 			s.errorHandler(ctx, s, outboundMarshaler, w, r, sterr) | ||||
| 			return | ||||
| 		} | ||||
| 		r.Method = strings.ToUpper(override) | ||||
| 	} | ||||
| 
 | ||||
| 	var pathComponents []string | ||||
|  |  | |||
							
								
								
									
										38
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/query.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										38
									
								
								vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/query.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -51,11 +51,13 @@ func (*DefaultQueryParser) Parse(msg proto.Message, values url.Values, filter *u | |||
| 			key = match[1] | ||||
| 			values = append([]string{match[2]}, values...) | ||||
| 		} | ||||
| 		fieldPath := strings.Split(key, ".") | ||||
| 
 | ||||
| 		msgValue := msg.ProtoReflect() | ||||
| 		fieldPath := normalizeFieldPath(msgValue, strings.Split(key, ".")) | ||||
| 		if filter.HasCommonPrefix(fieldPath) { | ||||
| 			continue | ||||
| 		} | ||||
| 		if err := populateFieldValueFromPath(msg.ProtoReflect(), fieldPath, values); err != nil { | ||||
| 		if err := populateFieldValueFromPath(msgValue, fieldPath, values); err != nil { | ||||
| 			return err | ||||
| 		} | ||||
| 	} | ||||
|  | @ -68,6 +70,38 @@ func PopulateFieldFromPath(msg proto.Message, fieldPathString string, value stri | |||
| 	return populateFieldValueFromPath(msg.ProtoReflect(), fieldPath, []string{value}) | ||||
| } | ||||
| 
 | ||||
| func normalizeFieldPath(msgValue protoreflect.Message, fieldPath []string) []string { | ||||
| 	newFieldPath := make([]string, 0, len(fieldPath)) | ||||
| 	for i, fieldName := range fieldPath { | ||||
| 		fields := msgValue.Descriptor().Fields() | ||||
| 		fieldDesc := fields.ByTextName(fieldName) | ||||
| 		if fieldDesc == nil { | ||||
| 			fieldDesc = fields.ByJSONName(fieldName) | ||||
| 		} | ||||
| 		if fieldDesc == nil { | ||||
| 			// return initial field path values if no matching  message field was found | ||||
| 			return fieldPath | ||||
| 		} | ||||
| 
 | ||||
| 		newFieldPath = append(newFieldPath, string(fieldDesc.Name())) | ||||
| 
 | ||||
| 		// If this is the last element, we're done | ||||
| 		if i == len(fieldPath)-1 { | ||||
| 			break | ||||
| 		} | ||||
| 
 | ||||
| 		// Only singular message fields are allowed | ||||
| 		if fieldDesc.Message() == nil || fieldDesc.Cardinality() == protoreflect.Repeated { | ||||
| 			return fieldPath | ||||
| 		} | ||||
| 
 | ||||
| 		// Get the nested message | ||||
| 		msgValue = msgValue.Get(fieldDesc).Message() | ||||
| 	} | ||||
| 
 | ||||
| 	return newFieldPath | ||||
| } | ||||
| 
 | ||||
| func populateFieldValueFromPath(msgValue protoreflect.Message, fieldPath []string, values []string) error { | ||||
| 	if len(fieldPath) < 1 { | ||||
| 		return errors.New("no field path") | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue