Merge branch 'main' into dependabot/go_modules/go.opentelemetry.io/co…

…ntrib/instrumentation/net/http/otelhttp-0.46.1

RELEASING.md

@@ -0,0 +1,11 @@
+# Releasing the library
+
+Release checklist
+
+ - Update `internal/utils/version.go` with new version. Create and merge PR.
+ - Tag the release `git tag vX.X.X && git push --tags`
+ - Create a [Github Release](https://github.com/solarwinds/apm-go/releases/new)
+
+Future consideration: add another step, after the release is complete, to update
+`version.go` with a prerelease name. If you released `v0.2.0`, perhaps the next
+prerelease version would be `v0.2.1-beta`.

go.mod

@@ -50,7 +50,7 @@ require (
 require (
 	github.com/stretchr/objx v0.5.1 // indirect
 	go.opentelemetry.io/otel v1.21.0
-	go.opentelemetry.io/otel/sdk v1.20.0
+	go.opentelemetry.io/otel/sdk v1.21.0
 	go.opentelemetry.io/otel/trace v1.21.0
 	golang.org/x/sys v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -48,8 +48,8 @@ go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
 go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
 go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
 go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
-go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM=
-go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0=
+go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
 go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
 go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=

internal/config/config.go

@@ -45,7 +45,7 @@ const (
 	// max config file size = 1MB
 	maxConfigFileSize = 1024 * 1024
 	// the default collector url
-	defaultSSLCollector    = "apm.collector.cloud.solarwinds.com:443"
+	defaultSSLCollector    = "apm.collector.na-01.cloud.solarwinds.com:443"
 	maxTokenBucketCapacity = 8
 	maxTokenBucketRate     = 4
 )
@@ -85,7 +85,7 @@ type Config struct {
 	sync.RWMutex `yaml:"-"`
 
 	// Collector defines the host and port of the SolarWinds Observability collector
-	Collector string `yaml:"Collector,omitempty" env:"SW_APM_COLLECTOR" default:"apm.collector.cloud.solarwinds.com:443"`
+	Collector string `yaml:"Collector,omitempty" env:"SW_APM_COLLECTOR" default:"apm.collector.na-01.cloud.solarwinds.com:443"`
 
 	// ServiceKey defines the service key and service name
 	ServiceKey string `yaml:"ServiceKey,omitempty" env:"SW_APM_SERVICE_KEY"`

internal/config/config_test.go

@@ -114,7 +114,7 @@ func TestPrintDelta(t *testing.T) {
 	changed.ReporterProperties.EventFlushInterval = 100
 
 	assert.Equal(t,
-		` - Collector (SW_APM_COLLECTOR) = test.com:443 (default: apm.collector.cloud.solarwinds.com:443)
+		` - Collector (SW_APM_COLLECTOR) = test.com:443 (default: apm.collector.na-01.cloud.solarwinds.com:443)
  - PrependDomain (SW_APM_PREPEND_DOMAIN) = true (default: false)
  - ReporterProperties.EventFlushInterval (SW_APM_EVENTS_FLUSH_INTERVAL) = 100 (default: 2)`,
 		getDelta(newConfig().reset(), changed, "").sanitize().String())

internal/utils/version.go

@@ -20,8 +20,8 @@ import (
 )
 
 var (
-	// The SolarWinds Observability Go agent version
-	version = "0.1" // TODO
+	// The SolarWinds Observability Go APM library version
+	version = "0.2.0"
 
 	// The Go version
 	goVersion = strings.TrimPrefix(runtime.Version(), "go")

license_check.sh

@@ -30,8 +30,7 @@ find . -type f \
     -not -path '*/\.git*' \
     -not -path '*/go.sum' \
     -not -path './LICENSE' \
-    -not -path '*/README.md' \
-    -not -path './CONTRIBUTING.md' \
+    -not -path '*/*.md' \
     -not -path './CODEOWNERS' \
     -not -path './\.editorconfig' \
     -not -path './\.codecov.yaml' \