mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 14:52:30 -05:00 
			
		
		
		
	[chore] pin otel library versions (#3538)
* pin otel library versions to v1.29.0 * bump otel deps to v1.32.0 (without actually bumping, hehe)
This commit is contained in:
		
					parent
					
						
							
								58f916e821
							
						
					
				
			
			
				commit
				
					
						aeacbe3962
					
				
			
		
					 2 changed files with 28 additions and 14 deletions
				
			
		
							
								
								
									
										24
									
								
								go.mod
									
										
									
									
									
								
							
							
						
						
									
										24
									
								
								go.mod
									
										
									
									
									
								
							|  | @ -2,12 +2,22 @@ module github.com/superseriousbusiness/gotosocial | ||||||
| 
 | 
 | ||||||
| go 1.22.2 | go 1.22.2 | ||||||
| 
 | 
 | ||||||
|  | // Replace modernc/sqlite with our version that fixes the concurrency INTERRUPT issue | ||||||
| replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.33.1-concurrency-workaround | replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.33.1-concurrency-workaround | ||||||
| 
 | 
 | ||||||
|  | // Below pin otel libraries to v1.29.0 until we can figure out issues | ||||||
| replace go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.29.0 | replace go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.29.0 | ||||||
| 
 | 
 | ||||||
|  | replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 | ||||||
|  | 
 | ||||||
|  | replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 | ||||||
|  | 
 | ||||||
| replace go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.29.0 | replace go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.29.0 | ||||||
| 
 | 
 | ||||||
|  | replace go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.29.0 | ||||||
|  | 
 | ||||||
|  | replace go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v1.29.0 | ||||||
|  | 
 | ||||||
| replace go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.29.0 | replace go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.29.0 | ||||||
| 
 | 
 | ||||||
| require ( | require ( | ||||||
|  | @ -69,14 +79,14 @@ require ( | ||||||
| 	github.com/uptrace/bun/extra/bunotel v1.2.5 | 	github.com/uptrace/bun/extra/bunotel v1.2.5 | ||||||
| 	github.com/wagslane/go-password-validator v0.3.0 | 	github.com/wagslane/go-password-validator v0.3.0 | ||||||
| 	github.com/yuin/goldmark v1.7.8 | 	github.com/yuin/goldmark v1.7.8 | ||||||
| 	go.opentelemetry.io/otel v1.31.0 | 	go.opentelemetry.io/otel v1.32.0 | ||||||
| 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 | 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 | ||||||
| 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 | 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 | ||||||
| 	go.opentelemetry.io/otel/exporters/prometheus v0.51.0 | 	go.opentelemetry.io/otel/exporters/prometheus v0.51.0 | ||||||
| 	go.opentelemetry.io/otel/metric v1.31.0 | 	go.opentelemetry.io/otel/metric v1.32.0 | ||||||
| 	go.opentelemetry.io/otel/sdk v1.29.0 | 	go.opentelemetry.io/otel/sdk v1.32.0 | ||||||
| 	go.opentelemetry.io/otel/sdk/metric v1.29.0 | 	go.opentelemetry.io/otel/sdk/metric v1.32.0 | ||||||
| 	go.opentelemetry.io/otel/trace v1.31.0 | 	go.opentelemetry.io/otel/trace v1.32.0 | ||||||
| 	go.uber.org/automaxprocs v1.6.0 | 	go.uber.org/automaxprocs v1.6.0 | ||||||
| 	golang.org/x/crypto v0.29.0 | 	golang.org/x/crypto v0.29.0 | ||||||
| 	golang.org/x/image v0.21.0 | 	golang.org/x/image v0.21.0 | ||||||
|  |  | ||||||
							
								
								
									
										18
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -974,7 +974,7 @@ go.mongodb.org/mongo-driver/bson/bsonrw | ||||||
| go.mongodb.org/mongo-driver/bson/bsontype | go.mongodb.org/mongo-driver/bson/bsontype | ||||||
| go.mongodb.org/mongo-driver/bson/primitive | go.mongodb.org/mongo-driver/bson/primitive | ||||||
| go.mongodb.org/mongo-driver/x/bsonx/bsoncore | go.mongodb.org/mongo-driver/x/bsonx/bsoncore | ||||||
| # go.opentelemetry.io/otel v1.31.0 => go.opentelemetry.io/otel v1.29.0 | # go.opentelemetry.io/otel v1.32.0 => go.opentelemetry.io/otel v1.29.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel | go.opentelemetry.io/otel | ||||||
| go.opentelemetry.io/otel/attribute | go.opentelemetry.io/otel/attribute | ||||||
|  | @ -998,14 +998,14 @@ go.opentelemetry.io/otel/semconv/v1.7.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace | go.opentelemetry.io/otel/exporters/otlp/otlptrace | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform | go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform | ||||||
| # go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 | # go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc | go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal | go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig | go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig | go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/retry | go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/retry | ||||||
| # go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 | # go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp | go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal | go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal | ||||||
|  | @ -1015,12 +1015,12 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/retry | ||||||
| # go.opentelemetry.io/otel/exporters/prometheus v0.51.0 | # go.opentelemetry.io/otel/exporters/prometheus v0.51.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/exporters/prometheus | go.opentelemetry.io/otel/exporters/prometheus | ||||||
| # go.opentelemetry.io/otel/metric v1.31.0 => go.opentelemetry.io/otel/metric v1.29.0 | # go.opentelemetry.io/otel/metric v1.32.0 => go.opentelemetry.io/otel/metric v1.29.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/metric | go.opentelemetry.io/otel/metric | ||||||
| go.opentelemetry.io/otel/metric/embedded | go.opentelemetry.io/otel/metric/embedded | ||||||
| go.opentelemetry.io/otel/metric/noop | go.opentelemetry.io/otel/metric/noop | ||||||
| # go.opentelemetry.io/otel/sdk v1.29.0 | # go.opentelemetry.io/otel/sdk v1.32.0 => go.opentelemetry.io/otel/sdk v1.29.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/sdk | go.opentelemetry.io/otel/sdk | ||||||
| go.opentelemetry.io/otel/sdk/instrumentation | go.opentelemetry.io/otel/sdk/instrumentation | ||||||
|  | @ -1028,7 +1028,7 @@ go.opentelemetry.io/otel/sdk/internal/env | ||||||
| go.opentelemetry.io/otel/sdk/internal/x | go.opentelemetry.io/otel/sdk/internal/x | ||||||
| go.opentelemetry.io/otel/sdk/resource | go.opentelemetry.io/otel/sdk/resource | ||||||
| go.opentelemetry.io/otel/sdk/trace | go.opentelemetry.io/otel/sdk/trace | ||||||
| # go.opentelemetry.io/otel/sdk/metric v1.29.0 | # go.opentelemetry.io/otel/sdk/metric v1.32.0 => go.opentelemetry.io/otel/sdk/metric v1.29.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/sdk/metric | go.opentelemetry.io/otel/sdk/metric | ||||||
| go.opentelemetry.io/otel/sdk/metric/internal | go.opentelemetry.io/otel/sdk/metric/internal | ||||||
|  | @ -1036,7 +1036,7 @@ go.opentelemetry.io/otel/sdk/metric/internal/aggregate | ||||||
| go.opentelemetry.io/otel/sdk/metric/internal/exemplar | go.opentelemetry.io/otel/sdk/metric/internal/exemplar | ||||||
| go.opentelemetry.io/otel/sdk/metric/internal/x | go.opentelemetry.io/otel/sdk/metric/internal/x | ||||||
| go.opentelemetry.io/otel/sdk/metric/metricdata | go.opentelemetry.io/otel/sdk/metric/metricdata | ||||||
| # go.opentelemetry.io/otel/trace v1.31.0 => go.opentelemetry.io/otel/trace v1.29.0 | # go.opentelemetry.io/otel/trace v1.32.0 => go.opentelemetry.io/otel/trace v1.29.0 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| go.opentelemetry.io/otel/trace | go.opentelemetry.io/otel/trace | ||||||
| go.opentelemetry.io/otel/trace/embedded | go.opentelemetry.io/otel/trace/embedded | ||||||
|  | @ -1347,5 +1347,9 @@ modernc.org/token | ||||||
| mvdan.cc/xurls/v2 | mvdan.cc/xurls/v2 | ||||||
| # modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.33.1-concurrency-workaround | # modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.33.1-concurrency-workaround | ||||||
| # go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.29.0 | # go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.29.0 | ||||||
|  | # go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 | ||||||
|  | # go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 | ||||||
| # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.29.0 | # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.29.0 | ||||||
|  | # go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.29.0 | ||||||
|  | # go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v1.29.0 | ||||||
| # go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.29.0 | # go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.29.0 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue