Merge pull request #2015 from Shopify/default-branch

Change default branch to main

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ Contributions are always welcome, both reporting issues and submitting pull requ
 
 Please make sure to include any potentially useful information in the issue, so we can pinpoint the issue faster without going back and forth.
 
-- What SHA of Sarama are you running? If this is not the latest SHA on the master branch, please try if the problem persists with the latest version.
+- What SHA of Sarama are you running? If this is not the latest SHA on the main branch, please try if the problem persists with the latest version.
 - You can set `sarama.Logger` to a [log.Logger](http://golang.org/pkg/log/#Logger) instance to capture debug output. Please include it in your issue description.
 - Also look at the logs of the Kafka broker you are connected to. If you see anything out of the ordinary, please include it.
 
@@ -28,4 +28,4 @@ We will gladly accept bug fixes, or additions to this library. Please fork this
 - Explicitly handle all error return values. If you really want to ignore an error value, you can assign it to `_`.You can use [errcheck](https://github.com/kisielk/errcheck) to verify whether you have handled all errors.
 - You may also want to run [golint](https://github.com/golang/lint) as well to detect style problems.
 - Add tests that cover the changes you made. Make sure to run `go test` with the `-race` argument to test for race conditions.
-- Make sure your code is supported by all the Go versions we support. You can rely on [Travis CI](https://travis-ci.org/Shopify/sarama) for testing older Go versions
+- Make sure your code is supported by all the Go versions we support. You can rely on GitHub Actions for testing older Go versions.

.github/stale.yml

@@ -18,7 +18,7 @@ issues:
     not had any activity on it in the past 90 days and will be closed in
     30 days if no updates occur.
 
-    Please check if the master branch has already resolved the issue
+    Please check if the main branch has already resolved the issue
     since it was raised. If you believe the issue is still valid and you
     would like input from the maintainers then please comment to ask for
     it to be reviewed.
@@ -30,5 +30,5 @@ pulls:
     no updates occur.
 
     If you believe the changes are still valid then please verify your
-    branch has no conflicts with master and rebase if needed. If you
+    branch has no conflicts with main and rebase if needed. If you
     are awaiting a (re-)review then please let us know.

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '39 12 * * 1'
 

README.md

@@ -1,8 +1,7 @@
 # sarama
 
 [![Go Reference](https://pkg.go.dev/badge/github.com/Shopify/sarama.svg)](https://pkg.go.dev/github.com/Shopify/sarama)
-[![Build Status](https://travis-ci.org/Shopify/sarama.svg?branch=master)](https://travis-ci.org/Shopify/sarama)
-[![Coverage](https://codecov.io/gh/Shopify/sarama/branch/master/graph/badge.svg)](https://codecov.io/gh/Shopify/sarama)
+[![Coverage](https://codecov.io/gh/Shopify/sarama/branch/main/graph/badge.svg)](https://codecov.io/gh/Shopify/sarama)
 
 Sarama is an MIT-licensed Go client library for [Apache Kafka](https://kafka.apache.org/) version 0.8 (and later).
 
@@ -29,7 +28,7 @@ A changelog is available [here](CHANGELOG.md).
 
 ## Contributing
 
-- Get started by checking our [contribution guidelines](https://github.com/Shopify/sarama/blob/master/.github/CONTRIBUTING.md).
+- Get started by checking our [contribution guidelines](https://github.com/Shopify/sarama/blob/main/.github/CONTRIBUTING.md).
 - Read the [Sarama wiki](https://github.com/Shopify/sarama/wiki) for more technical and design details.
 - The [Kafka Protocol Specification](https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol) contains a wealth of useful information.
 - For more general issues, there is [a google group](https://groups.google.com/forum/#!forum/kafka-clients) for Kafka client developers.

examples/consumergroup/main.go

@@ -153,7 +153,7 @@ func (consumer *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, clai
 	// NOTE:
 	// Do not move the code below to a goroutine.
 	// The `ConsumeClaim` itself is called within a goroutine, see:
-	// https://github.com/Shopify/sarama/blob/master/consumer_group.go#L27-L29
+	// https://github.com/Shopify/sarama/blob/main/consumer_group.go#L27-L29
 	for message := range claim.Messages() {
 		log.Printf("Message claimed: value = %s, timestamp = %v, topic = %s", string(message.Value), message.Timestamp, message.Topic)
 		session.MarkMessage(message, "")

examples/interceptors/trace_interceptor.go

@@ -22,7 +22,7 @@ func NewOTelInterceptor(brokers []string) *OTelInterceptor {
 	oi.tracer = global.TraceProvider().Tracer("shopify.com/sarama/examples/interceptors")
 
 	// These are based on the spec, which was reachable as of 2020-05-15
-	// https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/messaging.md
+	// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/messaging.md
 	oi.fixedAttrs = []kv.KeyValue{
 		kv.String("messaging.destination_kind", "topic"),
 		kv.String("span.otel.kind", "PRODUCER"),