mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 06:02:26 -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
				
			
		
							
								
								
									
										35
									
								
								vendor/google.golang.org/grpc/internal/pretty/pretty.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										35
									
								
								vendor/google.golang.org/grpc/internal/pretty/pretty.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -24,10 +24,8 @@ import ( | |||
| 	"encoding/json" | ||||
| 	"fmt" | ||||
| 
 | ||||
| 	"github.com/golang/protobuf/jsonpb" | ||||
| 	protov1 "github.com/golang/protobuf/proto" | ||||
| 	"google.golang.org/protobuf/encoding/protojson" | ||||
| 	protov2 "google.golang.org/protobuf/proto" | ||||
| 	"google.golang.org/protobuf/protoadapt" | ||||
| ) | ||||
| 
 | ||||
| const jsonIndent = "  " | ||||
|  | @ -36,21 +34,14 @@ const jsonIndent = "  " | |||
| // | ||||
| // If marshal fails, it falls back to fmt.Sprintf("%+v"). | ||||
| func ToJSON(e any) string { | ||||
| 	switch ee := e.(type) { | ||||
| 	case protov1.Message: | ||||
| 		mm := jsonpb.Marshaler{Indent: jsonIndent} | ||||
| 		ret, err := mm.MarshalToString(ee) | ||||
| 		if err != nil { | ||||
| 			// This may fail for proto.Anys, e.g. for xDS v2, LDS, the v2 | ||||
| 			// messages are not imported, and this will fail because the message | ||||
| 			// is not found. | ||||
| 			return fmt.Sprintf("%+v", ee) | ||||
| 		} | ||||
| 		return ret | ||||
| 	case protov2.Message: | ||||
| 	if ee, ok := e.(protoadapt.MessageV1); ok { | ||||
| 		e = protoadapt.MessageV2Of(ee) | ||||
| 	} | ||||
| 
 | ||||
| 	if ee, ok := e.(protoadapt.MessageV2); ok { | ||||
| 		mm := protojson.MarshalOptions{ | ||||
| 			Multiline: true, | ||||
| 			Indent:    jsonIndent, | ||||
| 			Multiline: true, | ||||
| 		} | ||||
| 		ret, err := mm.Marshal(ee) | ||||
| 		if err != nil { | ||||
|  | @ -60,13 +51,13 @@ func ToJSON(e any) string { | |||
| 			return fmt.Sprintf("%+v", ee) | ||||
| 		} | ||||
| 		return string(ret) | ||||
| 	default: | ||||
| 		ret, err := json.MarshalIndent(ee, "", jsonIndent) | ||||
| 		if err != nil { | ||||
| 			return fmt.Sprintf("%+v", ee) | ||||
| 		} | ||||
| 		return string(ret) | ||||
| 	} | ||||
| 
 | ||||
| 	ret, err := json.MarshalIndent(e, "", jsonIndent) | ||||
| 	if err != nil { | ||||
| 		return fmt.Sprintf("%+v", e) | ||||
| 	} | ||||
| 	return string(ret) | ||||
| } | ||||
| 
 | ||||
| // FormatJSON formats the input json bytes with indentation. | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue